Skip to content

Commit

Permalink
Merge pull request #104 from ukleinek/linux-6.7-drop-pwmbl-patch
Browse files Browse the repository at this point in the history
linux-lxatac: Drop unneeded pwm-bl patch
  • Loading branch information
hnez authored Feb 8, 2024
2 parents 19a3e44 + b07db65 commit 930cb06
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 67 deletions.
2 changes: 1 addition & 1 deletion meta-lxatac-bsp/recipes-kernel/linux/files/defconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Forwarded: https://lore.kernel.org/linux-arm-kernel/[email protected]
---
arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 4 ++++
1 file changed, 4 insertions(+)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]>
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 @@
VERSION = 6
PATCHLEVEL = 7
SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION =-20240129-1
+EXTRAVERSION =-20240208-1
NAME = Hurr durr I'ma ninja sloth

# *DOCUMENTATION*
32 changes: 13 additions & 19 deletions meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -12,33 +12,27 @@ 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 \
file://patches/0103-pwm-stm32-Use-hweight32-in-stm32_pwm_detect_channels.patch \
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

0 comments on commit 930cb06

Please sign in to comment.