Re: [PATCH] ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

2012-03-07 Thread Kukjin Kim 

On 03/06/12 01:51, Kukjin Kim wrote:

On 03/05/12 18:29, Jaehoon Chung wrote:

Hi Kukjin.

Is it merged?

Best Regards,
Jaehoon Chung

On 02/24/2012 06:56 PM, Thomas Abraham wrote:


On 23 February 2012 11:18, Jaehoon Chungjh80.ch...@samsung.com wrote:

Thomas Arbrahams's patchset have changed the device name in sdhci-s3c.c
(mmc: sdhci-s3c: Rework platform data and add device tree support)
But didn't change the regulator_consumer name.
So maybe didn't initialize the mmc/sd card for exynos4.

This patch is fixed that (based-on linux-samsung for-next branch)

Signed-off-by: Jaehoon Chungjh80.ch...@samsung.com
Signed-off-by: kyungmin Parkkyungmin.p...@samsung.com
---
arch/arm/mach-exynos/mach-nuri.c | 4 ++--
arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-exynos/mach-nuri.c
b/arch/arm/mach-exynos/mach-nuri.c
index a6b9162..251dd7a 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -116,7 +116,7 @@ static struct s3c_sdhci_platdata
nuri_hsmmc0_data __initdata = {
};

static struct regulator_consumer_supply emmc_supplies[] = {
- REGULATOR_SUPPLY(vmmc, s3c-sdhci.0),
+ REGULATOR_SUPPLY(vmmc, exynos4-sdhci.0),
REGULATOR_SUPPLY(vmmc, dw_mmc),
};

@@ -415,7 +415,7 @@ static struct regulator_consumer_supply
__initdata max8997_ldo12_[] = {
REGULATOR_SUPPLY(vddio, 6-003c), /* HDC802 */
};
static struct regulator_consumer_supply __initdata max8997_ldo13_[] = {
- REGULATOR_SUPPLY(vmmc, s3c-sdhci.2), /* TFLASH */
+ REGULATOR_SUPPLY(vmmc, exynos4-sdhci.2), /* TFLASH */
};
static struct regulator_consumer_supply __initdata max8997_ldo14_[] = {
REGULATOR_SUPPLY(inmotor, max8997-haptic),
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c
b/arch/arm/mach-exynos/mach-universal_c210.c
index 6017a21..320cb1d 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -749,7 +749,7 @@ static struct s3c_sdhci_platdata
universal_hsmmc0_data __initdata = {
};

static struct regulator_consumer_supply mmc0_supplies[] = {
- REGULATOR_SUPPLY(vmmc, s3c-sdhci.0),
+ REGULATOR_SUPPLY(vmmc, exynos4-sdhci.0),
};

static struct regulator_init_data mmc0_fixed_voltage_init_data = {


Reviewed-by: Thomas Abrahamthomas.abra...@linaro.org


Looks OK, will apply.



(Cc'ed Marek)

Hi Kyungmin, Marek and Jaehoon,

As you know, same patches have been submitted duplicated and this should 
be fixed. Which one would be better to send upstream?


Thanks.

Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH] ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

2012-03-07 Thread Marek Szyprowski 
Hello,

On Wednesday, March 07, 2012 2:20 PM Kukjin Kim wrote:

 On 03/06/12 01:51, Kukjin Kim wrote:
  On 03/05/12 18:29, Jaehoon Chung wrote:
  Hi Kukjin.
 
  Is it merged?
 
  Best Regards,
  Jaehoon Chung
 
  On 02/24/2012 06:56 PM, Thomas Abraham wrote:
 
  On 23 February 2012 11:18, Jaehoon Chungjh80.ch...@samsung.com wrote:
  Thomas Arbrahams's patchset have changed the device name in sdhci-s3c.c
  (mmc: sdhci-s3c: Rework platform data and add device tree support)
  But didn't change the regulator_consumer name.
  So maybe didn't initialize the mmc/sd card for exynos4.
 
  This patch is fixed that (based-on linux-samsung for-next branch)
 
  Signed-off-by: Jaehoon Chungjh80.ch...@samsung.com
  Signed-off-by: kyungmin Parkkyungmin.p...@samsung.com
  ---
  arch/arm/mach-exynos/mach-nuri.c | 4 ++--
  arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
  diff --git a/arch/arm/mach-exynos/mach-nuri.c
  b/arch/arm/mach-exynos/mach-nuri.c
  index a6b9162..251dd7a 100644
  --- a/arch/arm/mach-exynos/mach-nuri.c
  +++ b/arch/arm/mach-exynos/mach-nuri.c
  @@ -116,7 +116,7 @@ static struct s3c_sdhci_platdata
  nuri_hsmmc0_data __initdata = {
  };
 
  static struct regulator_consumer_supply emmc_supplies[] = {
  - REGULATOR_SUPPLY(vmmc, s3c-sdhci.0),
  + REGULATOR_SUPPLY(vmmc, exynos4-sdhci.0),
  REGULATOR_SUPPLY(vmmc, dw_mmc),
  };
 
  @@ -415,7 +415,7 @@ static struct regulator_consumer_supply
  __initdata max8997_ldo12_[] = {
  REGULATOR_SUPPLY(vddio, 6-003c), /* HDC802 */
  };
  static struct regulator_consumer_supply __initdata max8997_ldo13_[] = {
  - REGULATOR_SUPPLY(vmmc, s3c-sdhci.2), /* TFLASH */
  + REGULATOR_SUPPLY(vmmc, exynos4-sdhci.2), /* TFLASH */
  };
  static struct regulator_consumer_supply __initdata max8997_ldo14_[] = {
  REGULATOR_SUPPLY(inmotor, max8997-haptic),
  diff --git a/arch/arm/mach-exynos/mach-universal_c210.c
  b/arch/arm/mach-exynos/mach-universal_c210.c
  index 6017a21..320cb1d 100644
  --- a/arch/arm/mach-exynos/mach-universal_c210.c
  +++ b/arch/arm/mach-exynos/mach-universal_c210.c
  @@ -749,7 +749,7 @@ static struct s3c_sdhci_platdata
  universal_hsmmc0_data __initdata = {
  };
 
  static struct regulator_consumer_supply mmc0_supplies[] = {
  - REGULATOR_SUPPLY(vmmc, s3c-sdhci.0),
  + REGULATOR_SUPPLY(vmmc, exynos4-sdhci.0),
  };
 
  static struct regulator_init_data mmc0_fixed_voltage_init_data = {
 
  Reviewed-by: Thomas Abrahamthomas.abra...@linaro.org
 
