From: Arnd Bergmann <arnd@arndb.de>
To: Tony Lindgren <tony@atomide.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
Nicolas Pitre <nico@fluxnic.net>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [GIT PULL] omap twl cleanup for v3.1 merge window
Date: Fri, 8 Jul 2011 17:41:23 +0200 [thread overview]
Message-ID: <201107081741.23425.arnd@arndb.de> (raw)
In-Reply-To: <20110708130102.GB5783@atomide.com>
On Friday 08 July 2011, Tony Lindgren wrote:
>
>I've attached a conflict resolution patch too, it's trivial execpt
>note that .vdac needs to be removed in board-rx51-peripherals.c.
>
>If this conflict causes problems for you, I can also base this series
>on omap/board.
The conflict resolution you suggested doesn't build here:
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@@ -572,75 -395,10 +509,62 @@@ static struct regulator_init_data sdp44
> },
> };
>
> +static struct regulator_init_data sdp4430_vana = {
> + .constraints = {
> + .min_uV = 2100000,
> + .max_uV = 2100000,
> + .valid_modes_mask = REGULATOR_MODE_NORMAL
> + | REGULATOR_MODE_STANDBY,
> + .valid_ops_mask = REGULATOR_CHANGE_MODE
> + | REGULATOR_CHANGE_STATUS,
> + },
> +};
> +
> +static struct regulator_init_data sdp4430_vcxio = {
> + .constraints = {
> + .min_uV = 1800000,
> + .max_uV = 1800000,
> + .valid_modes_mask = REGULATOR_MODE_NORMAL
> + | REGULATOR_MODE_STANDBY,
> + .valid_ops_mask = REGULATOR_CHANGE_MODE
> + | REGULATOR_CHANGE_STATUS,
> + },
> +};
> +
> +static struct regulator_init_data sdp4430_vdac = {
> + .constraints = {
> + .min_uV = 1800000,
> + .max_uV = 1800000,
> + .valid_modes_mask = REGULATOR_MODE_NORMAL
> + | REGULATOR_MODE_STANDBY,
> + .valid_ops_mask = REGULATOR_CHANGE_MODE
> + | REGULATOR_CHANGE_STATUS,
> + },
> +};
> +
> +static struct regulator_init_data sdp4430_vusb = {
> + .constraints = {
> + .min_uV = 3300000,
> + .max_uV = 3300000,
> + .apply_uV = true,
> + .valid_modes_mask = REGULATOR_MODE_NORMAL
> + | REGULATOR_MODE_STANDBY,
> + .valid_ops_mask = REGULATOR_CHANGE_MODE
> + | REGULATOR_CHANGE_STATUS,
> + },
> +};
> +
> +static struct regulator_init_data sdp4430_clk32kg = {
> + .constraints = {
> + .valid_ops_mask = REGULATOR_CHANGE_STATUS,
> + .always_on = true,
> + },
> +};
These are removed in the cleanup series, but changed in the fixes branch,
now the removal is undone
> static struct twl4030_platform_data sdp4430_twldata = {
> - .irq_base = TWL6030_IRQ_BASE,
> - .irq_end = TWL6030_IRQ_END,
> -
> /* Regulators */
> - .vmmc = &sdp4430_vmmc,
> - .vpp = &sdp4430_vpp,
> .vusim = &sdp4430_vusim,
> - .vana = &sdp4430_vana,
> - .vcxio = &sdp4430_vcxio,
> - .vdac = &sdp4430_vdac,
> - .vusb = &sdp4430_vusb,
> .vaux1 = &sdp4430_vaux1,
> - .vaux2 = &sdp4430_vaux2,
> - .vaux3 = &sdp4430_vaux3,
> - .clk32kg = &sdp4430_clk32kg,
> - .usb = &omap4_usbphy_data
> };
>
but the references remain.
I tried a different path, but then got
arch/arm/mach-omap2/board-4430sdp.c:406:41: warning: 'sdp4430_vmmc_supply' defined but not used [-Wunused-variable]
Should that variable be removed or kept referenced?
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] omap twl cleanup for v3.1 merge window
Date: Fri, 8 Jul 2011 17:41:23 +0200 [thread overview]
Message-ID: <201107081741.23425.arnd@arndb.de> (raw)
In-Reply-To: <20110708130102.GB5783@atomide.com>
On Friday 08 July 2011, Tony Lindgren wrote:
>
>I've attached a conflict resolution patch too, it's trivial execpt
>note that .vdac needs to be removed in board-rx51-peripherals.c.
>
>If this conflict causes problems for you, I can also base this series
>on omap/board.
The conflict resolution you suggested doesn't build here:
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@@ -572,75 -395,10 +509,62 @@@ static struct regulator_init_data sdp44
> },
> };
>
> +static struct regulator_init_data sdp4430_vana = {
> + .constraints = {
> + .min_uV = 2100000,
> + .max_uV = 2100000,
> + .valid_modes_mask = REGULATOR_MODE_NORMAL
> + | REGULATOR_MODE_STANDBY,
> + .valid_ops_mask = REGULATOR_CHANGE_MODE
> + | REGULATOR_CHANGE_STATUS,
> + },
> +};
> +
> +static struct regulator_init_data sdp4430_vcxio = {
> + .constraints = {
> + .min_uV = 1800000,
> + .max_uV = 1800000,
> + .valid_modes_mask = REGULATOR_MODE_NORMAL
> + | REGULATOR_MODE_STANDBY,
> + .valid_ops_mask = REGULATOR_CHANGE_MODE
> + | REGULATOR_CHANGE_STATUS,
> + },
> +};
> +
> +static struct regulator_init_data sdp4430_vdac = {
> + .constraints = {
> + .min_uV = 1800000,
> + .max_uV = 1800000,
> + .valid_modes_mask = REGULATOR_MODE_NORMAL
> + | REGULATOR_MODE_STANDBY,
> + .valid_ops_mask = REGULATOR_CHANGE_MODE
> + | REGULATOR_CHANGE_STATUS,
> + },
> +};
> +
> +static struct regulator_init_data sdp4430_vusb = {
> + .constraints = {
> + .min_uV = 3300000,
> + .max_uV = 3300000,
> + .apply_uV = true,
> + .valid_modes_mask = REGULATOR_MODE_NORMAL
> + | REGULATOR_MODE_STANDBY,
> + .valid_ops_mask = REGULATOR_CHANGE_MODE
> + | REGULATOR_CHANGE_STATUS,
> + },
> +};
> +
> +static struct regulator_init_data sdp4430_clk32kg = {
> + .constraints = {
> + .valid_ops_mask = REGULATOR_CHANGE_STATUS,
> + .always_on = true,
> + },
> +};
These are removed in the cleanup series, but changed in the fixes branch,
now the removal is undone
> static struct twl4030_platform_data sdp4430_twldata = {
> - .irq_base = TWL6030_IRQ_BASE,
> - .irq_end = TWL6030_IRQ_END,
> -
> /* Regulators */
> - .vmmc = &sdp4430_vmmc,
> - .vpp = &sdp4430_vpp,
> .vusim = &sdp4430_vusim,
> - .vana = &sdp4430_vana,
> - .vcxio = &sdp4430_vcxio,
> - .vdac = &sdp4430_vdac,
> - .vusb = &sdp4430_vusb,
> .vaux1 = &sdp4430_vaux1,
> - .vaux2 = &sdp4430_vaux2,
> - .vaux3 = &sdp4430_vaux3,
> - .clk32kg = &sdp4430_clk32kg,
> - .usb = &omap4_usbphy_data
> };
>
but the references remain.
I tried a different path, but then got
arch/arm/mach-omap2/board-4430sdp.c:406:41: warning: 'sdp4430_vmmc_supply' defined but not used [-Wunused-variable]
Should that variable be removed or kept referenced?
Arnd
next prev parent reply other threads:[~2011-07-08 15:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-08 13:01 [GIT PULL] omap twl cleanup for v3.1 merge window Tony Lindgren
2011-07-08 13:01 ` Tony Lindgren
2011-07-08 15:41 ` Arnd Bergmann [this message]
2011-07-08 15:41 ` Arnd Bergmann
2011-07-10 6:55 ` Tony Lindgren
2011-07-10 6:55 ` Tony Lindgren
2011-07-10 10:17 ` Tony Lindgren
2011-07-10 10:17 ` Tony Lindgren
2011-07-10 19:50 ` Tony Lindgren
2011-07-10 19:50 ` Tony Lindgren
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=201107081741.23425.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=tglx@linutronix.de \
--cc=tony@atomide.com \
/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 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.