From: kgene.kim@samsung•com (Kukjin Kim)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
Date: Wed, 07 Mar 2012 05:19:47 -0800 [thread overview]
Message-ID: <4F576073.6010001@samsung.com> (raw)
In-Reply-To: <4F55DE1F.9010405@samsung.com>
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 Chung<jh80.chung@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.chung@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 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.abraham@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.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2012-03-07 13:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4F45D343.6020409@samsung.com>
[not found] ` <CAJuYYwTh8tVdA0X-TLEU-9O_M0_PmJR=i3WYAQXsaRcPF3MbJA@mail.gmail.com>
2012-03-06 2:29 ` [PATCH] ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci Jaehoon Chung
2012-03-06 9:51 ` Kukjin Kim
2012-03-07 13:19 ` Kukjin Kim [this message]
2012-03-07 14:01 ` Marek Szyprowski
2012-03-07 15:54 ` Kukjin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F576073.6010001@samsung.com \
--to=kgene.kim@samsung$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox