Skip to content

Commit dfab90b

Browse files
committed
arm64: dts: rockchip: move rk3562 pinctrl node outside the soc node
The non-mmio pinctrl node is not supposed to be inside the soc simple-bus as dtc points out: ../arch/arm64/boot/dts/rockchip/rk3562.dtsi:1115.20-1181.5: Warning (simple_bus_reg): /soc/pinctrl: missing or empty reg/ranges property Move the pinctrl node outside and adapt the indentation. Signed-off-by: Heiko Stuebner <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 25d3e1d commit dfab90b

File tree

1 file changed

+68
-68
lines changed

1 file changed

+68
-68
lines changed

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

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,74 @@
218218
};
219219
};
220220

221+
pinctrl: pinctrl {
222+
compatible = "rockchip,rk3562-pinctrl";
223+
rockchip,grf = <&ioc_grf>;
224+
#address-cells = <2>;
225+
#size-cells = <2>;
226+
ranges;
227+
228+
gpio0: gpio@ff260000 {
229+
compatible = "rockchip,gpio-bank";
230+
reg = <0x0 0xff260000 0x0 0x100>;
231+
clocks = <&cru PCLK_PMU0_GPIO0>, <&cru DBCLK_PMU0_GPIO0>;
232+
gpio-controller;
233+
gpio-ranges = <&pinctrl 0 0 32>;
234+
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
235+
interrupt-controller;
236+
#gpio-cells = <2>;
237+
#interrupt-cells = <2>;
238+
};
239+
240+
gpio1: gpio@ff620000 {
241+
compatible = "rockchip,gpio-bank";
242+
reg = <0x0 0xff620000 0x0 0x100>;
243+
clocks = <&cru PCLK_PERI_GPIO1>, <&cru DCLK_PERI_GPIO1>;
244+
gpio-controller;
245+
gpio-ranges = <&pinctrl 0 32 32>;
246+
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
247+
interrupt-controller;
248+
#gpio-cells = <2>;
249+
#interrupt-cells = <2>;
250+
};
251+
252+
gpio2: gpio@ff630000 {
253+
compatible = "rockchip,gpio-bank";
254+
reg = <0x0 0xff630000 0x0 0x100>;
255+
clocks = <&cru PCLK_PERI_GPIO2>, <&cru DCLK_PERI_GPIO2>;
256+
gpio-controller;
257+
gpio-ranges = <&pinctrl 0 64 32>;
258+
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
259+
interrupt-controller;
260+
#gpio-cells = <2>;
261+
#interrupt-cells = <2>;
262+
};
263+
264+
gpio3: gpio@ffac0000 {
265+
compatible = "rockchip,gpio-bank";
266+
reg = <0x0 0xffac0000 0x0 0x100>;
267+
clocks = <&cru PCLK_GPIO3_VCCIO156>, <&cru DCLK_BUS_GPIO3>;
268+
gpio-controller;
269+
gpio-ranges = <&pinctrl 0 96 32>;
270+
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
271+
interrupt-controller;
272+
#gpio-cells = <2>;
273+
#interrupt-cells = <2>;
274+
};
275+
276+
gpio4: gpio@ffad0000 {
277+
compatible = "rockchip,gpio-bank";
278+
reg = <0x0 0xffad0000 0x0 0x100>;
279+
clocks = <&cru PCLK_GPIO4_VCCIO156>, <&cru DCLK_BUS_GPIO4>;
280+
gpio-controller;
281+
gpio-ranges = <&pinctrl 0 128 32>;
282+
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
283+
interrupt-controller;
284+
#gpio-cells = <2>;
285+
#interrupt-cells = <2>;
286+
};
287+
};
288+
221289
psci {
222290
compatible = "arm,psci-1.0";
223291
method = "smc";
@@ -1111,74 +1179,6 @@
11111179
#io-channel-cells = <1>;
11121180
status = "disabled";
11131181
};
1114-
1115-
pinctrl: pinctrl {
1116-
compatible = "rockchip,rk3562-pinctrl";
1117-
rockchip,grf = <&ioc_grf>;
1118-
#address-cells = <2>;
1119-
#size-cells = <2>;
1120-
ranges;
1121-
1122-
gpio0: gpio@ff260000 {
1123-
compatible = "rockchip,gpio-bank";
1124-
reg = <0x0 0xff260000 0x0 0x100>;
1125-
clocks = <&cru PCLK_PMU0_GPIO0>, <&cru DBCLK_PMU0_GPIO0>;
1126-
gpio-controller;
1127-
gpio-ranges = <&pinctrl 0 0 32>;
1128-
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
1129-
interrupt-controller;
1130-
#gpio-cells = <2>;
1131-
#interrupt-cells = <2>;
1132-
};
1133-
1134-
gpio1: gpio@ff620000 {
1135-
compatible = "rockchip,gpio-bank";
1136-
reg = <0x0 0xff620000 0x0 0x100>;
1137-
clocks = <&cru PCLK_PERI_GPIO1>, <&cru DCLK_PERI_GPIO1>;
1138-
gpio-controller;
1139-
gpio-ranges = <&pinctrl 0 32 32>;
1140-
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
1141-
interrupt-controller;
1142-
#gpio-cells = <2>;
1143-
#interrupt-cells = <2>;
1144-
};
1145-
1146-
gpio2: gpio@ff630000 {
1147-
compatible = "rockchip,gpio-bank";
1148-
reg = <0x0 0xff630000 0x0 0x100>;
1149-
clocks = <&cru PCLK_PERI_GPIO2>, <&cru DCLK_PERI_GPIO2>;
1150-
gpio-controller;
1151-
gpio-ranges = <&pinctrl 0 64 32>;
1152-
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
1153-
interrupt-controller;
1154-
#gpio-cells = <2>;
1155-
#interrupt-cells = <2>;
1156-
};
1157-
1158-
gpio3: gpio@ffac0000 {
1159-
compatible = "rockchip,gpio-bank";
1160-
reg = <0x0 0xffac0000 0x0 0x100>;
1161-
clocks = <&cru PCLK_GPIO3_VCCIO156>, <&cru DCLK_BUS_GPIO3>;
1162-
gpio-controller;
1163-
gpio-ranges = <&pinctrl 0 96 32>;
1164-
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
1165-
interrupt-controller;
1166-
#gpio-cells = <2>;
1167-
#interrupt-cells = <2>;
1168-
};
1169-
1170-
gpio4: gpio@ffad0000 {
1171-
compatible = "rockchip,gpio-bank";
1172-
reg = <0x0 0xffad0000 0x0 0x100>;
1173-
clocks = <&cru PCLK_GPIO4_VCCIO156>, <&cru DCLK_BUS_GPIO4>;
1174-
gpio-controller;
1175-
gpio-ranges = <&pinctrl 0 128 32>;
1176-
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
1177-
interrupt-controller;
1178-
#gpio-cells = <2>;
1179-
#interrupt-cells = <2>;
1180-
};
1181-
};
11821182
};
11831183
};
11841184

0 commit comments

Comments
 (0)