rockchip: cleanup and rewrite patches for current

patch/kernel/archive/rockchip-6.12/kernel-6.8-tools-cgroup-makefile.patch

@@ -1,6 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo Sabatino <[email protected]>
+Date: Mon, 25 Mar 2024 19:38:38 +0100
+Subject: [ARCHEOLOGY] rockchip: bump edge kernel to 6.8
+
+> X-Git-Archeology: - Revision 47d2e8287e34fed3e47f37ab076d0f34ed0ac399: https://github.com/armbian/build/commit/47d2e8287e34fed3e47f37ab076d0f34ed0ac399
+> X-Git-Archeology:   Date: Mon, 25 Mar 2024 19:38:38 +0100
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip: bump edge kernel to 6.8
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 724573bf7a21e61b0b626f835031a4c3206bb8ba: https://github.com/armbian/build/commit/724573bf7a21e61b0b626f835031a4c3206bb8ba
+> X-Git-Archeology:   Date: Wed, 05 Jun 2024 22:18:51 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: bump rockchip family edge kernel to 6.9
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 7da7bbf61cb776a054219e35926d391dad9a67a7: https://github.com/armbian/build/commit/7da7bbf61cb776a054219e35926d391dad9a67a7
+> X-Git-Archeology:   Date: Mon, 22 Jul 2024 19:18:14 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip: bump edge kernel to 6.10
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision 94ec783de0dad381b3e2e71d646d8428af4d5051: https://github.com/armbian/build/commit/94ec783de0dad381b3e2e71d646d8428af4d5051
+> X-Git-Archeology:   Date: Wed, 18 Sep 2024 14:03:19 +0200
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: bump rockchip 32 bit edge kernel to 6.11
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision c90a0f7890bddc8e755847fc8227e15828950251: https://github.com/armbian/build/commit/c90a0f7890bddc8e755847fc8227e15828950251
+> X-Git-Archeology:   Date: Sat, 30 Nov 2024 13:07:31 +0100
+> X-Git-Archeology:   From: Paolo Sabatino <[email protected]>
+> X-Git-Archeology:   Subject: rockchip: bump edge kernel to 6.12
+> X-Git-Archeology:
+---
+ tools/cgroup/Makefile | 11 ++++++++++
+ 1 file changed, 11 insertions(+)
+
 diff --git a/tools/cgroup/Makefile b/tools/cgroup/Makefile
 new file mode 100644
-index 000000000000..ffca068e4a76
+index 000000000000..111111111111
 --- /dev/null
 +++ b/tools/cgroup/Makefile
 @@ -0,0 +1,11 @@
@@ -15,3 +49,6 @@ index 000000000000..ffca068e4a76
 +
 +clean:
 +	$(RM) cgroup_event_listener
+-- 
+Armbian
+

patch/kernel/archive/rockchip-6.12/patches.armbian/bt-broadcom-serdev-workaround.patch

@@ -1,18 +1,18 @@
-From e5c9702bd2ffd09e48c118ab40c2764590af7929 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <[email protected]>
 Date: Sat, 1 May 2021 12:41:14 +0000
-Subject: [PATCH] Workaround to make several broadcom bluetooth serdev devices
- work even without proper MAC address
+Subject: Workaround to make several broadcom bluetooth serdev devices work
+ even without proper MAC address
 
 ---
  drivers/bluetooth/btbcm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
-index 1b9743b7f..b274f1cdd 100644
+index 111111111111..222222222222 100644
 --- a/drivers/bluetooth/btbcm.c
 +++ b/drivers/bluetooth/btbcm.c
-@@ -129,7 +129,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev)
+@@ -135,7 +135,7 @@ int btbcm_check_bdaddr(struct hci_dev *hdev)
  		if (btbcm_set_bdaddr_from_efi(hdev) != 0) {
  			bt_dev_info(hdev, "BCM: Using default device address (%pMR)",
  				    &bda->bdaddr);
@@ -21,7 +21,6 @@ index 1b9743b7f..b274f1cdd 100644
  		}
  	}
 
-
 -- 
-2.25.1
+Armbian
 

patch/kernel/archive/rockchip-6.12/patches.armbian/clk-rk322x-composite-mmc-clk.patch

