diff mbox

[1/2] mmc: dw_mmc: exynos: Add a new compatible string for exynos5420

Message ID 1369389873-15018-2-git-send-email-yuvaraj.cd@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Yuvaraj CD May 24, 2013, 10:04 a.m. UTC 
The Exynos5420 has a DWMMC controller which is different from prior
versions.This patch adds a new compatible string for Exynos5420.

Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>
---
 drivers/mmc/host/dw_mmc-exynos.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Jaehoon Chung June 20, 2013, 12:50 p.m. UTC | #1 
Looks good to me.

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

Best Regards,
Jaehoon Chung

On 05/24/2013 07:04 PM, Yuvaraj Kumar C D wrote:
> The Exynos5420 has a DWMMC controller which is different from prior
> versions.This patch adds a new compatible string for Exynos5420.
> 
> Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
> Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
> Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>
> ---
>  drivers/mmc/host/dw_mmc-exynos.c |    9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
> index f013e7e..f883b17 100644
> --- a/drivers/mmc/host/dw_mmc-exynos.c
> +++ b/drivers/mmc/host/dw_mmc-exynos.c
> @@ -41,6 +41,7 @@ enum dw_mci_exynos_type {
>  	DW_MCI_TYPE_EXYNOS4210,
>  	DW_MCI_TYPE_EXYNOS4412,
>  	DW_MCI_TYPE_EXYNOS5250,
> +	DW_MCI_TYPE_EXYNOS5420,
>  };
>  
>  /* Exynos implementation specific driver private data */
> @@ -64,6 +65,9 @@ static struct dw_mci_exynos_compatible {
>  	}, {
>  		.compatible	= "samsung,exynos5250-dw-mshc",
>  		.ctrl_type	= DW_MCI_TYPE_EXYNOS5250,
> +	}, {
> +		.compatible	= "samsung,exynos5420-dw-mshc",
> +		.ctrl_type	= DW_MCI_TYPE_EXYNOS5420,
>  	},
>  };
>  
> @@ -92,7 +96,8 @@ static int dw_mci_exynos_setup_clock(struct dw_mci *host)
>  {
>  	struct dw_mci_exynos_priv_data *priv = host->priv;
>  
> -	if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS5250)
> +	if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS5250 ||
> +		priv->ctrl_type == DW_MCI_TYPE_EXYNOS5420)
>  		host->bus_hz /= (priv->ciu_div + 1);
>  	else if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS4412)
>  		host->bus_hz /= EXYNOS4412_FIXED_CIU_CLK_DIV;
> @@ -175,6 +180,8 @@ static const struct of_device_id dw_mci_exynos_match[] = {
>  			.data = &exynos_drv_data, },
>  	{ .compatible = "samsung,exynos5250-dw-mshc",
>  			.data = &exynos_drv_data, },
> +	{ .compatible = "samsung,exynos5420-dw-mshc",
> +			.data = &exynos_drv_data, },
>  	{},
>  };
>  MODULE_DEVICE_TABLE(of, dw_mci_exynos_match);
> 

--
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
Yuvaraj CD Aug. 14, 2013, 9:27 a.m. UTC | #2 
Chris,
Can you pick this to your tree?

