[PATCHv3 0/4] mmc: fixed the mmc_of_parse for dwmmc

[PATCHv3 0/4] mmc: fixed the mmc_of_parse for dwmmc

[Jaehoon Chung]

This patch-set is fixed the dw-mmc controller problem.
dw-mmc controller have the slot, but mmc_of_parse didn't parse the slot sub-node.
So dw-mmc controller didn't work correctly.

Jaehoon Chung (3):
  mmc: dw_mmc: use the __mmc_of_parse to parse the slot node
  mmc: dw_mmc: remove the "supports-highspeed" property.
  ARM: dts: replace the slot property into slot sub-node for dwmmc.

Ludovic Desroches (1):
  mmc: host: add slot argument to mmc_of_parse

 .../devicetree/bindings/mmc/exynos-dw-mshc.txt     |    5 +++--
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |    3 ++-
 .../devicetree/bindings/mmc/synopsys-dw-mshc.txt   |    6 ++++--
 arch/arm/boot/dts/exynos4412-odroidx.dts           |    4 ++--
 arch/arm/boot/dts/exynos4412-origen.dts            |    4 ++--
 arch/arm/boot/dts/exynos4412-trats2.dts            |    6 +++---
 arch/arm/boot/dts/exynos5250-arndale.dts           |    6 +++---
 arch/arm/boot/dts/exynos5250-cros-common.dtsi      |   10 +++++-----
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |    6 +++---
 arch/arm/boot/dts/exynos5420-arndale-octa.dts      |    6 +++---
 arch/arm/boot/dts/exynos5420-smdk5420.dts          |    4 ++--
 arch/arm/boot/dts/rk3066a-bqcurie2.dts             |    2 +-
 arch/arm/boot/dts/socfpga_arria5.dtsi              |    5 +++--
 arch/arm/boot/dts/socfpga_cyclone5.dtsi            |    5 +++--
 arch/arm/boot/dts/socfpga_vt.dts                   |    5 +++--
 drivers/mmc/core/host.c                            |   13 +++++++++----
 drivers/mmc/host/dw_mmc.c                          |   18 ++++++------------
 include/linux/mmc/host.h                           |   10 +++++++++-
 18 files changed, 66 insertions(+), 52 deletions(-)

-- 
1.7.9.5

[PATCHv3 1/4] mmc: host: add slot argument to mmc_of_parse

[Jaehoon Chung]

From: Ludovic Desroches <ludovic.desroches@atmel.com>

Some hosts manage several slots. In these case information such as the
bus width, chip detect and others are into the slot node. So we have to
parse child node. If not NULL, slot node will be used instead of the
device node.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
---
Changelog V3:
	- None.
Changelog V2:
	- Fix the typo.

 drivers/mmc/core/host.c  |   13 +++++++++----
 include/linux/mmc/host.h |   10 +++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 95cceae..0f677b3 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -298,15 +298,17 @@ static inline void mmc_host_clk_sysfs_init(struct mmc_host *host)
 #endif
 
 /**
- *	mmc_of_parse() - parse host's device-tree node
+ *	__mmc_of_parse() - parse host's device-tree node
  *	@host: host whose node should be parsed.
+ *	@slot : some device provide several slots so the node to parse
+ *		is not the host one.
  *
  * To keep the rest of the MMC subsystem unaware of whether DT has been
  * used to to instantiate and configure this host instance or not, we
  * parse the properties and set respective generic mmc-host flags and
  * parameters.
  */
