Fixed watchdog DTS for CM3588

linux-5.12.10-cm3588-nas.patch

 diff -uNr linux-5.12.10/arch/arm64/boot/dts/rockchip/Makefile linux-5.12.10-cm3588-nas/arch/arm64/boot/dts/rockchip/Makefile
---- linux-5.12.10/arch/arm64/boot/dts/rockchip/Makefile	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/arch/arm64/boot/dts/rockchip/Makefile	2026-10-28 00:40:25.115052816 +0000
+--- linux-5.12.10/arch/arm64/boot/dts/rockchip/Makefile	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/arch/arm64/boot/dts/rockchip/Makefile	2026-10-31 05:06:03.302401689 +1030
 @@ -50,3 +50,5 @@
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
@@ -8,8 +8,8 @@ diff -uNr linux-5.12.10/arch/arm64/boot/dts/rockchip/Makefile linux-5.12.10-cm35
 +
 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-cm3588-nas.dtb
 diff -uNr linux-5.12.10/arch/arm64/boot/dts/rockchip/rk3588-cm3588-nas.dts linux-5.12.10-cm3588-nas/arch/arm64/boot/dts/rockchip/rk3588-cm3588-nas.dts
---- linux-5.12.10/arch/arm64/boot/dts/rockchip/rk3588-cm3588-nas.dts	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/arch/arm64/boot/dts/rockchip/rk3588-cm3588-nas.dts	2026-10-28 00:46:07.218155272 +0000
+--- linux-5.12.10/arch/arm64/boot/dts/rockchip/rk3588-cm3588-nas.dts	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/arch/arm64/boot/dts/rockchip/rk3588-cm3588-nas.dts	2026-10-31 05:27:42.354063071 +1030
 @@ -0,0 +1,2945 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/* CM3588 NAS: vendor physical wiring, Linux 5.12 + upstream USB/HDMI bindings. */
@@ -1229,12 +1229,12 @@ diff -uNr linux-5.12.10/arch/arm64/boot/dts/rockchip/rk3588-cm3588-nas.dts linux
 +		arm,pl330-periph-burst;
 +		phandle = <0xf6>;
 +	};
-+	wdt: watchdog@feaf0000 {
-+		compatible = "rockchip,rk3588-wdt", "snps,dw-wdt";
++	watchdog: watchdog@feaf0000 {
++		compatible = "snps,dw-wdt";
 +		reg = <0x0 0xfeaf0000 0x0 0x100>;
-+		clocks = <&cru TCLK_WDT0>, <&cru PCLK_WDT0>;
++		clocks = <&p2 108>, <&p2 107>;
 +		clock-names = "tclk", "pclk";
-+		interrupts = <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH 0>;
++		interrupts = <0x0 315 0x4>;
 +		status = "okay";
 +	};
 +	p2b8: spi@feb20000 {
@@ -2957,8 +2957,8 @@ diff -uNr linux-5.12.10/arch/arm64/boot/dts/rockchip/rk3588-cm3588-nas.dts linux
 +	};
 +};
 diff -uNr linux-5.12.10/drivers/clk/clk-fractional-divider.c linux-5.12.10-cm3588-nas/drivers/clk/clk-fractional-divider.c
---- linux-5.12.10/drivers/clk/clk-fractional-divider.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/clk-fractional-divider.c	2026-10-28 00:40:25.115052816 +0000
+--- linux-5.12.10/drivers/clk/clk-fractional-divider.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/clk-fractional-divider.c	2026-10-31 05:06:03.346400827 +1030
 @@ -3,8 +3,39 @@
   * Copyright (C) 2014 Intel Corporation
   *
@@ -3099,8 +3099,8 @@ diff -uNr linux-5.12.10/drivers/clk/clk-fractional-divider.c linux-5.12.10-cm358
  	if (fd->lock)
  		spin_lock_irqsave(fd->lock, flags);
 diff -uNr linux-5.12.10/drivers/clk/clk-fractional-divider.h linux-5.12.10-cm3588-nas/drivers/clk/clk-fractional-divider.h
---- linux-5.12.10/drivers/clk/clk-fractional-divider.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/clk-fractional-divider.h	2026-10-28 00:40:25.115052816 +0000
+--- linux-5.12.10/drivers/clk/clk-fractional-divider.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/clk-fractional-divider.h	2026-10-31 05:06:03.347400808 +1030
 @@ -0,0 +1,15 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +#ifndef _CLK_FRACTIONAL_DIV_H
@@ -3118,8 +3118,8 @@ diff -uNr linux-5.12.10/drivers/clk/clk-fractional-divider.h linux-5.12.10-cm358
 +
 +#endif
 diff -uNr linux-5.12.10/drivers/clk/rockchip/clk.c linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk.c
---- linux-5.12.10/drivers/clk/rockchip/clk.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk.c	2026-10-28 00:40:25.119052946 +0000
+--- linux-5.12.10/drivers/clk/rockchip/clk.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk.c	2026-10-31 05:06:03.347400808 +1030
 @@ -3,7 +3,7 @@
   * Copyright (c) 2014 MundoReader S.L.
   * Author: Heiko Stuebner <heiko@sntech.de>
@@ -3551,8 +3551,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/clk.c linux-5.12.10-cm3588-nas/driv
 +MODULE_LICENSE("GPL");
 +#endif /* MODULE */
 diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-cpu.c linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-cpu.c
---- linux-5.12.10/drivers/clk/rockchip/clk-cpu.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-cpu.c	2026-10-28 00:40:25.115052816 +0000
+--- linux-5.12.10/drivers/clk/rockchip/clk-cpu.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-cpu.c	2026-10-31 05:06:03.348400788 +1030
 @@ -51,6 +51,7 @@
   */
  struct rockchip_cpuclk {
@@ -3979,8 +3979,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-cpu.c linux-5.12.10-cm3588-nas/
 +	return ERR_PTR(ret);
 +}
 diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-ddr.c linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-ddr.c
