[PATCH 1/2] ARM: dts: zx: remove the slot sub-nodes relevant to dwmmc controller

[PATCH 1/2] ARM: dts: zx: remove the slot sub-nodes relevant to dwmmc controller

[Jaehoon Chung]

Dwmmc controller didn't support the slot sub-nodes.
(dwmmc controller decided not to consider the slot nodes.)
And "supports-highspeed" property was deprecated.
Instead, use "cap-sd/mmc-highspeed" properties.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
 arch/arm/boot/dts/zx296702-ad1.dts | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/zx296702-ad1.dts b/arch/arm/boot/dts/zx296702-ad1.dts
index 081f980..23b1c79 100644
--- a/arch/arm/boot/dts/zx296702-ad1.dts
+++ b/arch/arm/boot/dts/zx296702-ad1.dts
@@ -19,28 +19,22 @@
 
 &mmc0 {
 	num-slots = <1>;
-	supports-highspeed;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
 	non-removable;
 	disable-wp;
+	bus-width = <4>;
 	status = "okay";
-
-	slot@0 {
-		reg = <0>;
-		bus-width = <4>;
-	};
 };
 
 &mmc1 {
 	num-slots = <1>;
-	supports-highspeed;
+	cap-mmc-highspeed;
+	cap-sd-highspeed;
 	non-removable;
 	disable-wp;
+	bus-width = <8>;
 	status = "okay";
-
-	slot@0 {
-		reg = <0>;
-		bus-width = <8>;
-	};
 };
 
 &uart0 {
-- 
1.9.1

[PATCH 2/2] mmc: dw_mmc: remove the deprecated "supports-highspeed" property

[Jaehoon Chung]

Remvoe the deprecated "supports-highspeed" property.
DWMMC controller will not use this property anymore.

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

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 1b719a6..e9faedd 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2890,11 +2890,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)) {
-		dev_info(dev, "supports-highspeed property is deprecated.\n");
-		pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
-	}
-
 	return pdata;
 }
 
-- 
1.9.1

Re: [PATCH 2/2] mmc: dw_mmc: remove the deprecated "supports-highspeed" property

[Shawn Lin]

在 2016/7/28 17:55, Jaehoon Chung 写道:
> Remvoe the deprecated "supports-highspeed" property.
> DWMMC controller will not use this property anymore.
>

We had set up a flag day to remove these deprecated property
long time agao.

It doesn't *break* old dtb which may(not ?) still boot up new
kernel code as we just make it suffer from lower speed, then
I think it's time for them to migrate to the new property anyway.

So,

Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>

> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> ---
>  drivers/mmc/host/dw_mmc.c | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 1b719a6..e9faedd 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -2890,11 +2890,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)) {
> -		dev_info(dev, "supports-highspeed property is deprecated.\n");
> -		pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
> -	}
> -
>  	return pdata;
>  }
>
>


-- 
Best Regards
Shawn Lin

Re: [PATCH 2/2] mmc: dw_mmc: remove the deprecated "supports-highspeed" property

[Jaehoon Chung]

Hi Shawn,

On 07/29/2016 11:44 AM, Shawn Lin wrote:
> 在 2016/7/28 17:55, Jaehoon Chung 写道:
>> Remvoe the deprecated "supports-highspeed" property.
>> DWMMC controller will not use this property anymore.
>>
> 
> We had set up a flag day to remove these deprecated property
> long time agao.
> 
> It doesn't *break* old dtb which may(not ?) still boot up new
> kernel code as we just make it suffer from lower speed, then
> I think it's time for them to migrate to the new property anyway.

Thanks for reviewing!

Best Regards,
Jaehoon Chung

> 
> So,
> 
> Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
> 
>> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
>> ---
>>  drivers/mmc/host/dw_mmc.c | 5 -----
>>  1 file changed, 5 deletions(-)
>>
>> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
>> index 1b719a6..e9faedd 100644
>> --- a/drivers/mmc/host/dw_mmc.c
>> +++ b/drivers/mmc/host/dw_mmc.c
>> @@ -2890,11 +2890,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)) {
>> -        dev_info(dev, "supports-highspeed property is deprecated.\n");
>> -        pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
>> -    }
>> -
>>      return pdata;
>>  }
>>
>>
> 
>