2 files changed, 127 insertions, 33 deletions

diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/i2c/dm355evm_msp.h
new file mode 100644
index 000000000000..372470350fab
--- /dev/null
+++ b/include/linux/i2c/dm355evm_msp.h
@@ -0,0 +1,79 @@
+/*
+ * dm355evm_msp.h - support MSP430 microcontroller on DM355EVM board
+ */
+#ifndef __LINUX_I2C_DM355EVM_MSP
+#define __LINUX_I2C_DM355EVM_MSP
+
+/*
+ * Written against Spectrum's writeup for the A4 firmware revision,
+ * and tweaked to match source and rev D2 schematics by removing CPLD
+ * and NOR flash hooks (which were last appropriate in rev B boards).
+ *
+ * Note that the firmware supports a flavor of write posting ... to be
+ * sure a write completes, issue another read or write.
+ */
+
+/* utilities to access "registers" emulated by msp430 firmware */
+extern int dm355evm_msp_write(u8 value, u8 reg);
+extern int dm355evm_msp_read(u8 reg);
+
+
+/* command/control registers */
+#define DM355EVM_MSP_COMMAND            0x00
+#       define MSP_COMMAND_NULL         0
+#       define MSP_COMMAND_RESET_COLD   1
+#       define MSP_COMMAND_RESET_WARM   2
+#       define MSP_COMMAND_RESET_WARM_I 3
+#       define MSP_COMMAND_POWEROFF     4
+#       define MSP_COMMAND_IR_REINIT    5
+#define DM355EVM_MSP_STATUS             0x01
+#       define MSP_STATUS_BAD_OFFSET    BIT(0)
+#       define MSP_STATUS_BAD_COMMAND   BIT(1)
+#       define MSP_STATUS_POWER_ERROR   BIT(2)
+#       define MSP_STATUS_RXBUF_OVERRUN BIT(3)
+#define DM355EVM_MSP_RESET              0x02    /* 0 bits == in reset */
+#       define MSP_RESET_DC5            BIT(0)
+#       define MSP_RESET_TVP5154        BIT(2)
+#       define MSP_RESET_IMAGER         BIT(3)
+#       define MSP_RESET_ETHERNET       BIT(4)
+#       define MSP_RESET_SYS            BIT(5)
+#       define MSP_RESET_AIC33          BIT(7)
+
+/* GPIO registers ... bit patterns mostly match the source MSP ports */
+#define DM355EVM_MSP_LED                0x03    /* active low (MSP P4) */
+#define DM355EVM_MSP_SWITCH1            0x04    /* (MSP P5, masked) */
+#       define MSP_SWITCH1_SW6_1        BIT(0)
+#       define MSP_SWITCH1_SW6_2        BIT(1)
+#       define MSP_SWITCH1_SW6_3        BIT(2)
+#       define MSP_SWITCH1_SW6_4        BIT(3)
+#       define MSP_SWITCH1_J1           BIT(4)  /* NTSC/PAL */
+#       define MSP_SWITCH1_MSP_INT      BIT(5)  /* active low */
+#define DM355EVM_MSP_SWITCH2            0x05    /* (MSP P6, masked) */
+#       define MSP_SWITCH2_SW10         BIT(3)
+#       define MSP_SWITCH2_SW11         BIT(4)
+#       define MSP_SWITCH2_SW12         BIT(5)
+#       define MSP_SWITCH2_SW13         BIT(6)
+#       define MSP_SWITCH2_SW14         BIT(7)
+#define DM355EVM_MSP_SDMMC              0x06    /* (MSP P2, masked) */
+#       define MSP_SDMMC_0_WP           BIT(1)
+#       define MSP_SDMMC_0_CD           BIT(2)  /* active low */
+#       define MSP_SDMMC_1_WP           BIT(3)
+#       define MSP_SDMMC_1_CD           BIT(4)  /* active low */
+#define DM355EVM_MSP_FIRMREV            0x07    /* not a GPIO (out of order) */
+#define DM355EVM_MSP_VIDEO_IN           0x08    /* (MSP P3, masked) */
+#       define MSP_VIDEO_IMAGER         BIT(7)  /* low == tvp5146 */
+
+/* power supply registers are currently omitted */
+
+/* RTC registers */
+#define DM355EVM_MSP_RTC_0              0x12    /* LSB */
+#define DM355EVM_MSP_RTC_1              0x13
+#define DM355EVM_MSP_RTC_2              0x14
+#define DM355EVM_MSP_RTC_3              0x15    /* MSB */
+
+/* input event queue registers; code == ((HIGH << 8) | LOW) */
+#define DM355EVM_MSP_INPUT_COUNT        0x16    /* decrement by reading LOW */
+#define DM355EVM_MSP_INPUT_HIGH         0x17
+#define DM355EVM_MSP_INPUT_LOW          0x18
+
+#endif /* __LINUX_I2C_DM355EVM_MSP */
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index fb604dcd38f1..a8f84c01f82e 100644
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -78,8 +78,8 @@ int twl4030_i2c_read_u8(u8 mod_no, u8 *val, u8 reg);
  * IMPORTANT:  For twl4030_i2c_write(), allocate num_bytes + 1
  * for the value, and populate your data starting at offset 1.
  */
-int twl4030_i2c_write(u8 mod_no, u8 *value, u8 reg, u8 num_bytes);
-int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, u8 num_bytes);
+int twl4030_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
+int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
 
 /*----------------------------------------------------------------------*/
 
