4 files changed, 75 insertions, 44 deletions

diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c
index c6422fb10bae..cebc71d5a5af 100644
--- a/arch/arm/mach-imx/clk-imx35.c
+++ b/arch/arm/mach-imx/clk-imx35.c
@@ -62,8 +62,8 @@ enum mx35_clks {
         kpp_gate, mlb_gate, mshc_gate, owire_gate, pwm_gate, rngc_gate,
         rtc_gate, rtic_gate, scc_gate, sdma_gate, spba_gate, spdif_gate,
         ssi1_gate, ssi2_gate, uart1_gate, uart2_gate, uart3_gate, usbotg_gate,
-        wdog_gate, max_gate, admux_gate, csi_gate, iim_gate, gpu2d_gate,
-        clk_max
+        wdog_gate, max_gate, admux_gate, csi_gate, csi_div, csi_sel, iim_gate,
+        gpu2d_gate, clk_max
 };
 
 static struct clk *clk[clk_max];
@@ -142,6 +142,9 @@ int __init mx35_clocks_init()
 
         clk[nfc_div] = imx_clk_divider("nfc_div", "ahb", base + MX35_CCM_PDR4, 28, 4);
 
+        clk[csi_sel] = imx_clk_mux("csi_sel", base + MX35_CCM_PDR2, 7, 1, std_sel, ARRAY_SIZE(std_sel));
+        clk[csi_div] = imx_clk_divider("csi_div", "csi_sel", base + MX35_CCM_PDR2, 16, 6);
+
         clk[asrc_gate] = imx_clk_gate2("asrc_gate", "ipg", base + MX35_CCM_CGR0,  0);
         clk[pata_gate] = imx_clk_gate2("pata_gate", "ipg", base + MX35_CCM_CGR0,  2);
         clk[audmux_gate] = imx_clk_gate2("audmux_gate", "ipg", base + MX35_CCM_CGR0,  4);
@@ -192,7 +195,7 @@ int __init mx35_clocks_init()
         clk[max_gate] = imx_clk_gate2("max_gate", "dummy", base + MX35_CCM_CGR2, 26);
         clk[admux_gate] = imx_clk_gate2("admux_gate", "ipg", base + MX35_CCM_CGR2, 30);
 
-        clk[csi_gate] = imx_clk_gate2("csi_gate", "ipg", base + MX35_CCM_CGR3,  0);
+        clk[csi_gate] = imx_clk_gate2("csi_gate", "csi_div", base + MX35_CCM_CGR3,  0);
         clk[iim_gate] = imx_clk_gate2("iim_gate", "ipg", base + MX35_CCM_CGR3,  2);
         clk[gpu2d_gate] = imx_clk_gate2("gpu2d_gate", "ahb", base + MX35_CCM_CGR3,  4);
 
@@ -228,6 +231,7 @@ int __init mx35_clocks_init()
         clk_register_clkdev(clk[i2c3_gate], NULL, "imx-i2c.2");
         clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core");
         clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb");
+        clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad");
         clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1");
         clk_register_clkdev(clk[sdma_gate], NULL, "imx35-sdma");
         clk_register_clkdev(clk[ipg], "ipg", "imx-ssi.0");
@@ -255,6 +259,7 @@ int __init mx35_clocks_init()
         clk_register_clkdev(clk[usbotg_gate], "ahb", "fsl-usb2-udc");
         clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0");
         clk_register_clkdev(clk[nfc_div], NULL, "mxc_nand.0");
+        clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0");
 
         clk_prepare_enable(clk[spba_gate]);
         clk_prepare_enable(clk[gpio1_gate]);
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index 4bdcaa97bd98..db70d23f95fa 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -49,6 +49,7 @@ static const char *mx53_tve_ext_sel[] = { "pll4_sw", "ckih1", };
 static const char *tve_sel[] = { "tve_pred", "tve_ext_sel", };
 static const char *ipu_sel[] = { "axi_a", "axi_b", "emi_slow_gate", "ahb", };
 static const char *vpu_sel[] = { "axi_a", "axi_b", "emi_slow_gate", "ahb", };
