8 files changed, 168 insertions, 6 deletions

diff --git a/arch/arm/mach-mmp/include/mach/irqs.h b/arch/arm/mach-mmp/include/mach/irqs.h
index e83e45ebf7a4..16295cfd5e29 100644
--- a/arch/arm/mach-mmp/include/mach/irqs.h
+++ b/arch/arm/mach-mmp/include/mach/irqs.h
@@ -52,6 +52,7 @@
 /*
  * Interrupt numbers for PXA910
  */
+#define IRQ_PXA910_NONE                 (-1)
 #define IRQ_PXA910_AIRQ                 0
 #define IRQ_PXA910_SSP3                 1
 #define IRQ_PXA910_SSP2                 2
diff --git a/arch/arm/mach-mmp/include/mach/mfp-pxa168.h b/arch/arm/mach-mmp/include/mach/mfp-pxa168.h
index 2e914649b9e4..3b216bf41e7f 100644
--- a/arch/arm/mach-mmp/include/mach/mfp-pxa168.h
+++ b/arch/arm/mach-mmp/include/mach/mfp-pxa168.h
@@ -253,6 +253,10 @@
 #define GPIO58_LCD_PCLK_WR      MFP_CFG(GPIO58, AF1)
 #define GPIO85_LCD_VSYNC        MFP_CFG(GPIO85, AF1)
 
+/* I2C */
+#define GPIO105_CI2C_SDA        MFP_CFG(GPIO105, AF1)
+#define GPIO106_CI2C_SCL        MFP_CFG(GPIO106, AF1)
+
 /* I2S */
 #define GPIO113_I2S_MCLK        MFP_CFG(GPIO113,AF6)
 #define GPIO114_I2S_FRM         MFP_CFG(GPIO114,AF1)
@@ -260,4 +264,27 @@
 #define GPIO116_I2S_RXD         MFP_CFG(GPIO116,AF2)
 #define GPIO117_I2S_TXD         MFP_CFG(GPIO117,AF2)
 
+/* PWM */
+#define GPIO96_PWM3_OUT         MFP_CFG(GPIO96, AF1)
+#define GPIO97_PWM2_OUT         MFP_CFG(GPIO97, AF1)
+#define GPIO98_PWM1_OUT         MFP_CFG(GPIO98, AF1)
+#define GPIO104_PWM4_OUT        MFP_CFG(GPIO104, AF1)
+#define GPIO106_PWM2_OUT        MFP_CFG(GPIO106, AF2)
+#define GPIO74_PWM4_OUT         MFP_CFG(GPIO74, AF2)
+#define GPIO75_PWM3_OUT         MFP_CFG(GPIO75, AF2)
+#define GPIO76_PWM2_OUT         MFP_CFG(GPIO76, AF2)
+#define GPIO77_PWM1_OUT         MFP_CFG(GPIO77, AF2)
+#define GPIO82_PWM4_OUT         MFP_CFG(GPIO82, AF2)
+#define GPIO83_PWM3_OUT         MFP_CFG(GPIO83, AF2)
+#define GPIO84_PWM2_OUT         MFP_CFG(GPIO84, AF2)
+#define GPIO85_PWM1_OUT         MFP_CFG(GPIO85, AF2)
+#define GPIO84_PWM1_OUT         MFP_CFG(GPIO84, AF4)
+#define GPIO122_PWM3_OUT        MFP_CFG(GPIO122, AF3)
+#define GPIO123_PWM1_OUT        MFP_CFG(GPIO123, AF1)
+#define GPIO124_PWM2_OUT        MFP_CFG(GPIO124, AF1)
+#define GPIO125_PWM3_OUT        MFP_CFG(GPIO125, AF1)
+#define GPIO126_PWM4_OUT        MFP_CFG(GPIO126, AF1)
+#define GPIO86_PWM1_OUT         MFP_CFG(GPIO86, AF2)
+#define GPIO86_PWM2_OUT         MFP_CFG(GPIO86, AF3)
+
 #endif /* __ASM_MACH_MFP_PXA168_H */
diff --git a/arch/arm/mach-mmp/include/mach/mfp-pxa910.h b/arch/arm/mach-mmp/include/mach/mfp-pxa910.h
index d97de36c50ad..bf1189ff9a34 100644
--- a/arch/arm/mach-mmp/include/mach/mfp-pxa910.h
+++ b/arch/arm/mach-mmp/include/mach/mfp-pxa910.h
@@ -159,4 +159,12 @@
 #define MMC1_CD_MMC1_CD         MFP_CFG_DRV(MMC1_CD, AF0, MEDIUM)
 #define MMC1_WP_MMC1_WP         MFP_CFG_DRV(MMC1_WP, AF0, MEDIUM)
 
