[3/3] arm: dts: Add MMC nodes for HiKey board

Message ID 20181220130702.23257-3-manivannan.sadhasivam@linaro.org
State New
Headers show
Series
  • [1/3] include: configs: Add gunzip size for HiKey board
Related show

Commit Message

Manivannan Sadhasivam Dec. 20, 2018, 1:07 p.m.
Add MMC nodes for HiKey board based on HI6220 SoC. There are two MMC
controllers in this SoC, first one used for eMMC and second one used
for SD card.

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
 arch/arm/dts/hi6220-hikey.dts | 13 +++++++++++++
 arch/arm/dts/hi6220.dtsi      | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+)

Comments

Simon Glass Dec. 21, 2018, 9:16 p.m. | #1
On Thu, 20 Dec 2018 at 06:07, Manivannan Sadhasivam
<manivannan.sadhasivam@linaro.org> wrote:
>
> Add MMC nodes for HiKey board based on HI6220 SoC. There are two MMC
> controllers in this SoC, first one used for eMMC and second one used
> for SD card.
>
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> ---
>  arch/arm/dts/hi6220-hikey.dts | 13 +++++++++++++
>  arch/arm/dts/hi6220.dtsi      | 18 ++++++++++++++++++
>  2 files changed, 31 insertions(+)
>

Reviewed-by: Simon Glass <sjg@chromium.org>
Tom Rini Dec. 26, 2018, 2:36 p.m. | #2
On Thu, Dec 20, 2018 at 06:37:02PM +0530, Manivannan Sadhasivam wrote:

> Add MMC nodes for HiKey board based on HI6220 SoC. There are two MMC

> controllers in this SoC, first one used for eMMC and second one used

> for SD card.

> 

> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

> ---

>  arch/arm/dts/hi6220-hikey.dts | 13 +++++++++++++

>  arch/arm/dts/hi6220.dtsi      | 18 ++++++++++++++++++

>  2 files changed, 31 insertions(+)

> 

> diff --git a/arch/arm/dts/hi6220-hikey.dts b/arch/arm/dts/hi6220-hikey.dts

> index 24f09257af..9c8f2467dc 100644

> --- a/arch/arm/dts/hi6220-hikey.dts

> +++ b/arch/arm/dts/hi6220-hikey.dts

> @@ -40,6 +40,19 @@

>  	};

>  };

>  

> +&mmc0 {

> +	u-boot,dm-pre-reloc;


Looks like hikey needs to be updated to have a -u-boot.dtsi file for
these kind of changes so that the core of the dts files can be synced
from Linux unchanged, thanks!

-- 
Tom
Manivannan Sadhasivam Dec. 27, 2018, 1:26 p.m. | #3
Hi Tom,

On Wed, Dec 26, 2018 at 09:36:25AM -0500, Tom Rini wrote:
> On Thu, Dec 20, 2018 at 06:37:02PM +0530, Manivannan Sadhasivam wrote:
> 
> > Add MMC nodes for HiKey board based on HI6220 SoC. There are two MMC
> > controllers in this SoC, first one used for eMMC and second one used
> > for SD card.
> > 
> > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > ---
> >  arch/arm/dts/hi6220-hikey.dts | 13 +++++++++++++
> >  arch/arm/dts/hi6220.dtsi      | 18 ++++++++++++++++++
> >  2 files changed, 31 insertions(+)
> > 
> > diff --git a/arch/arm/dts/hi6220-hikey.dts b/arch/arm/dts/hi6220-hikey.dts
> > index 24f09257af..9c8f2467dc 100644
> > --- a/arch/arm/dts/hi6220-hikey.dts
> > +++ b/arch/arm/dts/hi6220-hikey.dts
> > @@ -40,6 +40,19 @@
> >  	};
> >  };
> >  
> > +&mmc0 {
> > +	u-boot,dm-pre-reloc;
> 
> Looks like hikey needs to be updated to have a -u-boot.dtsi file for
> these kind of changes so that the core of the dts files can be synced
> from Linux unchanged, thanks!
> 

Agree! Will add this in next revision.

Thanks,
Mani

> -- 
> Tom

Patch

diff --git a/arch/arm/dts/hi6220-hikey.dts b/arch/arm/dts/hi6220-hikey.dts
index 24f09257af..9c8f2467dc 100644
--- a/arch/arm/dts/hi6220-hikey.dts
+++ b/arch/arm/dts/hi6220-hikey.dts
@@ -40,6 +40,19 @@ 
 	};
 };
 
+&mmc0 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+	non-removable;
+	bus-width = <8>;
+};
+
+&mmc1 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+	bus-width = <4>;
+};
+
 &uart2 {
 	label = "LS-UART0";
 };
diff --git a/arch/arm/dts/hi6220.dtsi b/arch/arm/dts/hi6220.dtsi
index a610ccb634..501c8906fd 100644
--- a/arch/arm/dts/hi6220.dtsi
+++ b/arch/arm/dts/hi6220.dtsi
@@ -162,6 +162,24 @@ 
 			#clock-cells = <1>;
 		};
 
+		mmc0: dwmmc@f723d000 {
+			compatible = "hisilicon,hi6220-dw-mshc";
+			reg = <0x0 0xf723d000 0x0 0x1000>;
+			interrupts = <0x0 0x48 0x4>;
+			clocks = <&sys_ctrl 2>, <&sys_ctrl 1>;
+			clock-names = "ciu", "biu";
+			status = "disabled";
+		};
+
+		mmc1: dwmmc@f723e000 {
+			compatible = "hisilicon,hi6220-dw-mshc";
+			reg = <0x0 0xf723e000 0x0 0x1000>;
+			interrupts = <0x0 0x49 0x4>;
+			clocks = <&sys_ctrl 4>, <&sys_ctrl 3>;
+			clock-names = "ciu", "biu";
+			status = "disabled";
+		};
+
 		uart0: uart@f8015000 {	/* console */
 			compatible = "arm,pl011", "arm,primecell";
 			reg = <0x0 0xf8015000 0x0 0x1000>;