[PATCH v3 0/4] Add eMMC and SD card support for rk3288-evb

[PATCH v3 0/4] Add eMMC and SD card support for rk3288-evb

[Doug Anderson]

This series adds basic eMMC and SD card support for the rk3288-evb
board based on Addy's posted dw_mmc patch from:
  https://patchwork.kernel.org/patch/4653631/

The series is a little tricky because:
* Jaehoon has some outstanding patches to remove the slot node.  Since
  those haven't landed yet, I've posted my original patch with the
  slot node and then some future patches that can land with Jaehoon's
  patches.

So just to be explicit:
- Patch #1 and #2 can land after Addy's patch lands.
- Patch #3 and #4 can land after Jaehoon's patch lands, though there's
  no huge hurry since Jaehoon's patch supports the old mode (it just
  prints a warning).

Note that we don't have regulators specified yet (no regulator driver
for rk808-based board).  We also don't yet support UHS modes or MMC
DDR50 (which require regulator support plus dw_mmc driver support for
tuning).  Those features can come later.

Changes in v3:
- Removed DDR50 mode since it needs tuning, which isn't there yet.

Changes in v2:
- New patchwork link for Addy's patch
- Squashed in the DDR50 mode since Addy spun his patch.
- Refer to the new title of Jaehoon's patch

Doug Anderson (4):
  ARM: dts: Add emmc and sdmmc to the rk3288 device tree
  ARM: dts: Enable emmc and sdmmc on the rk3288-evb boards
  ARM: dts: Take the mmc slot node out of rk3288-evb
  ARM: dts: mmc slot node gone on rk3288 => no more address / size cells

 arch/arm/boot/dts/rk3288-evb.dtsi | 24 ++++++++++++++++++++++++
 arch/arm/boot/dts/rk3288.dtsi     | 18 ++++++++++++++++++
 2 files changed, 42 insertions(+)

-- 
2.0.0.526.g5318336

[PATCH v3 1/4] ARM: dts: Add emmc and sdmmc to the rk3288 device tree

[Doug Anderson]

This adds support for the sdmmc and emmc ports on the rk3288 using the
currently posted driver from Addy at:
  https://patchwork.kernel.org/patch/4653631/

Note:
* This is not baesd on Jaehoon's patch series removing the slot node,
  but it does use new syntax like putting the bus width at the top
  level and using the new cap-mmc-highspeed / cap-sd-highspeed.  A
  future patch will modify this one to remove the slot node.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
Changes in v3: None
Changes in v2:
- New patchwork link for Addy's patch

 arch/arm/boot/dts/rk3288.dtsi | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index e7cb008..dc98a5b 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -78,6 +78,28 @@
 		clock-frequency = <24000000>;
 	};
 
+	sdmmc: dwmmc at ff0c0000 {
+		compatible = "rockchip,rk3288-dw-mshc";
+		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
+		clock-names = "biu", "ciu";
+		fifo-depth = <0x100>;
+		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+		reg = <0xff0c0000 0x4000>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+	};
+
+	emmc: dwmmc at ff0f0000 {
+		compatible = "rockchip,rk3288-dw-mshc";
+		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>;
+		clock-names = "biu", "ciu";
+		fifo-depth = <0x100>;
+		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+		reg = <0xff0f0000 0x4000>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+	};
+
 	i2c1: i2c at ff140000 {
 		compatible = "rockchip,rk3288-i2c";
 		reg = <0xff140000 0x1000>;
-- 
2.0.0.526.g5318336

[PATCH v3 2/4] ARM: dts: Enable emmc and sdmmc on the rk3288-evb boards

[Doug Anderson]

This adds support for the sdmmc and emmc ports on the rk3288 using the
currently posted driver from Addy at:
  https://patchwork.kernel.org/patch/4653631/

This enables basic SD and eMMC support.  Things are not yet running at
the fastest speed and we don't have the regulators specified, but we
can at least use the eMMC and SD cards now.

A few notes:
* This is not baesd on Jaehoon's patch series removing the slot node,
  but it does use new syntax like putting the bus width at the top
  level and using the new cap-mmc-highspeed / cap-sd-highspeed.  A
  future patch will modify this one to remove the slot node.
* Though MMC DDR50 mode is partially supported in the dw_mmc
  rk3288-specific code in Addy's patch, Addy's patch doesn't add
  tuning support.  That means DDR50 mode is not reliable.  From the
  3288 TRM: "Tuning is required for other speed modes-such as
  DDR50-even though the output delay from the card is less than one
  cycle."  Thus, we don't enable MMC DDR50 mode in this patch.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
Changes in v3:
- Removed DDR50 mode since it needs tuning, which isn't there yet.

Changes in v2:
- Squashed in the DDR50 mode since Addy spun his patch.
- New patchwork link for Addy's patch

 arch/arm/boot/dts/rk3288-evb.dtsi | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 4f57209..c2cf72f 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -49,6 +49,38 @@
 	};
 };
 