+/* PWM */
+#define GPIO27 PWM3 AF2         MFP_CFG(GPIO27, AF2)
+#define GPIO51_PWM2_OUT         MFP_CFG(GPIO51, AF2)
+#define GPIO117_PWM1_OUT        MFP_CFG(GPIO117, AF2)
+#define GPIO118_PWM2_OUT        MFP_CFG(GPIO118, AF2)
+#define GPIO119_PWM3_OUT        MFP_CFG(GPIO119, AF2)
+#define GPIO120_PWM4_OUT        MFP_CFG(GPIO120, AF2)
+
 #endif /* __ASM_MACH MFP_PXA910_H */
diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h
index ef0a8a2076e9..6bf1f0eefcd1 100644
--- a/arch/arm/mach-mmp/include/mach/pxa168.h
+++ b/arch/arm/mach-mmp/include/mach/pxa168.h
@@ -1,10 +1,18 @@
 #ifndef __ASM_MACH_PXA168_H
 #define __ASM_MACH_PXA168_H
 
+#include <linux/i2c.h>
 #include <mach/devices.h>
+#include <plat/i2c.h>
 
 extern struct pxa_device_desc pxa168_device_uart1;
 extern struct pxa_device_desc pxa168_device_uart2;
+extern struct pxa_device_desc pxa168_device_twsi0;
+extern struct pxa_device_desc pxa168_device_twsi1;
+extern struct pxa_device_desc pxa168_device_pwm1;
+extern struct pxa_device_desc pxa168_device_pwm2;
+extern struct pxa_device_desc pxa168_device_pwm3;
+extern struct pxa_device_desc pxa168_device_pwm4;
 
 static inline int pxa168_add_uart(int id)
 {
@@ -20,4 +28,40 @@ static inline int pxa168_add_uart(int id)
 
         return pxa_register_device(d, NULL, 0);
 }
+
+static inline int pxa168_add_twsi(int id, struct i2c_pxa_platform_data *data,
+                                  struct i2c_board_info *info, unsigned size)
+{
+        struct pxa_device_desc *d = NULL;
+        int ret;
+
+        switch (id) {
+        case 0: d = &pxa168_device_twsi0; break;
+        case 1: d = &pxa168_device_twsi1; break;
+        default:
+                return -EINVAL;
+        }
+
+        ret = i2c_register_board_info(id, info, size);
+        if (ret)
+                return ret;
+
+        return pxa_register_device(d, data, sizeof(*data));
+}
+
+static inline int pxa168_add_pwm(int id)
+{
+        struct pxa_device_desc *d = NULL;
+
+        switch (id) {
+        case 1: d = &pxa168_device_pwm1; break;
+        case 2: d = &pxa168_device_pwm2; break;
+        case 3: d = &pxa168_device_pwm3; break;
+        case 4: d = &pxa168_device_pwm4; break;
+        default:
+                return -EINVAL;
+        }
+
+        return pxa_register_device(d, NULL, 0);
+}
 #endif /* __ASM_MACH_PXA168_H */
diff --git a/arch/arm/mach-mmp/include/mach/pxa910.h b/arch/arm/mach-mmp/include/mach/pxa910.h
index b7aeaf574c36..6ae1ed7a0a9f 100644
--- a/arch/arm/mach-mmp/include/mach/pxa910.h
+++ b/arch/arm/mach-mmp/include/mach/pxa910.h
@@ -1,10 +1,18 @@
 #ifndef __ASM_MACH_PXA910_H
 #define __ASM_MACH_PXA910_H
 
+#include <linux/i2c.h>
 #include <mach/devices.h>
+#include <plat/i2c.h>
 
 extern struct pxa_device_desc pxa910_device_uart1;
 extern struct pxa_device_desc pxa910_device_uart2;
+extern struct pxa_device_desc pxa910_device_twsi0;
+extern struct pxa_device_desc pxa910_device_twsi1;
+extern struct pxa_device_desc pxa910_device_pwm1;
+extern struct pxa_device_desc pxa910_device_pwm2;
+extern struct pxa_device_desc pxa910_device_pwm3;
+extern struct pxa_device_desc pxa910_device_pwm4;
 
 static inline int pxa910_add_uart(int id)
 {
@@ -20,4 +28,40 @@ static inline int pxa910_add_uart(int id)
 
         return pxa_register_device(d, NULL, 0);
 }
