Merge branch 'next-samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel...
Arnd Bergmann [Thu, 21 Jul 2011 14:31:22 +0000 (16:31 +0200)]
1  2 
arch/arm/Kconfig
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap2/board-rx51-peripherals.c

diff --combined arch/arm/Kconfig
@@@ -682,6 -682,7 +682,7 @@@ config ARCH_S3C241
        select GENERIC_GPIO
        select ARCH_HAS_CPUFREQ
        select HAVE_CLK
+       select CLKDEV_LOOKUP
        select ARCH_USES_GETTIMEOFFSET
        select HAVE_S3C2410_I2C if I2C
        help
@@@ -699,6 -700,7 +700,7 @@@ config ARCH_S3C64X
        select CPU_V6
        select ARM_VIC
        select HAVE_CLK
+       select CLKDEV_LOOKUP
        select NO_IOPORT
        select ARCH_USES_GETTIMEOFFSET
        select ARCH_HAS_CPUFREQ
@@@ -723,6 -725,8 +725,8 @@@ config ARCH_S5P64X
        select CPU_V6
        select GENERIC_GPIO
        select HAVE_CLK
+       select CLKDEV_LOOKUP
+       select CLKSRC_MMIO
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select GENERIC_CLOCKEVENTS
        select HAVE_SCHED_CLOCK
@@@ -736,6 -740,7 +740,7 @@@ config ARCH_S5PC10
        bool "Samsung S5PC100"
        select GENERIC_GPIO
        select HAVE_CLK
+       select CLKDEV_LOOKUP
        select CPU_V7
        select ARM_L1_CACHE_SHIFT_6
        select ARCH_USES_GETTIMEOFFSET
@@@ -751,6 -756,8 +756,8 @@@ config ARCH_S5PV21
        select ARCH_SPARSEMEM_ENABLE
        select GENERIC_GPIO
        select HAVE_CLK
+       select CLKDEV_LOOKUP
+       select CLKSRC_MMIO
        select ARM_L1_CACHE_SHIFT_6
        select ARCH_HAS_CPUFREQ
        select GENERIC_CLOCKEVENTS
@@@ -767,6 -774,7 +774,7 @@@ config ARCH_EXYNOS
        select ARCH_SPARSEMEM_ENABLE
        select GENERIC_GPIO
        select HAVE_CLK
+       select CLKDEV_LOOKUP
        select ARCH_HAS_CPUFREQ
        select GENERIC_CLOCKEVENTS
        select HAVE_S3C_RTC if RTC_CLASS
@@@ -852,7 -860,6 +860,7 @@@ config ARCH_OMA
        select HAVE_CLK
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_HAS_CPUFREQ
 +      select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
        select HAVE_SCHED_CLOCK
        select ARCH_HAS_HOLES_MEMORYMODEL
