Skip to contentSkip to conversation

omap twl cleanup for v3.1 merge window

GIT PULL Tony Lindgren 2 participants 5 messages Jul 8, 2011 – Jul 10, 2011

lore
Share & tools
lore
#0 lore raw

Hi Arnd,

Please pull TWL cleanup from:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git cleanup-part-2

This can be pulled into your omap/cleanup. It will cause a minor merge conflict with omap/board.

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.

Regards,

Tony

The following changes since commit 48cb1258e8b0f8c81cfb699b42326c5b2147b3f8:
Tony Lindgren (1):
Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-cleanup

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git cleanup-part-2

Jarkko Nikula (2):
omap: mcbsp: Remove rx_/tx_word_length variables
omap: mcbsp: Remove port number enums

Peter Ujfalusi (4):
OMAP: New twl-common for common TWL configuration
OMAP4: Move common twl6030 configuration to twl-common
OMAP3: Move common twl configuration to twl-common
OMAP3: Move common regulator configuration to twl-common

Tony Lindgren (1):
Merge branch 'peter/topic/for-tony_mach-cleanup' of git://gitorious.org/omap-audio/linux-audio into cleanup-part-2

 arch/arm/mach-omap1/mcbsp.c                  |    4 +-
 arch/arm/mach-omap2/Makefile                 |    2 +-
 arch/arm/mach-omap2/board-3430sdp.c          |   89 +-------
 arch/arm/mach-omap2/board-4430sdp.c          |  141 +-----------
 arch/arm/mach-omap2/board-cm-t35.c           |   51 +----
 arch/arm/mach-omap2/board-devkit8000.c       |   38 +---
 arch/arm/mach-omap2/board-igep0020.c         |   44 +---
 arch/arm/mach-omap2/board-ldp.c              |   15 +-
 arch/arm/mach-omap2/board-omap3beagle.c      |   62 +-----
 arch/arm/mach-omap2/board-omap3evm.c         |   70 +------
 arch/arm/mach-omap2/board-omap3pandora.c     |   62 +-----
 arch/arm/mach-omap2/board-omap3stalker.c     |   72 +------
 arch/arm/mach-omap2/board-omap3touchbook.c   |   61 +----
 arch/arm/mach-omap2/board-omap4panda.c       |  146 +-----------
 arch/arm/mach-omap2/board-overo.c            |   61 +-----
 arch/arm/mach-omap2/board-rm680.c            |    8 +-
 arch/arm/mach-omap2/board-rx51-peripherals.c |   40 +---
 arch/arm/mach-omap2/board-zoom-peripherals.c |   89 +-------
 arch/arm/mach-omap2/common-board-devices.c   |   21 --
 arch/arm/mach-omap2/common-board-devices.h   |   26 +--
 arch/arm/mach-omap2/twl-common.c             |  304 ++++++++++++++++++++++++++
 arch/arm/mach-omap2/twl-common.h             |   59 +++++
 arch/arm/plat-omap/include/plat/mcbsp.h      |   12 +-
 arch/arm/plat-omap/mcbsp.c                   |    3 -
 24 files changed, 492 insertions(+), 988 deletions(-)
 create mode 100644 arch/arm/mach-omap2/twl-common.c
 create mode 100644 arch/arm/mach-omap2/twl-common.h

-------------- next part --------------
A non-text attachment was scrubbed...
Name: resolve.patch
Type: text/x-diff
Size: 2584 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110708/a96bac57/attachment.bin>

#1 lore raw
Quoted 6 lines · Tony Lindgren

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:

Quoted 47 lines
arch/arm/mach-omap2/board-4430sdp.c +0 -0
@@@ -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

arch/arm/mach-omap2/board-4430sdp.c

Quoted 10 lines
arch/arm/mach-omap2/board-4430sdp.c +0 -0
 +                                      | 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

Quoted 9 lines
  static struct twl4030_platform_data sdp4430_twldata = {
arch/arm/mach-omap2/board-4430sdp.c +0 -5
-       .irq_base       = TWL6030_IRQ_BASE,
-       .irq_end        = TWL6030_IRQ_END,
- 
        /* Regulators */
-       .vmmc           = &sdp4430_vmmc,
-       .vpp            = &sdp4430_vpp,
        .vusim          = &sdp4430_vusim,

arch/arm/mach-omap2/board-4430sdp.c

Quoted 10 lines
arch/arm/mach-omap2/board-4430sdp.c +0 -8
-       .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

#2 lore raw
Quoted 9 lines · Arnd Bergmann
Quoted 6 lines · Tony Lindgren

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:

...

Quoted 3 lines

These are removed in the cleanup series, but changed in the fixes branch, now the removal is undone

Hmm these are added in omap/board. Maybe the issue is caused by not merging omap/board also?

Quoted 5 lines

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?

That's added in omap/board. I think the resolution I posted should work if you merge omap/cleanup omap/fixes and omap/board into your master branch.

Or maybe I'm missing something. If you want, I can try out your merge here too.

Regards,

Tony

#3 lore raw
Quoted 10 lines · Tony Lindgren
Quoted 9 lines · Arnd Bergmann
Quoted 6 lines · Tony Lindgren

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:

Quoted 8 lines

...

Quoted 3 lines

These are removed in the cleanup series, but changed in the fixes branch, now the removal is undone

Hmm these are added in omap/board. Maybe the issue is caused by not merging omap/board also?

Looks like what got added in in omap/board should now work with the TWL default values in twl-common.c. So most likely those can just be dropped. Will check that today.

Regards,

Tony

#4 lore raw
Quoted 17 lines · Tony Lindgren
Quoted 16 lines · Tony Lindgren
Quoted 9 lines · Arnd Bergmann
Quoted 6 lines · Tony Lindgren

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:

...

Quoted 3 lines

These are removed in the cleanup series, but changed in the fixes branch, now the removal is undone

Quoted 6 lines
Quoted 2 lines

Hmm these are added in omap/board. Maybe the issue is caused by not merging omap/board also?

Looks like what got added in in omap/board should now work with the TWL default values in twl-common.c. So most likely those can just be dropped. Will check that today.

Yes most of it can be dropped for 4430sdp, but the merge is a pain.

I've merged cleanup-part-2 into my devel-board so if you pull that into your omap/board, and merge omap/board into your master branch things should be sorted out. The updated devel-board is at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-board

The new top commit at 1ad920556f32a5a127397ca461d1a1faaf22c4e0.

As omap/board already depends on omap/cleanup, this does not cause new dependency issues. I've also added the resolve patch below.

Regards,

Tony

--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -411,41 -324,6 +403,37 @@@ static struct regulator_consumer_suppl
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
};

- static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {
- REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
- };
-
+static struct regulator_consumer_supply omap4_sdp4430_vmmc5_supply = {
+ .supply = "vmmc",
+ .dev_name = "omap_hsmmc.4",
+};
+
+static struct regulator_init_data sdp4430_vmmc5 = {
+ .constraints = {
+ .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+ },
+ .num_consumer_supplies = 1,
+ .consumer_supplies = &omap4_sdp4430_vmmc5_supply,
+};
+
+static struct fixed_voltage_config sdp4430_vwlan = {
+ .supply_name = "vwl1271",
+ .microvolts = 1800000, /* 1.8V */
+ .gpio = GPIO_WIFI_PMENA,
+ .startup_delay = 70000, /* 70msec */
+ .enable_high = 1,
+ .enabled_at_boot = 0,
+ .init_data = &sdp4430_vmmc5,
+};
+
+static struct platform_device omap_vwlan_device = {
+ .name = "reg-fixed-voltage",
+ .id = 1,
+ .dev = {
+ .platform_data = &sdp4430_vwlan,
+ },
+};
+
static int omap4_twl6030_hsmmc_late_init(struct device *dev) {
int ret = 0;
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -916,13 -761,7 +884,12 @@@ static struct twl4030_platform_data rx5
.vaux2 = &rx51_vaux2,
.vaux4 = &rx51_vaux4,
.vmmc1 = &rx51_vmmc1,
+ .vpll1 = &rx51_vpll1,
+ .vpll2 = &rx51_vpll2,
.vsim = &rx51_vsim,
- .vdac = &rx51_vdac,
+ .vintana1 = &rx51_vintana1,
+ .vintana2 = &rx51_vintana2,
+ .vintdig = &rx51_vintdig,
.vio = &rx51_vio,
};