+
+static inline int pxa910_add_twsi(int id, struct i2c_pxa_platform_data *data,
+                                  struct i2c_board_info *info, unsigned size)
+{
+        struct pxa_device_desc *d = NULL;
+        int ret;
+
+        switch (id) {
+        case 0: d = &pxa910_device_twsi0; break;
+        case 1: d = &pxa910_device_twsi1; break;
+        default:
+                return -EINVAL;
+        }
+
+        ret = i2c_register_board_info(id, info, size);
+        if (ret)
+                return ret;
+
+        return pxa_register_device(d, data, sizeof(*data));
+}
+
+static inline int pxa910_add_pwm(int id)
+{
+        struct pxa_device_desc *d = NULL;
+
+        switch (id) {
+        case 1: d = &pxa910_device_pwm1; break;
+        case 2: d = &pxa910_device_pwm2; break;
+        case 3: d = &pxa910_device_pwm3; break;
+        case 4: d = &pxa910_device_pwm4; break;
+        default:
+                return -EINVAL;
+        }
+
+        return pxa_register_device(d, NULL, 0);
+}
 #endif /* __ASM_MACH_PXA910_H */
diff --git a/arch/arm/mach-mmp/include/mach/regs-apbc.h b/arch/arm/mach-mmp/include/mach/regs-apbc.h
index c6b8c9dc2026..98ccbee4bd0c 100644
--- a/arch/arm/mach-mmp/include/mach/regs-apbc.h
+++ b/arch/arm/mach-mmp/include/mach/regs-apbc.h
@@ -22,8 +22,10 @@
 #define APBC_PXA168_UART1       APBC_REG(0x000)
 #define APBC_PXA168_UART2       APBC_REG(0x004)
 #define APBC_PXA168_GPIO        APBC_REG(0x008)
-#define APBC_PXA168_PWM0        APBC_REG(0x00c)
-#define APBC_PXA168_PWM1        APBC_REG(0x010)
+#define APBC_PXA168_PWM1        APBC_REG(0x00c)
+#define APBC_PXA168_PWM2        APBC_REG(0x010)
+#define APBC_PXA168_PWM3        APBC_REG(0x014)
+#define APBC_PXA168_PWM4        APBC_REG(0x018)
 #define APBC_PXA168_SSP1        APBC_REG(0x01c)
 #define APBC_PXA168_SSP2        APBC_REG(0x020)
 #define APBC_PXA168_RTC         APBC_REG(0x028)
@@ -48,10 +50,10 @@
 #define APBC_PXA910_UART0       APBC_REG(0x000)
 #define APBC_PXA910_UART1       APBC_REG(0x004)
 #define APBC_PXA910_GPIO        APBC_REG(0x008)
-#define APBC_PXA910_PWM0        APBC_REG(0x00c)
-#define APBC_PXA910_PWM1        APBC_REG(0x010)
-#define APBC_PXA910_PWM2        APBC_REG(0x014)
-#define APBC_PXA910_PWM3        APBC_REG(0x018)
+#define APBC_PXA910_PWM1        APBC_REG(0x00c)
+#define APBC_PXA910_PWM2        APBC_REG(0x010)
+#define APBC_PXA910_PWM3        APBC_REG(0x014)
+#define APBC_PXA910_PWM4        APBC_REG(0x018)
 #define APBC_PXA910_SSP1        APBC_REG(0x01c)
 #define APBC_PXA910_SSP2        APBC_REG(0x020)
 #define APBC_PXA910_IPC         APBC_REG(0x024)
diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c
index ae924468658c..71b1ae338753 100644
--- a/arch/arm/mach-mmp/pxa168.c
+++ b/arch/arm/mach-mmp/pxa168.c
@@ -65,11 +65,23 @@ void __init pxa168_init_irq(void)
 /* APB peripheral clocks */
 static APBC_CLK(uart1, PXA168_UART1, 1, 14745600);
 static APBC_CLK(uart2, PXA168_UART2, 1, 14745600);
+static APBC_CLK(twsi0, PXA168_TWSI0, 1, 33000000);
+static APBC_CLK(twsi1, PXA168_TWSI1, 1, 33000000);
+static APBC_CLK(pwm1, PXA168_PWM1, 1, 13000000);
+static APBC_CLK(pwm2, PXA168_PWM2, 1, 13000000);
+static APBC_CLK(pwm3, PXA168_PWM3, 1, 13000000);
+static APBC_CLK(pwm4, PXA168_PWM4, 1, 13000000);
 
 /* device and clock bindings */
 static struct clk_lookup pxa168_clkregs[] = {
         INIT_CLKREG(&clk_uart1, "pxa2xx-uart.0", NULL),
         INIT_CLKREG(&clk_uart2, "pxa2xx-uart.1", NULL),
+        INIT_CLKREG(&clk_twsi0, "pxa2xx-i2c.0", NULL),
+        INIT_CLKREG(&clk_twsi1, "pxa2xx-i2c.1", NULL),
+        INIT_CLKREG(&clk_pwm1, "pxa168-pwm.0", NULL),
+        INIT_CLKREG(&clk_pwm2, "pxa168-pwm.1", NULL),
+        INIT_CLKREG(&clk_pwm3, "pxa168-pwm.2", NULL),
+        INIT_CLKREG(&clk_pwm4, "pxa168-pwm.3", NULL),
 };
 
 static int __init pxa168_init(void)
