diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-26 12:26:24 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-26 12:26:24 -0500 |
| commit | cf4128e53caa4f7b0a6586fc3f10690d5c05db31 (patch) | |
| tree | 2e953d14e76609fadaf1acb8593b46c38c604cdc /arch | |
| parent | f59f07ece5ec78a8fc2f0e06a80ff66029002629 (diff) | |
| parent | e559ef1ae80c1bde942ad9c62932de20e2b68cef (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/armada-3720-db.dts | 21 | ||||
| -rw-r--r-- | arch/arm/dts/armada-37xx.dtsi | 16 | ||||
| -rw-r--r-- | arch/arm/dts/armada-7040-db.dts | 14 | ||||
| -rw-r--r-- | arch/arm/dts/armada-ap806.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/dts/armada-cp110-master.dtsi | 8 |
5 files changed, 67 insertions, 0 deletions
diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts index 83967eeac4..85761afb74 100644 --- a/arch/arm/dts/armada-3720-db.dts +++ b/arch/arm/dts/armada-3720-db.dts @@ -94,6 +94,27 @@ status = "okay"; }; +&sdhci0 { + bus-width = <4>; + status = "okay"; +}; + +&sdhci1 { + non-removable; + bus-width = <8>; + mmc-ddr-1_8v; + mmc-hs400-1_8v; + marvell,pad-type = "fixed-1-8v"; + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + mmccard: mmccard@0 { + compatible = "mmc-card"; + reg = <0>; + }; +}; + &spi0 { status = "okay"; diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi index e27eae0362..062f2a69f4 100644 --- a/arch/arm/dts/armada-37xx.dtsi +++ b/arch/arm/dts/armada-37xx.dtsi @@ -133,6 +133,22 @@ }; }; + sdhci0: sdhci@d0000 { + compatible = "marvell,armada-3700-sdhci", + "marvell,sdhci-xenon"; + reg = <0xd0000 0x300 + 0x1e808 0x4>; + status = "disabled"; + }; + + sdhci1: sdhci@d8000 { + compatible = "marvell,armada-3700-sdhci", + "marvell,sdhci-xenon"; + reg = <0xd8000 0x300 + 0x17808 0x4>; + status = "disabled"; + }; + sata: sata@e0000 { compatible = "marvell,armada-3700-ahci"; reg = <0xe0000 0x2000>; diff --git a/arch/arm/dts/armada-7040-db.dts b/arch/arm/dts/armada-7040-db.dts index 466c6dcc3f..63442df8f3 100644 --- a/arch/arm/dts/armada-7040-db.dts +++ b/arch/arm/dts/armada-7040-db.dts @@ -195,3 +195,17 @@ &cpm_utmi1 { 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; +}; diff --git a/arch/arm/dts/armada-ap806.dtsi b/arch/arm/dts/armada-ap806.dtsi index efb383b9f3..3042cb154b 100644 --- a/arch/arm/dts/armada-ap806.dtsi +++ b/arch/arm/dts/armada-ap806.dtsi @@ -234,6 +234,14 @@ }; + ap_sdhci0: sdhci@6e0000 { + compatible = "marvell,armada-8k-sdhci"; + reg = <0x6e0000 0x300>; + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; + dma-coherent; + status = "disabled"; + }; + ap_syscon: system-controller@6f4000 { compatible = "marvell,ap806-system-controller", "syscon"; diff --git a/arch/arm/dts/armada-cp110-master.dtsi b/arch/arm/dts/armada-cp110-master.dtsi index d637867615..661a69679e 100644 --- a/arch/arm/dts/armada-cp110-master.dtsi +++ b/arch/arm/dts/armada-cp110-master.dtsi @@ -206,6 +206,14 @@ utmi-port = <UTMI_PHY_TO_USB_HOST1>; status = "disabled"; }; + + cpm_sdhci0: sdhci@780000 { + compatible = "marvell,armada-8k-sdhci"; + reg = <0x780000 0x300>; + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; + dma-coherent; + status = "disabled"; + }; }; cpm_pcie0: pcie@f2600000 { |