+&emmc {
+	broken-cd;
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	non-removable;
+	num-slots = <1>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
+	status = "okay";
+
+	slot at 0 {
+		reg = <0>;
+		disable-wp;
+	};
+};
+
+&sdmmc {
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
+	card-detect-delay = <200>;
+	num-slots = <1>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
+	status = "okay";
+
+	slot at 0 {
+		reg = <0>;
+		disable-wp;		/* wp not hooked up */
+	};
+};
+
 &i2c0 {
 	status = "okay";
 };
-- 
2.0.0.526.g5318336

[PATCH v3 3/4] ARM: dts: Take the mmc slot node out of rk3288-evb

[Doug Anderson]

In Jaehoon's (mmc: dw_mmc: Slot quirk "disable-wp" is deprecated) the
slot node is no longer used.  Remove it.

Note that if Jaehoon's patch lands before my (ARM: dts: Enable emmc
and sdmmc on the rk3288-evb boards) then this could be squashed into
the later.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
Changes in v3: None
Changes in v2:
- Refer to the new title of Jaehoon's patch

 arch/arm/boot/dts/rk3288-evb.dtsi | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index c2cf72f..ebce49a 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -53,16 +53,12 @@
 	broken-cd;
 	bus-width = <8>;
 	cap-mmc-highspeed;
+	disable-wp;
 	non-removable;
 	num-slots = <1>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
 	status = "okay";
-
-	slot at 0 {
-		reg = <0>;
-		disable-wp;
-	};
 };
 
 &sdmmc {
@@ -70,15 +66,11 @@
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
 	card-detect-delay = <200>;
+	disable-wp;			/* wp not hooked up */
 	num-slots = <1>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
 	status = "okay";
-
-	slot at 0 {
-		reg = <0>;
-		disable-wp;		/* wp not hooked up */
-	};
 };
 
 &i2c0 {
-- 
2.0.0.526.g5318336

[PATCH v3 4/4] ARM: dts: mmc slot node gone on rk3288 => no more address / size cells

[Doug Anderson]

We've removed the slot node from all rk3288 device trees, so we no
longer need address-cells or size-cells.

If Jaehoon's (mmc: dw_mmc: Slot quirk "disable-wp" is deprecated)
patch lands before my (ARM: dts: Add emmc and sdmmc to the rk3288
device tree) then this could be squashed into the later patch.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
Changes in v3: None
Changes in v2:
- Refer to the new title of Jaehoon's patch

 arch/arm/boot/dts/rk3288.dtsi | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index dc98a5b..8774e83 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -85,8 +85,6 @@
 		fifo-depth = <0x100>;
 		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
 		reg = <0xff0c0000 0x4000>;
-		#address-cells = <1>;
-		#size-cells = <0>;
 	};
 
 	emmc: dwmmc at ff0f0000 {
@@ -96,8 +94,6 @@
 		fifo-depth = <0x100>;
 		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
 		reg = <0xff0f0000 0x4000>;
-		#address-cells = <1>;
-		#size-cells = <0>;
 	};
 
 	i2c1: i2c at ff140000 {
-- 
2.0.0.526.g5318336

[PATCH v3 0/4] Add eMMC and SD card support for rk3288-evb

[Jaehoon Chung]

Hi, Doug.

Acked-by: Jaehoon Chung <jh80.chung@samsung.com>

On 08/07/2014 02:09 AM, Doug Anderson wrote:
> This series adds basic eMMC and SD card support for the rk3288-evb
> board based on Addy's posted dw_mmc patch from:
>   https://patchwork.kernel.org/patch/4653631/
> 
> The series is a little tricky because:
> * Jaehoon has some outstanding patches to remove the slot node.  Since
>   those haven't landed yet, I've posted my original patch with the
>   slot node and then some future patches that can land with Jaehoon's
>   patches.
> 
> So just to be explicit:
> - Patch #1 and #2 can land after Addy's patch lands.
> - Patch #3 and #4 can land after Jaehoon's patch lands, though there's
>   no huge hurry since Jaehoon's patch supports the old mode (it just
>   prints a warning).
> 
> Note that we don't have regulators specified yet (no regulator driver
> for rk808-based board).  We also don't yet support UHS modes or MMC
> DDR50 (which require regulator support plus dw_mmc driver support for
> tuning).  Those features can come later.
> 
> Changes in v3:
> - Removed DDR50 mode since it needs tuning, which isn't there yet.
> 
> Changes in v2:
> - New patchwork link for Addy's patch
> - Squashed in the DDR50 mode since Addy spun his patch.
> - Refer to the new title of Jaehoon's patch
> 
> Doug Anderson (4):
>   ARM: dts: Add emmc and sdmmc to the rk3288 device tree
>   ARM: dts: Enable emmc and sdmmc on the rk3288-evb boards
>   ARM: dts: Take the mmc slot node out of rk3288-evb
>   ARM: dts: mmc slot node gone on rk3288 => no more address / size cells
> 
>  arch/arm/boot/dts/rk3288-evb.dtsi | 24 ++++++++++++++++++++++++
>  arch/arm/boot/dts/rk3288.dtsi     | 18 ++++++++++++++++++
>  2 files changed, 42 insertions(+)
> 

