ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

PATCH In review Jaehoon Chung 4 participants 7 messages Feb 23, 2012 – Mar 7, 2012

Subsystems (4)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos MMC, SD and SDIO

lore

Share & tools

lore

Jaehoon Chung

author

2012-02-23 05:48 UTC #0 lore raw

PATCH 1/1 ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

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 <[email protected]>

Signed-off-by kyungmin Park <[email protected]>

---
 arch/arm/mach-exynos/mach-nuri.c           |    4 ++--
 arch/arm/mach-exynos/mach-universal_c210.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

arch/arm/mach-exynos/mach-nuri.c +2 -2

index a6b9162..251dd7a 100644
@@ -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"),

arch/arm/mach-exynos/mach-universal_c210.c +1 -1

index 6017a21..320cb1d 100644
@@ -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 = {

Thomas Abraham

Reviewed-by on v1 1/1

2012-02-24 09:56 UTC #1 lore raw

Quoted 41 lines · Jaehoon Chung

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 <[email protected]>
Signed-off-by kyungmin Park <[email protected]>
---
arch/arm/mach-exynos/mach-nuri.c | 4 ++-- arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/mach-nuri.c +1 -1
index a6b9162..251dd7a 100644
@@ -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"),
arch/arm/mach-exynos/mach-universal_c210.c +0 -0
index 6017a21..320cb1d 100644

arch/arm/mach-exynos/mach-universal_c210.c static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = { · line 755

Quoted 8 lines

arch/arm/mach-exynos/mach-universal_c210.c +1 -1

@@ -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 <[email protected]>

Jaehoon Chung

author

2012-03-06 02:29 UTC #2 lore raw

PATCH 1/1 ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

Hi Kukjin.

Is it merged?

Best Regards,
Jaehoon Chung

Quoted 57 lines · Thomas Abraham

Quoted 41 lines · Jaehoon Chung
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 <[email protected]>
Signed-off-by kyungmin Park <[email protected]>
---
 arch/arm/mach-exynos/mach-nuri.c           |    4 ++--
 arch/arm/mach-exynos/mach-universal_c210.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/mach-nuri.c +2 -2
index a6b9162..251dd7a 100644
@@ -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"),
arch/arm/mach-exynos/mach-universal_c210.c +0 -0
index 6017a21..320cb1d 100644
arch/arm/mach-exynos/mach-universal_c210.c static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = { · line 755
Quoted 8 lines
arch/arm/mach-exynos/mach-universal_c210.c +1 -1
@@ -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 <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Kukjin Kim

2012-03-06 09:51 UTC #3 lore raw

PATCH 1/1 ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

Quoted 61 lines · Jaehoon Chung

Hi Kukjin.
Is it merged?
Best Regards,
Jaehoon Chung
Quoted 52 lines · Thomas Abraham
Quoted 41 lines · Jaehoon Chung
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<[email protected]>
Signed-off-by kyungmin Park<[email protected]>
---
  arch/arm/mach-exynos/mach-nuri.c           |    4 ++--
  arch/arm/mach-exynos/mach-universal_c210.c |    2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/mach-nuri.c +2 -2
index a6b9162..251dd7a 100644
@@ -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"),
arch/arm/mach-exynos/mach-universal_c210.c +0 -0
index 6017a21..320cb1d 100644
arch/arm/mach-exynos/mach-universal_c210.c static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = { · line 755
Quoted 8 lines
arch/arm/mach-exynos/mach-universal_c210.c +1 -1
@@ -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<[email protected]>

Looks OK, will apply.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Kukjin Kim

2012-03-07 13:19 UTC #4 lore raw

PATCH 1/1 ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

Quoted 64 lines · Kukjin Kim

Quoted 63 lines · Jaehoon Chung
Hi Kukjin.
Is it merged?
Best Regards,
Jaehoon Chung
Quoted 54 lines · Thomas Abraham
Quoted 53 lines · Jaehoon Chung
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<[email protected]>
Signed-off-by kyungmin Park<[email protected]>
---
arch/arm/mach-exynos/mach-nuri.c | 4 ++--
arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/mach-nuri.c +1 -1
index a6b9162..251dd7a 100644
@@ -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"),
arch/arm/mach-exynos/mach-universal_c210.c +1 -1
index 6017a21..320cb1d 100644
@@ -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"),
 };
 

Quoted 6 lines

Quoted 3 lines
Quoted 3 lines
Quoted 1 line
static struct regulator_init_data mmc0_fixed_voltage_init_data = {
Reviewed-by Thomas Abraham<[email protected]>
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 <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Marek Szyprowski

2012-03-07 14:01 UTC #5 lore raw

PATCH 1/1 ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

Hello,

Quoted 72 lines · Kukjin Kim

Quoted 64 lines · Kukjin Kim
Quoted 63 lines · Jaehoon Chung
Hi Kukjin.
Is it merged?
Best Regards,
Jaehoon Chung
Quoted 54 lines · Thomas Abraham
Quoted 53 lines · Jaehoon Chung
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<[email protected]>
Signed-off-by kyungmin Park<[email protected]>
---
arch/arm/mach-exynos/mach-nuri.c | 4 ++--
arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/mach-nuri.c +1 -1
index a6b9162..251dd7a 100644
@@ -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"),
arch/arm/mach-exynos/mach-universal_c210.c +1 -1
index 6017a21..320cb1d 100644
@@ -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"),
 };
 
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
static struct regulator_init_data mmc0_fixed_voltage_init_data = {
Reviewed-by Thomas Abraham<[email protected]>
Looks OK, will apply.

Quoted 6 lines

(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

Signature · 2 lines

Marek Szyprowski
Samsung Poland R&D Center

Kukjin Kim

2012-03-07 15:54 UTC #6 lore raw

PATCH 1/1 ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci

Quoted 80 lines · Marek Szyprowski

Hello,
Quoted 76 lines · Kukjin Kim
Quoted 64 lines · Kukjin Kim
Quoted 63 lines · Jaehoon Chung
Hi Kukjin.
Is it merged?
Best Regards,
Jaehoon Chung
Quoted 54 lines · Thomas Abraham
Quoted 53 lines · Jaehoon Chung
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<[email protected]>
Signed-off-by kyungmin Park<[email protected]>
---
arch/arm/mach-exynos/mach-nuri.c | 4 ++--
arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/mach-nuri.c +1 -1
index a6b9162..251dd7a 100644
@@ -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"),
arch/arm/mach-exynos/mach-universal_c210.c +1 -1
index 6017a21..320cb1d 100644
@@ -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"),
 };
 
Quoted 6 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
static struct regulator_init_data mmc0_fixed_voltage_init_data = {
Reviewed-by Thomas Abraham<[email protected]>
Looks OK, will apply.
(Cc'ed Marek)
Hi Kyungmin, Marek and Jaehoon,

Quoted 7 lines

Quoted 2 lines
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 <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.