Skip to content

L
linux
Commit ba84c80b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'renesas-dt-cleanups2-for-v3.19' of... 

Merge tag 'renesas-dt-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Pull "Second Round of Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:

* Drop console= bootargs parameter on alt
* Correct scifb* naming on r8a73a4
* Drop 0x unit-address prefixes
* Remove unnecessary MMC options

* tag 'renesas-dt-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: alt dts: Drop console= bootargs parameter
  ARM: shmobile: r8a73a4: fix scifb* naming
  ARM: shmobile: kzm9g-reference dts: Drop bogus 0x unit-address prefix
  ARM: shmobile: r8a7791 dtsi: Drop bogus 0x unit-address prefix
  ARM: shmobile: r8a7790 dtsi: Drop bogus 0x unit-address prefix
  ARM: shmobile: r8a7790 dtsi: Remove unnecessary MMC options
  ARM: shmobile: r8a7779 dtsi: Remove unnecessary MMC options
  ARM: shmobile: r8a7778 dtsi: Remove unnecessary MMC options
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8ef74e5d 89aeff99
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 26 deletions
arch/arm/boot/dts/r8a73a4.dtsi
View file @ ba84c80b
...@@ -274,14 +274,14 @@ i2c8: i2c@e6570000 { ...@@ -274,14 +274,14 @@ i2c8: i2c@e6570000 {
status = "disabled"; status = "disabled";
}; };
scifb2: serial@e6c20000 { scifb0: serial@e6c20000 {
compatible = "renesas,scifb-r8a73a4", "renesas,scifb"; compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
reg = <0 0xe6c20000 0 0x100>; reg = <0 0xe6c20000 0 0x100>;
interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
scifb3: serial@e6c30000 { scifb1: serial@e6c30000 {
compatible = "renesas,scifb-r8a73a4", "renesas,scifb"; compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
reg = <0 0xe6c30000 0 0x100>; reg = <0 0xe6c30000 0 0x100>;
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
...@@ -302,14 +302,14 @@ scifa1: serial@e6c50000 { ...@@ -302,14 +302,14 @@ scifa1: serial@e6c50000 {
status = "disabled"; status = "disabled";
}; };
scifb4: serial@e6ce0000 { scifb2: serial@e6ce0000 {
compatible = "renesas,scifb-r8a73a4", "renesas,scifb"; compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
reg = <0 0xe6ce0000 0 0x100>; reg = <0 0xe6ce0000 0 0x100>;
interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
scifb5: serial@e6cf0000 { scifb3: serial@e6cf0000 {
compatible = "renesas,scifb-r8a73a4", "renesas,scifb"; compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
reg = <0 0xe6cf0000 0 0x100>; reg = <0 0xe6cf0000 0 0x100>;
interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/r8a7778.dtsi
View file @ ba84c80b
...@@ -251,8 +251,6 @@ sdhi0: sd@ffe4c000 { ...@@ -251,8 +251,6 @@ sdhi0: sd@ffe4c000 {
compatible = "renesas,sdhi-r8a7778"; compatible = "renesas,sdhi-r8a7778";
reg = <0xffe4c000 0x100>; reg = <0xffe4c000 0x100>;
interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled"; status = "disabled";
}; };
...@@ -260,8 +258,6 @@ sdhi1: sd@ffe4d000 { ...@@ -260,8 +258,6 @@ sdhi1: sd@ffe4d000 {
compatible = "renesas,sdhi-r8a7778"; compatible = "renesas,sdhi-r8a7778";
reg = <0xffe4d000 0x100>; reg = <0xffe4d000 0x100>;
interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled"; status = "disabled";
}; };
...@@ -269,8 +265,6 @@ sdhi2: sd@ffe4f000 { ...@@ -269,8 +265,6 @@ sdhi2: sd@ffe4f000 {
compatible = "renesas,sdhi-r8a7778"; compatible = "renesas,sdhi-r8a7778";
reg = <0xffe4f000 0x100>; reg = <0xffe4f000 0x100>;
interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled"; status = "disabled";
}; };
......
arch/arm/boot/dts/r8a7779.dtsi
View file @ ba84c80b
...@@ -314,8 +314,6 @@ sdhi0: sd@ffe4c000 { ...@@ -314,8 +314,6 @@ sdhi0: sd@ffe4c000 {
reg = <0xffe4c000 0x100>; reg = <0xffe4c000 0x100>;
interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7779_CLK_SDHI0>; clocks = <&mstp3_clks R8A7779_CLK_SDHI0>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled"; status = "disabled";
}; };
...@@ -324,8 +322,6 @@ sdhi1: sd@ffe4d000 { ...@@ -324,8 +322,6 @@ sdhi1: sd@ffe4d000 {
reg = <0xffe4d000 0x100>; reg = <0xffe4d000 0x100>;
interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7779_CLK_SDHI1>; clocks = <&mstp3_clks R8A7779_CLK_SDHI1>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled"; status = "disabled";
}; };
...@@ -334,8 +330,6 @@ sdhi2: sd@ffe4e000 { ...@@ -334,8 +330,6 @@ sdhi2: sd@ffe4e000 {
reg = <0xffe4e000 0x100>; reg = <0xffe4e000 0x100>;
interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7779_CLK_SDHI2>; clocks = <&mstp3_clks R8A7779_CLK_SDHI2>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled"; status = "disabled";
}; };
...@@ -344,8 +338,6 @@ sdhi3: sd@ffe4f000 { ...@@ -344,8 +338,6 @@ sdhi3: sd@ffe4f000 {
reg = <0xffe4f000 0x100>; reg = <0xffe4f000 0x100>;
interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7779_CLK_SDHI3>; clocks = <&mstp3_clks R8A7779_CLK_SDHI3>;
cap-sd-highspeed;
cap-sdio-irq;
status = "disabled"; status = "disabled";
}; };
......
arch/arm/boot/dts/r8a7790.dtsi
View file @ ba84c80b
...@@ -424,7 +424,6 @@ sdhi0: sd@ee100000 { ...@@ -424,7 +424,6 @@ sdhi0: sd@ee100000 {
reg = <0 0xee100000 0 0x200>; reg = <0 0xee100000 0 0x200>;
interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI0>; clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
cap-sd-highspeed;
status = "disabled"; status = "disabled";
}; };
...@@ -433,7 +432,6 @@ sdhi1: sd@ee120000 { ...@@ -433,7 +432,6 @@ sdhi1: sd@ee120000 {
reg = <0 0xee120000 0 0x200>; reg = <0 0xee120000 0 0x200>;
interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI1>; clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
cap-sd-highspeed;
status = "disabled"; status = "disabled";
}; };
...@@ -442,7 +440,6 @@ sdhi2: sd@ee140000 { ...@@ -442,7 +440,6 @@ sdhi2: sd@ee140000 {
reg = <0 0xee140000 0 0x100>; reg = <0 0xee140000 0 0x100>;
interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI2>; clocks = <&mstp3_clks R8A7790_CLK_SDHI2>;
cap-sd-highspeed;
status = "disabled"; status = "disabled";
}; };
...@@ -451,7 +448,6 @@ sdhi3: sd@ee160000 { ...@@ -451,7 +448,6 @@ sdhi3: sd@ee160000 {
reg = <0 0xee160000 0 0x100>; reg = <0 0xee160000 0 0x100>;
interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI3>; clocks = <&mstp3_clks R8A7790_CLK_SDHI3>;
cap-sd-highspeed;
status = "disabled"; status = "disabled";
}; };
...@@ -1324,7 +1320,7 @@ pciec: pcie@fe000000 { ...@@ -1324,7 +1320,7 @@ pciec: pcie@fe000000 {
status = "disabled"; status = "disabled";
}; };
rcar_sound: rcar_sound@0xec500000 { rcar_sound: rcar_sound@ec500000 {
#sound-dai-cells = <1>; #sound-dai-cells = <1>;
compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2", "renesas,rcar_sound"; compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
reg = <0 0xec500000 0 0x1000>, /* SCU */ reg = <0 0xec500000 0 0x1000>, /* SCU */
......
arch/arm/boot/dts/r8a7791.dtsi
View file @ ba84c80b
...@@ -1307,7 +1307,7 @@ pciec: pcie@fe000000 { ...@@ -1307,7 +1307,7 @@ pciec: pcie@fe000000 {
status = "disabled"; status = "disabled";
}; };
rcar_sound: rcar_sound@0xec500000 { rcar_sound: rcar_sound@ec500000 {
#sound-dai-cells = <1>; #sound-dai-cells = <1>;
compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2", "renesas,rcar_sound"; compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
reg = <0 0xec500000 0 0x1000>, /* SCU */ reg = <0 0xec500000 0 0x1000>, /* SCU */
......
arch/arm/boot/dts/r8a7794-alt.dts
View file @ ba84c80b
...@@ -20,7 +20,7 @@ aliases { ...@@ -20,7 +20,7 @@ aliases {
}; };
chosen { chosen {
bootargs = "console=ttySC0,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp"; bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
stdout-path = &scif2; stdout-path = &scif2;
}; };
......
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
View file @ ba84c80b
...@@ -251,7 +251,7 @@ ldo8 { ...@@ -251,7 +251,7 @@ ldo8 {
}; };
}; };
ak4648: ak4648@0x12 { ak4648: ak4648@12 {
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
compatible = "asahi-kasei,ak4648"; compatible = "asahi-kasei,ak4648";
reg = <0x12>; reg = <0x12>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7