[PATCH v3 1/4] ARM: dts: Add emmc and sdmmc to the rk3288 device tree

[Doug Anderson]

Heiko,

On Wed, Aug 6, 2014 at 10:09 AM, Doug Anderson <dianders@chromium.org> wrote:
> This adds support for the sdmmc and emmc ports on the rk3288 using the
> currently posted driver from Addy at:
>   https://patchwork.kernel.org/patch/4653631/
>
> Note:
> * This is not baesd on Jaehoon's patch series removing the slot node,
>   but it does use new syntax like putting the bus width at the top
>   level and using the new cap-mmc-highspeed / cap-sd-highspeed.  A
>   future patch will modify this one to remove the slot node.
>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> ---
> Changes in v3: None
> Changes in v2:
> - New patchwork link for Addy's patch
>
>  arch/arm/boot/dts/rk3288.dtsi | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>
> diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
> index e7cb008..dc98a5b 100644
> --- a/arch/arm/boot/dts/rk3288.dtsi
> +++ b/arch/arm/boot/dts/rk3288.dtsi
> @@ -78,6 +78,28 @@
>                 clock-frequency = <24000000>;
>         };
>
> +       sdmmc: dwmmc at ff0c0000 {
> +               compatible = "rockchip,rk3288-dw-mshc";
> +               clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
> +               clock-names = "biu", "ciu";
> +               fifo-depth = <0x100>;
> +               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
> +               reg = <0xff0c0000 0x4000>;
> +               #address-cells = <1>;
> +               #size-cells = <0>;

When doing other testing I realized that I missed a:
  status = "disabled";

...from both of these two nodes.  I'm happy to repost with this fix or
I'm happy if you want to add to the patch when applying.

Let me know.  Thanks!


> +       };
> +
> +       emmc: dwmmc at ff0f0000 {
> +               compatible = "rockchip,rk3288-dw-mshc";
> +               clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>;
> +               clock-names = "biu", "ciu";
> +               fifo-depth = <0x100>;
> +               interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
> +               reg = <0xff0f0000 0x4000>;
> +               #address-cells = <1>;
> +               #size-cells = <0>;
> +       };
> +
>         i2c1: i2c at ff140000 {
>                 compatible = "rockchip,rk3288-i2c";
>                 reg = <0xff140000 0x1000>;
> --
> 2.0.0.526.g5318336
>

[PATCH v3 1/4] ARM: dts: Add emmc and sdmmc to the rk3288 device tree

[Heiko Stübner]

Am Dienstag, 12. August 2014, 14:06:11 schrieb Doug Anderson:
> Heiko,
> 
> On Wed, Aug 6, 2014 at 10:09 AM, Doug Anderson <dianders@chromium.org> 
wrote:
> > This adds support for the sdmmc and emmc ports on the rk3288 using the
> > 
> > currently posted driver from Addy at:
> >   https://patchwork.kernel.org/patch/4653631/
> > 
> > Note:
> > * This is not baesd on Jaehoon's patch series removing the slot node,
> > 
> >   but it does use new syntax like putting the bus width at the top
> >   level and using the new cap-mmc-highspeed / cap-sd-highspeed.  A
> >   future patch will modify this one to remove the slot node.
> > 
> > Signed-off-by: Doug Anderson <dianders@chromium.org>
> > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > Changes in v3: None
> > Changes in v2:
> > - New patchwork link for Addy's patch
> > 
> >  arch/arm/boot/dts/rk3288.dtsi | 22 ++++++++++++++++++++++
> >  1 file changed, 22 insertions(+)
> > 
> > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
> > index e7cb008..dc98a5b 100644
> > --- a/arch/arm/boot/dts/rk3288.dtsi
> > +++ b/arch/arm/boot/dts/rk3288.dtsi
> > @@ -78,6 +78,28 @@
> > 
> >                 clock-frequency = <24000000>;
> >         
> >         };
> > 
> > +       sdmmc: dwmmc at ff0c0000 {
> > +               compatible = "rockchip,rk3288-dw-mshc";
> > +               clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
> > +               clock-names = "biu", "ciu";
> > +               fifo-depth = <0x100>;
> > +               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
> > +               reg = <0xff0c0000 0x4000>;
> > +               #address-cells = <1>;
> > +               #size-cells = <0>;
> 
> When doing other testing I realized that I missed a:
>   status = "disabled";
> 
> ...from both of these two nodes.  I'm happy to repost with this fix or
> I'm happy if you want to add to the patch when applying.
> 
> Let me know.  Thanks!

I don't really have a preference :-) . Btw. I also did plan on merging patches 
1 +4 and 2+3 now that the slot-removal series has landed.
Would this be ok with you?

So if you want to repost, you could do this as two patches already :-).


Heiko

> 
> > +       };
> > +
> > +       emmc: dwmmc at ff0f0000 {
> > +               compatible = "rockchip,rk3288-dw-mshc";
> > +               clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>;
> > +               clock-names = "biu", "ciu";
> > +               fifo-depth = <0x100>;
> > +               interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
> > +               reg = <0xff0f0000 0x4000>;
> > +               #address-cells = <1>;
> > +               #size-cells = <0>;
> > +       };
> > +
> > 
> >         i2c1: i2c at ff140000 {
> >         
> >                 compatible = "rockchip,rk3288-i2c";
> >                 reg = <0xff140000 0x1000>;
> > 
> > --
> > 2.0.0.526.g5318336

[PATCH v3 1/4] ARM: dts: Add emmc and sdmmc to the rk3288 device tree

[Sonny Rao]

On Tue, Aug 12, 2014 at 3:07 PM, Heiko St?bner <heiko@sntech.de> wrote:
> Am Dienstag, 12. August 2014, 14:06:11 schrieb Doug Anderson:
>> Heiko,
>>
>> On Wed, Aug 6, 2014 at 10:09 AM, Doug Anderson <dianders@chromium.org>
> wrote:
>> > This adds support for the sdmmc and emmc ports on the rk3288 using the
>> >
>> > currently posted driver from Addy at:
>> >   https://patchwork.kernel.org/patch/4653631/
>> >
>> > Note:
>> > * This is not baesd on Jaehoon's patch series removing the slot node,
>> >
>> >   but it does use new syntax like putting the bus width at the top
>> >   level and using the new cap-mmc-highspeed / cap-sd-highspeed.  A
>> >   future patch will modify this one to remove the slot node.
>> >
>> > Signed-off-by: Doug Anderson <dianders@chromium.org>
>> > Acked-by: Arnd Bergmann <arnd@arndb.de>
>> > ---
>> > Changes in v3: None
>> > Changes in v2:
>> > - New patchwork link for Addy's patch
>> >
>> >  arch/arm/boot/dts/rk3288.dtsi | 22 ++++++++++++++++++++++
>> >  1 file changed, 22 insertions(+)
>> >
>> > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
>> > index e7cb008..dc98a5b 100644
>> > --- a/arch/arm/boot/dts/rk3288.dtsi
>> > +++ b/arch/arm/boot/dts/rk3288.dtsi
>> > @@ -78,6 +78,28 @@
>> >
>> >                 clock-frequency = <24000000>;
>> >
>> >         };
>> >
>> > +       sdmmc: dwmmc at ff0c0000 {
>> > +               compatible = "rockchip,rk3288-dw-mshc";
>> > +               clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
>> > +               clock-names = "biu", "ciu";
>> > +               fifo-depth = <0x100>;
>> > +               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
>> > +               reg = <0xff0c0000 0x4000>;
>> > +               #address-cells = <1>;
>> > +               #size-cells = <0>;
>>
>> When doing other testing I realized that I missed a:
>>   status = "disabled";
>>
>> ...from both of these two nodes.  I'm happy to repost with this fix or
>> I'm happy if you want to add to the patch when applying.
>>
>> Let me know.  Thanks!
>
> I don't really have a preference :-) . Btw. I also did plan on merging patches
> 1 +4 and 2+3 now that the slot-removal series has landed.
> Would this be ok with you?
>
> So if you want to repost, you could do this as two patches already :-).