+static const char *mx53_can_sel[] = { "ipg", "ckih1", "ckih2", "lp_apm", };
 
 enum imx5_clks {
         dummy, ckil, osc, ckih1, ckih2, ahb, ipg, axi_a, axi_b, uart_pred,
@@ -82,6 +83,7 @@ enum imx5_clks {
         ssi_ext1_podf, ssi_ext2_pred, ssi_ext2_podf, ssi1_root_gate,
         ssi2_root_gate, ssi3_root_gate, ssi_ext1_gate, ssi_ext2_gate,
         epit1_ipg_gate, epit1_hf_gate, epit2_ipg_gate, epit2_hf_gate,
+        can_sel, can1_serial_gate, can1_ipg_gate,
         clk_max
 };
 
@@ -421,8 +423,12 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
         clk[esdhc4_per_gate] = imx_clk_gate2("esdhc4_per_gate", "esdhc_d_sel", MXC_CCM_CCGR3, 14);
         clk[usb_phy1_gate] = imx_clk_gate2("usb_phy1_gate", "usb_phy_sel", MXC_CCM_CCGR4, 10);
         clk[usb_phy2_gate] = imx_clk_gate2("usb_phy2_gate", "usb_phy_sel", MXC_CCM_CCGR4, 12);
-        clk[can2_serial_gate] = imx_clk_gate2("can2_serial_gate", "ipg", MXC_CCM_CCGR4, 6);
-        clk[can2_ipg_gate] = imx_clk_gate2("can2_ipg_gate", "ipg", MXC_CCM_CCGR4, 8);
+        clk[can_sel] = imx_clk_mux("can_sel", MXC_CCM_CSCMR2, 6, 2,
+                                mx53_can_sel, ARRAY_SIZE(mx53_can_sel));
+        clk[can1_serial_gate] = imx_clk_gate2("can1_serial_gate", "can_sel", MXC_CCM_CCGR6, 22);
+        clk[can1_ipg_gate] = imx_clk_gate2("can1_ipg_gate", "ipg", MXC_CCM_CCGR6, 20);
+        clk[can2_serial_gate] = imx_clk_gate2("can2_serial_gate", "can_sel", MXC_CCM_CCGR4, 8);
+        clk[can2_ipg_gate] = imx_clk_gate2("can2_ipg_gate", "ipg", MXC_CCM_CCGR4, 6);
         clk[i2c3_gate] = imx_clk_gate2("i2c3_gate", "per_root", MXC_CCM_CCGR1, 22);
 
         for (i = 0; i < ARRAY_SIZE(clk); i++)
@@ -455,6 +461,10 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
         clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "63fcc000.ssi");
         clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "50014000.ssi");
         clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "63fd0000.ssi");
