| Message ID | 1345982371-26483-4-git-send-email-thomas.abraham@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 08/26/12 04:59, Thomas Abraham wrote: > Add device nodes for the four instances of dw_mmc controllers in Exynos5250 > and enable instance 0 and 2 for the smdk5250 board. > > Signed-off-by: Thomas Abraham<thomas.abraham@linaro.org> > --- > arch/arm/boot/dts/exynos5250-smdk5250.dts | 57 ++++++++++++++++++++++++++++- > arch/arm/boot/dts/exynos5250.dtsi | 32 ++++++++++++++++ > 2 files changed, 88 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts > index 8a5e348..6dc9faf 100644 > --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts > +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts > @@ -16,12 +16,19 @@ > model = "SAMSUNG SMDK5250 board based on EXYNOS5250"; > compatible = "samsung,smdk5250", "samsung,exynos5250"; > > + aliases { > + mshc0 =&mshc_0; > + mshc1 =&mshc_1; > + mshc2 =&mshc_2; > + mshc3 =&mshc_3; > + }; > + > memory { > reg =<0x40000000 0x80000000>; > }; > > chosen { > - bootargs = "root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200"; > + bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc"; Yes, we need to sort out the 'bootargs' for using uart2 as a console, but you know, this should be separated :-) > }; > > i2c@12C60000 { > @@ -72,6 +79,54 @@ > status = "disabled"; > }; > > + mshc_0: dwmmc0@12200000 { How about to keep the consistent naming? dwmmc or dw_mmc? I think, 'dw_mmc' makes more sense? > + num-slots =<1>; > + supports-highspeed; > + broken-cd; > + fifo-depth =<0x80>; > + card-detect-delay =<200>; > + samsung,dw-mshc-sdr-timing =<2 3 3>; > + samsung,dw-mshc-ddr-timing =<1 2 3>; We need to think again the name of dw-mshc-sdr-timing, dw-mshc-ddr-timing? [...] > diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi > index 004aaa8..f69e389 100644 > --- a/arch/arm/boot/dts/exynos5250.dtsi > +++ b/arch/arm/boot/dts/exynos5250.dtsi > @@ -182,6 +182,38 @@ > #size-cells =<0>; > }; > > + dwmmc0@12200000 { > + compatible = "samsung,exynos5250-dw-mshc"; I'm not sure, 'exynos5250-dw-mshc' is right here. Because it is just dw_mmc controller on exynos5250. So...hmm... [...] Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
On 28 August 2012 04:16, Kukjin Kim <kgene.kim@samsung.com> wrote: > On 08/26/12 04:59, Thomas Abraham wrote: >> >> Add device nodes for the four instances of dw_mmc controllers in >> Exynos5250 >> and enable instance 0 and 2 for the smdk5250 board. >> >> Signed-off-by: Thomas Abraham<thomas.abraham@linaro.org> >> --- >> arch/arm/boot/dts/exynos5250-smdk5250.dts | 57 >> ++++++++++++++++++++++++++++- >> arch/arm/boot/dts/exynos5250.dtsi | 32 ++++++++++++++++ >> 2 files changed, 88 insertions(+), 1 deletions(-) >> >> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts >> b/arch/arm/boot/dts/exynos5250-smdk5250.dts >> index 8a5e348..6dc9faf 100644 >> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts >> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts >> @@ -16,12 +16,19 @@ >> model = "SAMSUNG SMDK5250 board based on EXYNOS5250"; >> compatible = "samsung,smdk5250", "samsung,exynos5250"; >> >> + aliases { >> + mshc0 =&mshc_0; >> + mshc1 =&mshc_1; >> + mshc2 =&mshc_2; >> + mshc3 =&mshc_3; >> + }; >> + >> memory { >> reg =<0x40000000 0x80000000>; >> }; >> >> chosen { >> - bootargs = "root=/dev/ram0 rw ramdisk=8192 >> console=ttySAC1,115200"; >> + bootargs = "root=/dev/ram0 rw ramdisk=8192 >> initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc"; > > > Yes, we need to sort out the 'bootargs' for using uart2 as a console, but > you know, this should be separated :-) > Sorry, that was never intended to be in this patch. My mistake. > >> }; >> >> i2c@12C60000 { >> @@ -72,6 +79,54 @@ >> status = "disabled"; >> }; >> >> + mshc_0: dwmmc0@12200000 { > > > How about to keep the consistent naming? dwmmc or dw_mmc? I think, 'dw_mmc' > makes more sense? Ok. > > >> + num-slots =<1>; >> + supports-highspeed; >> + broken-cd; >> + fifo-depth =<0x80>; >> + card-detect-delay =<200>; >> + samsung,dw-mshc-sdr-timing =<2 3 3>; >> + samsung,dw-mshc-ddr-timing =<1 2 3>; > > > We need to think again the name of dw-mshc-sdr-timing, dw-mshc-ddr-timing? Synopsis calls this controller "Mobile Storage Host Controller (MSHC)" in their online data sheets. Hence, all the bindings (which are used on non-samsung platforms as well) follow the this name. For any Samsung specific code for this controller, we are free to choose any name. > > [...] > > >> diff --git a/arch/arm/boot/dts/exynos5250.dtsi >> b/arch/arm/boot/dts/exynos5250.dtsi >> index 004aaa8..f69e389 100644 >> --- a/arch/arm/boot/dts/exynos5250.dtsi >> +++ b/arch/arm/boot/dts/exynos5250.dtsi >> @@ -182,6 +182,38 @@ >> #size-cells =<0>; >> }; >> >> + dwmmc0@12200000 { >> + compatible = "samsung,exynos5250-dw-mshc"; > > > I'm not sure, 'exynos5250-dw-mshc' is right here. Because it is just dw_mmc > controller on exynos5250. So...hmm... There are differences in the implementation of the dw-mmc controller in Exynos SoC's. So it has to be exynos5250-dw-mshc. Thanks, Thomas.
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 8a5e348..6dc9faf 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -16,12 +16,19 @@ model = "SAMSUNG SMDK5250 board based on EXYNOS5250"; compatible = "samsung,smdk5250", "samsung,exynos5250"; + aliases { + mshc0 = &mshc_0; + mshc1 = &mshc_1; + mshc2 = &mshc_2; + mshc3 = &mshc_3; + }; + memory { reg = <0x40000000 0x80000000>; }; chosen { - bootargs = "root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200"; + bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc"; }; i2c@12C60000 { @@ -72,6 +79,54 @@ status = "disabled"; }; + mshc_0: dwmmc0@12200000 { + num-slots = <1>; + supports-highspeed; + broken-cd; + fifo-depth = <0x80>; + card-detect-delay = <200>; + samsung,dw-mshc-sdr-timing = <2 3 3>; + samsung,dw-mshc-ddr-timing = <1 2 3>; + + slot@0 { + reg = <0>; + bus-width = <8>; + gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>, + <&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>, + <&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>, + <&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>, + <&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>; + }; + }; + + mshc_1: dwmmc1@12210000 { + status = "disabled"; + }; + + mshc_2: dwmmc2@12220000 { + num-slots = <1>; + supports-highspeed; + fifo-depth = <0x80>; + card-detect-delay = <200>; + samsung,dw-mshc-sdr-timing = <2 3 3>; + samsung,dw-mshc-ddr-timing = <1 2 3>; + + slot@0 { + reg = <0>; + bus-width = <4>; + samsung,cd-pinmux-gpio = <&gpc3 2 2 3 3>; + gpios = <&gpc3 0 2 0 3>, <&gpc3 1 2 0 3>, + <&gpc3 3 2 3 3>, <&gpc3 4 2 3 3>, + <&gpc3 5 2 3 3>, <&gpc3 6 2 3 3>, + <&gpc4 3 3 3 3>, <&gpc4 3 3 3 3>, + <&gpc4 5 3 3 3>, <&gpc4 6 3 3 3>; + }; + }; + + mshc_3: dwmmc3@12230000 { + status = "disabled"; + }; + spi_0: spi@12d20000 { status = "disabled"; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 004aaa8..f69e389 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -182,6 +182,38 @@ #size-cells = <0>; }; + dwmmc0@12200000 { + compatible = "samsung,exynos5250-dw-mshc"; + reg = <0x12200000 0x1000>; + interrupts = <0 75 0>; + #address-cells = <1>; + #size-cells = <0>; + }; + + dwmmc1@12210000 { + compatible = "samsung,exynos5250-dw-mshc"; + reg = <0x12210000 0x1000>; + interrupts = <0 76 0>; + #address-cells = <1>; + #size-cells = <0>; + }; + + dwmmc2@12220000 { + compatible = "samsung,exynos5250-dw-mshc"; + reg = <0x12220000 0x1000>; + interrupts = <0 77 0>; + #address-cells = <1>; + #size-cells = <0>; + }; + + dwmmc3@12230000 { + compatible = "samsung,exynos5250-dw-mshc"; + reg = <0x12230000 0x1000>; + interrupts = <0 78 0>; + #address-cells = <1>; + #size-cells = <0>; + }; + amba { #address-cells = <1>; #size-cells = <1>;
Add device nodes for the four instances of dw_mmc controllers in Exynos5250 and enable instance 0 and 2 for the smdk5250 board. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> --- arch/arm/boot/dts/exynos5250-smdk5250.dts | 57 ++++++++++++++++++++++++++++- arch/arm/boot/dts/exynos5250.dtsi | 32 ++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletions(-)