---- linux-5.12.10/drivers/clk/rockchip/clk-ddr.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-ddr.c	2026-10-28 00:40:25.115052816 +0000
+--- linux-5.12.10/drivers/clk/rockchip/clk-ddr.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-ddr.c	2026-10-31 05:06:03.348400788 +1030
 @@ -1,6 +1,6 @@
  // SPDX-License-Identifier: GPL-2.0-or-later
  /*
@@ -4170,8 +4170,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-ddr.c linux-5.12.10-cm3588-nas/
  	ddrclk->mux_offset = mux_offset;
  	ddrclk->mux_shift = mux_shift;
 diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-fractional-divider-v2.c linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-fractional-divider-v2.c
---- linux-5.12.10/drivers/clk/rockchip/clk-fractional-divider-v2.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-fractional-divider-v2.c	2026-10-28 00:40:25.115052816 +0000
+--- linux-5.12.10/drivers/clk/rockchip/clk-fractional-divider-v2.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-fractional-divider-v2.c	2026-10-31 05:06:03.349400769 +1030
 @@ -0,0 +1,347 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -4521,8 +4521,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-fractional-divider-v2.c linux-5
 +	kfree(fd);
 +}
 diff -uNr linux-5.12.10/drivers/clk/rockchip/clk.h linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk.h
---- linux-5.12.10/drivers/clk/rockchip/clk.h	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk.h	2026-10-28 00:40:25.119052946 +0000
+--- linux-5.12.10/drivers/clk/rockchip/clk.h	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk.h	2026-10-31 05:06:03.350400749 +1030
 @@ -3,7 +3,7 @@
   * Copyright (c) 2014 MundoReader S.L.
   * Author: Heiko Stuebner <heiko@sntech.de>
@@ -5463,8 +5463,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/clk.h linux-5.12.10-cm3588-nas/driv
 +#define CLK_FRAC_DIVIDER_NO_LIMIT BIT(3)
  #endif
 diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-half-divider.c linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-half-divider.c
---- linux-5.12.10/drivers/clk/rockchip/clk-half-divider.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-half-divider.c	2026-10-28 00:40:25.115052816 +0000
+--- linux-5.12.10/drivers/clk/rockchip/clk-half-divider.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-half-divider.c	2026-10-31 05:06:03.350400749 +1030
 @@ -14,9 +14,9 @@
  			      unsigned long best, unsigned long flags)
  {
@@ -5563,8 +5563,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-half-divider.c linux-5.12.10-cm
  		div->width = div_width;
  		div->lock = lock;
 diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-link.c linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-link.c
---- linux-5.12.10/drivers/clk/rockchip/clk-link.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-link.c	2026-10-28 00:40:25.115052816 +0000
+--- linux-5.12.10/drivers/clk/rockchip/clk-link.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-link.c	2026-10-31 05:06:03.350400749 +1030
 @@ -0,0 +1,234 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -5801,8 +5801,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-link.c linux-5.12.10-cm3588-nas
 +MODULE_DESCRIPTION("Clock driver for Niu Dependencies");
 +MODULE_LICENSE("GPL");
 diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-pll.c linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-pll.c
---- linux-5.12.10/drivers/clk/rockchip/clk-pll.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-pll.c	2026-10-28 00:40:25.119052946 +0000
+--- linux-5.12.10/drivers/clk/rockchip/clk-pll.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-pll.c	2026-10-31 05:06:03.352400710 +1030
 @@ -3,7 +3,7 @@
   * Copyright (c) 2014 MundoReader S.L.
   * Author: Heiko Stuebner <heiko@sntech.de>
@@ -7319,8 +7319,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-pll.c linux-5.12.10-cm3588-nas/
 +#endif /* CONFIG_DEBUG_FS */
 +#endif /* CONFIG_ROCKCHIP_CLK_BOOST */
 diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-rk3588.c linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-rk3588.c
---- linux-5.12.10/drivers/clk/rockchip/clk-rk3588.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-rk3588.c	2026-10-28 00:40:25.119052946 +0000
+--- linux-5.12.10/drivers/clk/rockchip/clk-rk3588.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/clk-rk3588.c	2026-10-31 05:06:03.353400690 +1030
 @@ -0,0 +1,2561 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -9884,8 +9884,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/clk-rk3588.c linux-5.12.10-cm3588-n
 +MODULE_LICENSE("GPL");
 +#endif /* MODULE */
 diff -uNr linux-5.12.10/drivers/clk/rockchip/Kconfig linux-5.12.10-cm3588-nas/drivers/clk/rockchip/Kconfig
---- linux-5.12.10/drivers/clk/rockchip/Kconfig	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/Kconfig	2026-10-28 00:40:25.115052816 +0000
+--- linux-5.12.10/drivers/clk/rockchip/Kconfig	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/Kconfig	2026-10-31 05:06:03.354400671 +1030
 @@ -86,3 +86,24 @@
  	help
  	  Build the driver for RK3399 Clock Driver.
@@ -9912,8 +9912,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/Kconfig linux-5.12.10-cm3588-nas/dr
 +	help
 +	  Enable NIU clock gates and the bus clocks needed to access them.
 diff -uNr linux-5.12.10/drivers/clk/rockchip/Makefile linux-5.12.10-cm3588-nas/drivers/clk/rockchip/Makefile
---- linux-5.12.10/drivers/clk/rockchip/Makefile	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/Makefile	2026-10-28 00:40:25.115052816 +0000
+--- linux-5.12.10/drivers/clk/rockchip/Makefile	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/clk/rockchip/Makefile	2026-10-31 05:06:03.354400671 +1030
 @@ -12,7 +12,7 @@
  clk-rockchip-y += clk-inverter.o
  clk-rockchip-y += clk-mmc-phase.o
@@ -9933,8 +9933,8 @@ diff -uNr linux-5.12.10/drivers/clk/rockchip/Makefile linux-5.12.10-cm3588-nas/d
 +
 +obj-$(CONFIG_ROCKCHIP_CLK_LINK) += clk-link.o
 diff -uNr linux-5.12.10/drivers/gpio/gpio-rockchip.c linux-5.12.10-cm3588-nas/drivers/gpio/gpio-rockchip.c
---- linux-5.12.10/drivers/gpio/gpio-rockchip.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpio/gpio-rockchip.c	2026-10-28 00:40:25.119052946 +0000
+--- linux-5.12.10/drivers/gpio/gpio-rockchip.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpio/gpio-rockchip.c	2026-10-31 05:06:03.355400651 +1030
 @@ -0,0 +1,1319 @@
 +// SPDX-License-Identifier: GPL-2.0-only
 +/*
@@ -11256,8 +11256,8 @@ diff -uNr linux-5.12.10/drivers/gpio/gpio-rockchip.c linux-5.12.10-cm3588-nas/dr
 +MODULE_LICENSE("GPL v2");
 +MODULE_DEVICE_TABLE(of, rockchip_gpio_match);
 diff -uNr linux-5.12.10/drivers/gpio/Kconfig linux-5.12.10-cm3588-nas/drivers/gpio/Kconfig
---- linux-5.12.10/drivers/gpio/Kconfig	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpio/Kconfig	2026-10-28 00:40:25.119052946 +0000
+--- linux-5.12.10/drivers/gpio/Kconfig	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpio/Kconfig	2026-10-31 05:06:03.356400631 +1030
 @@ -1636,3 +1636,9 @@
  endmenu
  
@@ -11269,8 +11269,8 @@ diff -uNr linux-5.12.10/drivers/gpio/Kconfig linux-5.12.10-cm3588-nas/drivers/gp
 + select GPIOLIB_IRQCHIP
 + default y
 diff -uNr linux-5.12.10/drivers/gpio/Makefile linux-5.12.10-cm3588-nas/drivers/gpio/Makefile
---- linux-5.12.10/drivers/gpio/Makefile	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpio/Makefile	2026-10-28 00:40:25.119052946 +0000
+--- linux-5.12.10/drivers/gpio/Makefile	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpio/Makefile	2026-10-31 05:06:03.357400612 +1030
 @@ -180,3 +180,5 @@
  obj-$(CONFIG_GPIO_XTENSA)		+= gpio-xtensa.o
  obj-$(CONFIG_GPIO_ZEVIO)		+= gpio-zevio.o
@@ -11278,8 +11278,8 @@ diff -uNr linux-5.12.10/drivers/gpio/Makefile linux-5.12.10-cm3588-nas/drivers/g
 +
 +obj-$(CONFIG_GPIO_ROCKCHIP) += gpio-rockchip.o
 diff -uNr linux-5.12.10/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
---- linux-5.12.10/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c	2026-10-31 05:06:03.357400612 +1030
 @@ -0,0 +1,582 @@
 +// SPDX-License-Identifier: GPL-2.0-or-later
 +/*
@@ -11864,8 +11864,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c linux-5.12.
 +MODULE_DESCRIPTION("DW HDMI QP transmitter library");
 +MODULE_LICENSE("GPL");
 diff -uNr linux-5.12.10/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
---- linux-5.12.10/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h	2026-10-31 05:06:03.358400592 +1030
 @@ -0,0 +1,834 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -12702,8 +12702,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h linux-5.12.
 +
 +#endif /* __DW_HDMI_QP_H__ */
 diff -uNr linux-5.12.10/drivers/gpu/drm/bridge/synopsys/Kconfig linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/Kconfig