Please repost with the status = "disabled"; the fact that they were
enabled by the dtsi was confusing to some of us at least once already
:-)

>
>
> Heiko
>
>>
>> > +       };
>> > +
>> > +       emmc: dwmmc at ff0f0000 {
>> > +               compatible = "rockchip,rk3288-dw-mshc";
>> > +               clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>;
>> > +               clock-names = "biu", "ciu";
>> > +               fifo-depth = <0x100>;
>> > +               interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
>> > +               reg = <0xff0f0000 0x4000>;
>> > +               #address-cells = <1>;
>> > +               #size-cells = <0>;
>> > +       };
>> > +
>> >
>> >         i2c1: i2c at ff140000 {
>> >
>> >                 compatible = "rockchip,rk3288-i2c";
>> >                 reg = <0xff140000 0x1000>;
>> >
>> > --
>> > 2.0.0.526.g5318336
>

[PATCH v3 1/4] ARM: dts: Add emmc and sdmmc to the rk3288 device tree

[Doug Anderson]

Sonny and Heiko,

On Tue, Aug 12, 2014 at 3:11 PM, Sonny Rao <sonnyrao@chromium.org> wrote:
> On Tue, Aug 12, 2014 at 3:07 PM, Heiko St?bner <heiko@sntech.de> wrote:
>> Am Dienstag, 12. August 2014, 14:06:11 schrieb Doug Anderson:
>>> Heiko,
>>>
>>> On Wed, Aug 6, 2014 at 10:09 AM, Doug Anderson <dianders@chromium.org>
>> wrote:
>>> > This adds support for the sdmmc and emmc ports on the rk3288 using the
>>> >
>>> > currently posted driver from Addy at:
>>> >   https://patchwork.kernel.org/patch/4653631/
>>> >
>>> > Note:
>>> > * This is not baesd on Jaehoon's patch series removing the slot node,
>>> >
>>> >   but it does use new syntax like putting the bus width at the top
>>> >   level and using the new cap-mmc-highspeed / cap-sd-highspeed.  A
>>> >   future patch will modify this one to remove the slot node.
>>> >
>>> > Signed-off-by: Doug Anderson <dianders@chromium.org>
>>> > Acked-by: Arnd Bergmann <arnd@arndb.de>
>>> > ---
>>> > Changes in v3: None
>>> > Changes in v2:
>>> > - New patchwork link for Addy's patch
>>> >
>>> >  arch/arm/boot/dts/rk3288.dtsi | 22 ++++++++++++++++++++++
>>> >  1 file changed, 22 insertions(+)
>>> >
>>> > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
>>> > index e7cb008..dc98a5b 100644
>>> > --- a/arch/arm/boot/dts/rk3288.dtsi
>>> > +++ b/arch/arm/boot/dts/rk3288.dtsi
>>> > @@ -78,6 +78,28 @@
>>> >
>>> >                 clock-frequency = <24000000>;
>>> >
>>> >         };
>>> >
>>> > +       sdmmc: dwmmc at ff0c0000 {
>>> > +               compatible = "rockchip,rk3288-dw-mshc";
>>> > +               clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
>>> > +               clock-names = "biu", "ciu";
>>> > +               fifo-depth = <0x100>;
>>> > +               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
>>> > +               reg = <0xff0c0000 0x4000>;
>>> > +               #address-cells = <1>;
>>> > +               #size-cells = <0>;
>>>
>>> When doing other testing I realized that I missed a:
>>>   status = "disabled";
>>>
>>> ...from both of these two nodes.  I'm happy to repost with this fix or
>>> I'm happy if you want to add to the patch when applying.
>>>
>>> Let me know.  Thanks!
>>
>> I don't really have a preference :-) . Btw. I also did plan on merging patches
>> 1 +4 and 2+3 now that the slot-removal series has landed.
>> Would this be ok with you?
>>
>> So if you want to repost, you could do this as two patches already :-).
>
> Please repost with the status = "disabled"; the fact that they were
> enabled by the dtsi was confusing to some of us at least once already
> :-)

Done.  Please let me know if it looks OK or if there are any other
spins needed.  ;)

-Doug