-int mmc_of_parse(struct mmc_host *host)
+int __mmc_of_parse(struct mmc_host *host, struct device_node *slot)
 {
 	struct device_node *np;
 	u32 bus_width;
@@ -317,7 +319,10 @@ int mmc_of_parse(struct mmc_host *host)
 	if (!host->parent || !host->parent->of_node)
 		return 0;
 
-	np = host->parent->of_node;
+	if (slot)
+		np = slot;
+	else
+		np = host->parent->of_node;
 
 	/* "bus-width" is translated to MMC_CAP_*_BIT_DATA flags */
 	if (of_property_read_u32(np, "bus-width", &bus_width) < 0) {
@@ -459,7 +464,7 @@ out:
 	return ret;
 }
 
-EXPORT_SYMBOL(mmc_of_parse);
+EXPORT_SYMBOL(__mmc_of_parse);
 
 /**
  *	mmc_alloc_host - initialise the per-host structure.
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 7960424..c62af91 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -372,7 +372,15 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *);
 int mmc_add_host(struct mmc_host *);
 void mmc_remove_host(struct mmc_host *);
 void mmc_free_host(struct mmc_host *);
-int mmc_of_parse(struct mmc_host *host);
+int __mmc_of_parse(struct mmc_host *host, struct device_node *slot);
+/*
+ * mmc_of_parse - parse host's device-tree node
+ *	@host: host whose node should be parsed.
+ */
+static inline int mmc_of_parse(struct mmc_host *host)
+{
+	return __mmc_of_parse(host, NULL);
+}
 
 static inline void *mmc_priv(struct mmc_host *host)
 {
-- 
1.7.9.5

[PATCHv3 2/4] mmc: dw_mmc: use the __mmc_of_parse to parse the slot node

[Jaehoon Chung]

dw-mmc controller has the multiple slot.
Then it needs to parse the property for each slot.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
Changelog V3:
	- Fix typo.
	- Maintained the dw_mci_of_quirks().
Changelog V2:
	- None

 drivers/mmc/host/dw_mmc.c |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 1ac227c..3285bdd 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1015,12 +1015,11 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
 {
 	int present;
 	struct dw_mci_slot *slot = mmc_priv(mmc);
-	struct dw_mci_board *brd = slot->host->pdata;
 	struct dw_mci *host = slot->host;
 	int gpio_cd = mmc_gpio_get_cd(mmc);
 
 	/* Use platform get_cd function, else try onboard card detect */
-	if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
+	if (slot->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
 		present = 1;
 	else if (!IS_ERR_VALUE(gpio_cd))
 		present = gpio_cd;
@@ -2010,6 +2009,9 @@ static struct dw_mci_of_slot_quirks {
 	{
 		.quirk	= "disable-wp",
 		.id	= DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT,
+	}, {
+		.quirk	= "broken-cd",
+		.id	= DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
 	},
 };
 
@@ -2088,7 +2090,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
 	if (host->pdata->caps2)
 		mmc->caps2 = host->pdata->caps2;
 
-	mmc_of_parse(mmc);
+	__mmc_of_parse(mmc, dw_mci_of_find_slot_node(host->dev, slot->id));
 
 	if (host->pdata->blk_settings) {
 		mmc->max_segs = host->pdata->blk_settings->max_segs;
@@ -2234,12 +2236,7 @@ static inline bool dw_mci_ctrl_all_reset(struct dw_mci *host)
 static struct dw_mci_of_quirks {
 	char *quirk;
 	int id;
-} of_quirks[] = {
-	{
-		.quirk	= "broken-cd",
-		.id	= DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
-	},
-};
+} of_quirks[] = {};
 
 static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
 {
-- 
1.7.9.5

RE: [PATCHv3 2/4] mmc: dw_mmc: use the __mmc_of_parse to parse the slot node

[Seungwon Jeon]

On Wed, May 28, 2014, Jaehoon Chung wrote:
> dw-mmc controller has the multiple slot.
> Then it needs to parse the property for each slot.
> 
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

Acked-by: Seungwon Jeon <tgih.jun@samsung.com>

Thanks,
Seungwon Jeon

> ---
> Changelog V3:
> 	- Fix typo.
> 	- Maintained the dw_mci_of_quirks().
> Changelog V2:
> 	- None
> 
>  drivers/mmc/host/dw_mmc.c |   15 ++++++---------
>  1 file changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 1ac227c..3285bdd 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -1015,12 +1015,11 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
>  {
>  	int present;
>  	struct dw_mci_slot *slot = mmc_priv(mmc);
> -	struct dw_mci_board *brd = slot->host->pdata;
>  	struct dw_mci *host = slot->host;
>  	int gpio_cd = mmc_gpio_get_cd(mmc);
> 
>  	/* Use platform get_cd function, else try onboard card detect */
> -	if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
> +	if (slot->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
>  		present = 1;
>  	else if (!IS_ERR_VALUE(gpio_cd))
>  		present = gpio_cd;
> @@ -2010,6 +2009,9 @@ static struct dw_mci_of_slot_quirks {
>  	{
>  		.quirk	= "disable-wp",
>  		.id	= DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT,
> +	}, {
> +		.quirk	= "broken-cd",
> +		.id	= DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
>  	},
>  };
> 
> @@ -2088,7 +2090,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
>  	if (host->pdata->caps2)
>  		mmc->caps2 = host->pdata->caps2;
> 
> -	mmc_of_parse(mmc);
> +	__mmc_of_parse(mmc, dw_mci_of_find_slot_node(host->dev, slot->id));
> 
>  	if (host->pdata->blk_settings) {
>  		mmc->max_segs = host->pdata->blk_settings->max_segs;
> @@ -2234,12 +2236,7 @@ static inline bool dw_mci_ctrl_all_reset(struct dw_mci *host)
>  static struct dw_mci_of_quirks {
>  	char *quirk;
>  	int id;
> -} of_quirks[] = {
> -	{
> -		.quirk	= "broken-cd",
> -		.id	= DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
> -	},
> -};
> +} of_quirks[] = {};
> 
>  static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
>  {
> --
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCHv3 3/4] mmc: dw_mmc: remove the "supports-highspeed" property.

[Jaehoon Chung]

Removed the parser for "supports-highspeed".
It can be parsed with "cap-mmc-highsped" or "cap-sd-highspeed" at
mmc_of_parse().

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
 drivers/mmc/host/dw_mmc.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 3285bdd..34b5210 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2281,9 +2281,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
 			return ERR_PTR(ret);
 	}
 
-	if (of_find_property(np, "supports-highspeed", NULL))
-		pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
-
 	return pdata;
 }
 
-- 
1.7.9.5

Re: [PATCHv3 3/4] mmc: dw_mmc: remove the "supports-highspeed" property.

[Ulf Hansson]

On 28 May 2014 07:35, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> Removed the parser for "supports-highspeed".
> It can be parsed with "cap-mmc-highsped" or "cap-sd-highspeed" at
> mmc_of_parse().
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> ---
>  drivers/mmc/host/dw_mmc.c |    3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 3285bdd..34b5210 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -2281,9 +2281,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
>                         return ERR_PTR(ret);
>         }
>
> -       if (of_find_property(np, "supports-highspeed", NULL))
> -               pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
> -

According to DT guys, normally we shouldn't remove DT bindings. Thus,
you need to keep this, unless you can get some of the DT guys to ack
it.

Though, you still want to move the DTs to use common mmc bindings. And
you could mark the documentation of the above binding as deprecated.

Kind regards
Ulf Hansson

Re: [PATCHv3 3/4] mmc: dw_mmc: remove the "supports-highspeed" property.

[Jaehoon Chung]

Hi, Ulf.

On 05/30/2014 05:01 PM, Ulf Hansson wrote:
> On 28 May 2014 07:35, Jaehoon Chung <jh80.chung@samsung.com> wrote:
>> Removed the parser for "supports-highspeed".
>> It can be parsed with "cap-mmc-highsped" or "cap-sd-highspeed" at
>> mmc_of_parse().
>>
>> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
>> ---
>>  drivers/mmc/host/dw_mmc.c |    3 ---
>>  1 file changed, 3 deletions(-)
>>
>> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
>> index 3285bdd..34b5210 100644
>> --- a/drivers/mmc/host/dw_mmc.c
>> +++ b/drivers/mmc/host/dw_mmc.c
>> @@ -2281,9 +2281,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
>>                         return ERR_PTR(ret);
>>         }
>>
>> -       if (of_find_property(np, "supports-highspeed", NULL))
>> -               pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
>> -
> 
> According to DT guys, normally we shouldn't remove DT bindings. Thus,
> you need to keep this, unless you can get some of the DT guys to ack
> it.
As you mentioned, this patch didn't need, right?

> 
> Though, you still want to move the DTs to use common mmc bindings. And
> you could mark the documentation of the above binding as deprecated.
I added the comment for deprecated into dw-mmc dt-binding doc file.
"[PATCHv3,4/4] ARM: dts: replace the slot property into slot sub-node for dwmmc."

I think this patch can be discarded. then everything is ok.!? :)

If i'm wrong, let me know, plz.

Thank you for sharing the information.

Best Regards,
Jaehoon Chung
> 
> Kind regards
> Ulf Hansson
> 

RE: [PATCHv3 3/4] mmc: dw_mmc: remove the "supports-highspeed" property.

[Seungwon Jeon]

On Fri, May 30, 2014, Jaehoon Chung wrote:
> Hi, Ulf.
> 
> On 05/30/2014 05:01 PM, Ulf Hansson wrote:
> > On 28 May 2014 07:35, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> >> Removed the parser for "supports-highspeed".
> >> It can be parsed with "cap-mmc-highsped" or "cap-sd-highspeed" at
> >> mmc_of_parse().
> >>
> >> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> >> ---
> >>  drivers/mmc/host/dw_mmc.c |    3 ---
> >>  1 file changed, 3 deletions(-)
> >>
> >> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> >> index 3285bdd..34b5210 100644
> >> --- a/drivers/mmc/host/dw_mmc.c
> >> +++ b/drivers/mmc/host/dw_mmc.c
> >> @@ -2281,9 +2281,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
> >>                         return ERR_PTR(ret);
> >>         }
> >>
> >> -       if (of_find_property(np, "supports-highspeed", NULL))
> >> -               pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
> >> -
> >
> > According to DT guys, normally we shouldn't remove DT bindings. Thus,
> > you need to keep this, unless you can get some of the DT guys to ack
> > it.
> As you mentioned, this patch didn't need, right?
> 
> >
> > Though, you still want to move the DTs to use common mmc bindings. And
> > you could mark the documentation of the above binding as deprecated.
> I added the comment for deprecated into dw-mmc dt-binding doc file.
> "[PATCHv3,4/4] ARM: dts: replace the slot property into slot sub-node for dwmmc."
> 
> I think this patch can be discarded. then everything is ok.!? :)
Once decided to turn common mmc bindings instead of driver-specific,
host driver shall not need old one.
I think we can remove it.