---- linux-5.12.10/drivers/gpu/drm/bridge/synopsys/Kconfig	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/Kconfig	2026-10-28 00:40:25.119052946 +0000
+--- linux-5.12.10/drivers/gpu/drm/bridge/synopsys/Kconfig	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/Kconfig	2026-10-31 05:06:03.359400573 +1030
 @@ -39,3 +39,8 @@
  	select DRM_KMS_HELPER
  	select DRM_MIPI_DSI
@@ -12714,8 +12714,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/bridge/synopsys/Kconfig linux-5.12.10-cm
 +	depends on DRM
 +	select REGMAP_MMIO
 diff -uNr linux-5.12.10/drivers/gpu/drm/bridge/synopsys/Makefile linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/Makefile
---- linux-5.12.10/drivers/gpu/drm/bridge/synopsys/Makefile	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/Makefile	2026-10-28 00:40:25.119052946 +0000
+--- linux-5.12.10/drivers/gpu/drm/bridge/synopsys/Makefile	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/bridge/synopsys/Makefile	2026-10-31 05:06:03.359400573 +1030
 @@ -5,3 +5,5 @@
  obj-$(CONFIG_DRM_DW_HDMI_CEC) += dw-hdmi-cec.o
  
@@ -12723,8 +12723,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/bridge/synopsys/Makefile linux-5.12.10-c
 +
 +obj-$(CONFIG_DRM_DW_HDMI_QP) += dw-hdmi-qp.o
 diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
---- linux-5.12.10/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c	2026-10-31 05:06:03.359400573 +1030
 @@ -0,0 +1,433 @@
 +// SPDX-License-Identifier: GPL-2.0-or-later
 +/*
@@ -13160,8 +13160,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c linux-5.1
 +	},
 +};
 diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/Kconfig linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/Kconfig
---- linux-5.12.10/drivers/gpu/drm/rockchip/Kconfig	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/Kconfig	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/gpu/drm/rockchip/Kconfig	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/Kconfig	2026-10-31 05:06:03.360400553 +1030
 @@ -88,3 +88,18 @@
  	  for the RK3066 HDMI driver. If you want to enable
  	  HDMI on RK3066 based SoC, you should select this option.
@@ -13182,8 +13182,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/Kconfig linux-5.12.10-cm3588-na
 +	depends on DRM_ROCKCHIP
 +	select DRM_DW_HDMI_QP
 diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/Makefile linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/Makefile
---- linux-5.12.10/drivers/gpu/drm/rockchip/Makefile	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/Makefile	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/gpu/drm/rockchip/Makefile	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/Makefile	2026-10-31 05:06:03.360400553 +1030
 @@ -4,7 +4,10 @@
  # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
  
@@ -13197,8 +13197,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/Makefile linux-5.12.10-cm3588-n
  
  rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
 diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_drv.c linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
---- linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_drv.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_drv.c	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_drv.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_drv.c	2026-10-31 05:06:03.360400553 +1030
 @@ -246,6 +246,30 @@
  				rockchip_drm_sys_resume)
  };
@@ -13271,8 +13271,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_drv.c linux-5.12.1
  				CONFIG_ROCKCHIP_LVDS);
  	ADD_ROCKCHIP_SUB_DRIVER(rockchip_dp_driver,
 diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_drv.h linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
---- linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_drv.h	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_drv.h	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_drv.h	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_drv.h	2026-10-31 05:06:04.529377638 +1030
 @@ -16,9 +16,19 @@
  #include <linux/module.h>
  #include <linux/component.h>
@@ -13331,8 +13331,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_drv.h linux-5.12.1
 +                                           struct device_node *np, int port, int reg);
  #endif /* _ROCKCHIP_DRM_DRV_H_ */
 diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
---- linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c	2026-10-31 05:06:04.540377423 +1030
 @@ -0,0 +1,3227 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
@@ -16562,8 +16562,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c linux-5.12.
 +};
 +EXPORT_SYMBOL_GPL(vop2_component_ops);
 diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
---- linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h	2026-10-31 05:06:04.544377344 +1030
 @@ -0,0 +1,543 @@
 +/* SPDX-License-Identifier: GPL-2.0-only */
 +/*
@@ -17109,8 +17109,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h linux-5.12.
 +
 +#endif /* _ROCKCHIP_DRM_VOP2_H */
 diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
---- linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c	2026-10-31 05:06:04.544377344 +1030
 @@ -0,0 +1,510 @@
 +// SPDX-License-Identifier: GPL-2.0-only
 +/*
@@ -17623,8 +17623,8 @@ diff -uNr linux-5.12.10/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c linux-5.12.
 +	},
 +};
 diff -uNr linux-5.12.10/drivers/iommu/rockchip-iommu.c linux-5.12.10-cm3588-nas/drivers/iommu/rockchip-iommu.c
---- linux-5.12.10/drivers/iommu/rockchip-iommu.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/iommu/rockchip-iommu.c	2026-10-28 00:40:25.123053076 +0000
+--- linux-5.12.10/drivers/iommu/rockchip-iommu.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/iommu/rockchip-iommu.c	2026-10-31 05:06:04.546377305 +1030
 @@ -10,8 +10,8 @@
  #include <linux/compiler.h>
  #include <linux/delay.h>
@@ -18022,8 +18022,8 @@ diff -uNr linux-5.12.10/drivers/iommu/rockchip-iommu.c linux-5.12.10-cm3588-nas/
  };
  
 diff -uNr linux-5.12.10/drivers/irqchip/irq-gic-v3-its.c linux-5.12.10-cm3588-nas/drivers/irqchip/irq-gic-v3-its.c
---- linux-5.12.10/drivers/irqchip/irq-gic-v3-its.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/irqchip/irq-gic-v3-its.c	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/irqchip/irq-gic-v3-its.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/irqchip/irq-gic-v3-its.c	2026-10-31 05:06:07.986309874 +1030
 @@ -2348,6 +2348,14 @@
  	its_write_baser(its, baser, val);
  	tmp = baser->val;
@@ -18071,8 +18071,8 @@ diff -uNr linux-5.12.10/drivers/irqchip/irq-gic-v3-its.c linux-5.12.10-cm3588-na
  		if (!(tmp & GITS_CBASER_SHAREABILITY_MASK)) {
  			/*
 diff -uNr linux-5.12.10/drivers/mfd/Kconfig linux-5.12.10-cm3588-nas/drivers/mfd/Kconfig
---- linux-5.12.10/drivers/mfd/Kconfig	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/mfd/Kconfig	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/mfd/Kconfig	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/mfd/Kconfig	2026-10-31 05:06:07.986309874 +1030
 @@ -2158,3 +2158,10 @@
  
  endmenu
@@ -18085,8 +18085,8 @@ diff -uNr linux-5.12.10/drivers/mfd/Kconfig linux-5.12.10-cm3588-nas/drivers/mfd
 + select REGMAP
 + select REGMAP_IRQ
 diff -uNr linux-5.12.10/drivers/mfd/Makefile linux-5.12.10-cm3588-nas/drivers/mfd/Makefile
---- linux-5.12.10/drivers/mfd/Makefile	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/mfd/Makefile	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/mfd/Makefile	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/mfd/Makefile	2026-10-31 05:06:07.986309874 +1030
 @@ -268,3 +268,5 @@
  obj-$(CONFIG_SGI_MFD_IOC3)	+= ioc3.o
  obj-$(CONFIG_MFD_SIMPLE_MFD_I2C)	+= simple-mfd-i2c.o
@@ -18094,8 +18094,8 @@ diff -uNr linux-5.12.10/drivers/mfd/Makefile linux-5.12.10-cm3588-nas/drivers/mf
 +
 +obj-$(CONFIG_MFD_RK806) += rk806-core.o rk806-spi.o
 diff -uNr linux-5.12.10/drivers/mfd/rk806-core.c linux-5.12.10-cm3588-nas/drivers/mfd/rk806-core.c
---- linux-5.12.10/drivers/mfd/rk806-core.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/mfd/rk806-core.c	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/mfd/rk806-core.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/mfd/rk806-core.c	2026-10-31 05:06:07.987309854 +1030
 @@ -0,0 +1,1031 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -19129,8 +19129,8 @@ diff -uNr linux-5.12.10/drivers/mfd/rk806-core.c linux-5.12.10-cm3588-nas/driver
 +MODULE_DESCRIPTION("rk806 MFD Driver");
 +MODULE_LICENSE("GPL v2");
 diff -uNr linux-5.12.10/drivers/mfd/rk806-spi.c linux-5.12.10-cm3588-nas/drivers/mfd/rk806-spi.c
---- linux-5.12.10/drivers/mfd/rk806-spi.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/mfd/rk806-spi.c	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/mfd/rk806-spi.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/mfd/rk806-spi.c	2026-10-31 05:06:07.987309854 +1030
 @@ -0,0 +1,155 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -19288,8 +19288,8 @@ diff -uNr linux-5.12.10/drivers/mfd/rk806-spi.c linux-5.12.10-cm3588-nas/drivers
 +MODULE_DESCRIPTION("RK806 SPI Interface Driver");
 +MODULE_LICENSE("GPL v2");
 diff -uNr linux-5.12.10/drivers/mmc/host/sdhci-of-dwcmshc.c linux-5.12.10-cm3588-nas/drivers/mmc/host/sdhci-of-dwcmshc.c
---- linux-5.12.10/drivers/mmc/host/sdhci-of-dwcmshc.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/mmc/host/sdhci-of-dwcmshc.c	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/mmc/host/sdhci-of-dwcmshc.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/mmc/host/sdhci-of-dwcmshc.c	2026-10-31 05:06:07.987309854 +1030
 @@ -7,11 +7,17 @@
   * Author: Jisheng Zhang <jszhang@kernel.org>
   */
@@ -20155,8 +20155,8 @@ diff -uNr linux-5.12.10/drivers/mmc/host/sdhci-of-dwcmshc.c linux-5.12.10-cm3588
  	},
  	.probe	= dwcmshc_probe,
 diff -uNr linux-5.12.10/drivers/pci/controller/dwc/Kconfig linux-5.12.10-cm3588-nas/drivers/pci/controller/dwc/Kconfig
---- linux-5.12.10/drivers/pci/controller/dwc/Kconfig	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/pci/controller/dwc/Kconfig	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/pci/controller/dwc/Kconfig	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/pci/controller/dwc/Kconfig	2026-10-31 05:06:07.988309835 +1030
 @@ -319,3 +319,8 @@
  	  Annapurna Labs PCIe controller don't need to enable this.
  
@@ -20167,8 +20167,8 @@ diff -uNr linux-5.12.10/drivers/pci/controller/dwc/Kconfig linux-5.12.10-cm3588-
 + depends on PCI && ARCH_ROCKCHIP && OF
 + select PCIE_DW_HOST
 diff -uNr linux-5.12.10/drivers/pci/controller/dwc/Makefile linux-5.12.10-cm3588-nas/drivers/pci/controller/dwc/Makefile
---- linux-5.12.10/drivers/pci/controller/dwc/Makefile	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/pci/controller/dwc/Makefile	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/pci/controller/dwc/Makefile	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/pci/controller/dwc/Makefile	2026-10-31 05:06:07.988309835 +1030
 @@ -35,3 +35,5 @@
  obj-$(CONFIG_ARM64) += pcie-al.o
  obj-$(CONFIG_ARM64) += pcie-hisi.o
@@ -20176,8 +20176,8 @@ diff -uNr linux-5.12.10/drivers/pci/controller/dwc/Makefile linux-5.12.10-cm3588
 +
 +obj-$(CONFIG_PCIE_RK3588) += pcie-rk3588.o
 diff -uNr linux-5.12.10/drivers/pci/controller/dwc/pcie-rk3588.c linux-5.12.10-cm3588-nas/drivers/pci/controller/dwc/pcie-rk3588.c
---- linux-5.12.10/drivers/pci/controller/dwc/pcie-rk3588.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/pci/controller/dwc/pcie-rk3588.c	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/pci/controller/dwc/pcie-rk3588.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/pci/controller/dwc/pcie-rk3588.c	2026-10-31 05:06:07.988309835 +1030
 @@ -0,0 +1,326 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -20506,8 +20506,8 @@ diff -uNr linux-5.12.10/drivers/pci/controller/dwc/pcie-rk3588.c linux-5.12.10-c
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("RK3588 PCIe root complex for Linux 5.12");
 diff -uNr linux-5.12.10/drivers/phy/rockchip/Kconfig linux-5.12.10-cm3588-nas/drivers/phy/rockchip/Kconfig
---- linux-5.12.10/drivers/phy/rockchip/Kconfig	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/Kconfig	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/phy/rockchip/Kconfig	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/Kconfig	2026-10-31 05:06:07.988309835 +1030
 @@ -81,3 +81,27 @@
  	select GENERIC_PHY
  	help