@@ -1,17 +1,17 @@
-From 9e105544fcb63f8f79b199d1b194a36a354519b3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <[email protected]>
 Date: Sun, 2 Apr 2023 10:53:07 +0000
-Subject: [PATCH 2/2] rk322x: better handle mmc/sdio clocks
+Subject: rk322x: better handle mmc/sdio clocks
 
 ---
  drivers/clk/rockchip/clk-rk3228.c | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c
-index 996f8bfee..0f690dd84 100644
+index 111111111111..222222222222 100644
 --- a/drivers/clk/rockchip/clk-rk3228.c
 +++ b/drivers/clk/rockchip/clk-rk3228.c
-@@ -371,17 +371,15 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
+@@ -383,17 +383,15 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
  			RK2928_CLKSEL_CON(11), 8, 2, MFLAGS, 0, 8, DFLAGS,
  			RK2928_CLKGATE_CON(2), 11, GFLAGS),
 
@@ -34,5 +34,5 @@ index 996f8bfee..0f690dd84 100644
  	/*
  	 * Clock-Architecture Diagram 2
 -- 
-2.34.1
+Armbian
 

patch/kernel/archive/rockchip-6.12/patches.armbian/driver-rk322x-audio-codec.patch

@@ -1,25 +1,22 @@
-From 50a8db983c682918cd2efe02ede48db93892d52a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <[email protected]>
 Date: Sat, 20 Jul 2024 13:51:55 +0200
-Subject: [PATCH] rk3228: add analog audio codec
+Subject: rk3228: add analog audio codec
 
 ---
- .../bindings/sound/rockchip,rk3228-codec.txt  |  22 +
- arch/arm/boot/dts/rockchip/rk322x.dtsi        |   9 +
- drivers/clk/rockchip/clk-rk3228.c             |   2 +-
- include/dt-bindings/clock/rk3228-cru.h        |   1 +
- sound/soc/codecs/Kconfig                      |   6 +
- sound/soc/codecs/Makefile                     |   2 +
- sound/soc/codecs/rk3228_codec.c               | 545 ++++++++++++++++++
- sound/soc/codecs/rk3228_codec.h               | 218 +++++++
+ Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt |  22 +
+ arch/arm/boot/dts/rockchip/rk322x.dtsi                            |   9 +
+ drivers/clk/rockchip/clk-rk3228.c                                 |   2 +-
+ include/dt-bindings/clock/rk3228-cru.h                            |   1 +
+ sound/soc/codecs/Kconfig                                          |   6 +
+ sound/soc/codecs/Makefile                                         |   2 +
+ sound/soc/codecs/rk3228_codec.c                                   | 545 ++++++++++
+ sound/soc/codecs/rk3228_codec.h                                   | 218 ++++
  8 files changed, 804 insertions(+), 1 deletion(-)
- create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt
- create mode 100644 sound/soc/codecs/rk3228_codec.c
- create mode 100644 sound/soc/codecs/rk3228_codec.h
 
 diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt
 new file mode 100644
-index 000000000000..9191a8593380
+index 000000000000..111111111111
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt
 @@ -0,0 +1,22 @@
@@ -46,10 +43,10 @@ index 000000000000..9191a8593380
 +	status = "disabled";
 +};
 diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi
-index cc5a5e609f04..d13dc979a67e 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi
 +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi
-@@ -249,6 +249,15 @@ i2s1: i2s1@100b0000 {
+@@ -149,6 +149,15 @@ i2s1: i2s1@100b0000 {
  		status = "disabled";
  	};
 
@@ -66,10 +63,10 @@ index cc5a5e609f04..d13dc979a67e 100644
  		compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s";
  		reg = <0x100c0000 0x4000>;
 diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c
-index 0db8a97007f2..0f690dd84650 100644
+index 111111111111..222222222222 100644
 --- a/drivers/clk/rockchip/clk-rk3228.c
 +++ b/drivers/clk/rockchip/clk-rk3228.c
-@@ -603,7 +603,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
+@@ -618,7 +618,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
  	GATE(0, "pclk_sim", "pclk_cpu", 0, RK2928_CLKGATE_CON(10), 3, GFLAGS),
 
  	GATE(0, "pclk_ddrphy", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 3, GFLAGS),
@@ -79,10 +76,10 @@ index 0db8a97007f2..0f690dd84650 100644
  	GATE(0, "pclk_vdacphy", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 8, GFLAGS),
  	GATE(0, "pclk_phy_noc", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 9, GFLAGS),
 diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h
-index 911824731866..9162f9132657 100644
+index 111111111111..222222222222 100644
 --- a/include/dt-bindings/clock/rk3228-cru.h
 +++ b/include/dt-bindings/clock/rk3228-cru.h
-@@ -116,6 +116,7 @@
+@@ -115,6 +115,7 @@
  #define PCLK_HDMI_CTRL		364
  #define PCLK_HDMI_PHY		365
  #define PCLK_GMAC		367
@@ -91,18 +88,18 @@ index 911824731866..9162f9132657 100644
  /* hclk gates */
  #define HCLK_I2S0_8CH		442
 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 4afc43d3f71f..183a69249160 100644
