]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
arm64: dts: marvell: add sdhci support for Armada 7K/8K
authorGregory CLEMENT <gregory.clement@free-electrons.com>
Thu, 30 Mar 2017 15:23:04 +0000 (17:23 +0200)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Tue, 11 Apr 2017 07:56:27 +0000 (09:56 +0200)
Also enable it on the Armada 7040 DB and Armada 8040 DB boards.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
arch/arm64/boot/dts/marvell/armada-7040-db.dts
arch/arm64/boot/dts/marvell/armada-8040-db.dts
arch/arm64/boot/dts/marvell/armada-ap806.dtsi
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi

index bb0e1e8e7138876a6eff222cd2c1f38fc19ea595..577950492fec6712631241594fbd5ef372598566 100644 (file)
        status = "okay";
 };
 
+&ap_sdhci0 {
+       status = "okay";
+       bus-width = <4>;
+       no-1-8-v;
+       non-removable;
+};
+
+&cpm_sdhci0 {
+       status = "okay";
+       bus-width = <4>;
+       no-1-8-v;
+       non-removable;
+};
+
 &cpm_mdio {
        phy0: ethernet-phy@0 {
                reg = <0>;
index 80e685e4235d3d3a010982e8908b719b43cbf4ec..81a0b1249c4524d3c133a8d325855e4bbf5a542a 100644 (file)
 &cps_usb3_1 {
        status = "okay";
 };
+
+&ap_sdhci0 {
+       status = "okay";
+       bus-width = <4>;
+       non-removable;
+};
+
+&cpm_sdhci0 {
+       status = "okay";
+       bus-width = <8>;
+       non-removable;
+};
index a749ba2edec4b1c30f861903da2b7e57db995a27..9e9a4025e79963e14d6311807caf7f565ddb29f0 100644 (file)
 
                        };
 
+                       ap_sdhci0: sdhci@6e0000 {
+                               compatible = "marvell,armada-ap806-sdhci";
+                               reg = <0x6e0000 0x300>;
+                               interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+                               clock-names = "core";
+                               clocks = <&ap_syscon 4>;
+                               dma-coherent;
+                               marvell,xenon-phy-slow-mode;
+                               status = "disabled";
+                       };
+
                        ap_syscon: system-controller@6f4000 {
                                compatible = "marvell,ap806-system-controller",
                                             "syscon";
index a035f59552821ceb481db9d8ccfa37f3eef320e1..ad349ad3034c8413177aad557551f3dea1259dc0 100644 (file)
                                clocks = <&cpm_syscon0 1 25>;
                                status = "okay";
                        };
+
+                       cpm_sdhci0: sdhci@780000 {
+                               compatible = "marvell,armada-cp110-sdhci";
+                               reg = <0x780000 0x300>;
+                               interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                               clock-names = "core";
+                               clocks = <&cpm_syscon0 1 4>;
+                               dma-coherent;
+                               status = "disabled";
+                       };
+
                };
 
                cpm_pcie0: pcie@f2600000 {