@@ -20537,8 +20537,8 @@ diff -uNr linux-5.12.10/drivers/phy/rockchip/Kconfig linux-5.12.10-cm3588-nas/dr
 +	select GENERIC_PHY
 +	select REGMAP_MMIO
 diff -uNr linux-5.12.10/drivers/phy/rockchip/Makefile linux-5.12.10-cm3588-nas/drivers/phy/rockchip/Makefile
---- linux-5.12.10/drivers/phy/rockchip/Makefile	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/Makefile	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/phy/rockchip/Makefile	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/Makefile	2026-10-31 05:06:07.988309835 +1030
 @@ -8,3 +8,9 @@
  obj-$(CONFIG_PHY_ROCKCHIP_PCIE)		+= phy-rockchip-pcie.o
  obj-$(CONFIG_PHY_ROCKCHIP_TYPEC)	+= phy-rockchip-typec.o
@@ -20550,8 +20550,8 @@ diff -uNr linux-5.12.10/drivers/phy/rockchip/Makefile linux-5.12.10-cm3588-nas/d
 +obj-$(CONFIG_PHY_ROCKCHIP_USBDP) += phy-rockchip-usbdp.o
 +obj-$(CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX) += phy-rockchip-samsung-hdptx.o
 diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-inno-usb2.c linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
---- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-inno-usb2.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-inno-usb2.c	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-inno-usb2.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-inno-usb2.c	2026-10-31 05:06:07.990309795 +1030
 @@ -15,15 +15,15 @@
  #include <linux/jiffies.h>
  #include <linux/kernel.h>
@@ -22030,8 +22030,8 @@ diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-inno-usb2.c linux-5.12
  	{}
  };
 diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
---- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c	2026-10-28 00:40:25.127053206 +0000
+--- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c	2026-10-31 05:06:07.990309795 +1030
 @@ -0,0 +1,1653 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -23687,8 +23687,8 @@ diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c linux
 +MODULE_DESCRIPTION("Rockchip NANENG COMBPHY driver");
 +MODULE_LICENSE("GPL v2");
 diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
---- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c	2026-10-28 00:40:25.131053335 +0000
+--- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c	2026-10-31 05:06:07.991309776 +1030
 @@ -0,0 +1,1155 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
@@ -24846,8 +24846,8 @@ diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c linux-
 +MODULE_DESCRIPTION("Samsung HDMI/eDP Transmitter Combo PHY Driver");
 +MODULE_LICENSE("GPL");
 diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c
---- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c	2026-10-28 00:40:25.131053335 +0000
+--- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c	2026-10-31 05:06:07.991309776 +1030
 @@ -0,0 +1,358 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -25208,8 +25208,8 @@ diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-snps-pcie3.c linux-5.1
 +MODULE_DESCRIPTION("Rockchip Synopsys PCIe 3.0 PHY driver");
 +MODULE_LICENSE("GPL");
 diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw
---- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw	2026-10-28 00:40:25.131053335 +0000
+--- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw	2026-10-31 05:06:07.993309737 +1030
 @@ -0,0 +1,8192 @@
 +0x081D,
 +0xFFFF,
@@ -33404,8 +33404,8 @@ diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-snps-pcie3.fw linux-5.
 +0x0000,
 +0x0000
 diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-usbdp.c linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-usbdp.c
---- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-usbdp.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-usbdp.c	2026-10-28 00:40:25.131053335 +0000
+--- linux-5.12.10/drivers/phy/rockchip/phy-rockchip-usbdp.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/phy/rockchip/phy-rockchip-usbdp.c	2026-10-31 05:06:07.994309717 +1030
 @@ -0,0 +1,1650 @@
 +// SPDX-License-Identifier: GPL-2.0-or-later
 +/*
@@ -35058,8 +35058,8 @@ diff -uNr linux-5.12.10/drivers/phy/rockchip/phy-rockchip-usbdp.c linux-5.12.10-
 +MODULE_DESCRIPTION("Rockchip USBDP Combo PHY driver");
 +MODULE_LICENSE("GPL");
 diff -uNr linux-5.12.10/drivers/pinctrl/Kconfig linux-5.12.10-cm3588-nas/drivers/pinctrl/Kconfig
---- linux-5.12.10/drivers/pinctrl/Kconfig	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/pinctrl/Kconfig	2026-10-28 00:40:25.131053335 +0000
+--- linux-5.12.10/drivers/pinctrl/Kconfig	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/pinctrl/Kconfig	2026-10-31 05:06:07.994309717 +1030
 @@ -441,3 +441,9 @@
  	  pinconf settings are retrieved from device tree.
  
@@ -35071,8 +35071,8 @@ diff -uNr linux-5.12.10/drivers/pinctrl/Kconfig linux-5.12.10-cm3588-nas/drivers
 + select PINMUX
 + select GENERIC_PINCONF
 diff -uNr linux-5.12.10/drivers/pinctrl/Makefile linux-5.12.10-cm3588-nas/drivers/pinctrl/Makefile
---- linux-5.12.10/drivers/pinctrl/Makefile	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/pinctrl/Makefile	2026-10-28 00:40:25.131053335 +0000
+--- linux-5.12.10/drivers/pinctrl/Makefile	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/pinctrl/Makefile	2026-10-31 05:06:07.994309717 +1030
 @@ -71,3 +71,5 @@
  obj-y				+= mediatek/
  obj-y				+= cirrus/
@@ -35080,8 +35080,8 @@ diff -uNr linux-5.12.10/drivers/pinctrl/Makefile linux-5.12.10-cm3588-nas/driver
 +
 +obj-$(CONFIG_PINCTRL_RK806) += pinctrl-rk806.o
 diff -uNr linux-5.12.10/drivers/pinctrl/pinctrl-rk806.c linux-5.12.10-cm3588-nas/drivers/pinctrl/pinctrl-rk806.c
---- linux-5.12.10/drivers/pinctrl/pinctrl-rk806.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/pinctrl/pinctrl-rk806.c	2026-10-28 00:40:25.131053335 +0000
+--- linux-5.12.10/drivers/pinctrl/pinctrl-rk806.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/pinctrl/pinctrl-rk806.c	2026-10-31 05:06:07.995309698 +1030
 @@ -0,0 +1,577 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -35661,8 +35661,8 @@ diff -uNr linux-5.12.10/drivers/pinctrl/pinctrl-rk806.c linux-5.12.10-cm3588-nas
 +MODULE_AUTHOR("Xu Shengfei <xsf@rock-chips.com>");
 +MODULE_LICENSE("GPL v2");
 diff -uNr linux-5.12.10/drivers/pinctrl/pinctrl-rockchip.c linux-5.12.10-cm3588-nas/drivers/pinctrl/pinctrl-rockchip.c
---- linux-5.12.10/drivers/pinctrl/pinctrl-rockchip.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/pinctrl/pinctrl-rockchip.c	2026-10-28 00:40:25.135053465 +0000
+--- linux-5.12.10/drivers/pinctrl/pinctrl-rockchip.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/pinctrl/pinctrl-rockchip.c	2026-10-31 05:06:07.998309639 +1030
 @@ -16,11 +16,13 @@
   */
  
