Merge tag 'omap-for-v3.11/board-signed' of git://git.kernel.org/pub/scm/linux/kernel...

From Tony Lindgren:

Minor board changes for v3.11 merge window. These are
tapering down finally as we're getting closer to making
omap2+ DT only.

* tag 'omap-for-v3.11/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV
  ARM: OMAP1: nokia770: enable Tahvo
  ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN
  arm: omap: board-overo: reset GPIO for SMSC911x

Signed-off-by: Arnd Bergmann <[email protected]>

diff --combined arch/arm/mach-kirkwood/board-ts219.c
index 10fb3974de5a4dcaa1001701f1cdfff45b7edd3f,4695d5f35fc937dc6eab658fc979d5ee2ecef721..860f44ab457d4f5b1857028da93bf58c56fd2f05
--- 1/arch/arm/mach-kirkwood/board-ts219.c
--- 2/arch/arm/mach-kirkwood/board-ts219.c
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@@ -23,6 -23,7 +23,6 @@@
  #include <asm/mach/arch.h>
  #include <mach/kirkwood.h>
  #include "common.h"
 -#include "tsx1x-common.h"
  
  static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
@@@ -37,14 -38,6 +37,4 @@@ void __init qnap_dt_ts219_init(void
                qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
  
        kirkwood_ge00_init(&qnap_ts219_ge00_data);
 -
 -      pm_power_off = qnap_tsx1x_power_off;
  }
- 
- /* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
- static int __init ts219_pci_init(void)
- {
-       if (machine_is_ts219())
-               kirkwood_pcie_init(KW_PCIE0);
- 
-       return 0;
- }
- subsys_initcall(ts219_pci_init);

diff --combined arch/arm/mach-ux500/board-mop500-regulators.c
index b34441bf8929b45717ba27376e44c8b7aca7d2ae,d6b7c8556fa1a79b4bcc0d4d735a1ed88ee24c4f..0dc44c6834273ecf915b7a6a920db3bc6b565aa4
--- 1/arch/arm/mach-ux500/board-mop500-regulators.c
--- 2/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@@ -374,6 -374,7 +374,7 @@@ static struct ab8500_regulator_reg_ini
  static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
        /* supplies to the display/camera */
        [AB8500_LDO_AUX1] = {
+               .supply_regulator = "ab8500-ext-supply3",
                .constraints = {
                        .name = "V-DISPLAY",
                        .min_uV = 2800000,
@@@ -387,6 -388,7 +388,7 @@@
        },
        /* supplies to the on-board eMMC */
        [AB8500_LDO_AUX2] = {
+               .supply_regulator = "ab8500-ext-supply3",
                .constraints = {
                        .name = "V-eMMC1",
                        .min_uV = 1100000,
@@@ -402,6 -404,7 +404,7 @@@
        },
        /* supply for VAUX3, supplies to SDcard slots */
        [AB8500_LDO_AUX3] = {
+               .supply_regulator = "ab8500-ext-supply3",
                .constraints = {
                        .name = "V-MMC-SD",
                        .min_uV = 1100000,
@@@ -996,6 -999,7 +999,6 @@@ struct ab8500_regulator_platform_data a
        .num_ext_regulator      = ARRAY_SIZE(ab8500_ext_regulators),
  };
  
 -/* Use the AB8500 init settings for AB8505 as they are the same right now */
  struct ab8500_regulator_platform_data ab8505_regulator_plat_data = {
        .reg_init               = ab8505_reg_init,
        .num_reg_init           = ARRAY_SIZE(ab8505_reg_init),