On Thu, Jun 20, 2013 at 6:20 PM, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> Looks good to me.
>
> Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
>
> Best Regards,
> Jaehoon Chung
>
> On 05/24/2013 07:04 PM, Yuvaraj Kumar C D wrote:
>> The Exynos5420 has a DWMMC controller which is different from prior
>> versions.This patch adds a new compatible string for Exynos5420.
>>
>> Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
>> Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
>> Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>
>> ---
>>  drivers/mmc/host/dw_mmc-exynos.c |    9 ++++++++-
>>  1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
>> index f013e7e..f883b17 100644
>> --- a/drivers/mmc/host/dw_mmc-exynos.c
>> +++ b/drivers/mmc/host/dw_mmc-exynos.c
>> @@ -41,6 +41,7 @@ enum dw_mci_exynos_type {
>>       DW_MCI_TYPE_EXYNOS4210,
>>       DW_MCI_TYPE_EXYNOS4412,
>>       DW_MCI_TYPE_EXYNOS5250,
>> +     DW_MCI_TYPE_EXYNOS5420,
>>  };
>>
>>  /* Exynos implementation specific driver private data */
>> @@ -64,6 +65,9 @@ static struct dw_mci_exynos_compatible {
>>       }, {
>>               .compatible     = "samsung,exynos5250-dw-mshc",
>>               .ctrl_type      = DW_MCI_TYPE_EXYNOS5250,
>> +     }, {
>> +             .compatible     = "samsung,exynos5420-dw-mshc",
>> +             .ctrl_type      = DW_MCI_TYPE_EXYNOS5420,
>>       },
>>  };
>>
>> @@ -92,7 +96,8 @@ static int dw_mci_exynos_setup_clock(struct dw_mci *host)
>>  {
>>       struct dw_mci_exynos_priv_data *priv = host->priv;
>>
>> -     if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS5250)
>> +     if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS5250 ||
>> +             priv->ctrl_type == DW_MCI_TYPE_EXYNOS5420)
>>               host->bus_hz /= (priv->ciu_div + 1);
>>       else if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS4412)
>>               host->bus_hz /= EXYNOS4412_FIXED_CIU_CLK_DIV;
>> @@ -175,6 +180,8 @@ static const struct of_device_id dw_mci_exynos_match[] = {
>>                       .data = &exynos_drv_data, },
>>       { .compatible = "samsung,exynos5250-dw-mshc",
>>                       .data = &exynos_drv_data, },
>> +     { .compatible = "samsung,exynos5420-dw-mshc",
>> +                     .data = &exynos_drv_data, },
>>       {},
>>  };
>>  MODULE_DEVICE_TABLE(of, dw_mci_exynos_match);
>>
>
--
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
Chris Ball Aug. 25, 2013, 4:22 a.m. UTC | #3 
Hi Yuvaraj,

On Fri, May 24 2013, Yuvaraj Kumar C D wrote:
> The Exynos5420 has a DWMMC controller which is different from prior
> versions.This patch adds a new compatible string for Exynos5420.
>
> Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
> Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
> Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>

Thanks, pushed to mmc-next for 3.12.

- Chris.
diff mbox

Patch

diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index f013e7e..f883b17 100644
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -41,6 +41,7 @@  enum dw_mci_exynos_type {
 	DW_MCI_TYPE_EXYNOS4210,
 	DW_MCI_TYPE_EXYNOS4412,
 	DW_MCI_TYPE_EXYNOS5250,
+	DW_MCI_TYPE_EXYNOS5420,
 };
 
 /* Exynos implementation specific driver private data */
@@ -64,6 +65,9 @@  static struct dw_mci_exynos_compatible {
 	}, {
 		.compatible	= "samsung,exynos5250-dw-mshc",
 		.ctrl_type	= DW_MCI_TYPE_EXYNOS5250,
+	}, {
+		.compatible	= "samsung,exynos5420-dw-mshc",
+		.ctrl_type	= DW_MCI_TYPE_EXYNOS5420,
 	},
 };
 
@@ -92,7 +96,8 @@  static int dw_mci_exynos_setup_clock(struct dw_mci *host)
 {
 	struct dw_mci_exynos_priv_data *priv = host->priv;
 
-	if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS5250)
+	if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS5250 ||
+		priv->ctrl_type == DW_MCI_TYPE_EXYNOS5420)
 		host->bus_hz /= (priv->ciu_div + 1);
 	else if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS4412)
 		host->bus_hz /= EXYNOS4412_FIXED_CIU_CLK_DIV;
@@ -175,6 +180,8 @@  static const struct of_device_id dw_mci_exynos_match[] = {
 			.data = &exynos_drv_data, },
 	{ .compatible = "samsung,exynos5250-dw-mshc",
 			.data = &exynos_drv_data, },
+	{ .compatible = "samsung,exynos5420-dw-mshc",
+			.data = &exynos_drv_data, },
 	{},
 };
 MODULE_DEVICE_TABLE(of, dw_mci_exynos_match);