@@@ -138,7 -138,7 +138,7 @@@ void ams_delta_latch2_write(u16 mask, u
  static void __init ams_delta_init_irq(void)
  {
        omap1_init_common_hw();
 -      omap_init_irq();
 +      omap1_init_irq();
  }
  
  static struct map_desc ams_delta_io_desc[] __initdata = {
@@@ -215,7 -215,7 +215,7 @@@ static struct omap_kp_platform_data ams
        .delay          = 9,
  };
  
- static struct platform_device ams_delta_kp_device __initdata = {
+ static struct platform_device ams_delta_kp_device = {
        .name           = "omap-keypad",
        .id             = -1,
        .dev            = {
        .resource       = ams_delta_kp_resources,
  };
  
- static struct platform_device ams_delta_lcd_device __initdata = {
+ static struct platform_device ams_delta_lcd_device = {
        .name   = "lcd_ams_delta",
        .id     = -1,
  };
  
- static struct platform_device ams_delta_led_device __initdata = {
+ static struct platform_device ams_delta_led_device = {
        .name   = "ams-delta-led",
        .id     = -1
  };
@@@ -267,7 -267,7 +267,7 @@@ static struct soc_camera_link ams_delta
        .power          = ams_delta_camera_power,
  };
  
- static struct platform_device ams_delta_camera_device __initdata = {
+ static struct platform_device ams_delta_camera_device = {
        .name   = "soc-camera-pdrv",
        .id     = 0,
        .dev    = {
@@@ -391,7 -391,7 +391,7 @@@ MACHINE_START(AMS_DELTA, "Amstrad E3 (D
        .reserve        = omap_reserve,
        .init_irq       = ams_delta_init_irq,
        .init_machine   = ams_delta_init,
 -      .timer          = &omap_timer,
 +      .timer          = &omap1_timer,
  MACHINE_END
  
  EXPORT_SYMBOL(ams_delta_latch1_write);
@@@ -288,6 -288,10 +288,6 @@@ static struct twl4030_keypad_data rx51_
        .rep            = 1,
  };
  
 -static struct twl4030_madc_platform_data rx51_madc_data = {
 -      .irq_line               = 1,
 -};
 -
  /* Enable input logic and pull all lines up when eMMC is on. */
  static struct omap_board_mux rx51_mmc2_on_mux[] = {
        OMAP3_MUX(SDMMC2_CMD, OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),
@@@ -354,17 -358,14 +354,17 @@@ static struct omap2_hsmmc_info mmc[] __
        {}      /* Terminator */
  };
  
 -static struct regulator_consumer_supply rx51_vmmc1_supply =
 -      REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0");
 +static struct regulator_consumer_supply rx51_vmmc1_supply[] = {
 +      REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
 +};
  
 -static struct regulator_consumer_supply rx51_vaux3_supply =
 -      REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1");
 +static struct regulator_consumer_supply rx51_vaux3_supply[] = {
 +      REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
 +};
  
 -static struct regulator_consumer_supply rx51_vsim_supply =
 -      REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1");
 +static struct regulator_consumer_supply rx51_vsim_supply[] = {
 +      REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1"),
 +};
  
  static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
        /* tlv320aic3x analog supplies */
@@@ -394,6 -395,10 +394,6 @@@ static struct regulator_consumer_suppl
        REGULATOR_SUPPLY("vdd", "2-0063"),
  };
  
 -static struct regulator_consumer_supply rx51_vdac_supply[] = {
 -      REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"),
 -};
 -
  static struct regulator_init_data rx51_vaux1 = {
        .constraints = {
                .name                   = "V28",
@@@ -447,8 -452,8 +447,8 @@@ static struct regulator_init_data rx51_
                                        | REGULATOR_CHANGE_MODE
                                        | REGULATOR_CHANGE_STATUS,
        },
 -      .num_consumer_supplies  = 1,
 -      .consumer_supplies      = &rx51_vaux3_supply,
 +      .num_consumer_supplies  = ARRAY_SIZE(rx51_vaux3_supply),
 +      .consumer_supplies      = rx51_vaux3_supply,
  };
  
  static struct regulator_init_data rx51_vaux4 = {
@@@ -474,8 -479,8 +474,8 @@@ static struct regulator_init_data rx51_
                                        | REGULATOR_CHANGE_MODE
                                        | REGULATOR_CHANGE_STATUS,
        },
 -      .num_consumer_supplies  = 1,
 -      .consumer_supplies      = &rx51_vmmc1_supply,
 +      .num_consumer_supplies  = ARRAY_SIZE(rx51_vmmc1_supply),
 +      .consumer_supplies      = rx51_vmmc1_supply,
  };
  
  static struct regulator_init_data rx51_vmmc2 = {
@@@ -506,8 -511,23 +506,8 @@@ static struct regulator_init_data rx51_
                .valid_ops_mask         = REGULATOR_CHANGE_MODE
                                        | REGULATOR_CHANGE_STATUS,
        },
 -      .num_consumer_supplies  = 1,
 -      .consumer_supplies      = &rx51_vsim_supply,
 -};
 -
 -static struct regulator_init_data rx51_vdac = {
 -      .constraints = {
 -              .name                   = "VDAC",
 -              .min_uV                 = 1800000,
 -              .max_uV                 = 1800000,
 -              .apply_uV               = true,
 -              .valid_modes_mask       = REGULATOR_MODE_NORMAL
 -                                      | REGULATOR_MODE_STANDBY,
 -              .valid_ops_mask         = REGULATOR_CHANGE_MODE
 -                                      | REGULATOR_CHANGE_STATUS,
 -      },
 -      .num_consumer_supplies  = 1,
 -      .consumer_supplies      = rx51_vdac_supply,
 +      .num_consumer_supplies  = ARRAY_SIZE(rx51_vsim_supply),
 +      .consumer_supplies      = rx51_vsim_supply,
  };
  
  static struct regulator_init_data rx51_vio = {
@@@ -538,7 -558,7 +538,7 @@@ static struct radio_si4713_platform_dat
        .subdev_board_info = &rx51_si4713_board_info,
  };
  
- static struct platform_device rx51_si4713_dev __initdata_or_module = {
+ static struct platform_device rx51_si4713_dev = {
        .name   = "radio-si4713",
        .id     = -1,
        .dev    = {
@@@ -580,6 -600,10 +580,6 @@@ static struct twl4030_gpio_platform_dat
        .setup                  = rx51_twlgpio_setup,
  };
  
 -static struct twl4030_usb_data rx51_usb_data = {
 -      .usb_mode               = T2_USB_MODE_ULPI,
 -};
 -
  static struct twl4030_ins sleep_on_seq[] __initdata = {
  /*
   * Turn off everything
@@@ -751,9 -775,14 +751,9 @@@ struct twl4030_codec_data rx51_codec_da
  };
  
  static struct twl4030_platform_data rx51_twldata __initdata = {
        /* platform_data for children goes here */
        .gpio                   = &rx51_gpio_data,
        .keypad                 = &rx51_kp_data,
 -      .madc                   = &rx51_madc_data,
 -      .usb                    = &rx51_usb_data,
        .power                  = &rx51_t2scripts_data,
        .codec                  = &rx51_codec_data,
  
        .vaux4                  = &rx51_vaux4,
        .vmmc1                  = &rx51_vmmc1,
        .vsim                   = &rx51_vsim,
 -      .vdac                   = &rx51_vdac,
        .vio                    = &rx51_vio,
  };
  
@@@ -817,13 -847,6 +817,13 @@@ static int __init rx51_i2c_init(void
                rx51_twldata.vaux3 = &rx51_vaux3_cam;
        }
        rx51_twldata.vmmc2 = &rx51_vmmc2;
 +      omap3_pmic_get_config(&rx51_twldata,
 +                      TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_MADC,
 +                      TWL_COMMON_REGULATOR_VDAC);
 +
 +      rx51_twldata.vdac->constraints.apply_uV = true;
 +      rx51_twldata.vdac->constraints.name = "VDAC";
 +
        omap_pmic_init(1, 2200, "twl5030", INT_34XX_SYS_NIRQ, &rx51_twldata);
        omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2,
                              ARRAY_SIZE(rx51_peripherals_i2c_board_info_2));