[PATCH 2/8] s3c6410: sdhci: Adding additional data in sdhci platform data structure.

[PATCH 2/8] s3c6410: sdhci: Adding additional data in sdhci platform data structure.

[thomas.ab at samsung.com]

From: Thomas Abraham <thomas.ab@samsung.com>

This patch adds additional information about the parent clock
name, sdhci clock name and desired sdhci operating frequency
in the sdhci platform data structure.

Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
---
 arch/arm/plat-s3c/dev-hsmmc.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-s3c/dev-hsmmc.c b/arch/arm/plat-s3c/dev-hsmmc.c
index 4c05b39..357ec60 100644
--- a/arch/arm/plat-s3c/dev-hsmmc.c
+++ b/arch/arm/plat-s3c/dev-hsmmc.c
@@ -38,9 +38,12 @@ static struct resource s3c_hsmmc_resource[] = {
 static u64 s3c_device_hsmmc_dmamask = 0xffffffffUL;
 
 struct s3c_sdhci_platdata s3c_hsmmc0_def_platdata = {
-	.max_width	= 4,
-	.host_caps	= (MMC_CAP_4_BIT_DATA |
-			   MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
+	.max_width		= 4,
+	.host_caps		= (MMC_CAP_4_BIT_DATA |
+				  MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
+	.clk_parent_name	= "dout_mpll",
+	.clk_source_name 	= "mmc_bus",
+	.clk_speed		= 50*MHZ,
 };
 
 struct platform_device s3c_device_hsmmc0 = {
-- 
1.5.3.4

[PATCH 2/8] s3c6410: sdhci: Adding additional data in sdhci platform data structure.

[Maurus Cuelenaere]

Hi,

this breaks hsmmc1 (and hsmmc2).

Attached patch fixes hsmmc1.

Regards,
Maurus Cuelenaere

 From a743b9c3b7a6b63e2c0ccf22a45a06952920dff4 Mon Sep 17 00:00:00 2001
From: Maurus Cuelenaere <mcuelenaere@gmail.com>
Date: Sat, 12 Sep 2009 17:40:33 +0200

This patch adds additional information about the parent clock
name, sdhci clock name and desired sdhci operating frequency
for hsmmc1 (based on e52782df345ec3e826701438ef42d2a8425bb973).

Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
---
  arch/arm/plat-s3c/dev-hsmmc1.c |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-s3c/dev-hsmmc1.c b/arch/arm/plat-s3c/dev-hsmmc1.c
index e49bc4c..d8c8f61 100644
--- a/arch/arm/plat-s3c/dev-hsmmc1.c
+++ b/arch/arm/plat-s3c/dev-hsmmc1.c
@@ -41,6 +41,9 @@ struct s3c_sdhci_platdata s3c_hsmmc1_def_platdata = {
      .max_width    = 4,
      .host_caps    = (MMC_CAP_4_BIT_DATA |
                 MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
+    .clk_parent_name    = "dout_mpll",
+    .clk_source_name     = "mmc_bus",
+    .clk_speed        = 50*MHZ,
  };

  struct platform_device s3c_device_hsmmc1 = {
-- 
1.6.3.3

[PATCH 2/8] s3c6410: sdhci: Adding additional data in sdhci platform data structure.

[Thomas P. Abraham]

Hi Maurus,

The patch "[PATCH 6/8] s3c6410: sdhci: Modify platform data for sdhci-1" was 
submitted to populate the hsmmc1 platform data.

Thanks,
Thomas.


----- Original Message ----- 
From: "Maurus Cuelenaere" <mcuelenaere@gmail.com>
To: <linux-arm-kernel@lists.infradead.org>; <thomas.ab@samsung.com>
Sent: Saturday, September 12, 2009 9:34 PM
Subject: Re: [PATCH 2/8] s3c6410: sdhci: Adding additional data in sdhci 
platform data structure.


> Hi,
>
> this breaks hsmmc1 (and hsmmc2).
>
> Attached patch fixes hsmmc1.
>
> Regards,
> Maurus Cuelenaere
>
> From a743b9c3b7a6b63e2c0ccf22a45a06952920dff4 Mon Sep 17 00:00:00 2001
> From: Maurus Cuelenaere <mcuelenaere@gmail.com>
> Date: Sat, 12 Sep 2009 17:40:33 +0200
>
> This patch adds additional information about the parent clock
> name, sdhci clock name and desired sdhci operating frequency
> for hsmmc1 (based on e52782df345ec3e826701438ef42d2a8425bb973).
>
> Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
> ---
>  arch/arm/plat-s3c/dev-hsmmc1.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-s3c/dev-hsmmc1.c 
> b/arch/arm/plat-s3c/dev-hsmmc1.c
> index e49bc4c..d8c8f61 100644
> --- a/arch/arm/plat-s3c/dev-hsmmc1.c
> +++ b/arch/arm/plat-s3c/dev-hsmmc1.c
> @@ -41,6 +41,9 @@ struct s3c_sdhci_platdata s3c_hsmmc1_def_platdata = {
>      .max_width    = 4,
>      .host_caps    = (MMC_CAP_4_BIT_DATA |
>                 MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
> +    .clk_parent_name    = "dout_mpll",
> +    .clk_source_name     = "mmc_bus",
> +    .clk_speed        = 50*MHZ,
>  };
>
>  struct platform_device s3c_device_hsmmc1 = {
> -- 
> 1.6.3.3
> 

[PATCH 2/8] s3c6410: sdhci: Adding additional data in sdhci platform data structure.

[Maurus Cuelenaere]

Thomas P. Abraham schreef:
> Hi Maurus,
>
> The patch "[PATCH 6/8] s3c6410: sdhci: Modify platform data for 
> sdhci-1" was submitted to populate the hsmmc1 platform data.
Oh, I am sorry. I based myself upon 
http://git.kernel.org/?p=linux/kernel/git/kki_ap/linux-2.6-samsung.git;a=shortlog;h=s3c6410-all
and probably forget to look at the actual patches you posted :)

Regards,
Maurus Cuelenaere

[PATCH 2/8] s3c6410: sdhci: Adding additional data in sdhci platform data structure.

[Ben Dooks]

On Mon, Sep 14, 2009 at 06:59:45PM +0530, Thomas P. Abraham wrote:
> Hi Maurus,
> 
> The patch "[PATCH 6/8] s3c6410: sdhci: Modify platform data for sdhci-1" 
> was submitted to populate the hsmmc1 platform data.

Please do not split the changes up like this, the best thing to do is
that if a change in the setup is required for >1 device, then place
them in one go so that changes applied do not leave the kernel broken
in between commits.

> Thanks,
> Thomas.
> 
> 
> ----- Original Message ----- 
> From: "Maurus Cuelenaere" <mcuelenaere@gmail.com>
> To: <linux-arm-kernel@lists.infradead.org>; <thomas.ab@samsung.com>
> Sent: Saturday, September 12, 2009 9:34 PM
> Subject: Re: [PATCH 2/8] s3c6410: sdhci: Adding additional data in sdhci 
> platform data structure.
> 
> 
> >Hi,
> >
> >this breaks hsmmc1 (and hsmmc2).
> >
> >Attached patch fixes hsmmc1.
> >
> >Regards,
> >Maurus Cuelenaere
> >
> >From a743b9c3b7a6b63e2c0ccf22a45a06952920dff4 Mon Sep 17 00:00:00 2001
> >From: Maurus Cuelenaere <mcuelenaere@gmail.com>
> >Date: Sat, 12 Sep 2009 17:40:33 +0200
> >
> >This patch adds additional information about the parent clock
> >name, sdhci clock name and desired sdhci operating frequency
> >for hsmmc1 (based on e52782df345ec3e826701438ef42d2a8425bb973).
> >
> >Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
> >---
> > arch/arm/plat-s3c/dev-hsmmc1.c |    3 +++
> > 1 files changed, 3 insertions(+), 0 deletions(-)
> >
> >diff --git a/arch/arm/plat-s3c/dev-hsmmc1.c 
> >b/arch/arm/plat-s3c/dev-hsmmc1.c
> >index e49bc4c..d8c8f61 100644
> >--- a/arch/arm/plat-s3c/dev-hsmmc1.c
> >+++ b/arch/arm/plat-s3c/dev-hsmmc1.c
> >@@ -41,6 +41,9 @@ struct s3c_sdhci_platdata s3c_hsmmc1_def_platdata = {
> >     .max_width    = 4,
> >     .host_caps    = (MMC_CAP_4_BIT_DATA |
> >                MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
> >+    .clk_parent_name    = "dout_mpll",
> >+    .clk_source_name     = "mmc_bus",
> >+    .clk_speed        = 50*MHZ,
> > };
> >
> > struct platform_device s3c_device_hsmmc1 = {
> >-- 
> >1.6.3.3
> >
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

[PATCH 2/8] s3c6410: sdhci: Adding additional data in sdhci platform data structure.

[Ben Dooks]

On Tue, Sep 08, 2009 at 03:47:38PM +0900, thomas.ab at samsung.com wrote:
> From: Thomas Abraham <thomas.ab@samsung.com>
> 
> This patch adds additional information about the parent clock
> name, sdhci clock name and desired sdhci operating frequency
> in the sdhci platform data structure.

This would have been better off being a series of adding the max field
and the clock fields seperately, and fixing up their platform data at
the same time.

The addiiton of the clock information is not necessary due to the
following:

1) There are four clock choices here, not just one.

2) The mmc_bus is a fixed clock name, it should not be up to the
   driver to change it, it is registered by the clock core code for
   the relevant architecture.

3) struct s3c_sdhci_platdata already has a `char **` pointer to an
   array of clock names for (1). Setup by functions such as the
   s3c_sdhci0_set_platdata. It does however seem to be missing a
   documentation point in the data.

I'd apply the max-frequency change, but not the clock change.
 
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> ---
>  arch/arm/plat-s3c/dev-hsmmc.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/plat-s3c/dev-hsmmc.c b/arch/arm/plat-s3c/dev-hsmmc.c
> index 4c05b39..357ec60 100644
> --- a/arch/arm/plat-s3c/dev-hsmmc.c
> +++ b/arch/arm/plat-s3c/dev-hsmmc.c
> @@ -38,9 +38,12 @@ static struct resource s3c_hsmmc_resource[] = {
>  static u64 s3c_device_hsmmc_dmamask = 0xffffffffUL;
>  
>  struct s3c_sdhci_platdata s3c_hsmmc0_def_platdata = {
> -	.max_width	= 4,
> -	.host_caps	= (MMC_CAP_4_BIT_DATA |
> -			   MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
> +	.max_width		= 4,
> +	.host_caps		= (MMC_CAP_4_BIT_DATA |
> +				  MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
> +	.clk_parent_name	= "dout_mpll",
> +	.clk_source_name 	= "mmc_bus",
> +	.clk_speed		= 50*MHZ,
>  };
>  
>  struct platform_device s3c_device_hsmmc0 = {
> -- 
> 1.5.3.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.