Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (113 commits)
  omap4: Add support for i2c init
  omap: Fix i2c platform init code for omap4
  OMAP2 clock: fix recursive spinlock attempt when CONFIG_CPU_FREQ=y
  OMAP powerdomain, hwmod, omap_device: add some credits
  OMAP4 powerdomain: Support LOWPOWERSTATECHANGE for powerdomains
  OMAP3 clock: add support for setting the divider for sys_clkout2 using clk_set_rate
  OMAP4 powerdomain: Fix pwrsts flags for ALWAYS ON domains
  OMAP: timers: Fix clock source names for OMAP4
  OMAP4 clock: Support clk_set_parent
  OMAP4: PRCM: Add offset defines for all CM registers
  OMAP4: PRCM: Add offset defines for all PRM registers
  OMAP4: PRCM: Remove duplicate definition of base addresses
  OMAP4: PRM: Remove MPU internal code name and apply PRCM naming convention
  OMAP4: CM: Remove non-functional registers in ES1.0
  OMAP: hwmod: Replace WARN by pr_warning for clockdomain check
  OMAP: hwmod: Rename hwmod name for the MPU
  OMAP: hwmod: Do not exit the iteration if one clock init failed
  OMAP: hwmod: Replace WARN by pr_warning if clock lookup failed
  OMAP: hwmod: Remove IS_ERR check with omap_clk_get_by_name return value
  OMAP: hwmod: Fix wrong pointer iteration in oh->slaves
  ...

1 files changed, 80 insertions, 12 deletions

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 4377a4cf36eb..966f5f84f2bd 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -277,7 +277,7 @@ static struct regulator_consumer_supply rx51_vmmc1_supply = {
         .dev_name = "mmci-omap-hs.0",
 };
 
