touch: raydium: Update to board files
[linux-2.6.git] / arch / arm / mach-tegra / board-dalmore-power.c
index 74da766..1a35943 100644 (file)
@@ -75,6 +75,7 @@ static struct regulator_consumer_supply tps65090_dcdc2_supply[] = {
        REGULATOR_SUPPLY("vdd_sys_dtv_3v3", NULL),
        REGULATOR_SUPPLY("vcc", "0-007c"),
        REGULATOR_SUPPLY("vcc", "0-0030"),
+       REGULATOR_SUPPLY("vin", "2-0030"),
 };
 
 static struct regulator_consumer_supply tps65090_dcdc3_supply[] = {
@@ -99,7 +100,7 @@ static struct regulator_consumer_supply tps65090_fet3_supply[] = {
 
 static struct regulator_consumer_supply tps65090_fet4_supply[] = {
        REGULATOR_SUPPLY("avdd_lcd", NULL),
-       REGULATOR_SUPPLY("vdd_ts_3v3", NULL),
+       REGULATOR_SUPPLY("avdd", "spi3.2"),
 };
 
 static struct regulator_consumer_supply tps65090_fet5_supply[] = {
@@ -219,7 +220,7 @@ static struct regulator_consumer_supply max77663_sd2_supply[] = {
        REGULATOR_SUPPLY("vdd_mic_1v8", NULL),
        REGULATOR_SUPPLY("vdd_nfc_1v8", NULL),
        REGULATOR_SUPPLY("vdd_ds_1v8", NULL),
-       REGULATOR_SUPPLY("vdd_ts_1v8", NULL),
+       REGULATOR_SUPPLY("dvdd", "spi3.2"),
        REGULATOR_SUPPLY("vdd_spi_1v8", NULL),
        REGULATOR_SUPPLY("dvdd_lcd", NULL),
        REGULATOR_SUPPLY("vdd_com_1v8", NULL),
@@ -283,11 +284,13 @@ static struct regulator_consumer_supply max77663_ldo6_supply[] = {
 static struct regulator_consumer_supply max77663_ldo7_supply[] = {
        REGULATOR_SUPPLY("avdd_cam1", NULL),
        REGULATOR_SUPPLY("avdd_2v8_cam_af", NULL),
+       REGULATOR_SUPPLY("vana", "2-0036"),
 };
 
 /* FIXME!! Put the device address of camera */
 static struct regulator_consumer_supply max77663_ldo8_supply[] = {
        REGULATOR_SUPPLY("avdd_cam2", NULL),
+       REGULATOR_SUPPLY("avdd", "2-0010"),
 };
 
 static struct max77663_regulator_fps_cfg max77663_fps_cfgs[] = {
@@ -570,6 +573,7 @@ static struct regulator_consumer_supply palmas_ldo4_supply[] = {
 
 static struct regulator_consumer_supply palmas_ldo7_supply[] = {
        REGULATOR_SUPPLY("vdd_af_cam1", NULL),
+       REGULATOR_SUPPLY("vdd", "2-000e"),
 };
 
 #define palmas_ldo8_supply max77663_ldo4_supply
@@ -736,6 +740,7 @@ static struct palmas_platform_data palmas_pdata = {
        .pad1 = 0,
        .pad2 = 0,
        .pad3 = PALMAS_PRIMARY_SECONDARY_PAD3_DVFS1,
+       .use_power_off = true,
 };
 
 static struct i2c_board_info palma_device[] = {
@@ -760,12 +765,20 @@ static struct regulator_consumer_supply fixed_reg_avdd_usb_hdmi_supply[] = {
 static struct regulator_consumer_supply fixed_reg_en_1v8_cam_supply[] = {
        REGULATOR_SUPPLY("dvdd_cam", NULL),
        REGULATOR_SUPPLY("vdd_cam_1v8", NULL),
+       REGULATOR_SUPPLY("vi2c", "2-0030"),
+       REGULATOR_SUPPLY("vif", "2-0036"),
+       REGULATOR_SUPPLY("dovdd", "2-0010"),
+       REGULATOR_SUPPLY("vdd_i2c", "2-000e"),
 };
 
 /* EN_CAM_1v8 on e1611 From PMU GP6 */
 static struct regulator_consumer_supply fixed_reg_en_1v8_cam_e1611_supply[] = {
        REGULATOR_SUPPLY("dvdd_cam", NULL),
        REGULATOR_SUPPLY("vdd_cam_1v8", NULL),
+       REGULATOR_SUPPLY("vi2c", "2-0030"),
+       REGULATOR_SUPPLY("vif", "2-0036"),
+       REGULATOR_SUPPLY("dovdd", "2-0010"),
+       REGULATOR_SUPPLY("vdd_i2c", "2-000e"),
 };
 
 static struct regulator_consumer_supply fixed_reg_vdd_hdmi_5v0_supply[] = {
@@ -1079,7 +1092,8 @@ static int __init dalmore_fixed_regulator_init(void)
 
        tegra_get_board_info(&board_info);
 
-       if (board_info.board_id == BOARD_E1611)
+       if (board_info.board_id == BOARD_E1611 ||
+               board_info.board_id == BOARD_P2454)
                return platform_add_devices(fixed_reg_devs_e1611_a00,
                                ARRAY_SIZE(fixed_reg_devs_e1611_a00));
        else
@@ -1097,7 +1111,8 @@ int __init dalmore_regulator_init(void)
        dalmore_cl_dvfs_init();
 #endif
        tegra_get_board_info(&board_info);
-       if (board_info.board_id == BOARD_E1611)
+       if (board_info.board_id == BOARD_E1611 ||
+               board_info.board_id == BOARD_P2454)
                dalmore_palmas_regulator_init();
        else
                dalmore_max77663_regulator_init();
@@ -1216,33 +1231,6 @@ static struct soctherm_platform_data dalmore_soctherm_data = {
                        .pdiv = 10,
                },
        },
-
-       .therm = {
-               [THERM_CPU] = {
-                       .thermtrip = 90, /* in C */
-                       .hw_backstop = 37, /* in C */
-
-                       .trip_temp = 68000, /* in mC */
-                       .tc1 = 0,
-                       .tc2 = 1,
-                       .passive_delay = 2000,
-               },
-       },
-
-       .throttle = {
-               [THROTTLE_HEAVY] = {
-                       .priority = 1,
-                       .devs = {
-                               [THROTTLE_DEV_CPU] = {
-                                       .enable = true,
-                                       .dividend = 1,
-                                       .divisor = 255,
-                                       .step = 0,
-                                       .duration = 65535,
-                               },
-                       },
-               },
-       },
 };
 
 static struct balanced_throttle tj_throttle = {