diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 22:48:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 22:48:06 +0100 |
| commit | ba84c80bada107b9f52bdfff147d2fbc6f4b5b54 (patch) | |
| tree | 1ef20e3cbac0f7d47ef936cc9d16c1e8a0119a2f /arch/arm/boot/dts/r8a7790.dtsi | |
| parent | 8ef74e5d396bd9bb4ce0909b4c02c3f46e60cb0a (diff) | |
| parent | 89aeff9989e87bb2d9d652994010bc18c68675d9 (diff) | |
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/r8a7790.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/r8a7790.dtsi | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 52c21569e352..69b7cd0e7fb3 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -424,7 +424,6 @@ reg = <0 0xee100000 0 0x200>; interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI0>; - cap-sd-highspeed; status = "disabled"; }; @@ -433,7 +432,6 @@ reg = <0 0xee120000 0 0x200>; interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI1>; - cap-sd-highspeed; status = "disabled"; }; @@ -442,7 +440,6 @@ reg = <0 0xee140000 0 0x100>; interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI2>; - cap-sd-highspeed; status = "disabled"; }; @@ -451,7 +448,6 @@ reg = <0 0xee160000 0 0x100>; interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI3>; - cap-sd-highspeed; status = "disabled"; }; @@ -1324,7 +1320,7 @@ status = "disabled"; }; - rcar_sound: rcar_sound@0xec500000 { + rcar_sound: rcar_sound@ec500000 { #sound-dai-cells = <1>; compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2", "renesas,rcar_sound"; reg = <0 0xec500000 0 0x1000>, /* SCU */ |