Skip to content

Commit 3b3e88e

Browse files
arndbarndb
committed
Merge tag 'v5.7-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
Some fixes for the newly added Pinebook Pro and other fixes to make dtc and the new dtscheck against yaml bindings happy. * tag 'v5.7-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi arm64: dts: rockchip: Fix Pinebook Pro FUSB302 interrupt ARM: dts: rockchip: swap clock-names of gpu nodes arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node arm64: dts: rockchip: fix status for &gmac2phy in rk3328-evb.dts arm64: dts: rockchip: remove extra assigned-clocks property from &gmac2phy node in rk3328-evb.dts ARM: dts: rockchip: fix phy nodename for rk3229-xms6 ARM: dts: rockchip: fix phy nodename for rk3228-evb arm64: dts: rockchip: Rename dwc3 device nodes on rk3399 to make dtc happy arm64: dts: rockchip: drop #address-cells, #size-cells from rk3399 pmugrf node arm64: dts: rockchip: drop #address-cells, #size-cells from rk3328 grf node arm64: dts: rockchip: drop non-existent gmac2phy pinmux options from rk3328 arm64: dts: rockchip: Replace RK805 PMIC node name with "pmic" on rk3328 boards arm64: dts: rockchip: enable DC charger detection pullup on Pinebook Pro arm64: dts: rockchip: fix inverted headphone detection on Pinebook Pro arm64: dts: rockchip: Correct PMU compatibles for PX30 and RK3308 Link: https://lore.kernel.org/r/1738941.6LdaBJIBqS@phil Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 6d9ac51 + 855bdca commit 3b3e88e

File tree

12 files changed

+23
-43
lines changed

12 files changed

+23
-43
lines changed

‎arch/arm/boot/dts/rk3036.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
assigned-clocks = <&cru SCLK_GPU>;
129129
assigned-clock-rates = <100000000>;
130130
clocks = <&cru SCLK_GPU>, <&cru SCLK_GPU>;
131-
clock-names = "core", "bus";
131+
clock-names = "bus", "core";
132132
resets = <&cru SRST_GPU>;
133133
status = "disabled";
134134
};

‎arch/arm/boot/dts/rk3228-evb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#address-cells = <1>;
4747
#size-cells = <0>;
4848

49-
phy: phy@0 {
49+
phy: ethernet-phy@0 {
5050
compatible = "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22";
5151
reg = <0>;
5252
clocks = <&cru SCLK_MAC_PHY>;

‎arch/arm/boot/dts/rk3229-xms6.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
#address-cells = <1>;
151151
#size-cells = <0>;
152152

153-
phy: phy@0 {
153+
phy: ethernet-phy@0 {
154154
compatible = "ethernet-phy-id1234.d400",
155155
"ethernet-phy-ieee802.3-c22";
156156
reg = <0>;

‎arch/arm/boot/dts/rk322x.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
"pp1",
556556
"ppmmu1";
557557
clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
558-
clock-names = "core", "bus";
558+
clock-names = "bus", "core";
559559
resets = <&cru SRST_GPU_A>;
560560
status = "disabled";
561561
};
@@ -1020,7 +1020,7 @@
10201020
};
10211021
};
10221022

1023-
spi-0 {
1023+
spi0 {
10241024
spi0_clk: spi0-clk {
10251025
rockchip,pins = <0 RK_PB1 2 &pcfg_pull_up>;
10261026
};
@@ -1038,7 +1038,7 @@
10381038
};
10391039
};
10401040

1041-
spi-1 {
1041+
spi1 {
10421042
spi1_clk: spi1-clk {
10431043
rockchip,pins = <0 RK_PC7 2 &pcfg_pull_up>;
10441044
};

‎arch/arm/boot/dts/rk3xxx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
compatible = "arm,mali-400";
8585
reg = <0x10090000 0x10000>;
8686
clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
87-
clock-names = "core", "bus";
87+
clock-names = "bus", "core";
8888
assigned-clocks = <&cru ACLK_GPU>;
8989
assigned-clock-rates = <100000000>;
9090
resets = <&cru SRST_GPU>;

‎arch/arm64/boot/dts/rockchip/px30.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
};
144144

145145
arm-pmu {
146-
compatible = "arm,cortex-a53-pmu";
146+
compatible = "arm,cortex-a35-pmu";
147147
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
148148
<GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
149149
<GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm64/boot/dts/rockchip/rk3308.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
};
128128

129129
arm-pmu {
130-
compatible = "arm,cortex-a53-pmu";
130+
compatible = "arm,cortex-a35-pmu";
131131
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>,
132132
<GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
133133
<GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm64/boot/dts/rockchip/rk3328-evb.dts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,16 @@
8282
&gmac2phy {
8383
phy-supply = <&vcc_phy>;
8484
clock_in_out = "output";
85-
assigned-clocks = <&cru SCLK_MAC2PHY_SRC>;
8685
assigned-clock-rate = <50000000>;
8786
assigned-clocks = <&cru SCLK_MAC2PHY>;
8887
assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>;
89-
88+
status = "okay";
9089
};
9190

9291
&i2c1 {
9392
status = "okay";
9493

95-
rk805: rk805@18 {
94+
rk805: pmic@18 {
9695
compatible = "rockchip,rk805";
9796
reg = <0x18>;
9897
interrupt-parent = <&gpio2>;

‎arch/arm64/boot/dts/rockchip/rk3328-rock64.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
&i2c1 {
171171
status = "okay";
172172

173-
rk805: rk805@18 {
173+
rk805: pmic@18 {
174174
compatible = "rockchip,rk805";
175175
reg = <0x18>;
176176
interrupt-parent = <&gpio2>;

‎arch/arm64/boot/dts/rockchip/rk3328.dtsi

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,6 @@
299299
grf: syscon@ff100000 {
300300
compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";
301301
reg = <0x0 0xff100000 0x0 0x1000>;
302-
#address-cells = <1>;
303-
#size-cells = <1>;
304302

305303
io_domains: io-domains {
306304
compatible = "rockchip,rk3328-io-voltage-domain";
@@ -1794,10 +1792,6 @@
17941792
};
17951793

17961794
gmac2phy {
1797-
fephyled_speed100: fephyled-speed100 {
1798-
rockchip,pins = <0 RK_PD7 1 &pcfg_pull_none>;
1799-
};
1800-
18011795
fephyled_speed10: fephyled-speed10 {
18021796
rockchip,pins = <0 RK_PD6 1 &pcfg_pull_none>;
18031797
};
@@ -1806,18 +1800,6 @@
18061800
rockchip,pins = <0 RK_PD6 2 &pcfg_pull_none>;
18071801
};
18081802

1809-
fephyled_rxm0: fephyled-rxm0 {
1810-
rockchip,pins = <0 RK_PD5 1 &pcfg_pull_none>;
1811-
};
1812-
1813-
fephyled_txm0: fephyled-txm0 {
1814-
rockchip,pins = <0 RK_PD5 2 &pcfg_pull_none>;
1815-
};
1816-
1817-
fephyled_linkm0: fephyled-linkm0 {
1818-
rockchip,pins = <0 RK_PD4 1 &pcfg_pull_none>;
1819-
};
1820-
18211803
fephyled_rxm1: fephyled-rxm1 {
18221804
rockchip,pins = <2 RK_PD1 2 &pcfg_pull_none>;
18231805
};

0 commit comments

Comments
 (0)