@@ -42269,8 +42269,8 @@ diff -uNr linux-5.12.10/drivers/pinctrl/pinctrl-rockchip.c linux-5.12.10-cm3588-
 +MODULE_ALIAS("platform:pinctrl-rockchip");
 +MODULE_DEVICE_TABLE(of, rockchip_pinctrl_dt_match);
 diff -uNr linux-5.12.10/drivers/pinctrl/pinctrl-rockchip.h linux-5.12.10-cm3588-nas/drivers/pinctrl/pinctrl-rockchip.h
---- linux-5.12.10/drivers/pinctrl/pinctrl-rockchip.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/pinctrl/pinctrl-rockchip.h	2026-10-28 00:40:25.135053465 +0000
+--- linux-5.12.10/drivers/pinctrl/pinctrl-rockchip.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/pinctrl/pinctrl-rockchip.h	2026-10-31 05:06:07.998309639 +1030
 @@ -0,0 +1,511 @@
 +/* SPDX-License-Identifier: GPL-2.0-only */
 +/*
@@ -42784,8 +42784,8 @@ diff -uNr linux-5.12.10/drivers/pinctrl/pinctrl-rockchip.h linux-5.12.10-cm3588-
 +
 +#endif
 diff -uNr linux-5.12.10/drivers/regulator/Kconfig linux-5.12.10-cm3588-nas/drivers/regulator/Kconfig
---- linux-5.12.10/drivers/regulator/Kconfig	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/regulator/Kconfig	2026-10-28 00:40:25.135053465 +0000
+--- linux-5.12.10/drivers/regulator/Kconfig	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/regulator/Kconfig	2026-10-31 05:06:07.998309639 +1030
 @@ -1352,3 +1352,7 @@
  
  endif
@@ -42795,8 +42795,8 @@ diff -uNr linux-5.12.10/drivers/regulator/Kconfig linux-5.12.10-cm3588-nas/drive
 + bool "RK806 regulators"
 + depends on MFD_RK806
 diff -uNr linux-5.12.10/drivers/regulator/Makefile linux-5.12.10-cm3588-nas/drivers/regulator/Makefile
---- linux-5.12.10/drivers/regulator/Makefile	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/regulator/Makefile	2026-10-28 00:40:25.135053465 +0000
+--- linux-5.12.10/drivers/regulator/Makefile	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/regulator/Makefile	2026-10-31 05:06:07.998309639 +1030
 @@ -165,3 +165,5 @@
  obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o
  
@@ -42804,8 +42804,8 @@ diff -uNr linux-5.12.10/drivers/regulator/Makefile linux-5.12.10-cm3588-nas/driv
 +
 +obj-$(CONFIG_REGULATOR_RK806) += rk806-regulator.o
 diff -uNr linux-5.12.10/drivers/regulator/rk806-regulator.c linux-5.12.10-cm3588-nas/drivers/regulator/rk806-regulator.c
---- linux-5.12.10/drivers/regulator/rk806-regulator.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/regulator/rk806-regulator.c	2026-10-28 00:40:25.135053465 +0000
+--- linux-5.12.10/drivers/regulator/rk806-regulator.c	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/regulator/rk806-regulator.c	2026-10-31 05:06:07.999309619 +1030
 @@ -0,0 +1,1290 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -44098,8 +44098,8 @@ diff -uNr linux-5.12.10/drivers/regulator/rk806-regulator.c linux-5.12.10-cm3588
 +MODULE_DESCRIPTION("rk806 voltage regulator driver");
 +MODULE_LICENSE("GPL v2");
 diff -uNr linux-5.12.10/drivers/soc/rockchip/pm_domains.c linux-5.12.10-cm3588-nas/drivers/soc/rockchip/pm_domains.c
---- linux-5.12.10/drivers/soc/rockchip/pm_domains.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/soc/rockchip/pm_domains.c	2026-10-28 00:40:25.135053465 +0000
+--- linux-5.12.10/drivers/soc/rockchip/pm_domains.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/soc/rockchip/pm_domains.c	2026-10-31 05:06:08.000309600 +1030
 @@ -2,12 +2,14 @@
  /*
   * Rockchip Generic power domain support.
@@ -46381,8 +46381,8 @@ diff -uNr linux-5.12.10/drivers/soc/rockchip/pm_domains.c linux-5.12.10-cm3588-n
 +MODULE_DESCRIPTION("ROCKCHIP PM Domain Driver");
 +MODULE_LICENSE("GPL");
 diff -uNr linux-5.12.10/drivers/spi/spi-rockchip.c linux-5.12.10-cm3588-nas/drivers/spi/spi-rockchip.c
---- linux-5.12.10/drivers/spi/spi-rockchip.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/spi/spi-rockchip.c	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/drivers/spi/spi-rockchip.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/spi/spi-rockchip.c	2026-10-31 05:06:08.001309580 +1030
 @@ -4,12 +4,16 @@
   * Author: Addy Ke <addy.ke@rock-chips.com>
   */
@@ -47526,8 +47526,8 @@ diff -uNr linux-5.12.10/drivers/spi/spi-rockchip.c linux-5.12.10-cm3588-nas/driv
  };
  MODULE_DEVICE_TABLE(of, rockchip_spi_dt_match);
 diff -uNr linux-5.12.10/drivers/thermal/rockchip_thermal.c linux-5.12.10-cm3588-nas/drivers/thermal/rockchip_thermal.c
---- linux-5.12.10/drivers/thermal/rockchip_thermal.c	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/drivers/thermal/rockchip_thermal.c	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/drivers/thermal/rockchip_thermal.c	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/drivers/thermal/rockchip_thermal.c	2026-10-31 05:06:08.761294683 +1030
 @@ -12,12 +12,15 @@
  #include <linux/of.h>
  #include <linux/of_address.h>
@@ -49853,8 +49853,8 @@ diff -uNr linux-5.12.10/drivers/thermal/rockchip_thermal.c linux-5.12.10-cm3588-
  MODULE_DESCRIPTION("ROCKCHIP THERMAL Driver");
  MODULE_AUTHOR("Rockchip, Inc.");
 diff -uNr linux-5.12.10/include/drm/bridge/dw_hdmi_qp.h linux-5.12.10-cm3588-nas/include/drm/bridge/dw_hdmi_qp.h
---- linux-5.12.10/include/drm/bridge/dw_hdmi_qp.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/drm/bridge/dw_hdmi_qp.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/drm/bridge/dw_hdmi_qp.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/drm/bridge/dw_hdmi_qp.h	2026-10-31 05:06:08.963290723 +1030
 @@ -0,0 +1,32 @@
 +/* SPDX-License-Identifier: GPL-2.0-or-later */
 +/*
@@ -49889,8 +49889,8 @@ diff -uNr linux-5.12.10/include/drm/bridge/dw_hdmi_qp.h linux-5.12.10-cm3588-nas
 +void dw_hdmi_qp_resume(struct device *dev, struct dw_hdmi_qp *hdmi);
 +#endif /* __DW_HDMI_QP__ */
 diff -uNr linux-5.12.10/include/dt-bindings/clock/rk3588-cru.h linux-5.12.10-cm3588-nas/include/dt-bindings/clock/rk3588-cru.h