@@ -278,6 +278,18 @@ struct twl4030_platform_data {
         struct twl4030_keypad_data              *keypad;
         struct twl4030_usb_data                 *usb;
 
+        /* LDO regulators */
+        struct regulator_init_data              *vdac;
+        struct regulator_init_data              *vpll1;
+        struct regulator_init_data              *vpll2;
+        struct regulator_init_data              *vmmc1;
+        struct regulator_init_data              *vmmc2;
+        struct regulator_init_data              *vsim;
+        struct regulator_init_data              *vaux1;
+        struct regulator_init_data              *vaux2;
+        struct regulator_init_data              *vaux3;
+        struct regulator_init_data              *vaux4;
+
         /* REVISIT more to come ... _nothing_ should be hard-wired */
 };
 
@@ -285,33 +297,6 @@ struct twl4030_platform_data {
 
 int twl4030_sih_setup(int module);
 
-/*
- * FIXME completely stop using TWL4030_IRQ_BASE ... instead, pass the
- * IRQ data to subsidiary devices using platform device resources.
- */
-
-/* IRQ information-need base */
-#include <mach/irqs.h>
-/* TWL4030 interrupts */
-
-/* #define TWL4030_MODIRQ_GPIO          (TWL4030_IRQ_BASE + 0) */
-#define TWL4030_MODIRQ_KEYPAD           (TWL4030_IRQ_BASE + 1)
-#define TWL4030_MODIRQ_BCI              (TWL4030_IRQ_BASE + 2)
-#define TWL4030_MODIRQ_MADC             (TWL4030_IRQ_BASE + 3)
-/* #define TWL4030_MODIRQ_USB           (TWL4030_IRQ_BASE + 4) */
-/* #define TWL4030_MODIRQ_PWR           (TWL4030_IRQ_BASE + 5) */
-
-#define TWL4030_PWRIRQ_PWRBTN           (TWL4030_PWR_IRQ_BASE + 0)
-/* #define TWL4030_PWRIRQ_CHG_PRES              (TWL4030_PWR_IRQ_BASE + 1) */
-/* #define TWL4030_PWRIRQ_USB_PRES              (TWL4030_PWR_IRQ_BASE + 2) */
-/* #define TWL4030_PWRIRQ_RTC           (TWL4030_PWR_IRQ_BASE + 3) */
-/* #define TWL4030_PWRIRQ_HOT_DIE               (TWL4030_PWR_IRQ_BASE + 4) */
-/* #define TWL4030_PWRIRQ_PWROK_TIMEOUT (TWL4030_PWR_IRQ_BASE + 5) */
-/* #define TWL4030_PWRIRQ_MBCHG         (TWL4030_PWR_IRQ_BASE + 6) */
-/* #define TWL4030_PWRIRQ_SC_DETECT     (TWL4030_PWR_IRQ_BASE + 7) */
-
-/* Rest are unsued currently*/
-
 /* Offsets to Power Registers */
 #define TWL4030_VDAC_DEV_GRP            0x3B
 #define TWL4030_VDAC_DEDICATED          0x3E
@@ -322,10 +307,6 @@ int twl4030_sih_setup(int module);
 #define TWL4030_VAUX3_DEV_GRP           0x1F
 #define TWL4030_VAUX3_DEDICATED         0x22
 
-/* TWL4030 GPIO interrupt definitions */
-
-#define TWL4030_GPIO_IRQ_NO(n)          (TWL4030_GPIO_IRQ_BASE + (n))
-
 /*
  * Exported TWL4030 GPIO APIs
  *
@@ -340,4 +321,38 @@ int twl4030_set_gpio_debounce(int gpio, int enable);
         static inline int twl4030charger_usb_en(int enable) { return 0; }
 #endif
 
+/*----------------------------------------------------------------------*/
+
+/* Linux-specific regulator identifiers ... for now, we only support
+ * the LDOs, and leave the three buck converters alone.  VDD1 and VDD2
+ * need to tie into hardware based voltage scaling (cpufreq etc), while
+ * VIO is generally fixed.
+ */
+
+/* EXTERNAL dc-to-dc buck converters */
+#define TWL4030_REG_VDD1        0
+#define TWL4030_REG_VDD2        1
+#define TWL4030_REG_VIO         2
+
+/* EXTERNAL LDOs */
+#define TWL4030_REG_VDAC        3
+#define TWL4030_REG_VPLL1       4
+#define TWL4030_REG_VPLL2       5       /* not on all chips */
+#define TWL4030_REG_VMMC1       6
+#define TWL4030_REG_VMMC2       7       /* not on all chips */
+#define TWL4030_REG_VSIM        8       /* not on all chips */
+#define TWL4030_REG_VAUX1       9       /* not on all chips */
+#define TWL4030_REG_VAUX2_4030  10      /* (twl4030-specific) */
+#define TWL4030_REG_VAUX2       11      /* (twl5030 and newer) */
+#define TWL4030_REG_VAUX3       12      /* not on all chips */
+#define TWL4030_REG_VAUX4       13      /* not on all chips */
+
+/* INTERNAL LDOs */
+#define TWL4030_REG_VINTANA1    14
+#define TWL4030_REG_VINTANA2    15
+#define TWL4030_REG_VINTDIG     16
+#define TWL4030_REG_VUSB1V5     17
+#define TWL4030_REG_VUSB1V8     18
+#define TWL4030_REG_VUSB3V1     19
+
 #endif /* End of __TWL4030_H */