  Looks OK, will apply.
 
 
 (Cc'ed Marek)
 
 Hi Kyungmin, Marek and Jaehoon,
 
 As you know, same patches have been submitted duplicated and this should
 be fixed. Which one would be better to send upstream?

For me it doesn't matter, I just need this fix to get merged, because otherwise
the Universal C210 and Nuri boards are dysfunctional. 

You can select the one prepared by Jaehoon if You like.

Best regards
-- 
Marek Szyprowski
Samsung Poland RD Center


--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

2012-03-07 Thread Kukjin Kim 

On 03/07/12 06:01, Marek Szyprowski wrote:

Hello,

On Wednesday, March 07, 2012 2:20 PM Kukjin Kim wrote:


On 03/06/12 01:51, Kukjin Kim wrote:

On 03/05/12 18:29, Jaehoon Chung wrote:

Hi Kukjin.

Is it merged?

Best Regards,
Jaehoon Chung

On 02/24/2012 06:56 PM, Thomas Abraham wrote:


On 23 February 2012 11:18, Jaehoon Chungjh80.ch...@samsung.com  wrote:

Thomas Arbrahams's patchset have changed the device name in sdhci-s3c.c
(mmc: sdhci-s3c: Rework platform data and add device tree support)
But didn't change the regulator_consumer name.
So maybe didn't initialize the mmc/sd card for exynos4.

This patch is fixed that (based-on linux-samsung for-next branch)

Signed-off-by: Jaehoon Chungjh80.ch...@samsung.com
Signed-off-by: kyungmin Parkkyungmin.p...@samsung.com
---
arch/arm/mach-exynos/mach-nuri.c | 4 ++--
arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-exynos/mach-nuri.c
b/arch/arm/mach-exynos/mach-nuri.c
index a6b9162..251dd7a 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -116,7 +116,7 @@ static struct s3c_sdhci_platdata
nuri_hsmmc0_data __initdata = {
};

static struct regulator_consumer_supply emmc_supplies[] = {
- REGULATOR_SUPPLY(vmmc, s3c-sdhci.0),
+ REGULATOR_SUPPLY(vmmc, exynos4-sdhci.0),
REGULATOR_SUPPLY(vmmc, dw_mmc),
};

@@ -415,7 +415,7 @@ static struct regulator_consumer_supply
__initdata max8997_ldo12_[] = {
REGULATOR_SUPPLY(vddio, 6-003c), /* HDC802 */
};
static struct regulator_consumer_supply __initdata max8997_ldo13_[] = {
- REGULATOR_SUPPLY(vmmc, s3c-sdhci.2), /* TFLASH */
+ REGULATOR_SUPPLY(vmmc, exynos4-sdhci.2), /* TFLASH */
};
static struct regulator_consumer_supply __initdata max8997_ldo14_[] = {
REGULATOR_SUPPLY(inmotor, max8997-haptic),
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c
b/arch/arm/mach-exynos/mach-universal_c210.c
index 6017a21..320cb1d 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -749,7 +749,7 @@ static struct s3c_sdhci_platdata
universal_hsmmc0_data __initdata = {
};

static struct regulator_consumer_supply mmc0_supplies[] = {
- REGULATOR_SUPPLY(vmmc, s3c-sdhci.0),
+ REGULATOR_SUPPLY(vmmc, exynos4-sdhci.0),
};

static struct regulator_init_data mmc0_fixed_voltage_init_data = {


Reviewed-by: Thomas Abrahamthomas.abra...@linaro.org


Looks OK, will apply.



(Cc'ed Marek)

Hi Kyungmin, Marek and Jaehoon,

As you know, same patches have been submitted duplicated and this should
be fixed. Which one would be better to send upstream?


For me it doesn't matter, I just need this fix to get merged, because otherwise
the Universal C210 and Nuri boards are dysfunctional.

You can select the one prepared by Jaehoon if You like.


OK, thanks :)

Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

2012-02-24 Thread Thomas Abraham 
On 23 February 2012 11:18, Jaehoon Chung jh80.ch...@samsung.com wrote:
 Thomas Arbrahams's patchset have changed the device name in sdhci-s3c.c
 (mmc: sdhci-s3c: Rework platform data and add device tree support)
 But didn't change the regulator_consumer name.
 So maybe didn't initialize the mmc/sd card for exynos4.

 This patch is fixed that (based-on linux-samsung for-next branch)

 Signed-off-by: Jaehoon Chung jh80.ch...@samsung.com
 Signed-off-by: kyungmin Park kyungmin.p...@samsung.com
 ---
  arch/arm/mach-exynos/mach-nuri.c           |    4 ++--
  arch/arm/mach-exynos/mach-universal_c210.c |    2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)

 diff --git a/arch/arm/mach-exynos/mach-nuri.c 
 b/arch/arm/mach-exynos/mach-nuri.c
 index a6b9162..251dd7a 100644
 --- a/arch/arm/mach-exynos/mach-nuri.c
 +++ b/arch/arm/mach-exynos/mach-nuri.c
 @@ -116,7 +116,7 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data 
 __initdata = {
  };

  static struct regulator_consumer_supply emmc_supplies[] = {
 -       REGULATOR_SUPPLY(vmmc, s3c-sdhci.0),
 +       REGULATOR_SUPPLY(vmmc, exynos4-sdhci.0),
        REGULATOR_SUPPLY(vmmc, dw_mmc),
  };

 @@ -415,7 +415,7 @@ static struct regulator_consumer_supply __initdata 
 max8997_ldo12_[] = {
        REGULATOR_SUPPLY(vddio, 6-003c), /* HDC802 */
  };
  static struct regulator_consumer_supply __initdata max8997_ldo13_[] = {
 -       REGULATOR_SUPPLY(vmmc, s3c-sdhci.2), /* TFLASH */
 +       REGULATOR_SUPPLY(vmmc, exynos4-sdhci.2), /* TFLASH */
  };
  static struct regulator_consumer_supply __initdata max8997_ldo14_[] = {
        REGULATOR_SUPPLY(inmotor, max8997-haptic),
 diff --git a/arch/arm/mach-exynos/mach-universal_c210.c 
 b/arch/arm/mach-exynos/mach-universal_c210.c
 index 6017a21..320cb1d 100644
 --- a/arch/arm/mach-exynos/mach-universal_c210.c
 +++ b/arch/arm/mach-exynos/mach-universal_c210.c
 @@ -749,7 +749,7 @@ static struct s3c_sdhci_platdata universal_hsmmc0_data 
 __initdata = {
  };

  static struct regulator_consumer_supply mmc0_supplies[] = {
 -       REGULATOR_SUPPLY(vmmc, s3c-sdhci.0),
 +       REGULATOR_SUPPLY(vmmc, exynos4-sdhci.0),
  };

  static struct regulator_init_data mmc0_fixed_voltage_init_data = {

Reviewed-by: Thomas Abraham thomas.abra...@linaro.org
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html