Thanks,
Seungwon Jeon

> 
> If i'm wrong, let me know, plz.
> 
> Thank you for sharing the information.
> 
> Best Regards,
> Jaehoon Chung
> >
> > Kind regards
> > Ulf Hansson
> >
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCHv3 3/4] mmc: dw_mmc: remove the "supports-highspeed" property.

[Mark Rutland]

On Fri, May 30, 2014 at 09:01:16AM +0100, Ulf Hansson wrote:
> On 28 May 2014 07:35, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> > Removed the parser for "supports-highspeed".
> > It can be parsed with "cap-mmc-highsped" or "cap-sd-highspeed" at
> > mmc_of_parse().
> >
> > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> > ---
> >  drivers/mmc/host/dw_mmc.c |    3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> > index 3285bdd..34b5210 100644
> > --- a/drivers/mmc/host/dw_mmc.c
> > +++ b/drivers/mmc/host/dw_mmc.c
> > @@ -2281,9 +2281,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
> >                         return ERR_PTR(ret);
> >         }
> >
> > -       if (of_find_property(np, "supports-highspeed", NULL))
> > -               pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
> > -
> 
> According to DT guys, normally we shouldn't remove DT bindings. Thus,
> you need to keep this, unless you can get some of the DT guys to ack
> it.

In general, yes. Unless there's a compelling reason to drop a binding,
and all users are happy with it being dropped, then there's not much
point in removing it. It's usually not possible to get agreement because
it's usually nto possible to know the full set of users, so in general
we can't drop or change stuff.

> Though, you still want to move the DTs to use common mmc bindings. And
> you could mark the documentation of the above binding as deprecated.

Deprecated bindings can be supported even if discouraged. As far as I
can see, keeping the existing binding along side the new one looks
relatively simple in this case.

Thanks,
Mark.

RE: [PATCHv3 3/4] mmc: dw_mmc: remove the "supports-highspeed" property.

[Seungwon Jeon]

On Wed, May 28, 2014, Jaehoon Chung wrote:
> Removed the parser for "supports-highspeed".
> It can be parsed with "cap-mmc-highsped" or "cap-sd-highspeed" at
> mmc_of_parse().
> 
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

Acked-by: Seungwon Jeon <tgih.jun@samsung.com>

Tahnks,
Seungwon Jeon

> ---
>  drivers/mmc/host/dw_mmc.c |    3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 3285bdd..34b5210 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -2281,9 +2281,6 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
>  			return ERR_PTR(ret);
>  	}
> 
> -	if (of_find_property(np, "supports-highspeed", NULL))
> -		pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
> -
>  	return pdata;
>  }
> 
> --
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCHv3 4/4] ARM: dts: replace the slot property into slot sub-node for dwmmc.

[Jaehoon Chung]

dw-mmc controller can support the multiple slot.
So each slot's property can be difference.
And "support-highspeed" property in dw-mmc is deprecated.
"support-highspeed" property can be replaced to "cap-sd/mmc-highspeed".

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
Changelog V3:
	- Merge "[PATCH 2/5] mmc: dw_mmc: rmove the "supports-highspeed" property"
Changelog V2:
	- None

 .../devicetree/bindings/mmc/exynos-dw-mshc.txt     |    5 +++--
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |    3 ++-
 .../devicetree/bindings/mmc/synopsys-dw-mshc.txt   |    6 ++++--
 arch/arm/boot/dts/exynos4412-odroidx.dts           |    4 ++--
 arch/arm/boot/dts/exynos4412-origen.dts            |    4 ++--
 arch/arm/boot/dts/exynos4412-trats2.dts            |    6 +++---
 arch/arm/boot/dts/exynos5250-arndale.dts           |    6 +++---
 arch/arm/boot/dts/exynos5250-cros-common.dtsi      |   10 +++++-----
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |    6 +++---
 arch/arm/boot/dts/exynos5420-arndale-octa.dts      |    6 +++---
 arch/arm/boot/dts/exynos5420-smdk5420.dts          |    4 ++--
 arch/arm/boot/dts/rk3066a-bqcurie2.dts             |    2 +-
 arch/arm/boot/dts/socfpga_arria5.dtsi              |    5 +++--
 arch/arm/boot/dts/socfpga_cyclone5.dtsi            |    5 +++--
 arch/arm/boot/dts/socfpga_vt.dts                   |    5 +++--
 15 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
index 532b1d4..41cc703 100644
--- a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
@@ -69,8 +69,6 @@ Example:
 
 	dwmmc0@12200000 {
 		num-slots = <1>;
-		supports-highspeed;
-		broken-cd;
 		fifo-depth = <0x80>;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
@@ -85,5 +83,8 @@ Example:
 				<&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>;
+			broken-cd;
+			cap-mmc-highspeed;
+			cap-sd-highspeed;
 		};
 	};
diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
index b8653ea..b1844c5 100644
--- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
@@ -34,7 +34,6 @@ Example:
 		num-slots = <1>;
 		vmmc-supply = <&ldo12>;
 		fifo-depth = <0x100>;
-		supports-highspeed;
 		pinctrl-names = "default";
 		pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>;
 		slot@0 {
@@ -42,5 +41,7 @@ Example:
 			bus-width = <4>;
 			disable-wp;
 			cd-gpios = <&gpio10 3 0>;
+			cap-mmc-highspeed;
+			cap-sd-highspeed;
 		};
 	};
diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
index 2d4a725..ff393ab 100644
--- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
@@ -67,7 +67,8 @@ Optional properties:
 * card-detect-delay: Delay in milli-seconds before detecting card after card
   insert event. The default value is 0.
 
-* supports-highspeed: Enables support for high speed cards (up to 50MHz)
+* supports-highspeed (DEPRECATED): Enables support for high speed cards (up to 50MHz)
+			   (use "cap-mmc-highspeed" or "cap-sd-highspeed" instead)
 
 * broken-cd: as documented in mmc core bindings.
 
