diff mbox

[v2,8/8] ARM: STi: DT: STiH407: Add dt nodes for sdhci and emmc.

Message ID 1424956227-18258-9-git-send-email-peter.griffin@linaro.org
State New
Headers show

Commit Message

Peter Griffin Feb. 26, 2015, 1:10 p.m. UTC
The nodes have been split to allow as much commonality as possible.
The stih407 has a silicon bug with eMMC UHS modes (with top regs)
and as such doesn't have any of the uhs dt properties.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 arch/arm/boot/dts/stih407-family.dtsi | 30 ++++++++++++++++++++++++++++++
 arch/arm/boot/dts/stih410-b2120.dts   | 10 ++++++++++
 arch/arm/boot/dts/stihxxx-b2120.dtsi  |  8 ++++++++
 3 files changed, 48 insertions(+)

Comments

Peter Griffin March 30, 2015, 11:23 a.m. UTC | #1
Hi Maxime,

On Tue, 03 Mar 2015, Maxime Coquelin wrote:

> 
> On 02/26/2015 02:10 PM, Peter Griffin wrote:
> >The nodes have been split to allow as much commonality as possible.
> >The stih407 has a silicon bug with eMMC UHS modes (with top regs)
> >and as such doesn't have any of the uhs dt properties.
> >
> >Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> >---
> >  arch/arm/boot/dts/stih407-family.dtsi | 30 ++++++++++++++++++++++++++++++
> >  arch/arm/boot/dts/stih410-b2120.dts   | 10 ++++++++++
> >  arch/arm/boot/dts/stihxxx-b2120.dtsi  |  8 ++++++++
> >  3 files changed, 48 insertions(+)
> >
> >
> Maybe you could also add SD/eMMC support to the b2199 too?

Yes ok, I will add support for stih418-b2199 in v3.

> I can test if you don't have the hardware yet.

Yes please, as I don't have any stih418 hardware yet

regards,

Peter.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lee Jones March 30, 2015, 11:37 a.m. UTC | #2
On Mon, 30 Mar 2015, Peter Griffin wrote:

> Hi Maxime,
> 
> On Tue, 03 Mar 2015, Maxime Coquelin wrote:
> 
> > 
> > On 02/26/2015 02:10 PM, Peter Griffin wrote:
> > >The nodes have been split to allow as much commonality as possible.
> > >The stih407 has a silicon bug with eMMC UHS modes (with top regs)
> > >and as such doesn't have any of the uhs dt properties.
> > >
> > >Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> > >---
> > >  arch/arm/boot/dts/stih407-family.dtsi | 30 ++++++++++++++++++++++++++++++
> > >  arch/arm/boot/dts/stih410-b2120.dts   | 10 ++++++++++
> > >  arch/arm/boot/dts/stihxxx-b2120.dtsi  |  8 ++++++++
> > >  3 files changed, 48 insertions(+)
> > >
> > >
> > Maybe you could also add SD/eMMC support to the b2199 too?
> 
> Yes ok, I will add support for stih418-b2199 in v3.

Is there any reason why this can't be actioned in a subsequent patch?
diff mbox

Patch

diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index c06a546..77614a5 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -336,5 +336,35 @@ 
 				resets = <&softreset STIH407_MIPHY2_SOFTRESET>;
 			};
 		};
+
+		mmc0: sdhci@09060000 {
+			compatible = "st,sdhci-stih407", "st,sdhci";
+			status = "disabled";
+			reg = <0x09060000 0x7ff>, <0x9061008 0x20>;
+			reg-names = "mmc", "top-mmc-delay";
+			interrupts = <GIC_SPI 92 IRQ_TYPE_NONE>;
+			interrupt-names = "mmcirq";
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_mmc0>;
+			clock-names = "mmc";
+			clocks = <&clk_s_c0_flexgen CLK_MMC_0>;
+			bus-width = <8>;
+			non-removable;
+		};
+
+		mmc1: sdhci@09080000 {
+			compatible = "st,sdhci-stih407", "st,sdhci";
+			status = "disabled";
+			reg = <0x09080000 0x7ff>;
+			reg-names = "mmc";
+			interrupts = <GIC_SPI 90 IRQ_TYPE_NONE>;
+			interrupt-names = "mmcirq";
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_sd1>;
+			clock-names = "mmc";
+			clocks = <&clk_s_c0_flexgen CLK_MMC_1>;
+			resets = <&softreset STIH407_MMC1_SOFTRESET>;
+			bus-width = <4>;
+		};
 	};
 };
diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts
index 2f61a99..16f02c5 100644
--- a/arch/arm/boot/dts/stih410-b2120.dts
+++ b/arch/arm/boot/dts/stih410-b2120.dts
@@ -26,4 +26,14 @@ 
 	aliases {
 		ttyAS0 = &sbc_serial0;
 	};
+
+	soc {
+
+		mmc0: sdhci@09060000 {
+			max-frequency = <200000000>;
+			sd-uhs-sdr50;
+			sd-uhs-sdr104;
+			sd-uhs-ddr50;
+		};
+	};
 };
diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index c1d8590..64fa0b5 100644
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -47,6 +47,14 @@ 
 			status = "okay";
 		};
 
+		mmc0: sdhci@09060000 {
+			status = "okay";
+		};
+
+		mmc1: sdhci@09080000 {
+			status = "okay";
+		};
+
 		/* SSC11 to HDMI */
 		hdmiddc: i2c@9541000 {
 			status = "okay";