* [PATCH 0/3] Universal C210 and NURI board fixes
@ 2012-03-01 8:40 Marek Szyprowski
2012-03-01 8:40 ` [PATCH 1/3] ARM: Exynos: fix SDHCI caps for UniversalC210 and NURI boards Marek Szyprowski
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Marek Szyprowski @ 2012-03-01 8:40 UTC (permalink / raw)
To: linux-samsung-soc
Cc: Marek Szyprowski, Kyungmin Park, Bartlomiej Zolnierkiewicz,
Kukjin Kim
Hi Kukjin,
I've found a few problems with Universal C210 and NURI boards in the
current linux-next kernel. The provided patches fix the issues with
SDHCI controllers and mysterious touch screen freeze.
Best regards,
Marek Szyprowski
Patch summary:
Bartlomiej Zolnierkiewicz (1):
ARM: Exynos: fix touchscreen IRQ setup on Universal C210 board
Marek Szyprowski (2):
ARM: Exynos: fix SDHCI caps for UniversalC210 and NURI boards
ARM: Exynos: fix SDHCI device names in regulator definitions
arch/arm/mach-exynos/mach-nuri.c | 6 ++++--
arch/arm/mach-exynos/mach-universal_c210.c | 5 ++++-
2 files changed, 8 insertions(+), 3 deletions(-)
--
1.7.1.569.g6f426
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/3] ARM: Exynos: fix SDHCI caps for UniversalC210 and NURI boards
2012-03-01 8:40 [PATCH 0/3] Universal C210 and NURI board fixes Marek Szyprowski
@ 2012-03-01 8:40 ` Marek Szyprowski
2012-03-06 10:15 ` Kukjin Kim
2012-03-01 8:40 ` [PATCH 2/3] ARM: Exynos: fix SDHCI device names in regulator definitions Marek Szyprowski
2012-03-01 8:40 ` [PATCH 3/3] ARM: Exynos: fix touchscreen IRQ setup on Universal C210 board Marek Szyprowski
2 siblings, 1 reply; 11+ messages in thread
From: Marek Szyprowski @ 2012-03-01 8:40 UTC (permalink / raw)
To: linux-samsung-soc
Cc: Marek Szyprowski, Kyungmin Park, Bartlomiej Zolnierkiewicz,
Kukjin Kim
Add a new quirk (introduced in 6e8201f57c935 "mmc: core: add the capability
for broken voltage" to indicate that MMC core should ignore voltage change
errors reported by the regulators core. This is required to get SDHCI
working on these boards again after commit ceb6143b2df81c ("mmc: sdhci:
fix vmmc handling").
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
arch/arm/mach-exynos/mach-nuri.c | 2 ++
arch/arm/mach-exynos/mach-universal_c210.c | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index a6b9162..8c0479f 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -112,6 +112,7 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data __initdata = {
.host_caps = (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
MMC_CAP_DISABLE | MMC_CAP_ERASE),
+ .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE,
.cd_type = S3C_SDHCI_CD_PERMANENT,
};
@@ -151,6 +152,7 @@ static struct s3c_sdhci_platdata nuri_hsmmc2_data __initdata = {
.host_caps = MMC_CAP_4_BIT_DATA |
MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
MMC_CAP_DISABLE,
+ .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE,
.ext_cd_gpio = EXYNOS4_GPX3(3), /* XEINT_27 */
.ext_cd_gpio_invert = 1,
.cd_type = S3C_SDHCI_CD_GPIO,
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 6017a21..908624c 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -745,6 +745,7 @@ static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = {
.host_caps = (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
MMC_CAP_DISABLE),
+ .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE,
.cd_type = S3C_SDHCI_CD_PERMANENT,
};
--
1.7.1.569.g6f426
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/3] ARM: Exynos: fix SDHCI device names in regulator definitions
2012-03-01 8:40 [PATCH 0/3] Universal C210 and NURI board fixes Marek Szyprowski
2012-03-01 8:40 ` [PATCH 1/3] ARM: Exynos: fix SDHCI caps for UniversalC210 and NURI boards Marek Szyprowski
@ 2012-03-01 8:40 ` Marek Szyprowski
2012-03-06 10:06 ` Kukjin Kim
2012-03-01 8:40 ` [PATCH 3/3] ARM: Exynos: fix touchscreen IRQ setup on Universal C210 board Marek Szyprowski
2 siblings, 1 reply; 11+ messages in thread
From: Marek Szyprowski @ 2012-03-01 8:40 UTC (permalink / raw)
To: linux-samsung-soc
Cc: Marek Szyprowski, Kyungmin Park, Bartlomiej Zolnierkiewicz,
Kukjin Kim
Patch 189eb7407 "ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci
controllers" changed the names of the SDHCI devices, but the author forgot
to update the definitions for the regulator subsystem. This patch fixes
this issue.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@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 8c0479f..dd26581 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -117,7 +117,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"),
};
@@ -417,7 +417,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 908624c..7cd738c 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -750,7 +750,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 = {
--
1.7.1.569.g6f426
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/3] ARM: Exynos: fix touchscreen IRQ setup on Universal C210 board
2012-03-01 8:40 [PATCH 0/3] Universal C210 and NURI board fixes Marek Szyprowski
2012-03-01 8:40 ` [PATCH 1/3] ARM: Exynos: fix SDHCI caps for UniversalC210 and NURI boards Marek Szyprowski
2012-03-01 8:40 ` [PATCH 2/3] ARM: Exynos: fix SDHCI device names in regulator definitions Marek Szyprowski
@ 2012-03-01 8:40 ` Marek Szyprowski
2012-03-06 10:08 ` Kukjin Kim
2 siblings, 1 reply; 11+ messages in thread
From: Marek Szyprowski @ 2012-03-01 8:40 UTC (permalink / raw)
To: linux-samsung-soc
Cc: Marek Szyprowski, Kyungmin Park, Bartlomiej Zolnierkiewicz,
Kukjin Kim
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Fixes atmel_mxt_ts freeze on Universal C210.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
arch/arm/mach-exynos/mach-universal_c210.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 7cd738c..e0cd5bb 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -13,6 +13,7 @@
#include <linux/i2c.h>
#include <linux/gpio_keys.h>
#include <linux/gpio.h>
+#include <linux/interrupt.h>
#include <linux/fb.h>
#include <linux/mfd/max8998.h>
#include <linux/regulator/machine.h>
@@ -604,6 +605,7 @@ static struct mxt_platform_data qt602240_platform_data = {
.threshold = 0x28,
.voltage = 2800000, /* 2.8V */
.orient = MXT_DIAGONAL,
+ .irqflags = IRQF_TRIGGER_FALLING,
};
static struct i2c_board_info i2c3_devs[] __initdata = {
--
1.7.1.569.g6f426
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] ARM: Exynos: fix SDHCI device names in regulator definitions
2012-03-01 8:40 ` [PATCH 2/3] ARM: Exynos: fix SDHCI device names in regulator definitions Marek Szyprowski
@ 2012-03-06 10:06 ` Kukjin Kim
2012-03-06 10:13 ` Kyungmin Park
0 siblings, 1 reply; 11+ messages in thread
From: Kukjin Kim @ 2012-03-06 10:06 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-samsung-soc, Kyungmin Park, Bartlomiej Zolnierkiewicz,
Kukjin Kim, Jaehoon Chung
On 03/01/12 00:40, Marek Szyprowski wrote:
> Patch 189eb7407 "ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci
> controllers" changed the names of the SDHCI devices, but the author forgot
> to update the definitions for the regulator subsystem. This patch fixes
> this issue.
>
> Signed-off-by: Marek Szyprowski<m.szyprowski@samsung.com>
> Signed-off-by: Kyungmin Park<kyungmin.park@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 8c0479f..dd26581 100644
> --- a/arch/arm/mach-exynos/mach-nuri.c
> +++ b/arch/arm/mach-exynos/mach-nuri.c
> @@ -117,7 +117,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"),
> };
>
> @@ -417,7 +417,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 908624c..7cd738c 100644
> --- a/arch/arm/mach-exynos/mach-universal_c210.c
> +++ b/arch/arm/mach-exynos/mach-universal_c210.c
> @@ -750,7 +750,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 = {
(Cc'ed Jaehoon Chung)
Oops, I looked at same patch from Jaehoon Chung just now and it could
be. However, including same Signed-off-by from Kyungmin Park, it seems
wrong. What's happened in your side?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] ARM: Exynos: fix touchscreen IRQ setup on Universal C210 board
2012-03-01 8:40 ` [PATCH 3/3] ARM: Exynos: fix touchscreen IRQ setup on Universal C210 board Marek Szyprowski
@ 2012-03-06 10:08 ` Kukjin Kim
0 siblings, 0 replies; 11+ messages in thread
From: Kukjin Kim @ 2012-03-06 10:08 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-samsung-soc, Kyungmin Park, Bartlomiej Zolnierkiewicz,
Kukjin Kim
On 03/01/12 00:40, Marek Szyprowski wrote:
> From: Bartlomiej Zolnierkiewicz<b.zolnierkie@samsung.com>
>
> Fixes atmel_mxt_ts freeze on Universal C210.
>
> Signed-off-by: Bartlomiej Zolnierkiewicz<b.zolnierkie@samsung.com>
> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
> Signed-off-by: Marek Szyprowski<m.szyprowski@samsung.com>
> ---
> arch/arm/mach-exynos/mach-universal_c210.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
> index 7cd738c..e0cd5bb 100644
> --- a/arch/arm/mach-exynos/mach-universal_c210.c
> +++ b/arch/arm/mach-exynos/mach-universal_c210.c
> @@ -13,6 +13,7 @@
> #include<linux/i2c.h>
> #include<linux/gpio_keys.h>
> #include<linux/gpio.h>
> +#include<linux/interrupt.h>
> #include<linux/fb.h>
> #include<linux/mfd/max8998.h>
> #include<linux/regulator/machine.h>
> @@ -604,6 +605,7 @@ static struct mxt_platform_data qt602240_platform_data = {
> .threshold = 0x28,
> .voltage = 2800000, /* 2.8V */
> .orient = MXT_DIAGONAL,
> + .irqflags = IRQF_TRIGGER_FALLING,
> };
>
> static struct i2c_board_info i2c3_devs[] __initdata = {
Looks ok, will apply into fixes-4.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] ARM: Exynos: fix SDHCI device names in regulator definitions
2012-03-06 10:06 ` Kukjin Kim
@ 2012-03-06 10:13 ` Kyungmin Park
2012-03-06 10:20 ` Kukjin Kim
0 siblings, 1 reply; 11+ messages in thread
From: Kyungmin Park @ 2012-03-06 10:13 UTC (permalink / raw)
To: Kukjin Kim
Cc: Marek Szyprowski, linux-samsung-soc, Bartlomiej Zolnierkiewicz,
Jaehoon Chung, Chris Ball
On 3/6/12, Kukjin Kim <kgene.kim@samsung.com> wrote:
> On 03/01/12 00:40, Marek Szyprowski wrote:
>> Patch 189eb7407 "ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci
>> controllers" changed the names of the SDHCI devices, but the author forgot
>> to update the definitions for the regulator subsystem. This patch fixes
>> this issue.
>>
>> Signed-off-by: Marek Szyprowski<m.szyprowski@samsung.com>
>> Signed-off-by: Kyungmin Park<kyungmin.park@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 8c0479f..dd26581 100644
>> --- a/arch/arm/mach-exynos/mach-nuri.c
>> +++ b/arch/arm/mach-exynos/mach-nuri.c
>> @@ -117,7 +117,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"),
>> };
>>
>> @@ -417,7 +417,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 908624c..7cd738c 100644
>> --- a/arch/arm/mach-exynos/mach-universal_c210.c
>> +++ b/arch/arm/mach-exynos/mach-universal_c210.c
>> @@ -750,7 +750,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 = {
>
> (Cc'ed Jaehoon Chung)
>
> Oops, I looked at same patch from Jaehoon Chung just now and it could
> be. However, including same Signed-off-by from Kyungmin Park, it seems
> wrong. What's happened in your side?
As your delayed work, we did the same thing from both side.
Most of all, exynos4-sdhci patchset should contains these change also.
as wrong merge, it breaks all sdhci support at least exynos4 series.
Thank you,
Kyungmin Park
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/3] ARM: Exynos: fix SDHCI caps for UniversalC210 and NURI boards
2012-03-01 8:40 ` [PATCH 1/3] ARM: Exynos: fix SDHCI caps for UniversalC210 and NURI boards Marek Szyprowski
@ 2012-03-06 10:15 ` Kukjin Kim
2012-03-06 10:31 ` Kukjin Kim
0 siblings, 1 reply; 11+ messages in thread
From: Kukjin Kim @ 2012-03-06 10:15 UTC (permalink / raw)
To: Marek Szyprowski
Cc: linux-samsung-soc, Kyungmin Park, Bartlomiej Zolnierkiewicz,
Kukjin Kim
On 03/01/12 00:40, Marek Szyprowski wrote:
> Add a new quirk (introduced in 6e8201f57c935 "mmc: core: add the capability
> for broken voltage" to indicate that MMC core should ignore voltage change
> errors reported by the regulators core. This is required to get SDHCI
> working on these boards again after commit ceb6143b2df81c ("mmc: sdhci:
> fix vmmc handling").
>
> Signed-off-by: Marek Szyprowski<m.szyprowski@samsung.com>
> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
> ---
> arch/arm/mach-exynos/mach-nuri.c | 2 ++
> arch/arm/mach-exynos/mach-universal_c210.c | 1 +
> 2 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
> index a6b9162..8c0479f 100644
> --- a/arch/arm/mach-exynos/mach-nuri.c
> +++ b/arch/arm/mach-exynos/mach-nuri.c
> @@ -112,6 +112,7 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data __initdata = {
> .host_caps = (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
> MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
> MMC_CAP_DISABLE | MMC_CAP_ERASE),
> + .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE,
> .cd_type = S3C_SDHCI_CD_PERMANENT,
> };
>
> @@ -151,6 +152,7 @@ static struct s3c_sdhci_platdata nuri_hsmmc2_data __initdata = {
> .host_caps = MMC_CAP_4_BIT_DATA |
> MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
> MMC_CAP_DISABLE,
> + .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE,
> .ext_cd_gpio = EXYNOS4_GPX3(3), /* XEINT_27 */
> .ext_cd_gpio_invert = 1,
> .cd_type = S3C_SDHCI_CD_GPIO,
> diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
> index 6017a21..908624c 100644
> --- a/arch/arm/mach-exynos/mach-universal_c210.c
> +++ b/arch/arm/mach-exynos/mach-universal_c210.c
> @@ -745,6 +745,7 @@ static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = {
> .host_caps = (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
> MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
> MMC_CAP_DISABLE),
> + .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE,
> .cd_type = S3C_SDHCI_CD_PERMANENT,
> };
>
Hi Marek,
If possible, please adding cover letter for patch set(series), I think
these are just independent patches though. Anyway, will apply this.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] ARM: Exynos: fix SDHCI device names in regulator definitions
2012-03-06 10:13 ` Kyungmin Park
@ 2012-03-06 10:20 ` Kukjin Kim
2012-03-06 11:02 ` Kyungmin Park
0 siblings, 1 reply; 11+ messages in thread
From: Kukjin Kim @ 2012-03-06 10:20 UTC (permalink / raw)
To: Kyungmin Park
Cc: Kukjin Kim, Marek Szyprowski, linux-samsung-soc,
Bartlomiej Zolnierkiewicz, Jaehoon Chung, Chris Ball
On 03/06/12 02:13, Kyungmin Park wrote:
> On 3/6/12, Kukjin Kim<kgene.kim@samsung.com> wrote:
>> On 03/01/12 00:40, Marek Szyprowski wrote:
>>> Patch 189eb7407 "ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci
>>> controllers" changed the names of the SDHCI devices, but the author forgot
>>> to update the definitions for the regulator subsystem. This patch fixes
>>> this issue.
>>>
>>> Signed-off-by: Marek Szyprowski<m.szyprowski@samsung.com>
>>> Signed-off-by: Kyungmin Park<kyungmin.park@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 8c0479f..dd26581 100644
>>> --- a/arch/arm/mach-exynos/mach-nuri.c
>>> +++ b/arch/arm/mach-exynos/mach-nuri.c
>>> @@ -117,7 +117,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"),
>>> };
>>>
>>> @@ -417,7 +417,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 908624c..7cd738c 100644
>>> --- a/arch/arm/mach-exynos/mach-universal_c210.c
>>> +++ b/arch/arm/mach-exynos/mach-universal_c210.c
>>> @@ -750,7 +750,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 = {
>>
>> (Cc'ed Jaehoon Chung)
>>
>> Oops, I looked at same patch from Jaehoon Chung just now and it could
>> be. However, including same Signed-off-by from Kyungmin Park, it seems
>> wrong. What's happened in your side?
>
> As your delayed work, we did the same thing from both side.
>
NO! As I remember, there was same case from your side before. My concern
is still how your sign can be added in duplication same patches but
other author?
> Most of all, exynos4-sdhci patchset should contains these change also.
> as wrong merge, it breaks all sdhci support at least exynos4 series.
Wrong merge? what's that?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/3] ARM: Exynos: fix SDHCI caps for UniversalC210 and NURI boards
2012-03-06 10:15 ` Kukjin Kim
@ 2012-03-06 10:31 ` Kukjin Kim
0 siblings, 0 replies; 11+ messages in thread
From: Kukjin Kim @ 2012-03-06 10:31 UTC (permalink / raw)
To: Kukjin Kim
Cc: Marek Szyprowski, linux-samsung-soc, Kyungmin Park,
Bartlomiej Zolnierkiewicz
On 03/06/12 02:15, Kukjin Kim wrote:
> On 03/01/12 00:40, Marek Szyprowski wrote:
>> Add a new quirk (introduced in 6e8201f57c935 "mmc: core: add the
>> capability
>> for broken voltage" to indicate that MMC core should ignore voltage
>> change
>> errors reported by the regulators core. This is required to get SDHCI
>> working on these boards again after commit ceb6143b2df81c ("mmc: sdhci:
>> fix vmmc handling").
>>
>> Signed-off-by: Marek Szyprowski<m.szyprowski@samsung.com>
>> Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com>
>> ---
>> arch/arm/mach-exynos/mach-nuri.c | 2 ++
>> arch/arm/mach-exynos/mach-universal_c210.c | 1 +
>> 2 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-exynos/mach-nuri.c
>> b/arch/arm/mach-exynos/mach-nuri.c
>> index a6b9162..8c0479f 100644
>> --- a/arch/arm/mach-exynos/mach-nuri.c
>> +++ b/arch/arm/mach-exynos/mach-nuri.c
>> @@ -112,6 +112,7 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data
>> __initdata = {
>> .host_caps = (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
>> MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
>> MMC_CAP_DISABLE | MMC_CAP_ERASE),
>> + .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE,
>> .cd_type = S3C_SDHCI_CD_PERMANENT,
>> };
>>
>> @@ -151,6 +152,7 @@ static struct s3c_sdhci_platdata nuri_hsmmc2_data
>> __initdata = {
>> .host_caps = MMC_CAP_4_BIT_DATA |
>> MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
>> MMC_CAP_DISABLE,
>> + .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE,
>> .ext_cd_gpio = EXYNOS4_GPX3(3), /* XEINT_27 */
>> .ext_cd_gpio_invert = 1,
>> .cd_type = S3C_SDHCI_CD_GPIO,
>> diff --git a/arch/arm/mach-exynos/mach-universal_c210.c
>> b/arch/arm/mach-exynos/mach-universal_c210.c
>> index 6017a21..908624c 100644
>> --- a/arch/arm/mach-exynos/mach-universal_c210.c
>> +++ b/arch/arm/mach-exynos/mach-universal_c210.c
>> @@ -745,6 +745,7 @@ static struct s3c_sdhci_platdata
>> universal_hsmmc0_data __initdata = {
>> .host_caps = (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
>> MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
>> MMC_CAP_DISABLE),
>> + .host_caps2 = MMC_CAP2_BROKEN_VOLTAGE,
>> .cd_type = S3C_SDHCI_CD_PERMANENT,
>> };
>>
>
> Hi Marek,
>
> If possible, please adding cover letter for patch set(series), I think
Just kindly ignore above. I found your cover letter :(
> these are just independent patches though. Anyway, will apply this.
>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] ARM: Exynos: fix SDHCI device names in regulator definitions
2012-03-06 10:20 ` Kukjin Kim
@ 2012-03-06 11:02 ` Kyungmin Park
0 siblings, 0 replies; 11+ messages in thread
From: Kyungmin Park @ 2012-03-06 11:02 UTC (permalink / raw)
To: Kukjin Kim
Cc: Marek Szyprowski, linux-samsung-soc, Bartlomiej Zolnierkiewicz,
Jaehoon Chung, Chris Ball
On 3/6/12, Kukjin Kim <kgene.kim@samsung.com> wrote:
> On 03/06/12 02:13, Kyungmin Park wrote:
>> On 3/6/12, Kukjin Kim<kgene.kim@samsung.com> wrote:
>>> On 03/01/12 00:40, Marek Szyprowski wrote:
>>>> Patch 189eb7407 "ARM: EXYNOS: use 'exynos4-sdhci' as device name for
>>>> sdhci
>>>> controllers" changed the names of the SDHCI devices, but the author
>>>> forgot
>>>> to update the definitions for the regulator subsystem. This patch fixes
>>>> this issue.
>>>>
>>>> Signed-off-by: Marek Szyprowski<m.szyprowski@samsung.com>
>>>> Signed-off-by: Kyungmin Park<kyungmin.park@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 8c0479f..dd26581 100644
>>>> --- a/arch/arm/mach-exynos/mach-nuri.c
>>>> +++ b/arch/arm/mach-exynos/mach-nuri.c
>>>> @@ -117,7 +117,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"),
>>>> };
>>>>
>>>> @@ -417,7 +417,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 908624c..7cd738c 100644
>>>> --- a/arch/arm/mach-exynos/mach-universal_c210.c
>>>> +++ b/arch/arm/mach-exynos/mach-universal_c210.c
>>>> @@ -750,7 +750,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 = {
>>>
>>> (Cc'ed Jaehoon Chung)
>>>
>>> Oops, I looked at same patch from Jaehoon Chung just now and it could
>>> be. However, including same Signed-off-by from Kyungmin Park, it seems
>>> wrong. What's happened in your side?
>>
>> As your delayed work, we did the same thing from both side.
>>
> NO! As I remember, there was same case from your side before. My concern
> is still how your sign can be added in duplication same patches but
> other author?
>
>> Most of all, exynos4-sdhci patchset should contains these change also.
>> as wrong merge, it breaks all sdhci support at least exynos4 series.
>
> Wrong merge? what's that?
That's problem. you don't know what you did. Did you test the
exynos4-sdhci patchset from Thomas?
and think why this patch is required.
>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim@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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-03-06 11:02 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-01 8:40 [PATCH 0/3] Universal C210 and NURI board fixes Marek Szyprowski
2012-03-01 8:40 ` [PATCH 1/3] ARM: Exynos: fix SDHCI caps for UniversalC210 and NURI boards Marek Szyprowski
2012-03-06 10:15 ` Kukjin Kim
2012-03-06 10:31 ` Kukjin Kim
2012-03-01 8:40 ` [PATCH 2/3] ARM: Exynos: fix SDHCI device names in regulator definitions Marek Szyprowski
2012-03-06 10:06 ` Kukjin Kim
2012-03-06 10:13 ` Kyungmin Park
2012-03-06 10:20 ` Kukjin Kim
2012-03-06 11:02 ` Kyungmin Park
2012-03-01 8:40 ` [PATCH 3/3] ARM: Exynos: fix touchscreen IRQ setup on Universal C210 board Marek Szyprowski
2012-03-06 10:08 ` Kukjin Kim
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.