Skip to content

Commit

Permalink
ARM: dts: rmobile: Fix duplicate definition SDHI on M3N
Browse files Browse the repository at this point in the history
SDHI definition fixed at commit cbff9f8
 ("ARM: dts: rmobile: Sync Gen3 DTS with Linux v4.19.6").
This patch removes SDHI defined in "arch/arm/dts/
r8a77965-u-boot.dtsi" and activates the overlap code defined in
"arch/arm/dts/salvator-common.dtsi" and "arch/arm/dts/ulcb.dtsi".

Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
  • Loading branch information
h-yokoya committed Mar 8, 2019
1 parent f250663 commit 6013d50
Showing 1 changed file with 0 additions and 44 deletions.
44 changes: 0 additions & 44 deletions arch/arm/dts/r8a77965-u-boot.dtsi
Expand Up @@ -20,50 +20,6 @@
status = "disabled";
};

sdhi0: sd@ee100000 {
compatible = "renesas,sdhi-r8a77965";
reg = <0 0xee100000 0 0x2000>;
interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 314>;
max-frequency = <200000000>;
power-domains = <&sysc 32>;
resets = <&cpg 314>;
status = "disabled";
};

sdhi1: sd@ee120000 {
compatible = "renesas,sdhi-r8a77965";
reg = <0 0xee120000 0 0x2000>;
interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 313>;
max-frequency = <200000000>;
power-domains = <&sysc 32>;
resets = <&cpg 313>;
status = "disabled";
};

sdhi2: sd@ee140000 {
compatible = "renesas,sdhi-r8a77965";
reg = <0 0xee140000 0 0x2000>;
interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 312>;
max-frequency = <200000000>;
power-domains = <&sysc 32>;
resets = <&cpg 312>;
status = "disabled";
};

sdhi3: sd@ee160000 {
compatible = "renesas,sdhi-r8a77965";
reg = <0 0xee160000 0 0x2000>;
interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 311>;
max-frequency = <200000000>;
power-domains = <&sysc 32>;
resets = <&cpg 311>;
status = "disabled";
};

ehci0: usb@ee080100 {
compatible = "generic-ehci";
reg = <0 0xee080100 0 0x100>;
Expand Down

0 comments on commit 6013d50

Please sign in to comment.