| Message ID | 20181227133405.11482-3-manivannanece23@gmail.com |
|---|---|
| State | Accepted |
| Commit | a50eb64915fd2e4775684b0dee98fb5d322ee4e4 |
| Headers | show |
| Series | [v2,1/3] include: configs: Add gunzip size for HiKey board | expand |
On Thu, Dec 27, 2018 at 07:04:05PM +0530, Manivannan Sadhasivam wrote: > From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > Add MMC nodes for HiKey board based on HI6220 SoC. There are three MMC > controllers in this SoC, first one used for eMMC, second one used > for SD card and third one is not used by u-boot. > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> But can you please do a follow-up series that syncs the DT files with say Linux v4.20? Thanks! -- Tom
On Thu, Dec 27, 2018 at 08:55:19AM -0500, Tom Rini wrote: > On Thu, Dec 27, 2018 at 07:04:05PM +0530, Manivannan Sadhasivam wrote: > > > From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > > > Add MMC nodes for HiKey board based on HI6220 SoC. There are three MMC > > controllers in this SoC, first one used for eMMC, second one used > > for SD card and third one is not used by u-boot. > > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > Reviewed-by: Simon Glass <sjg@chromium.org> > > Reviewed-by: Tom Rini <trini@konsulko.com> > > But can you please do a follow-up series that syncs the DT files with > say Linux v4.20? Thanks! > Sure, will do as a part of the follow up series which converts USB driver to driver model. Thanks, Mani > -- > Tom
On Thu, Dec 27, 2018 at 07:04:05PM +0530, Manivannan Sadhasivam wrote: > From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > Add MMC nodes for HiKey board based on HI6220 SoC. There are three MMC > controllers in this SoC, first one used for eMMC, second one used > for SD card and third one is not used by u-boot. > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Reviewed-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks! -- Tom
diff --git a/arch/arm/dts/hi6220-hikey-u-boot.dtsi b/arch/arm/dts/hi6220-hikey-u-boot.dtsi new file mode 100644 index 00000000000..31139832401 --- /dev/null +++ b/arch/arm/dts/hi6220-hikey-u-boot.dtsi @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * U-Boot additions + * + * Copyright (c) 2018 Linaro Ltd. + */ + +&mmc0 { + u-boot,dm-pre-reloc; +}; + +&mmc1 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/hi6220-hikey.dts b/arch/arm/dts/hi6220-hikey.dts index 24f09257af0..d63929348bb 100644 --- a/arch/arm/dts/hi6220-hikey.dts +++ b/arch/arm/dts/hi6220-hikey.dts @@ -40,6 +40,17 @@ }; }; +&mmc0 { + status = "okay"; + non-removable; + bus-width = <8>; +}; + +&mmc1 { + status = "okay"; + bus-width = <4>; +}; + &uart2 { label = "LS-UART0"; }; diff --git a/arch/arm/dts/hi6220.dtsi b/arch/arm/dts/hi6220.dtsi index a610ccb6346..501c8906fd6 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>;