-static struct regulator_consumer_supply rx51_vmmc2_supply = {
+static struct regulator_consumer_supply rx51_vaux3_supply = {
         .supply   = "vmmc",
         .dev_name = "mmci-omap-hs.1",
 };
@@ -287,6 +287,48 @@ static struct regulator_consumer_supply rx51_vsim_supply = {
         .dev_name = "mmci-omap-hs.1",
 };
 
+static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
+        /* tlv320aic3x analog supplies */
+        {
+                .supply         = "AVDD",
+                .dev_name       = "2-0018",
+        },
+        {
+                .supply         = "DRVDD",
+                .dev_name       = "2-0018",
+        },
+        /* Keep vmmc as last item. It is not iterated for newer boards */
+        {
+                .supply         = "vmmc",
+                .dev_name       = "mmci-omap-hs.1",
+        },
+};
+
+static struct regulator_consumer_supply rx51_vio_supplies[] = {
+        /* tlv320aic3x digital supplies */
+        {
+                .supply         = "IOVDD",
+                .dev_name       = "2-0018"
+        },
+        {
+                .supply         = "DVDD",
+                .dev_name       = "2-0018"
+        },
+};
+
+#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+extern struct platform_device rx51_display_device;
+#endif
+
+static struct regulator_consumer_supply rx51_vaux1_consumers[] = {
+#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+        {
+                .supply = "vdds_sdi",
+                .dev    = &rx51_display_device.dev,
+        },
+#endif
+};
+
 static struct regulator_init_data rx51_vaux1 = {
         .constraints = {
                 .name                   = "V28",
@@ -297,6 +339,8 @@ static struct regulator_init_data rx51_vaux1 = {
                 .valid_ops_mask         = REGULATOR_CHANGE_MODE
                                         | REGULATOR_CHANGE_STATUS,
         },
+        .num_consumer_supplies  = ARRAY_SIZE(rx51_vaux1_consumers),
+        .consumer_supplies      = rx51_vaux1_consumers,
 };
 
 static struct regulator_init_data rx51_vaux2 = {
@@ -338,7 +382,7 @@ static struct regulator_init_data rx51_vaux3_mmc = {
                                         | REGULATOR_CHANGE_STATUS,
         },
         .num_consumer_supplies  = 1,
-        .consumer_supplies      = &rx51_vmmc2_supply,
+        .consumer_supplies      = &rx51_vaux3_supply,
 };
 
 static struct regulator_init_data rx51_vaux4 = {
@@ -370,9 +414,9 @@ static struct regulator_init_data rx51_vmmc1 = {
 
 static struct regulator_init_data rx51_vmmc2 = {
         .constraints = {
-                .name                   = "VMMC2_30",
-                .min_uV                 = 1850000,
-                .max_uV                 = 3150000,
+                .name                   = "V28_A",
+                .min_uV                 = 2800000,
+                .max_uV                 = 3000000,
                 .apply_uV               = true,
                 .valid_modes_mask       = REGULATOR_MODE_NORMAL
                                         | REGULATOR_MODE_STANDBY,
@@ -380,8 +424,8 @@ static struct regulator_init_data rx51_vmmc2 = {
                                         | REGULATOR_CHANGE_MODE
                                         | REGULATOR_CHANGE_STATUS,
         },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &rx51_vmmc2_supply,
+        .num_consumer_supplies  = ARRAY_SIZE(rx51_vmmc2_supplies),
+        .consumer_supplies      = rx51_vmmc2_supplies,
 };
 
 static struct regulator_init_data rx51_vsim = {
@@ -411,6 +455,20 @@ static struct regulator_init_data rx51_vdac = {
         },
 };
 
+static struct regulator_init_data rx51_vio = {
+        .constraints = {
+                .min_uV                 = 1800000,
+                .max_uV                 = 1800000,
+                .valid_modes_mask       = REGULATOR_MODE_NORMAL
+                                        | REGULATOR_MODE_STANDBY,
+                .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE
+                                        | REGULATOR_CHANGE_MODE
+                                        | REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = ARRAY_SIZE(rx51_vio_supplies),
+        .consumer_supplies      = rx51_vio_supplies,
+};
+
 static int rx51_twlgpio_setup(struct device *dev, unsigned gpio, unsigned n)
 {
         /* FIXME this gpio setup is just a placeholder for now */
@@ -618,6 +676,7 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
         .vmmc1                  = &rx51_vmmc1,
         .vsim                   = &rx51_vsim,
         .vdac                   = &rx51_vdac,
+        .vio                    = &rx51_vio,
 };
 
 static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = {
@@ -629,18 +688,27 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = {
         },
 };
 
+static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
+        {
+                I2C_BOARD_INFO("tlv320aic3x", 0x18),
+        },
+};
+
 static int __init rx51_i2c_init(void)
 {
         if ((system_rev >= SYSTEM_REV_S_USES_VAUX3 && system_rev < 0x100) ||
-            system_rev >= SYSTEM_REV_B_USES_VAUX3)
+            system_rev >= SYSTEM_REV_B_USES_VAUX3) {
                 rx51_twldata.vaux3 = &rx51_vaux3_mmc;
-        else {
+                /* Only older boards use VMMC2 for internal MMC */
+                rx51_vmmc2.num_consumer_supplies--;
+        } else {
                 rx51_twldata.vaux3 = &rx51_vaux3_cam;
-                rx51_twldata.vmmc2 = &rx51_vmmc2;
         }
+        rx51_twldata.vmmc2 = &rx51_vmmc2;
         omap_register_i2c_bus(1, 2200, rx51_peripherals_i2c_board_info_1,
-                        ARRAY_SIZE(rx51_peripherals_i2c_board_info_1));
-        omap_register_i2c_bus(2, 100, NULL, 0);
+                              ARRAY_SIZE(rx51_peripherals_i2c_board_info_1));
+        omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2,
+                              ARRAY_SIZE(rx51_peripherals_i2c_board_info_2));
         omap_register_i2c_bus(3, 400, NULL, 0);
         return 0;
 }