+        clk_register_clkdev(clk[can1_ipg_gate], "ipg", "53fc8000.can");
+        clk_register_clkdev(clk[can1_serial_gate], "per", "53fc8000.can");
+        clk_register_clkdev(clk[can2_ipg_gate], "ipg", "53fcc000.can");
+        clk_register_clkdev(clk[can2_serial_gate], "per", "53fcc000.can");
 
         /* set SDHC root clock to 200MHZ*/
         clk_set_rate(clk[esdhc_a_podf], 200000000);
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx3.h b/arch/arm/plat-mxc/include/mach/iomux-mx3.h
index d8b65b51f2a9..f79f78a1c0ed 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx3.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx3.h
@@ -512,12 +512,16 @@ enum iomux_pins {
 #define MX31_PIN_CSPI3_SPI_RDY__CTS3    IOMUX_MODE(MX31_PIN_CSPI3_SPI_RDY, IOMUX_CONFIG_ALT1)
 #define MX31_PIN_CTS1__CTS1             IOMUX_MODE(MX31_PIN_CTS1, IOMUX_CONFIG_FUNC)
 #define MX31_PIN_RTS1__RTS1             IOMUX_MODE(MX31_PIN_RTS1, IOMUX_CONFIG_FUNC)
+#define MX31_PIN_RTS1__SFS              IOMUX_MODE(MX31_PIN_RTS1, IOMUX_CONFIG_ALT2)
 #define MX31_PIN_TXD1__TXD1             IOMUX_MODE(MX31_PIN_TXD1, IOMUX_CONFIG_FUNC)
+#define MX31_PIN_TXD1__SCK              IOMUX_MODE(MX31_PIN_TXD1, IOMUX_CONFIG_ALT2)
 #define MX31_PIN_RXD1__RXD1             IOMUX_MODE(MX31_PIN_RXD1, IOMUX_CONFIG_FUNC)
+#define MX31_PIN_RXD1__STXDA            IOMUX_MODE(MX31_PIN_RXD1, IOMUX_CONFIG_ALT2)
 #define MX31_PIN_DCD_DCE1__DCD_DCE1     IOMUX_MODE(MX31_PIN_DCD_DCE1, IOMUX_CONFIG_FUNC)
 #define MX31_PIN_RI_DCE1__RI_DCE1       IOMUX_MODE(MX31_PIN_RI_DCE1, IOMUX_CONFIG_FUNC)
 #define MX31_PIN_DSR_DCE1__DSR_DCE1     IOMUX_MODE(MX31_PIN_DSR_DCE1, IOMUX_CONFIG_FUNC)
 #define MX31_PIN_DTR_DCE1__DTR_DCE1     IOMUX_MODE(MX31_PIN_DTR_DCE1, IOMUX_CONFIG_FUNC)
+#define MX31_PIN_DTR_DCE1__SRXDA        IOMUX_MODE(MX31_PIN_DTR_DCE1, IOMUX_CONFIG_ALT2)
 #define MX31_PIN_CTS2__CTS2             IOMUX_MODE(MX31_PIN_CTS2, IOMUX_CONFIG_FUNC)
 #define MX31_PIN_RTS2__RTS2             IOMUX_MODE(MX31_PIN_RTS2, IOMUX_CONFIG_FUNC)
 #define MX31_PIN_TXD2__TXD2             IOMUX_MODE(MX31_PIN_TXD2, IOMUX_CONFIG_FUNC)
@@ -721,6 +725,7 @@ enum iomux_pins {
 #define MX31_PIN_KEY_ROW2_KEY_ROW2      IOMUX_MODE(MX31_PIN_KEY_ROW2, IOMUX_CONFIG_FUNC)
 #define MX31_PIN_KEY_ROW3_KEY_ROW3      IOMUX_MODE(MX31_PIN_KEY_ROW3, IOMUX_CONFIG_FUNC)
 #define MX31_PIN_KEY_ROW4_KEY_ROW4      IOMUX_MODE(MX31_PIN_KEY_ROW4, IOMUX_CONFIG_FUNC)
+#define MX31_PIN_KEY_ROW4_GPIO          IOMUX_MODE(MX31_PIN_KEY_ROW4, IOMUX_CONFIG_GPIO)
 #define MX31_PIN_KEY_ROW5_KEY_ROW5      IOMUX_MODE(MX31_PIN_KEY_ROW5, IOMUX_CONFIG_FUNC)
 #define MX31_PIN_KEY_ROW6_KEY_ROW6      IOMUX_MODE(MX31_PIN_KEY_ROW6, IOMUX_CONFIG_FUNC)
 #define MX31_PIN_KEY_ROW7_KEY_ROW7      IOMUX_MODE(MX31_PIN_KEY_ROW7, IOMUX_CONFIG_FUNC)
diff --git a/arch/arm/plat-mxc/ssi-fiq.S b/arch/arm/plat-mxc/ssi-fiq.S
index 8397a2dd19f2..a8b93c5f29b5 100644
--- a/arch/arm/plat-mxc/ssi-fiq.S
+++ b/arch/arm/plat-mxc/ssi-fiq.S
@@ -34,91 +34,98 @@
                 .global imx_ssi_fiq_rx_buffer
                 .global imx_ssi_fiq_tx_buffer
 
+/*
+ * imx_ssi_fiq_start is _intentionally_ not marked as a function symbol
+ * using ENDPROC().  imx_ssi_fiq_start and imx_ssi_fiq_end are used to
+ * mark the function body so that it can be copied to the FIQ vector in
+ * the vectors page.  imx_ssi_fiq_start should only be called as the result
+ * of an FIQ: calling it directly will not work.
+ */
 imx_ssi_fiq_start:
-                ldr r12, imx_ssi_fiq_base
+                ldr r12, .L_imx_ssi_fiq_base
 
                 /* TX */
-                ldr r11, imx_ssi_fiq_tx_buffer
+                ldr r13, .L_imx_ssi_fiq_tx_buffer
 
                 /* shall we send? */
-                ldr r13, [r12, #SSI_SIER]
-                tst r13, #SSI_SIER_TFE0_EN
+                ldr r11, [r12, #SSI_SIER]
+                tst r11, #SSI_SIER_TFE0_EN
                 beq 1f
 
                 /* TX FIFO empty? */
-                ldr r13, [r12, #SSI_SISR]
-                tst r13, #SSI_SISR_TFE0
+                ldr r11, [r12, #SSI_SISR]
+                tst r11, #SSI_SISR_TFE0
                 beq 1f
 
                 mov r10, #0x10000
                 sub r10, #1
                 and r10, r10, r8        /* r10: current buffer offset */
 
-                add r11, r11, r10
+                add r13, r13, r10
 
-                ldrh r13, [r11]
-                strh r13, [r12, #SSI_STX0]
+                ldrh r11, [r13]
+                strh r11, [r12, #SSI_STX0]
 
-                ldrh r13, [r11, #2]
-                strh r13, [r12, #SSI_STX0]
+                ldrh r11, [r13, #2]
+                strh r11, [r12, #SSI_STX0]
 
-                ldrh r13, [r11, #4]
-                strh r13, [r12, #SSI_STX0]
+                ldrh r11, [r13, #4]
+                strh r11, [r12, #SSI_STX0]
 
-                ldrh r13, [r11, #6]
-                strh r13, [r12, #SSI_STX0]
+                ldrh r11, [r13, #6]
+                strh r11, [r12, #SSI_STX0]
 
                 add r10, #8
-                lsr r13, r8, #16        /* r13: buffer size */
-                cmp r10, r13
-                lslgt r8, r13, #16
+                lsr r11, r8, #16        /* r11: buffer size */
+                cmp r10, r11
+                lslgt r8, r11, #16
                 addle r8, #8
 1:
                 /* RX */
 
                 /* shall we receive? */
-                ldr r13, [r12, #SSI_SIER]
-                tst r13, #SSI_SIER_RFF0_EN
+                ldr r11, [r12, #SSI_SIER]
+                tst r11, #SSI_SIER_RFF0_EN
                 beq 1f
 
                 /* RX FIFO full? */
-                ldr r13, [r12, #SSI_SISR]
-                tst r13, #SSI_SISR_RFF0
+                ldr r11, [r12, #SSI_SISR]
+                tst r11, #SSI_SISR_RFF0
                 beq 1f
 
-                ldr r11, imx_ssi_fiq_rx_buffer
+                ldr r13, .L_imx_ssi_fiq_rx_buffer
 
                 mov r10, #0x10000
                 sub r10, #1
                 and r10, r10, r9        /* r10: current buffer offset */
 
-                add r11, r11, r10
+                add r13, r13, r10
 
-                ldr r13, [r12, #SSI_SACNT]
-                tst r13, #SSI_SACNT_AC97EN
+                ldr r11, [r12, #SSI_SACNT]
+                tst r11, #SSI_SACNT_AC97EN
 
-                ldr r13, [r12, #SSI_SRX0]
-                strh r13, [r11]
+                ldr r11, [r12, #SSI_SRX0]
+                strh r11, [r13]
 
-                ldr r13, [r12, #SSI_SRX0]
-                strh r13, [r11, #2]
+                ldr r11, [r12, #SSI_SRX0]
+                strh r11, [r13, #2]
 
                 /* dummy read to skip slot 12 */
-                ldrne r13, [r12, #SSI_SRX0]
+                ldrne r11, [r12, #SSI_SRX0]
 
-                ldr r13, [r12, #SSI_SRX0]
-                strh r13, [r11, #4]
+                ldr r11, [r12, #SSI_SRX0]
+                strh r11, [r13, #4]
 
-                ldr r13, [r12, #SSI_SRX0]
-                strh r13, [r11, #6]
+                ldr r11, [r12, #SSI_SRX0]
+                strh r11, [r13, #6]
 
                 /* dummy read to skip slot 12 */
-                ldrne r13, [r12, #SSI_SRX0]
+                ldrne r11, [r12, #SSI_SRX0]
 
                 add r10, #8
-                lsr r13, r9, #16        /* r13: buffer size */
-                cmp r10, r13
-                lslgt r9, r13, #16
+                lsr r11, r9, #16        /* r11: buffer size */
+                cmp r10, r11
+                lslgt r9, r11, #16
                 addle r9, #8
 
 1:
@@ -126,11 +133,15 @@ imx_ssi_fiq_start:
                 subs    pc, lr, #4
 
                 .align
+.L_imx_ssi_fiq_base:
 imx_ssi_fiq_base:
                 .word 0x0
+.L_imx_ssi_fiq_rx_buffer:
 imx_ssi_fiq_rx_buffer:
                 .word 0x0
+.L_imx_ssi_fiq_tx_buffer:
 imx_ssi_fiq_tx_buffer:
                 .word 0x0
+.L_imx_ssi_fiq_end:
 imx_ssi_fiq_end: