Unverified Commit 634f0f26 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.18-rockchip-dts32-2' of...

Merge tag 'v5.18-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Some fixes for rk8xx pmics to make them follow
the dt-binding better.

* tag 'v5.18-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Update regulator name for PX3
  ARM: dts: rockchip: Add #clock-cells value for rk805

Link: https://lore.kernel.org/r/3788968.RB9BLzCXGK@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fc30ed4e c042639a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@
				regulator-name = "wl_18";
			};

			lcd_33: SWITCH_REG1 {
			lcd_33: SWITCH_REG {
				regulator-name = "lcd_33";
			};
		};
+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@
		interrupt-parent = <&gpio0>;
		interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
		rockchip,system-power-controller;
		#clock-cells = <0>;

		vcc1-supply = <&vcc_sys>;
		vcc2-supply = <&vcc_sys>;
+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@
		interrupt-parent = <&gpio0>;
		interrupts = <RK_PB4 IRQ_TYPE_LEVEL_LOW>;
		rockchip,system-power-controller;
		#clock-cells = <0>;

		vcc1-supply = <&vcc_sys>;
		vcc2-supply = <&vcc_sys>;