Skip to content

Commit b94e0e3

Browse files
arndbarndb
committed
Merge tag 'renesas-fixes-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/fixes
Renesas fixes for v7.1 - Fix SCIF (serial port) clocks on R-Car X5H, - Fix various dtc and dtbs_check warnings. * tag 'renesas-fixes-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: arm64: dts: renesas: r9a09g056: Add #mux-state-cells to usb20phyrst arm64: dts: renesas: r9a09g057: Add #mux-state-cells to usb2{0,1}phyrst ARM: dts: renesas: rskrza1: Drop superfluous cells ARM: dts: renesas: genmai: Drop superfluous cells ARM: dts: renesas: r7s72100: Add missing unit address to bus node ARM: dts: renesas: r8a7792: Add missing unit address to bus node ARM: dts: renesas: r8a7779: Add missing unit address to bus node ARM: dts: renesas: r8a7778: Add missing unit address to bus node arm64: dts: renesas: rz-smarc-du-adv7513-smarc: Fix missing cells and reg in DU subnode arm64: dts: renesas: rz-smarc-cru-csi-ov5645: Fix missing cells and reg in CSI2 subnode arm64: dts: renesas: salvator-panel: Fix missing cells and reg in DTO arm64: dts: renesas: draak/ebisu-panel: Fix missing cells and reg in DTO arm64: dts: renesas: r8a78000: Fix SCIF brg_int clocks Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 7fd2df2 + 7e070a1 commit b94e0e3

13 files changed

Lines changed: 31 additions & 13 deletions

‎arch/arm/boot/dts/renesas/r7s72100-genmai.dts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
clocks = <&mstp9_clks R7S72100_CLK_SPIBSC0>;
3535
power-domains = <&cpg_clocks>;
3636

37-
#address-cells = <1>;
38-
#size-cells = <1>;
39-
4037
partitions {
4138
compatible = "fixed-partitions";
4239
#address-cells = <1>;

‎arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
power-domains = <&cpg_clocks>;
3737
bank-width = <4>;
3838
device-width = <1>;
39-
#address-cells = <1>;
40-
#size-cells = <1>;
4139

4240
partitions {
4341
compatible = "fixed-partitions";

‎arch/arm/boot/dts/renesas/r7s72100.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
clock-div = <3>;
3838
};
3939

40-
bsc: bus {
40+
bsc: bus@0 {
4141
compatible = "simple-bus";
4242
#address-cells = <1>;
4343
#size-cells = <1>;

‎arch/arm/boot/dts/renesas/r8a7778.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
spi2 = &hspi2;
4141
};
4242

43-
lbsc: bus {
43+
lbsc: bus@0 {
4444
compatible = "simple-bus";
4545
#address-cells = <1>;
4646
#size-cells = <1>;

‎arch/arm/boot/dts/renesas/r8a7779.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@
704704
};
705705
};
706706

707-
lbsc: bus {
707+
lbsc: bus@0 {
708708
compatible = "simple-bus";
709709
#address-cells = <1>;
710710
#size-cells = <1>;

‎arch/arm/boot/dts/renesas/r8a7792.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
bootph-all;
8787
};
8888

89-
lbsc: bus {
89+
lbsc: bus@0 {
9090
compatible = "simple-bus";
9191
#address-cells = <1>;
9292
#size-cells = <1>;

‎arch/arm64/boot/dts/renesas/draak-ebisu-panel-aa104xd12.dtso‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@
2727
status = "okay";
2828

2929
ports {
30+
#address-cells = <1>;
31+
#size-cells = <0>;
32+
3033
port@1 {
34+
reg = <1>;
35+
3136
lvds1_out: endpoint {
3237
remote-endpoint = <&panel_in>;
3338
};

‎arch/arm64/boot/dts/renesas/r8a78000.dtsi‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@
699699
"renesas,rcar-gen5-scif", "renesas,scif";
700700
reg = <0 0xc0700000 0 0x40>;
701701
interrupts = <GIC_ESPI 10 IRQ_TYPE_LEVEL_HIGH>;
702-
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;
702+
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd4>, <&scif_clk>;
703703
clock-names = "fck", "brg_int", "scif_clk";
704704
status = "disabled";
705705
};
@@ -709,7 +709,7 @@
709709
"renesas,rcar-gen5-scif", "renesas,scif";
710710
reg = <0 0xc0704000 0 0x40>;
711711
interrupts = <GIC_ESPI 11 IRQ_TYPE_LEVEL_HIGH>;
712-
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;
712+
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd4>, <&scif_clk>;
713713
clock-names = "fck", "brg_int", "scif_clk";
714714
status = "disabled";
715715
};
@@ -719,7 +719,7 @@
719719
"renesas,rcar-gen5-scif", "renesas,scif";
720720
reg = <0 0xc0708000 0 0x40>;
721721
interrupts = <GIC_ESPI 12 IRQ_TYPE_LEVEL_HIGH>;
722-
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;
722+
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd4>, <&scif_clk>;
723723
clock-names = "fck", "brg_int", "scif_clk";
724724
status = "disabled";
725725
};
@@ -729,7 +729,7 @@
729729
"renesas,rcar-gen5-scif", "renesas,scif";
730730
reg = <0 0xc070c000 0 0x40>;
731731
interrupts = <GIC_ESPI 13 IRQ_TYPE_LEVEL_HIGH>;
732-
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;
732+
clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd4>, <&scif_clk>;
733733
clock-names = "fck", "brg_int", "scif_clk";
734734
status = "disabled";
735735
};

‎arch/arm64/boot/dts/renesas/r9a09g056.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,6 +1327,7 @@
13271327
resets = <&cpg 0xaf>;
13281328
power-domains = <&cpg>;
13291329
#reset-cells = <0>;
1330+
#mux-state-cells = <1>;
13301331
status = "disabled";
13311332
};
13321333

‎arch/arm64/boot/dts/renesas/r9a09g057.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,6 +1345,7 @@
13451345
resets = <&cpg 0xaf>;
13461346
power-domains = <&cpg>;
13471347
#reset-cells = <0>;
1348+
#mux-state-cells = <1>;
13481349
status = "disabled";
13491350
};
13501351

@@ -1355,6 +1356,7 @@
13551356
resets = <&cpg 0xaf>;
13561357
power-domains = <&cpg>;
13571358
#reset-cells = <0>;
1359+
#mux-state-cells = <1>;
13581360
status = "disabled";
13591361
};
13601362

0 commit comments

Comments
 (0)