+index 111111111111..222222222222 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
-@@ -182,6 +182,7 @@ config SND_SOC_ALL_CODECS
+@@ -186,6 +186,7 @@ config SND_SOC_ALL_CODECS
  	imply SND_SOC_PCM6240
  	imply SND_SOC_PEB2466
  	imply SND_SOC_RK3308
 +	imply SND_SOC_RK3228
  	imply SND_SOC_RK3328
  	imply SND_SOC_RK817
  	imply SND_SOC_RT274
-@@ -1457,6 +1458,11 @@ config SND_SOC_RK3308
+@@ -1494,6 +1495,11 @@ config SND_SOC_RK3308
  	  It has 8 24-bit ADCs and 2 24-bit DACs. The maximum supported
  	  sampling rate is 192 kHz.
 
@@ -115,18 +112,18 @@ index 4afc43d3f71f..183a69249160 100644
  	tristate "Rockchip RK3328 audio CODEC"
  	depends on ARCH_ROCKCHIP || COMPILE_TEST
 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index b4df22186e25..454179eb7b73 100644
+index 111111111111..222222222222 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
-@@ -207,6 +207,7 @@ snd-soc-pcm512x-spi-y := pcm512x-spi.o
+@@ -213,6 +213,7 @@ snd-soc-pcm512x-spi-y := pcm512x-spi.o
  snd-soc-pcm6240-y := pcm6240.o
  snd-soc-peb2466-y := peb2466.o
  snd-soc-rk3308-y := rk3308_codec.o
 +snd-soc-rk3228-y := rk3228_codec.o
  snd-soc-rk3328-y := rk3328_codec.o
  snd-soc-rk817-y := rk817_codec.o
  snd-soc-rl6231-y := rl6231.o
-@@ -599,6 +600,7 @@ obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o
+@@ -615,6 +616,7 @@ obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o
  obj-$(CONFIG_SND_SOC_PCM6240)	+= snd-soc-pcm6240.o
  obj-$(CONFIG_SND_SOC_PEB2466)	+= snd-soc-peb2466.o
  obj-$(CONFIG_SND_SOC_RK3308)	+= snd-soc-rk3308.o
@@ -136,7 +133,7 @@ index b4df22186e25..454179eb7b73 100644
  obj-$(CONFIG_SND_SOC_RL6231)	+= snd-soc-rl6231.o
 diff --git a/sound/soc/codecs/rk3228_codec.c b/sound/soc/codecs/rk3228_codec.c
 new file mode 100644
-index 000000000000..197e7e2e0d8b
+index 000000000000..111111111111
 --- /dev/null
 +++ b/sound/soc/codecs/rk3228_codec.c
 @@ -0,0 +1,545 @@
@@ -687,7 +684,7 @@ index 000000000000..197e7e2e0d8b
 +MODULE_LICENSE("GPL v2");
 diff --git a/sound/soc/codecs/rk3228_codec.h b/sound/soc/codecs/rk3228_codec.h
 new file mode 100644
-index 000000000000..7283d0ba86e8
+index 000000000000..111111111111
 --- /dev/null
 +++ b/sound/soc/codecs/rk3228_codec.h
 @@ -0,0 +1,218 @@
@@ -910,5 +907,5 @@ index 000000000000..7283d0ba86e8
 +
 +#endif
 -- 
-2.34.1
+Armbian