From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH for 2.6.38] ARM: S5PC110: update max8998_platform_data
Date: Fri, 18 Feb 2011 18:18:58 +0900 [thread overview]
Message-ID: <020f01cbcf4c$df47f450$9dd7dcf0$%kim@samsung.com> (raw)
In-Reply-To: <1297760464-7639-1-git-send-email-m.szyprowski@samsung.com>
Marek Szyprowski wrote:
>
> Max8998 PMIC driver's platform data has been changed once again in
> commit 735a3d9efdc. This patch fixes build break caused by that commit.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
> arch/arm/mach-s5pv210/mach-aquila.c | 9 ++++++---
> arch/arm/mach-s5pv210/mach-goni.c | 9 ++++++---
> 2 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-
> s5pv210/mach-aquila.c
> index 461aa035..1236e19 100644
> --- a/arch/arm/mach-s5pv210/mach-aquila.c
> +++ b/arch/arm/mach-s5pv210/mach-aquila.c
> @@ -381,9 +381,12 @@ static struct max8998_platform_data
aquila_max8998_pdata
> = {
> .buck1_set1 = S5PV210_GPH0(3),
> .buck1_set2 = S5PV210_GPH0(4),
> .buck2_set3 = S5PV210_GPH0(5),
> - .buck1_max_voltage1 = 1200000,
> - .buck1_max_voltage2 = 1200000,
> - .buck2_max_voltage = 1200000,
> + .buck1_voltage1 = 1200000,
> + .buck1_voltage2 = 1200000,
> + .buck1_voltage3 = 1200000,
> + .buck1_voltage4 = 1200000,
> + .buck2_voltage1 = 1200000,
> + .buck2_voltage2 = 1200000,
> };
> #endif
>
> diff --git a/arch/arm/mach-s5pv210/mach-goni.c
b/arch/arm/mach-s5pv210/mach-
> goni.c
> index e22d511..2beeb66 100644
> --- a/arch/arm/mach-s5pv210/mach-goni.c
> +++ b/arch/arm/mach-s5pv210/mach-goni.c
> @@ -521,9 +521,12 @@ static struct max8998_platform_data
goni_max8998_pdata =
> {
> .buck1_set1 = S5PV210_GPH0(3),
> .buck1_set2 = S5PV210_GPH0(4),
> .buck2_set3 = S5PV210_GPH0(5),
> - .buck1_max_voltage1 = 1200000,
> - .buck1_max_voltage2 = 1200000,
> - .buck2_max_voltage = 1200000,
> + .buck1_voltage1 = 1200000,
> + .buck1_voltage2 = 1200000,
> + .buck1_voltage3 = 1200000,
> + .buck1_voltage4 = 1200000,
> + .buck2_voltage1 = 1200000,
> + .buck2_voltage2 = 1200000,
> };
> #endif
>
> --
Ok, applied into s5p-fixes-for-linus for 38.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
prev parent reply other threads:[~2011-02-18 9:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-15 9:01 [PATCH for 2.6.38] ARM: S5PC110: update max8998_platform_data Marek Szyprowski
2011-02-18 9:18 ` Kukjin Kim [this message]
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='020f01cbcf4c$df47f450$9dd7dcf0$%kim@samsung.com' \
--to=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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