---- linux-5.12.10/include/dt-bindings/clock/rk3588-cru.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/clock/rk3588-cru.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/clock/rk3588-cru.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/clock/rk3588-cru.h	2026-10-31 05:06:08.964290704 +1030
 @@ -0,0 +1,1501 @@
 +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 +/*
@@ -51394,8 +51394,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/clock/rk3588-cru.h linux-5.12.10-cm3
 +
 +#endif
 diff -uNr linux-5.12.10/include/dt-bindings/phy/phy-snps-pcie3.h linux-5.12.10-cm3588-nas/include/dt-bindings/phy/phy-snps-pcie3.h
---- linux-5.12.10/include/dt-bindings/phy/phy-snps-pcie3.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/phy/phy-snps-pcie3.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/phy/phy-snps-pcie3.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/phy/phy-snps-pcie3.h	2026-10-31 05:06:08.964290704 +1030
 @@ -0,0 +1,21 @@
 +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 +/*
@@ -51419,8 +51419,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/phy/phy-snps-pcie3.h linux-5.12.10-c
 +
 +#endif /* _DT_BINDINGS_PHY_SNPS_PCIE3 */
 diff -uNr linux-5.12.10/include/dt-bindings/pinctrl/rockchip.h linux-5.12.10-cm3588-nas/include/dt-bindings/pinctrl/rockchip.h
---- linux-5.12.10/include/dt-bindings/pinctrl/rockchip.h	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/pinctrl/rockchip.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/pinctrl/rockchip.h	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/pinctrl/rockchip.h	2026-10-31 05:06:08.964290704 +1030
 @@ -42,6 +42,12 @@
  #define RK_PD6		30
  #define RK_PD7		31
@@ -51435,8 +51435,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/pinctrl/rockchip.h linux-5.12.10-cm3
  
  #endif
 diff -uNr linux-5.12.10/include/dt-bindings/power/rk1808-power.h linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk1808-power.h
---- linux-5.12.10/include/dt-bindings/power/rk1808-power.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk1808-power.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/power/rk1808-power.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk1808-power.h	2026-10-31 05:06:08.964290704 +1030
 @@ -0,0 +1,20 @@
 +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 +#ifndef __DT_BINDINGS_POWER_RK1808_POWER_H__
@@ -51459,8 +51459,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/power/rk1808-power.h linux-5.12.10-c
 +
 +#endif
 diff -uNr linux-5.12.10/include/dt-bindings/power/rk3528-power.h linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3528-power.h
---- linux-5.12.10/include/dt-bindings/power/rk3528-power.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3528-power.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/power/rk3528-power.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3528-power.h	2026-10-31 05:06:08.964290704 +1030
 @@ -0,0 +1,18 @@
 +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 +#ifndef __DT_BINDINGS_POWER_RK3528_POWER_H__
@@ -51481,8 +51481,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/power/rk3528-power.h linux-5.12.10-c
 +
 +#endif
 diff -uNr linux-5.12.10/include/dt-bindings/power/rk3562-power.h linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3562-power.h
---- linux-5.12.10/include/dt-bindings/power/rk3562-power.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3562-power.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/power/rk3562-power.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3562-power.h	2026-10-31 05:06:08.965290684 +1030
 @@ -0,0 +1,32 @@
 +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 +#ifndef __DT_BINDINGS_POWER_RK3562_POWER_H__
@@ -51517,8 +51517,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/power/rk3562-power.h linux-5.12.10-c
 +
 +#endif
 diff -uNr linux-5.12.10/include/dt-bindings/power/rk3568-power.h linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3568-power.h
---- linux-5.12.10/include/dt-bindings/power/rk3568-power.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3568-power.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/power/rk3568-power.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3568-power.h	2026-10-31 05:06:08.965290684 +1030
 @@ -0,0 +1,32 @@
 +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 +#ifndef __DT_BINDINGS_POWER_RK3568_POWER_H__
@@ -51553,8 +51553,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/power/rk3568-power.h linux-5.12.10-c
 +
 +#endif
 diff -uNr linux-5.12.10/include/dt-bindings/power/rk3576-power.h linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3576-power.h
---- linux-5.12.10/include/dt-bindings/power/rk3576-power.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3576-power.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/power/rk3576-power.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3576-power.h	2026-10-31 05:06:08.965290684 +1030
 @@ -0,0 +1,30 @@
 +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 +#ifndef __DT_BINDINGS_POWER_RK3576_POWER_H__
@@ -51587,8 +51587,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/power/rk3576-power.h linux-5.12.10-c
 +
 +#endif
 diff -uNr linux-5.12.10/include/dt-bindings/power/rk3588-power.h linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3588-power.h
---- linux-5.12.10/include/dt-bindings/power/rk3588-power.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3588-power.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/power/rk3588-power.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rk3588-power.h	2026-10-31 05:06:08.965290684 +1030
 @@ -0,0 +1,69 @@
 +/* SPDX-License-Identifier: (GPL-2.0 or MIT) */
 +#ifndef __DT_BINDINGS_POWER_RK3588_POWER_H__
@@ -51660,8 +51660,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/power/rk3588-power.h linux-5.12.10-c
 +
 +#endif
 diff -uNr linux-5.12.10/include/dt-bindings/power/rockchip,rv1126b-power.h linux-5.12.10-cm3588-nas/include/dt-bindings/power/rockchip,rv1126b-power.h
---- linux-5.12.10/include/dt-bindings/power/rockchip,rv1126b-power.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rockchip,rv1126b-power.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/power/rockchip,rv1126b-power.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rockchip,rv1126b-power.h	2026-10-31 05:06:08.965290684 +1030
 @@ -0,0 +1,17 @@
 +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
 +/*
@@ -51681,8 +51681,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/power/rockchip,rv1126b-power.h linux
 +
 +#endif
 diff -uNr linux-5.12.10/include/dt-bindings/power/rockchip,rv1126-power.h linux-5.12.10-cm3588-nas/include/dt-bindings/power/rockchip,rv1126-power.h
---- linux-5.12.10/include/dt-bindings/power/rockchip,rv1126-power.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rockchip,rv1126-power.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/power/rockchip,rv1126-power.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/power/rockchip,rv1126-power.h	2026-10-31 05:06:08.965290684 +1030
 @@ -0,0 +1,35 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +
@@ -51720,8 +51720,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/power/rockchip,rv1126-power.h linux-
 +
 +#endif
 diff -uNr linux-5.12.10/include/dt-bindings/soc/rockchip,vop2.h linux-5.12.10-cm3588-nas/include/dt-bindings/soc/rockchip,vop2.h
---- linux-5.12.10/include/dt-bindings/soc/rockchip,vop2.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/dt-bindings/soc/rockchip,vop2.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/dt-bindings/soc/rockchip,vop2.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/dt-bindings/soc/rockchip,vop2.h	2026-10-31 05:06:08.965290684 +1030
 @@ -0,0 +1,18 @@
 +/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */
 +
@@ -51742,8 +51742,8 @@ diff -uNr linux-5.12.10/include/dt-bindings/soc/rockchip,vop2.h linux-5.12.10-cm
 +
 +#endif /* __DT_BINDINGS_ROCKCHIP_VOP2_H */
 diff -uNr linux-5.12.10/include/linux/clk/rockchip.h linux-5.12.10-cm3588-nas/include/linux/clk/rockchip.h
---- linux-5.12.10/include/linux/clk/rockchip.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/linux/clk/rockchip.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/linux/clk/rockchip.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/linux/clk/rockchip.h	2026-10-31 05:06:08.966290664 +1030
 @@ -0,0 +1,18 @@
 +/* SPDX-License-Identifier: GPL-2.0-or-later */
 +/*
@@ -51764,8 +51764,8 @@ diff -uNr linux-5.12.10/include/linux/clk/rockchip.h linux-5.12.10-cm3588-nas/in
 +
 +#endif /* __LINUX_CLK_ROCKCHIP_H_ */
 diff -uNr linux-5.12.10/include/linux/clk-provider.h linux-5.12.10-cm3588-nas/include/linux/clk-provider.h
---- linux-5.12.10/include/linux/clk-provider.h	2021-06-10 11:41:49.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/linux/clk-provider.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/linux/clk-provider.h	2021-06-10 21:11:49.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/linux/clk-provider.h	2026-10-31 05:06:08.966290664 +1030
 @@ -986,6 +986,8 @@
  
  #define CLK_FRAC_DIVIDER_ZERO_BASED		BIT(0)
@@ -51776,8 +51776,8 @@ diff -uNr linux-5.12.10/include/linux/clk-provider.h linux-5.12.10-cm3588-nas/in
  extern const struct clk_ops clk_fractional_divider_ops;
  struct clk *clk_register_fractional_divider(struct device *dev,
 diff -uNr linux-5.12.10/include/linux/mfd/rk806.h linux-5.12.10-cm3588-nas/include/linux/mfd/rk806.h
---- linux-5.12.10/include/linux/mfd/rk806.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/linux/mfd/rk806.h	2026-10-28 00:40:25.139053595 +0000
+--- linux-5.12.10/include/linux/mfd/rk806.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/linux/mfd/rk806.h	2026-10-31 05:06:08.967290645 +1030
 @@ -0,0 +1,556 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -52336,8 +52336,8 @@ diff -uNr linux-5.12.10/include/linux/mfd/rk806.h linux-5.12.10-cm3588-nas/inclu
 +void rk806_shutdown_requence_config(struct rk806 *rk806);
 +#endif /* __LINUX_REGULATOR_RK806_H */
 diff -uNr linux-5.12.10/include/linux/phy/pcie.h linux-5.12.10-cm3588-nas/include/linux/phy/pcie.h
---- linux-5.12.10/include/linux/phy/pcie.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/linux/phy/pcie.h	2026-10-28 00:40:25.143053725 +0000
+--- linux-5.12.10/include/linux/phy/pcie.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/linux/phy/pcie.h	2026-10-31 05:06:08.967290645 +1030
 @@ -0,0 +1,12 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -52352,8 +52352,8 @@ diff -uNr linux-5.12.10/include/linux/phy/pcie.h linux-5.12.10-cm3588-nas/includ
 +
 +#endif
 diff -uNr linux-5.12.10/include/linux/rockchip/compat-5.12.h linux-5.12.10-cm3588-nas/include/linux/rockchip/compat-5.12.h
---- linux-5.12.10/include/linux/rockchip/compat-5.12.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/linux/rockchip/compat-5.12.h	2026-10-28 00:40:25.143053725 +0000
+--- linux-5.12.10/include/linux/rockchip/compat-5.12.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/linux/rockchip/compat-5.12.h	2026-10-31 05:06:15.495162683 +1030
 @@ -0,0 +1,106 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +#ifndef _ROCKCHIP_COMPAT_512_H
@@ -52462,8 +52462,8 @@ diff -uNr linux-5.12.10/include/linux/rockchip/compat-5.12.h linux-5.12.10-cm358
 +
 +#endif
 diff -uNr linux-5.12.10/include/linux/rockchip/cpu.h linux-5.12.10-cm3588-nas/include/linux/rockchip/cpu.h
---- linux-5.12.10/include/linux/rockchip/cpu.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/linux/rockchip/cpu.h	2026-10-28 00:40:25.143053725 +0000
+--- linux-5.12.10/include/linux/rockchip/cpu.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/linux/rockchip/cpu.h	2026-10-31 05:06:15.496162663 +1030
 @@ -0,0 +1,315 @@
 +/*
 + * Copyright (C) 2017 Rockchip Electronics Co., Ltd.
@@ -52781,8 +52781,8 @@ diff -uNr linux-5.12.10/include/linux/rockchip/cpu.h linux-5.12.10-cm3588-nas/in
 +
 +#endif
 diff -uNr linux-5.12.10/include/linux/rockchip/rockchip_sip.h linux-5.12.10-cm3588-nas/include/linux/rockchip/rockchip_sip.h
---- linux-5.12.10/include/linux/rockchip/rockchip_sip.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/linux/rockchip/rockchip_sip.h	2026-10-28 00:40:25.143053725 +0000
+--- linux-5.12.10/include/linux/rockchip/rockchip_sip.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/linux/rockchip/rockchip_sip.h	2026-10-31 05:06:15.499162604 +1030
 @@ -0,0 +1,605 @@
 +/* Copyright (c) 2016, Fuzhou Rockchip Electronics Co., Ltd
 + *
@@ -53390,8 +53390,8 @@ diff -uNr linux-5.12.10/include/linux/rockchip/rockchip_sip.h linux-5.12.10-cm35
 +
 +#endif
 diff -uNr linux-5.12.10/include/soc/rockchip/pm_domains.h linux-5.12.10-cm3588-nas/include/soc/rockchip/pm_domains.h
---- linux-5.12.10/include/soc/rockchip/pm_domains.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/soc/rockchip/pm_domains.h	2026-10-28 00:40:25.143053725 +0000
+--- linux-5.12.10/include/soc/rockchip/pm_domains.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/soc/rockchip/pm_domains.h	2026-10-31 05:06:15.499162604 +1030
 @@ -0,0 +1,78 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
@@ -53472,8 +53472,8 @@ diff -uNr linux-5.12.10/include/soc/rockchip/pm_domains.h linux-5.12.10-cm3588-n
 +
 +#endif /* __SOC_ROCKCHIP_PM_DOMAINS_H__ */
 diff -uNr linux-5.12.10/include/soc/rockchip/rockchip_dmc.h linux-5.12.10-cm3588-nas/include/soc/rockchip/rockchip_dmc.h
---- linux-5.12.10/include/soc/rockchip/rockchip_dmc.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-5.12.10-cm3588-nas/include/soc/rockchip/rockchip_dmc.h	2026-10-28 00:40:25.143053725 +0000
+--- linux-5.12.10/include/soc/rockchip/rockchip_dmc.h	1970-01-01 09:30:00.000000000 +0930
++++ linux-5.12.10-cm3588-nas/include/soc/rockchip/rockchip_dmc.h	2026-10-31 05:06:15.501162565 +1030
 @@ -0,0 +1,137 @@
 +/*
 + * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd