Skip to content

Commit f9930ae

Browse files
committed
Merge tag 'v6.16-rockchip-dts64-3' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
Power-domains needed for stability, dropping of unnecessary assigned-clocks (handled by cpufreq) and fixes for dtc W=1 warnings. * tag 'v6.16-rockchip-dts64-3' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: move rk3562 pinctrl node outside the soc node arm64: dts: rockchip: fix rk3562 pcie unit addresses arm64: dts: rockchip: move rk3528 pinctrl node outside the soc node arm64: dts: rockchip: remove a double-empty line from rk3576 core dtsi arm64: dts: rockchip: move rk3576 pinctrl node outside the soc node arm64: dts: rockchip: fix rk3576 pcie unit addresses arm64: dts: rockchip: Drop assigned-clock* from cpu nodes on rk3588 arm64: dts: rockchip: Add missing SFC power-domains to rk3576 Link: https://lore.kernel.org/r/4798229.ejJDZkT8p0@phil Signed-off-by: Arnd Bergmann <[email protected]>
2 parents b9e82be + dfab90b commit f9930ae

File tree

4 files changed

+367
-372
lines changed

4 files changed

+367
-372
lines changed

arch/arm64/boot/dts/rockchip/rk3528.dtsi

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,74 @@
9595
};
9696
};
9797

98+
pinctrl: pinctrl {
99+
compatible = "rockchip,rk3528-pinctrl";
100+
rockchip,grf = <&ioc_grf>;
101+
#address-cells = <2>;
102+
#size-cells = <2>;
103+
ranges;
104+
105+
gpio0: gpio@ff610000 {
106+
compatible = "rockchip,gpio-bank";
107+
reg = <0x0 0xff610000 0x0 0x200>;
108+
clocks = <&cru PCLK_GPIO0>, <&cru DBCLK_GPIO0>;
109+
interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
110+
gpio-controller;
111+
#gpio-cells = <2>;
112+
gpio-ranges = <&pinctrl 0 0 32>;
113+
interrupt-controller;
114+
#interrupt-cells = <2>;
115+
};
116+
117+
gpio1: gpio@ffaf0000 {
118+
compatible = "rockchip,gpio-bank";
119+
reg = <0x0 0xffaf0000 0x0 0x200>;
120+
clocks = <&cru PCLK_GPIO1>, <&cru DBCLK_GPIO1>;
121+
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
122+
gpio-controller;
123+
#gpio-cells = <2>;
124+
gpio-ranges = <&pinctrl 0 32 32>;
125+
interrupt-controller;
126+
#interrupt-cells = <2>;
127+
};
128+
129+
gpio2: gpio@ffb00000 {
130+
compatible = "rockchip,gpio-bank";
131+
reg = <0x0 0xffb00000 0x0 0x200>;
132+
clocks = <&cru PCLK_GPIO2>, <&cru DBCLK_GPIO2>;
133+
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
134+
gpio-controller;
135+
#gpio-cells = <2>;
136+
gpio-ranges = <&pinctrl 0 64 32>;
137+
interrupt-controller;
138+
#interrupt-cells = <2>;
139+
};
140+
141+
gpio3: gpio@ffb10000 {
142+
compatible = "rockchip,gpio-bank";
143+
reg = <0x0 0xffb10000 0x0 0x200>;
144+
clocks = <&cru PCLK_GPIO3>, <&cru DBCLK_GPIO3>;
145+
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
146+
gpio-controller;
147+
#gpio-cells = <2>;
148+
gpio-ranges = <&pinctrl 0 96 32>;
149+
interrupt-controller;
150+
#interrupt-cells = <2>;
151+
};
152+
153+
gpio4: gpio@ffb20000 {
154+
compatible = "rockchip,gpio-bank";
155+
reg = <0x0 0xffb20000 0x0 0x200>;
156+
clocks = <&cru PCLK_GPIO4>, <&cru DBCLK_GPIO4>;
157+
interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
158+
gpio-controller;
159+
#gpio-cells = <2>;
160+
gpio-ranges = <&pinctrl 0 128 32>;
161+
interrupt-controller;
162+
#interrupt-cells = <2>;
163+
};
164+
};
165+
98166
psci {
99167
compatible = "arm,psci-1.0", "arm,psci-0.2";
100168
method = "smc";
@@ -866,74 +934,6 @@
866934
#dma-cells = <1>;
867935
arm,pl330-periph-burst;
868936
};
869-
870-
pinctrl: pinctrl {
871-
compatible = "rockchip,rk3528-pinctrl";
872-
rockchip,grf = <&ioc_grf>;
873-
#address-cells = <2>;
874-
#size-cells = <2>;
875-
ranges;
876-
877-
gpio0: gpio@ff610000 {
878-
compatible = "rockchip,gpio-bank";
879-
reg = <0x0 0xff610000 0x0 0x200>;
880-
clocks = <&cru PCLK_GPIO0>, <&cru DBCLK_GPIO0>;
881-
interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
882-
gpio-controller;
883-
#gpio-cells = <2>;
884-
gpio-ranges = <&pinctrl 0 0 32>;
885-
interrupt-controller;
886-
#interrupt-cells = <2>;
887-
};
888-
889-
gpio1: gpio@ffaf0000 {
890-
compatible = "rockchip,gpio-bank";
891-
reg = <0x0 0xffaf0000 0x0 0x200>;
892-
clocks = <&cru PCLK_GPIO1>, <&cru DBCLK_GPIO1>;
893-
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
894-
gpio-controller;
895-
#gpio-cells = <2>;
896-
gpio-ranges = <&pinctrl 0 32 32>;
897-
interrupt-controller;
898-
#interrupt-cells = <2>;
899-
};
900-
901-
gpio2: gpio@ffb00000 {
902-
compatible = "rockchip,gpio-bank";
903-
reg = <0x0 0xffb00000 0x0 0x200>;
904-
clocks = <&cru PCLK_GPIO2>, <&cru DBCLK_GPIO2>;
905-
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
906-
gpio-controller;
907-
#gpio-cells = <2>;
908-
gpio-ranges = <&pinctrl 0 64 32>;
909-
interrupt-controller;
910-
#interrupt-cells = <2>;
911-
};
912-
913-
gpio3: gpio@ffb10000 {
914-
compatible = "rockchip,gpio-bank";
915-
reg = <0x0 0xffb10000 0x0 0x200>;
916-
clocks = <&cru PCLK_GPIO3>, <&cru DBCLK_GPIO3>;
917-
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
918-
gpio-controller;
919-
#gpio-cells = <2>;
920-
gpio-ranges = <&pinctrl 0 96 32>;
921-
interrupt-controller;
922-
#interrupt-cells = <2>;
923-
};
924-
925-
gpio4: gpio@ffb20000 {
926-
compatible = "rockchip,gpio-bank";
927-
reg = <0x0 0xffb20000 0x0 0x200>;
928-
clocks = <&cru PCLK_GPIO4>, <&cru DBCLK_GPIO4>;
929-
interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
930-
gpio-controller;
931-
#gpio-cells = <2>;
932-
gpio-ranges = <&pinctrl 0 128 32>;
933-
interrupt-controller;
934-
#interrupt-cells = <2>;
935-
};
936-
};
937937
};
938938
};
939939

0 commit comments

Comments
 (0)