@@ -109,3 +121,9 @@ struct sys_timer pxa168_timer = {
 /* on-chip devices */
 PXA168_DEVICE(uart1, "pxa2xx-uart", 0, UART1, 0xd4017000, 0x30, 21, 22);
 PXA168_DEVICE(uart2, "pxa2xx-uart", 1, UART2, 0xd4018000, 0x30, 23, 24);
+PXA168_DEVICE(twsi0, "pxa2xx-i2c", 0, TWSI0, 0xd4011000, 0x28);
+PXA168_DEVICE(twsi1, "pxa2xx-i2c", 1, TWSI1, 0xd4025000, 0x28);
+PXA168_DEVICE(pwm1, "pxa168-pwm", 0, NONE, 0xd401a000, 0x10);
+PXA168_DEVICE(pwm2, "pxa168-pwm", 1, NONE, 0xd401a400, 0x10);
+PXA168_DEVICE(pwm3, "pxa168-pwm", 2, NONE, 0xd401a800, 0x10);
+PXA168_DEVICE(pwm4, "pxa168-pwm", 3, NONE, 0xd401ac00, 0x10);
diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c
index 453f8f7758bf..5882ca6b49fb 100644
--- a/arch/arm/mach-mmp/pxa910.c
+++ b/arch/arm/mach-mmp/pxa910.c
@@ -103,11 +103,23 @@ void __init pxa910_init_irq(void)
 /* APB peripheral clocks */
 static APBC_CLK(uart1, PXA910_UART0, 1, 14745600);
 static APBC_CLK(uart2, PXA910_UART1, 1, 14745600);
+static APBC_CLK(twsi0, PXA168_TWSI0, 1, 33000000);
+static APBC_CLK(twsi1, PXA168_TWSI1, 1, 33000000);
+static APBC_CLK(pwm1, PXA910_PWM1, 1, 13000000);
+static APBC_CLK(pwm2, PXA910_PWM2, 1, 13000000);
+static APBC_CLK(pwm3, PXA910_PWM3, 1, 13000000);
+static APBC_CLK(pwm4, PXA910_PWM4, 1, 13000000);
 
 /* device and clock bindings */
 static struct clk_lookup pxa910_clkregs[] = {
         INIT_CLKREG(&clk_uart1, "pxa2xx-uart.0", NULL),
         INIT_CLKREG(&clk_uart2, "pxa2xx-uart.1", NULL),
+        INIT_CLKREG(&clk_twsi0, "pxa2xx-i2c.0", NULL),
+        INIT_CLKREG(&clk_twsi1, "pxa2xx-i2c.1", NULL),
+        INIT_CLKREG(&clk_pwm1, "pxa910-pwm.0", NULL),
+        INIT_CLKREG(&clk_pwm2, "pxa910-pwm.1", NULL),
+        INIT_CLKREG(&clk_pwm3, "pxa910-pwm.2", NULL),
+        INIT_CLKREG(&clk_pwm4, "pxa910-pwm.3", NULL),
 };
 
 static int __init pxa910_init(void)
@@ -156,3 +168,9 @@ struct sys_timer pxa910_timer = {
  */
 PXA910_DEVICE(uart1, "pxa2xx-uart", 0, UART2, 0xd4017000, 0x30, 21, 22);
 PXA910_DEVICE(uart2, "pxa2xx-uart", 1, UART3, 0xd4018000, 0x30, 23, 24);
+PXA910_DEVICE(twsi0, "pxa2xx-i2c", 0, TWSI0, 0xd4011000, 0x28);
+PXA910_DEVICE(twsi1, "pxa2xx-i2c", 1, TWSI1, 0xd4025000, 0x28);
+PXA910_DEVICE(pwm1, "pxa910-pwm", 0, NONE, 0xd401a000, 0x10);
+PXA910_DEVICE(pwm2, "pxa910-pwm", 1, NONE, 0xd401a400, 0x10);
+PXA910_DEVICE(pwm3, "pxa910-pwm", 2, NONE, 0xd401a800, 0x10);
+PXA910_DEVICE(pwm4, "pxa910-pwm", 3, NONE, 0xd401ac00, 0x10);