From b07db65d535db99bb581c4beb8739d757b1fe321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 8 Feb 2024 14:11:05 +0100 Subject: [PATCH] linux-lxatac: Drop unneeded pwm-bl patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the pwm hardware driver (here: pwm-stm32) has .get_state() implemented the extra effort to keep the pwm-bl state on probe isn't needed any more. Signed-off-by: Uwe Kleine-König --- .../recipes-kernel/linux/files/defconfig | 2 +- ...a-tac-reduce-RGMII-interface-drive-s.patch | 1 + ...-Avoid-backlight-flicker-applying-in.patch | 43 ------------------- ...d-new-helper-function-tty_get_tiocm.patch} | 0 ...Free-allocated-ttyname-buffer-on-de.patch} | 0 ...g-tty-Replace-mutex-with-completion.patch} | 0 ...-Make-rx-tx-activitate-configurable.patch} | 0 ...Add-additional-line-state-evaluatio.patch} | 0 ...6.7-customers-lxa-lxatac-20240208-1.patch} | 8 ++-- .../linux/files/patches/series.inc | 32 ++++++-------- 10 files changed, 19 insertions(+), 67 deletions(-) delete mode 100644 meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-backlight-pwm_bl-Avoid-backlight-flicker-applying-in.patch rename meta-lxatac-bsp/recipes-kernel/linux/files/patches/{0301-tty-add-new-helper-function-tty_get_tiocm.patch => 0201-tty-add-new-helper-function-tty_get_tiocm.patch} (100%) rename meta-lxatac-bsp/recipes-kernel/linux/files/patches/{0302-leds-ledtrig-tty-Free-allocated-ttyname-buffer-on-de.patch => 0202-leds-ledtrig-tty-Free-allocated-ttyname-buffer-on-de.patch} (100%) rename meta-lxatac-bsp/recipes-kernel/linux/files/patches/{0303-leds-ledtrig-tty-Replace-mutex-with-completion.patch => 0203-leds-ledtrig-tty-Replace-mutex-with-completion.patch} (100%) rename meta-lxatac-bsp/recipes-kernel/linux/files/patches/{0304-leds-ledtrig-tty-Make-rx-tx-activitate-configurable.patch => 0204-leds-ledtrig-tty-Make-rx-tx-activitate-configurable.patch} (100%) rename meta-lxatac-bsp/recipes-kernel/linux/files/patches/{0305-leds-ledtrig-tty-Add-additional-line-state-evaluatio.patch => 0205-leds-ledtrig-tty-Add-additional-line-state-evaluatio.patch} (100%) rename meta-lxatac-bsp/recipes-kernel/linux/files/patches/{0401-Release-6.7-customers-lxa-lxatac-20240129-1.patch => 0301-Release-6.7-customers-lxa-lxatac-20240208-1.patch} (67%) diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig index a2a2c6a9..6657c868 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.7.0-20240129-1 Kernel Configuration +# Linux/arm 6.7.0-20240208-1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-oe-linux-gnueabi-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0003-ARM-dts-stm32-lxa-tac-reduce-RGMII-interface-drive-s.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0003-ARM-dts-stm32-lxa-tac-reduce-RGMII-interface-drive-s.patch index 43ebbf2b..cbe9527d 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0003-ARM-dts-stm32-lxa-tac-reduce-RGMII-interface-drive-s.patch +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0003-ARM-dts-stm32-lxa-tac-reduce-RGMII-interface-drive-s.patch @@ -10,6 +10,7 @@ This results in an improvement of EMI performance by reducing the 125MHz emission and its harmonics caused by the RGMII clock line. Signed-off-by: Leonard Göhrs +Forwarded: https://lore.kernel.org/linux-arm-kernel/20240129114649.2458468-2-u.kleine-koenig@pengutronix.de --- arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-backlight-pwm_bl-Avoid-backlight-flicker-applying-in.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-backlight-pwm_bl-Avoid-backlight-flicker-applying-in.patch deleted file mode 100644 index 4b1340ca..00000000 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-backlight-pwm_bl-Avoid-backlight-flicker-applying-in.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Philipp Zabel -Date: Thu, 30 Mar 2023 12:49:54 +0200 -Subject: [PATCH] backlight: pwm_bl: Avoid backlight flicker applying initial - PWM state - -The initial PWM state returned by pwm_init_state() has a duty cycle of -0 ns. To avoid backlight flicker when taking over an enabled display -from the bootloader, explicitly query initial hardware state, and if -period and polarity match the reference state, keep the current duty -cycle until backlight_update_state() will apply the state with the -configured brightness. - -Signed-off-by: Philipp Zabel ---- - drivers/video/backlight/pwm_bl.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c -index 289bd9ce4d36..bacce7880b06 100644 ---- a/drivers/video/backlight/pwm_bl.c -+++ b/drivers/video/backlight/pwm_bl.c -@@ -455,6 +455,7 @@ static int pwm_backlight_probe(struct platform_device *pdev) - struct backlight_properties props; - struct backlight_device *bl; - struct pwm_bl_data *pb; -+ struct pwm_state initial_state; - struct pwm_state state; - unsigned int i; - int ret; -@@ -517,8 +518,13 @@ static int pwm_backlight_probe(struct platform_device *pdev) - dev_dbg(&pdev->dev, "got pwm for backlight\n"); - - /* Sync up PWM state. */ -+ pwm_get_state(pb->pwm, &initial_state); - pwm_init_state(pb->pwm, &state); - -+ if (initial_state.period == state.period && -+ initial_state.polarity == state.polarity) -+ state.duty_cycle = initial_state.duty_cycle; -+ - /* - * The DT case will set the pwm_period_ns field to 0 and store the - * period, parsed from the DT, in the PWM device. For the non-DT case, diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0301-tty-add-new-helper-function-tty_get_tiocm.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-tty-add-new-helper-function-tty_get_tiocm.patch similarity index 100% rename from meta-lxatac-bsp/recipes-kernel/linux/files/patches/0301-tty-add-new-helper-function-tty_get_tiocm.patch rename to meta-lxatac-bsp/recipes-kernel/linux/files/patches/0201-tty-add-new-helper-function-tty_get_tiocm.patch diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0302-leds-ledtrig-tty-Free-allocated-ttyname-buffer-on-de.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0202-leds-ledtrig-tty-Free-allocated-ttyname-buffer-on-de.patch similarity index 100% rename from meta-lxatac-bsp/recipes-kernel/linux/files/patches/0302-leds-ledtrig-tty-Free-allocated-ttyname-buffer-on-de.patch rename to meta-lxatac-bsp/recipes-kernel/linux/files/patches/0202-leds-ledtrig-tty-Free-allocated-ttyname-buffer-on-de.patch diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0303-leds-ledtrig-tty-Replace-mutex-with-completion.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0203-leds-ledtrig-tty-Replace-mutex-with-completion.patch similarity index 100% rename from meta-lxatac-bsp/recipes-kernel/linux/files/patches/0303-leds-ledtrig-tty-Replace-mutex-with-completion.patch rename to meta-lxatac-bsp/recipes-kernel/linux/files/patches/0203-leds-ledtrig-tty-Replace-mutex-with-completion.patch diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0304-leds-ledtrig-tty-Make-rx-tx-activitate-configurable.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0204-leds-ledtrig-tty-Make-rx-tx-activitate-configurable.patch similarity index 100% rename from meta-lxatac-bsp/recipes-kernel/linux/files/patches/0304-leds-ledtrig-tty-Make-rx-tx-activitate-configurable.patch rename to meta-lxatac-bsp/recipes-kernel/linux/files/patches/0204-leds-ledtrig-tty-Make-rx-tx-activitate-configurable.patch diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0305-leds-ledtrig-tty-Add-additional-line-state-evaluatio.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0205-leds-ledtrig-tty-Add-additional-line-state-evaluatio.patch similarity index 100% rename from meta-lxatac-bsp/recipes-kernel/linux/files/patches/0305-leds-ledtrig-tty-Add-additional-line-state-evaluatio.patch rename to meta-lxatac-bsp/recipes-kernel/linux/files/patches/0205-leds-ledtrig-tty-Add-additional-line-state-evaluatio.patch diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0401-Release-6.7-customers-lxa-lxatac-20240129-1.patch b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0301-Release-6.7-customers-lxa-lxatac-20240208-1.patch similarity index 67% rename from meta-lxatac-bsp/recipes-kernel/linux/files/patches/0401-Release-6.7-customers-lxa-lxatac-20240129-1.patch rename to meta-lxatac-bsp/recipes-kernel/linux/files/patches/0301-Release-6.7-customers-lxa-lxatac-20240208-1.patch index fdbdd5e8..d4bbe597 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0401-Release-6.7-customers-lxa-lxatac-20240129-1.patch +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/0301-Release-6.7-customers-lxa-lxatac-20240208-1.patch @@ -1,13 +1,13 @@ From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= -Date: Mon, 29 Jan 2024 11:05:56 +0100 -Subject: [PATCH] Release 6.7/customers/lxa/lxatac/20240129-1 +Date: Thu, 8 Feb 2024 11:30:22 +0100 +Subject: [PATCH] Release 6.7/customers/lxa/lxatac/20240208-1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index c6f549f6a4ae..5d3c3596af48 100644 +index c6f549f6a4ae..e6a3c25c0677 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ @@ -15,7 +15,7 @@ index c6f549f6a4ae..5d3c3596af48 100644 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -+EXTRAVERSION =-20240129-1 ++EXTRAVERSION =-20240208-1 NAME = Hurr durr I'ma ninja sloth # *DOCUMENTATION* diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc index 78204b85..e094fb87 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc @@ -1,9 +1,9 @@ # umpf-base: v6.7 # umpf-name: 6.7/customers/lxa/lxatac -# umpf-version: 6.7/customers/lxa/lxatac/20240129-1 +# umpf-version: 6.7/customers/lxa/lxatac/20240208-1 # umpf-topic: v6.7/customers/lxa/lxatac -# umpf-hashinfo: 0d265df5d410a153a00c1df71f837d0575c46521 -# umpf-topic-range: 0dd3ee31125508cd67f7e7172247f05b7fd1753a..267c5d7c1bd2a55accd9522beacb95a14cd7a1f4 +# umpf-hashinfo: 65acf36d24b3cf1964d37ee9a9ebc220e1c49f6d +# umpf-topic-range: 0dd3ee31125508cd67f7e7172247f05b7fd1753a..f10020eca8231159dcd18c2c63fa3b553b392bfb SRC_URI += "\ file://patches/0001-ARM-dts-stm32-lxa-tac-adjust-USB-gadget-fifo-sizes-f.patch \ file://patches/0002-ARM-dts-stm32-lxa-tac-drive-powerboard-lines-as-open.patch \ @@ -12,7 +12,7 @@ SRC_URI += "\ " # umpf-topic: v6.7/topic/pwm-stm32 # umpf-hashinfo: d11fc1b76a295d643d17314df8f3a4c815900e4b -# umpf-topic-range: 267c5d7c1bd2a55accd9522beacb95a14cd7a1f4..94e5887c843f6598eb3e2ef7f5a525533cc6888a +# umpf-topic-range: f10020eca8231159dcd18c2c63fa3b553b392bfb..f3a9a0f9423ec10328d08d294f1d1778dbdb1dc0 SRC_URI += "\ file://patches/0101-pwm-stm32-Replace-write_ccrx-with-regmap_write.patch \ file://patches/0102-pwm-stm32-Make-ch-parameter-unsigned.patch \ @@ -20,25 +20,19 @@ SRC_URI += "\ file://patches/0104-pwm-stm32-Implement-.get_state.patch \ file://patches/0105-pwm-stm32-Fix-enable-count-for-clk-in-.probe.patch \ " -# umpf-topic: v6.7/topic/pwm-backlight -# umpf-hashinfo: 264f4a613475def4ed75da53dcbce6bfe7a646b6 -# umpf-topic-range: 94e5887c843f6598eb3e2ef7f5a525533cc6888a..266a578d413f743d2fc76912841acfb936db668d -SRC_URI += "\ - file://patches/0201-backlight-pwm_bl-Avoid-backlight-flicker-applying-in.patch \ - " # umpf-topic: v6.7/topic/tty-trigger # umpf-hashinfo: 6c436e04db10c52d628131d3645ed0e98e8609b7 -# umpf-topic-range: 266a578d413f743d2fc76912841acfb936db668d..11bea3b3e0a3facb8779149d285c00c00886e722 +# umpf-topic-range: f3a9a0f9423ec10328d08d294f1d1778dbdb1dc0..c1e9027f7c56f9f24f671589406c195f2108b616 SRC_URI += "\ - file://patches/0301-tty-add-new-helper-function-tty_get_tiocm.patch \ - file://patches/0302-leds-ledtrig-tty-Free-allocated-ttyname-buffer-on-de.patch \ - file://patches/0303-leds-ledtrig-tty-Replace-mutex-with-completion.patch \ - file://patches/0304-leds-ledtrig-tty-Make-rx-tx-activitate-configurable.patch \ - file://patches/0305-leds-ledtrig-tty-Add-additional-line-state-evaluatio.patch \ + file://patches/0201-tty-add-new-helper-function-tty_get_tiocm.patch \ + file://patches/0202-leds-ledtrig-tty-Free-allocated-ttyname-buffer-on-de.patch \ + file://patches/0203-leds-ledtrig-tty-Replace-mutex-with-completion.patch \ + file://patches/0204-leds-ledtrig-tty-Make-rx-tx-activitate-configurable.patch \ + file://patches/0205-leds-ledtrig-tty-Add-additional-line-state-evaluatio.patch \ " -# umpf-release: 6.7/customers/lxa/lxatac/20240129-1 -# umpf-topic-range: 11bea3b3e0a3facb8779149d285c00c00886e722..e602f3a6a07eccc9b0ec86e2eca466a499f66c80 +# umpf-release: 6.7/customers/lxa/lxatac/20240208-1 +# umpf-topic-range: c1e9027f7c56f9f24f671589406c195f2108b616..61fe68067d88dcf210fbb52607002f0dd5dca2b3 SRC_URI += "\ - file://patches/0401-Release-6.7-customers-lxa-lxatac-20240129-1.patch \ + file://patches/0301-Release-6.7-customers-lxa-lxatac-20240208-1.patch \ " # umpf-end