@@ -98,7 +99,6 @@ board specific portions as listed below.
 		clock-frequency = <400000000>;
 		clock-freq-min-max = <400000 200000000>;
 		num-slots = <1>;
-		supports-highspeed;
 		broken-cd;
 		fifo-depth = <0x80>;
 		card-detect-delay = <200>;
@@ -107,5 +107,7 @@ board specific portions as listed below.
 		slot@0 {
 			reg = <0>;
 			bus-width = <8>;
+			cap-mmc-highspeed;
+			cap-sd-highspeed;
 		};
 	};
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 31db28a..fb2cd8d 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -45,8 +45,6 @@
 		status = "okay";
 
 		num-slots = <1>;
-		supports-highspeed;
-		broken-cd;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -55,6 +53,8 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <8>;
+			broken-cd;
+			cap-mmc-highspeed;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index e2c0dca..698a5f4 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -128,8 +128,6 @@
 		status = "okay";
 
 		num-slots = <1>;
-		supports-highspeed;
-		broken-cd;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -138,6 +136,8 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <8>;
+			broken-cd;
+			cap-mmc-highspeed;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 73be464..eb53d3a 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -459,9 +459,6 @@
 
 	mmc@12550000 {
 		num-slots = <1>;
-		supports-highspeed;
-		broken-cd;
-		non-removable;
 		card-detect-delay = <200>;
 		vmmc-supply = <&vemmc_reg>;
 		clock-frequency = <400000000>;
@@ -475,6 +472,9 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <8>;
+			non-removable;
+			broken-cd;
+			cap-mmc-highspeed;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 090f983..c48293f 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -399,8 +399,6 @@
 	mmc_0: mmc@12200000 {
 		status = "okay";
 		num-slots = <1>;
-		supports-highspeed;
-		broken-cd;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -412,13 +410,14 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <8>;
+			broken-cd;
+			cap-mmc-highspeed;
 		};
 	};
 
 	mmc_2: mmc@12220000 {
 		status = "okay";
 		num-slots = <1>;
-		supports-highspeed;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -431,6 +430,7 @@
 			reg = <0>;
 			bus-width = <4>;
 			disable-wp;
+			cap-sd-highspeed;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
index 2c1560d..c00eef6 100644
--- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
@@ -248,8 +248,6 @@
 
 	mmc@12200000 {
 		num-slots = <1>;
-		supports-highspeed;
-		broken-cd;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -260,12 +258,13 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <8>;
+			broken-cd;
+			cap-mmc-highspeed;
 		};
 	};
 
 	mmc@12220000 {
 		num-slots = <1>;
-		supports-highspeed;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -277,13 +276,12 @@
 			reg = <0>;
 			bus-width = <4>;
 			wp-gpios = <&gpc2 1 0>;
+			cap-sd-highspeed;
 		};
 	};
 
 	mmc@12230000 {
 		num-slots = <1>;
-		supports-highspeed;
-		broken-cd;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -293,6 +291,8 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <4>;
+			broken-cd;
+			cap-sd-highspeed;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index a794a70..28095cb 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -282,8 +282,6 @@
 	mmc@12200000 {
 		status = "okay";
 		num-slots = <1>;
-		supports-highspeed;
-		broken-cd;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -294,13 +292,14 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <8>;
+			broken-cd;
+			cap-mmc-highspeed;
 		};
 	};
 
 	mmc@12220000 {
 		status = "okay";
 		num-slots = <1>;
-		supports-highspeed;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -312,6 +311,7 @@
 			reg = <0>;
 			bus-width = <4>;
 			disable-wp;
+			cap-sd-highspeed;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 80a3bf4..506ce0d 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -39,8 +39,6 @@
 
 	mmc@12200000 {
 		status = "okay";
-		broken-cd;
-		supports-highspeed;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <0 4>;
@@ -52,12 +50,13 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <8>;
+			broken-cd;
+			cap-mmc-highspeed;
 		};
 	};
 
 	mmc@12220000 {
 		status = "okay";
-		supports-highspeed;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -69,6 +68,7 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <4>;
+			cap-sd-highspeed;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 6910485..4d7b2c8 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -71,7 +71,6 @@
 	mmc@12200000 {
 		status = "okay";
 		broken-cd;
-		supports-highspeed;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <0 4>;
@@ -82,12 +81,12 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <8>;
+			cap-mmc-highspeed;
 		};
 	};
 
 	mmc@12220000 {
 		status = "okay";
-		supports-highspeed;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -98,6 +97,7 @@
 		slot@0 {
 			reg = <0>;
 			bus-width = <4>;
+			cap-sd-highspeed;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index 035df40..62c7484 100644
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -69,7 +69,6 @@
 		dwmmc@10218000 { /* wifi */
 			num-slots = <1>;
 			status = "okay";
-			non-removable;
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
@@ -78,6 +77,7 @@
 				reg = <0>;
 				bus-width = <4>;
 				disable-wp;
+				non-removable;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
index 6c87b70..1da0e81 100644
--- a/arch/arm/boot/dts/socfpga_arria5.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
@@ -29,12 +29,13 @@
 
 		dwmmc0@ff704000 {
 			num-slots = <1>;
-			supports-highspeed;
-			broken-cd;
 
 			slot@0 {
 				reg = <0>;
 				bus-width = <4>;
+				broken-cd;
+				cap-mmc-highspeed;
+				cap-sd-highspeed;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
index ca41b0e..5c61067 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
+++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
@@ -30,12 +30,13 @@
 
 		dwmmc0@ff704000 {
 			num-slots = <1>;
-			supports-highspeed;
-			broken-cd;
 
 			slot@0 {
 				reg = <0>;
 				bus-width = <4>;
+				broken-cd;
+				cap-mmc-highspeed;
+				cap-sd-highspeed;
 			};
 		};
 
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
index 87d6f75..79c0e86 100644
--- a/arch/arm/boot/dts/socfpga_vt.dts
+++ b/arch/arm/boot/dts/socfpga_vt.dts
@@ -43,12 +43,13 @@
 
 		dwmmc0@ff704000 {
 			num-slots = <1>;
-			supports-highspeed;
-			broken-cd;
 
 			slot@0 {
 				reg = <0>;
 				bus-width = <4>;
+				broken-cd;
+				cap-mmc-highspeed;
+				cap-sd-highspeed;
 			};
 		};
 
-- 
1.7.9.5

RE: [PATCHv3 4/4] ARM: dts: replace the slot property into slot sub-node for dwmmc.

[Seungwon Jeon]

+ Dinh Nguyen <dinguyen@altera.com>
+ Heiko Stuebner <heiko@sntech.de>

On Wed, May 28, 2014, Jaehoon Chung wrote:
> dw-mmc controller can support the multiple slot.
> So each slot's property can be difference.
> And "support-highspeed" property in dw-mmc is deprecated.
> "support-highspeed" property can be replaced to "cap-sd/mmc-highspeed".
> 
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

Looks good to me.

Acked-by: Seungwon Jeon <tgih.jun@samsung.com>

Thanks,
Seungwon Jeon

> ---
> Changelog V3:
> 	- Merge "[PATCH 2/5] mmc: dw_mmc: rmove the "supports-highspeed" property"
> Changelog V2:
> 	- None
> 
>  .../devicetree/bindings/mmc/exynos-dw-mshc.txt     |    5 +++--
>  .../devicetree/bindings/mmc/k3-dw-mshc.txt         |    3 ++-
>  .../devicetree/bindings/mmc/synopsys-dw-mshc.txt   |    6 ++++--
>  arch/arm/boot/dts/exynos4412-odroidx.dts           |    4 ++--
>  arch/arm/boot/dts/exynos4412-origen.dts            |    4 ++--
>  arch/arm/boot/dts/exynos4412-trats2.dts            |    6 +++---
>  arch/arm/boot/dts/exynos5250-arndale.dts           |    6 +++---
>  arch/arm/boot/dts/exynos5250-cros-common.dtsi      |   10 +++++-----
>  arch/arm/boot/dts/exynos5250-smdk5250.dts          |    6 +++---
>  arch/arm/boot/dts/exynos5420-arndale-octa.dts      |    6 +++---
>  arch/arm/boot/dts/exynos5420-smdk5420.dts          |    4 ++--
>  arch/arm/boot/dts/rk3066a-bqcurie2.dts             |    2 +-
>  arch/arm/boot/dts/socfpga_arria5.dtsi              |    5 +++--
>  arch/arm/boot/dts/socfpga_cyclone5.dtsi            |    5 +++--
>  arch/arm/boot/dts/socfpga_vt.dts                   |    5 +++--
>  15 files changed, 42 insertions(+), 35 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> index 532b1d4..41cc703 100644
> --- a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> +++ b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> @@ -69,8 +69,6 @@ Example:
> 
>  	dwmmc0@12200000 {
>  		num-slots = <1>;
> -		supports-highspeed;
> -		broken-cd;
>  		fifo-depth = <0x80>;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
> @@ -85,5 +83,8 @@ Example:
>  				<&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>;
> +			broken-cd;
> +			cap-mmc-highspeed;
> +			cap-sd-highspeed;
>  		};
>  	};
> diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> index b8653ea..b1844c5 100644
> --- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> +++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> @@ -34,7 +34,6 @@ Example:
>  		num-slots = <1>;
>  		vmmc-supply = <&ldo12>;
>  		fifo-depth = <0x100>;
> -		supports-highspeed;
>  		pinctrl-names = "default";
>  		pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>;
>  		slot@0 {
> @@ -42,5 +41,7 @@ Example:
>  			bus-width = <4>;
>  			disable-wp;
>  			cd-gpios = <&gpio10 3 0>;
> +			cap-mmc-highspeed;
> +			cap-sd-highspeed;
>  		};
>  	};
> diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> index 2d4a725..ff393ab 100644
> --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> @@ -67,7 +67,8 @@ Optional properties:
>  * card-detect-delay: Delay in milli-seconds before detecting card after card
>    insert event. The default value is 0.
> 
> -* supports-highspeed: Enables support for high speed cards (up to 50MHz)
> +* supports-highspeed (DEPRECATED): Enables support for high speed cards (up to 50MHz)
> +			   (use "cap-mmc-highspeed" or "cap-sd-highspeed" instead)
> 
>  * broken-cd: as documented in mmc core bindings.
> 
> @@ -98,7 +99,6 @@ board specific portions as listed below.
>  		clock-frequency = <400000000>;
>  		clock-freq-min-max = <400000 200000000>;
>  		num-slots = <1>;
> -		supports-highspeed;
>  		broken-cd;
>  		fifo-depth = <0x80>;
>  		card-detect-delay = <200>;
> @@ -107,5 +107,7 @@ board specific portions as listed below.
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <8>;
> +			cap-mmc-highspeed;
> +			cap-sd-highspeed;
>  		};
>  	};
> diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
> index 31db28a..fb2cd8d 100644
> --- a/arch/arm/boot/dts/exynos4412-odroidx.dts
> +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
> @@ -45,8 +45,6 @@
>  		status = "okay";
> 
>  		num-slots = <1>;
> -		supports-highspeed;
> -		broken-cd;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -55,6 +53,8 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <8>;
> +			broken-cd;
> +			cap-mmc-highspeed;
>  		};
>  	};
> 
> diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
> index e2c0dca..698a5f4 100644
> --- a/arch/arm/boot/dts/exynos4412-origen.dts
> +++ b/arch/arm/boot/dts/exynos4412-origen.dts
> @@ -128,8 +128,6 @@
>  		status = "okay";
> 
>  		num-slots = <1>;
> -		supports-highspeed;
> -		broken-cd;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -138,6 +136,8 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <8>;
> +			broken-cd;
> +			cap-mmc-highspeed;
>  		};
>  	};
> 
> diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
> index 73be464..eb53d3a 100644
> --- a/arch/arm/boot/dts/exynos4412-trats2.dts
> +++ b/arch/arm/boot/dts/exynos4412-trats2.dts
> @@ -459,9 +459,6 @@
> 
>  	mmc@12550000 {
>  		num-slots = <1>;
> -		supports-highspeed;
> -		broken-cd;
> -		non-removable;
>  		card-detect-delay = <200>;
>  		vmmc-supply = <&vemmc_reg>;
>  		clock-frequency = <400000000>;
> @@ -475,6 +472,9 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <8>;
> +			non-removable;
> +			broken-cd;
> +			cap-mmc-highspeed;
>  		};
>  	};
> 
> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
> index 090f983..c48293f 100644
> --- a/arch/arm/boot/dts/exynos5250-arndale.dts
> +++ b/arch/arm/boot/dts/exynos5250-arndale.dts
> @@ -399,8 +399,6 @@
>  	mmc_0: mmc@12200000 {
>  		status = "okay";
>  		num-slots = <1>;
> -		supports-highspeed;
> -		broken-cd;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -412,13 +410,14 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <8>;
> +			broken-cd;
> +			cap-mmc-highspeed;
>  		};
>  	};
> 
>  	mmc_2: mmc@12220000 {
>  		status = "okay";
>  		num-slots = <1>;
> -		supports-highspeed;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -431,6 +430,7 @@
>  			reg = <0>;
>  			bus-width = <4>;
>  			disable-wp;
> +			cap-sd-highspeed;
>  		};
>  	};
> 
> diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-
> common.dtsi
> index 2c1560d..c00eef6 100644
> --- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> @@ -248,8 +248,6 @@
> 
>  	mmc@12200000 {
>  		num-slots = <1>;
> -		supports-highspeed;
> -		broken-cd;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -260,12 +258,13 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <8>;
> +			broken-cd;
> +			cap-mmc-highspeed;
>  		};
>  	};
> 
>  	mmc@12220000 {
>  		num-slots = <1>;
> -		supports-highspeed;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -277,13 +276,12 @@
>  			reg = <0>;
>  			bus-width = <4>;
>  			wp-gpios = <&gpc2 1 0>;
> +			cap-sd-highspeed;
>  		};
>  	};
> 
>  	mmc@12230000 {
>  		num-slots = <1>;
> -		supports-highspeed;
> -		broken-cd;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -293,6 +291,8 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <4>;
> +			broken-cd;
> +			cap-sd-highspeed;
>  		};
>  	};
> 
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> index a794a70..28095cb 100644
> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> @@ -282,8 +282,6 @@
>  	mmc@12200000 {
>  		status = "okay";
>  		num-slots = <1>;
> -		supports-highspeed;
> -		broken-cd;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -294,13 +292,14 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <8>;
> +			broken-cd;
> +			cap-mmc-highspeed;
>  		};
>  	};
> 
>  	mmc@12220000 {
>  		status = "okay";
>  		num-slots = <1>;
> -		supports-highspeed;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -312,6 +311,7 @@
>  			reg = <0>;
>  			bus-width = <4>;
>  			disable-wp;
> +			cap-sd-highspeed;
>  		};
>  	};
> 
> diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-
> octa.dts
> index 80a3bf4..506ce0d 100644
> --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> @@ -39,8 +39,6 @@
> 
>  	mmc@12200000 {
>  		status = "okay";
> -		broken-cd;
> -		supports-highspeed;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <0 4>;
> @@ -52,12 +50,13 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <8>;
> +			broken-cd;
> +			cap-mmc-highspeed;
>  		};
>  	};
> 
>  	mmc@12220000 {
>  		status = "okay";
> -		supports-highspeed;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -69,6 +68,7 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <4>;
> +			cap-sd-highspeed;
>  		};
>  	};
> 
> diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
> index 6910485..4d7b2c8 100644
> --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
> +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
> @@ -71,7 +71,6 @@
>  	mmc@12200000 {
>  		status = "okay";
>  		broken-cd;
> -		supports-highspeed;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <0 4>;
> @@ -82,12 +81,12 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <8>;
> +			cap-mmc-highspeed;
>  		};
>  	};
> 
>  	mmc@12220000 {
>  		status = "okay";
> -		supports-highspeed;
>  		card-detect-delay = <200>;
>  		samsung,dw-mshc-ciu-div = <3>;
>  		samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -98,6 +97,7 @@
>  		slot@0 {
>  			reg = <0>;
>  			bus-width = <4>;
> +			cap-sd-highspeed;
>  		};
>  	};
> 
> diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> index 035df40..62c7484 100644
> --- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> +++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> @@ -69,7 +69,6 @@
>  		dwmmc@10218000 { /* wifi */
>  			num-slots = <1>;
>  			status = "okay";
> -			non-removable;
> 
>  			pinctrl-names = "default";
>  			pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
> @@ -78,6 +77,7 @@
>  				reg = <0>;
>  				bus-width = <4>;
>  				disable-wp;
> +				non-removable;
>  			};
>  		};
> 
> diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
> index 6c87b70..1da0e81 100644
> --- a/arch/arm/boot/dts/socfpga_arria5.dtsi
> +++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
> @@ -29,12 +29,13 @@
> 
>  		dwmmc0@ff704000 {
>  			num-slots = <1>;
> -			supports-highspeed;
> -			broken-cd;
> 
>  			slot@0 {
>  				reg = <0>;
>  				bus-width = <4>;
> +				broken-cd;
> +				cap-mmc-highspeed;
> +				cap-sd-highspeed;
>  			};
>  		};
> 
> diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> index ca41b0e..5c61067 100644
> --- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> +++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> @@ -30,12 +30,13 @@
> 
>  		dwmmc0@ff704000 {
>  			num-slots = <1>;
> -			supports-highspeed;
> -			broken-cd;
> 
>  			slot@0 {
>  				reg = <0>;
>  				bus-width = <4>;
> +				broken-cd;
> +				cap-mmc-highspeed;
> +				cap-sd-highspeed;
>  			};
>  		};
> 
> diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
> index 87d6f75..79c0e86 100644
> --- a/arch/arm/boot/dts/socfpga_vt.dts
> +++ b/arch/arm/boot/dts/socfpga_vt.dts
> @@ -43,12 +43,13 @@
> 
>  		dwmmc0@ff704000 {
>  			num-slots = <1>;
> -			supports-highspeed;
> -			broken-cd;
> 
>  			slot@0 {
>  				reg = <0>;
>  				bus-width = <4>;
> +				broken-cd;
> +				cap-mmc-highspeed;
> +				cap-sd-highspeed;
>  			};
>  		};
> 
> --
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCHv3 4/4] ARM: dts: replace the slot property into slot sub-node for dwmmc.

[Heiko Stübner]

Am Freitag, 30. Mai 2014, 21:54:13 schrieb Seungwon Jeon:
> + Dinh Nguyen <dinguyen@altera.com>
> + Heiko Stuebner <heiko@sntech.de>
> 
> On Wed, May 28, 2014, Jaehoon Chung wrote:
> > dw-mmc controller can support the multiple slot.
> > So each slot's property can be difference.
> > And "support-highspeed" property in dw-mmc is deprecated.
> > "support-highspeed" property can be replaced to "cap-sd/mmc-highspeed".
> > 
> > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> 
> Looks good to me.
> 
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>

the rockchip part also looks ok to me

Acked-by: Heiko Stuebner <heiko@sntech.de>


> 
> Thanks,
> Seungwon Jeon
> 
> > ---
> > 
> > Changelog V3:
> > 	- Merge "[PATCH 2/5] mmc: dw_mmc: rmove the "supports-highspeed"
> > 	property"
> > 
> > Changelog V2:
> > 	- None
> > 	
> >  .../devicetree/bindings/mmc/exynos-dw-mshc.txt     |    5 +++--
> >  .../devicetree/bindings/mmc/k3-dw-mshc.txt         |    3 ++-
> >  .../devicetree/bindings/mmc/synopsys-dw-mshc.txt   |    6 ++++--
> >  arch/arm/boot/dts/exynos4412-odroidx.dts           |    4 ++--
> >  arch/arm/boot/dts/exynos4412-origen.dts            |    4 ++--
> >  arch/arm/boot/dts/exynos4412-trats2.dts            |    6 +++---
> >  arch/arm/boot/dts/exynos5250-arndale.dts           |    6 +++---
> >  arch/arm/boot/dts/exynos5250-cros-common.dtsi      |   10 +++++-----
> >  arch/arm/boot/dts/exynos5250-smdk5250.dts          |    6 +++---
> >  arch/arm/boot/dts/exynos5420-arndale-octa.dts      |    6 +++---
> >  arch/arm/boot/dts/exynos5420-smdk5420.dts          |    4 ++--
> >  arch/arm/boot/dts/rk3066a-bqcurie2.dts             |    2 +-
> >  arch/arm/boot/dts/socfpga_arria5.dtsi              |    5 +++--
> >  arch/arm/boot/dts/socfpga_cyclone5.dtsi            |    5 +++--
> >  arch/arm/boot/dts/socfpga_vt.dts                   |    5 +++--
> >  15 files changed, 42 insertions(+), 35 deletions(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> > b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> > index 532b1d4..41cc703 100644
> > --- a/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> > +++ b/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
> > 
> > @@ -69,8 +69,6 @@ Example:
> >  	dwmmc0@12200000 {
> >  	
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > -		broken-cd;
> > 
> >  		fifo-depth = <0x80>;
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> > 
> > @@ -85,5 +83,8 @@ Example:
> >  				<&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>;
> > 
> > +			broken-cd;
> > +			cap-mmc-highspeed;
> > +			cap-sd-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> > b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> > index b8653ea..b1844c5 100644
> > --- a/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> > +++ b/Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
> > 
> > @@ -34,7 +34,6 @@ Example:
> >  		num-slots = <1>;
> >  		vmmc-supply = <&ldo12>;
> >  		fifo-depth = <0x100>;
> > 
> > -		supports-highspeed;
> > 
> >  		pinctrl-names = "default";
> >  		pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>;
> >  		slot@0 {
> > 
> > @@ -42,5 +41,7 @@ Example:
> >  			bus-width = <4>;
> >  			disable-wp;
> >  			cd-gpios = <&gpio10 3 0>;
> > 
> > +			cap-mmc-highspeed;
> > +			cap-sd-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> > b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> > index 2d4a725..ff393ab 100644
> > --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> > +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
> > 
> > @@ -67,7 +67,8 @@ Optional properties:
> >  * card-detect-delay: Delay in milli-seconds before detecting card after
> >  card>  
> >    insert event. The default value is 0.
> > 
> > -* supports-highspeed: Enables support for high speed cards (up to 50MHz)
> > +* supports-highspeed (DEPRECATED): Enables support for high speed cards
> > (up to 50MHz) +			   (use "cap-mmc-highspeed" or "cap-sd-
highspeed"
> > instead)
> > 
> >  * broken-cd: as documented in mmc core bindings.
> > 
> > @@ -98,7 +99,6 @@ board specific portions as listed below.
> > 
> >  		clock-frequency = <400000000>;
> >  		clock-freq-min-max = <400000 200000000>;
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > 
> >  		broken-cd;
> >  		fifo-depth = <0x80>;
> >  		card-detect-delay = <200>;
> > 
> > @@ -107,5 +107,7 @@ board specific portions as listed below.
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <8>;
> > 
> > +			cap-mmc-highspeed;
> > +			cap-sd-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts
> > b/arch/arm/boot/dts/exynos4412-odroidx.dts index 31db28a..fb2cd8d 100644
> > --- a/arch/arm/boot/dts/exynos4412-odroidx.dts
> > +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
> > @@ -45,8 +45,6 @@
> > 
> >  		status = "okay";
> >  		
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > -		broken-cd;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -55,6 +53,8 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <8>;
> > 
> > +			broken-cd;
> > +			cap-mmc-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/arch/arm/boot/dts/exynos4412-origen.dts
> > b/arch/arm/boot/dts/exynos4412-origen.dts index e2c0dca..698a5f4 100644
> > --- a/arch/arm/boot/dts/exynos4412-origen.dts
> > +++ b/arch/arm/boot/dts/exynos4412-origen.dts
> > @@ -128,8 +128,6 @@
> > 
> >  		status = "okay";
> >  		
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > -		broken-cd;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -138,6 +136,8 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <8>;
> > 
> > +			broken-cd;
> > +			cap-mmc-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts
> > b/arch/arm/boot/dts/exynos4412-trats2.dts index 73be464..eb53d3a 100644
> > --- a/arch/arm/boot/dts/exynos4412-trats2.dts
> > +++ b/arch/arm/boot/dts/exynos4412-trats2.dts
> > @@ -459,9 +459,6 @@
> > 
> >  	mmc@12550000 {
> >  	
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > -		broken-cd;
> > -		non-removable;
> > 
> >  		card-detect-delay = <200>;
> >  		vmmc-supply = <&vemmc_reg>;
> >  		clock-frequency = <400000000>;
> > 
> > @@ -475,6 +472,9 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <8>;
> > 
> > +			non-removable;
> > +			broken-cd;
> > +			cap-mmc-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts
> > b/arch/arm/boot/dts/exynos5250-arndale.dts index 090f983..c48293f 100644
> > --- a/arch/arm/boot/dts/exynos5250-arndale.dts
> > +++ b/arch/arm/boot/dts/exynos5250-arndale.dts
> > @@ -399,8 +399,6 @@
> > 
> >  	mmc_0: mmc@12200000 {
> >  	
> >  		status = "okay";
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > -		broken-cd;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -412,13 +410,14 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <8>;
> > 
> > +			broken-cd;
> > +			cap-mmc-highspeed;
> > 
> >  		};
> >  	
> >  	};
> >  	
> >  	mmc_2: mmc@12220000 {
> >  	
> >  		status = "okay";
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -431,6 +430,7 @@
> > 
> >  			reg = <0>;
> >  			bus-width = <4>;
> >  			disable-wp;
> > 
> > +			cap-sd-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> > b/arch/arm/boot/dts/exynos5250-cros- common.dtsi
> > index 2c1560d..c00eef6 100644
> > --- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> > +++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
> > @@ -248,8 +248,6 @@
> > 
> >  	mmc@12200000 {
> >  	
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > -		broken-cd;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -260,12 +258,13 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <8>;
> > 
> > +			broken-cd;
> > +			cap-mmc-highspeed;
> > 
> >  		};
> >  	
> >  	};
> >  	
> >  	mmc@12220000 {
> >  	
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -277,13 +276,12 @@
> > 
> >  			reg = <0>;
> >  			bus-width = <4>;
> >  			wp-gpios = <&gpc2 1 0>;
> > 
> > +			cap-sd-highspeed;
> > 
> >  		};
> >  	
> >  	};
> >  	
> >  	mmc@12230000 {
> >  	
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > -		broken-cd;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -293,6 +291,8 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <4>;
> > 
> > +			broken-cd;
> > +			cap-sd-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> > b/arch/arm/boot/dts/exynos5250-smdk5250.dts index a794a70..28095cb 100644
> > --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> > +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> > @@ -282,8 +282,6 @@
> > 
> >  	mmc@12200000 {
> >  	
> >  		status = "okay";
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > -		broken-cd;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -294,13 +292,14 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <8>;
> > 
> > +			broken-cd;
> > +			cap-mmc-highspeed;
> > 
> >  		};
> >  	
> >  	};
> >  	
> >  	mmc@12220000 {
> >  	
> >  		status = "okay";
> >  		num-slots = <1>;
> > 
> > -		supports-highspeed;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -312,6 +311,7 @@
> > 
> >  			reg = <0>;
> >  			bus-width = <4>;
> >  			disable-wp;
> > 
> > +			cap-sd-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> > b/arch/arm/boot/dts/exynos5420-arndale- octa.dts
> > index 80a3bf4..506ce0d 100644
> > --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> > +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
> > @@ -39,8 +39,6 @@
> > 
> >  	mmc@12200000 {
> >  	
> >  		status = "okay";
> > 
> > -		broken-cd;
> > -		supports-highspeed;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <0 4>;
> > 
> > @@ -52,12 +50,13 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <8>;
> > 
> > +			broken-cd;
> > +			cap-mmc-highspeed;
> > 
> >  		};
> >  	
> >  	};
> >  	
> >  	mmc@12220000 {
> >  	
> >  		status = "okay";
> > 
> > -		supports-highspeed;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -69,6 +68,7 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <4>;
> > 
> > +			cap-sd-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts
> > b/arch/arm/boot/dts/exynos5420-smdk5420.dts index 6910485..4d7b2c8 100644
> > --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
> > +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
> > @@ -71,7 +71,6 @@
> > 
> >  	mmc@12200000 {
> >  	
> >  		status = "okay";
> >  		broken-cd;
> > 
> > -		supports-highspeed;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <0 4>;
> > 
> > @@ -82,12 +81,12 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <8>;
> > 
> > +			cap-mmc-highspeed;
> > 
> >  		};
> >  	
> >  	};
> >  	
> >  	mmc@12220000 {
> >  	
> >  		status = "okay";
> > 
> > -		supports-highspeed;
> > 
> >  		card-detect-delay = <200>;
> >  		samsung,dw-mshc-ciu-div = <3>;
> >  		samsung,dw-mshc-sdr-timing = <2 3>;
> > 
> > @@ -98,6 +97,7 @@
> > 
> >  		slot@0 {
> >  		
> >  			reg = <0>;
> >  			bus-width = <4>;
> > 
> > +			cap-sd-highspeed;
> > 
> >  		};
> >  	
> >  	};
> > 
> > diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> > b/arch/arm/boot/dts/rk3066a-bqcurie2.dts index 035df40..62c7484 100644
> > --- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> > +++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
> > @@ -69,7 +69,6 @@
> > 
> >  		dwmmc@10218000 { /* wifi */
> >  		
> >  			num-slots = <1>;
> >  			status = "okay";
> > 
> > -			non-removable;
> > 
> >  			pinctrl-names = "default";
> >  			pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
> > 
> > @@ -78,6 +77,7 @@
> > 
> >  				reg = <0>;
> >  				bus-width = <4>;
> >  				disable-wp;
> > 
> > +				non-removable;
> > 
> >  			};
> >  		
> >  		};
> > 
> > diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi
> > b/arch/arm/boot/dts/socfpga_arria5.dtsi index 6c87b70..1da0e81 100644
> > --- a/arch/arm/boot/dts/socfpga_arria5.dtsi
> > +++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
> > @@ -29,12 +29,13 @@
> > 
> >  		dwmmc0@ff704000 {
> >  		
> >  			num-slots = <1>;
> > 
> > -			supports-highspeed;
> > -			broken-cd;
> > 
> >  			slot@0 {
> >  			
> >  				reg = <0>;
> >  				bus-width = <4>;
> > 
> > +				broken-cd;
> > +				cap-mmc-highspeed;
> > +				cap-sd-highspeed;
> > 
> >  			};
> >  		
> >  		};
> > 
> > diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> > b/arch/arm/boot/dts/socfpga_cyclone5.dtsi index ca41b0e..5c61067 100644
> > --- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> > +++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> > @@ -30,12 +30,13 @@
> > 
> >  		dwmmc0@ff704000 {
> >  		
> >  			num-slots = <1>;
> > 
> > -			supports-highspeed;
> > -			broken-cd;
> > 
> >  			slot@0 {
> >  			
> >  				reg = <0>;
> >  				bus-width = <4>;
> > 
> > +				broken-cd;
> > +				cap-mmc-highspeed;
> > +				cap-sd-highspeed;
> > 
> >  			};
> >  		
> >  		};
> > 
> > diff --git a/arch/arm/boot/dts/socfpga_vt.dts
> > b/arch/arm/boot/dts/socfpga_vt.dts index 87d6f75..79c0e86 100644
> > --- a/arch/arm/boot/dts/socfpga_vt.dts
> > +++ b/arch/arm/boot/dts/socfpga_vt.dts
> > @@ -43,12 +43,13 @@
> > 
> >  		dwmmc0@ff704000 {
> >  		
> >  			num-slots = <1>;
> > 
> > -			supports-highspeed;
> > -			broken-cd;
> > 
> >  			slot@0 {
> >  			
> >  				reg = <0>;
> >  				bus-width = <4>;
> > 
> > +				broken-cd;
> > +				cap-mmc-highspeed;
> > +				cap-sd-highspeed;
> > 
> >  			};
> >  		
> >  		};
> > 
> > --
> > 1.7.9.5
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCHv3 4/4] ARM: dts: replace the slot property into slot sub-node for dwmmc.

[Dinh Nguyen]

On 05/30/2014 01:15 PM, Heiko Stübner wrote:
> Am Freitag, 30. Mai 2014, 21:54:13 schrieb Seungwon Jeon:
>> + Dinh Nguyen <dinguyen@altera.com>
>> + Heiko Stuebner <heiko@sntech.de>
>>
>> On Wed, May 28, 2014, Jaehoon Chung wrote:
>>> dw-mmc controller can support the multiple slot.
>>> So each slot's property can be difference.
>>> And "support-highspeed" property in dw-mmc is deprecated.
>>> "support-highspeed" property can be replaced to "cap-sd/mmc-highspeed".
>>>
>>> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
>>
>> Looks good to me.
>>
>> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
>
> the rockchip part also looks ok to me
>
> Acked-by: Heiko Stuebner <heiko@sntech.de>
>
>
>>

For the socfpga parts:

Acked-by: Dinh Nguyen <dinguyen@altera.com>

Thanks,
Dinh