13 files changed, 20 insertions, 28 deletions

diff --git a/arch/arm/mach-at91/at91_rstc.h b/arch/arm/mach-at91/at91_rstc.h
index 875fa336800b..a600e6992920 100644
--- a/arch/arm/mach-at91/at91_rstc.h
+++ b/arch/arm/mach-at91/at91_rstc.h
@@ -23,7 +23,7 @@ extern void __iomem *at91_rstc_base;
         __raw_readl(at91_rstc_base + field)
 
 #define at91_rstc_write(field, value) \
-        __raw_writel(value, at91_rstc_base + field);
+        __raw_writel(value, at91_rstc_base + field)
 #else
 .extern at91_rstc_base
 #endif
diff --git a/arch/arm/mach-at91/at91_shdwc.h b/arch/arm/mach-at91/at91_shdwc.h
index 60478ea8bd46..9e29f31ec9a6 100644
--- a/arch/arm/mach-at91/at91_shdwc.h
+++ b/arch/arm/mach-at91/at91_shdwc.h
@@ -23,7 +23,7 @@ extern void __iomem *at91_shdwc_base;
         __raw_readl(at91_shdwc_base + field)
 
 #define at91_shdwc_write(field, value) \
-        __raw_writel(value, at91_shdwc_base + field);
+        __raw_writel(value, at91_shdwc_base + field)
 #endif
 
 #define AT91_SHDW_CR            0x00                    /* Shut Down Control Register */
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index ccce7592dbd3..d193a409bc45 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -212,6 +212,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("t2_clk", "fffa4000.timer", &tc5_clk),
         CLKDEV_CON_DEV_ID("mci_clk", "fffb4000.mmc", &mmc_clk),
         CLKDEV_CON_DEV_ID("emac_clk", "fffbc000.ethernet", &ether_clk),
+        CLKDEV_CON_DEV_ID(NULL, "fffb8000.i2c", &twi_clk),
         CLKDEV_CON_DEV_ID("hclk", "300000.ohci", &ohci_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk),
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 1833b4c365df..a8ce24538da6 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -232,6 +232,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("t2_clk", "fffdc000.timer", &tc5_clk),
         CLKDEV_CON_DEV_ID("hclk", "500000.ohci", &ohci_clk),
         CLKDEV_CON_DEV_ID("mci_clk", "fffa8000.mmc", &mmc_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "fffc8000.spi", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "fffcc000.spi", &spi1_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
         CLKDEV_CON_ID("pioA", &pioA_clk),
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 4fcbe7b5b58d..a6c224fc9542 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -262,6 +262,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("mci_clk", "fffd0000.mmc", &mmc1_clk),
         CLKDEV_CON_DEV_ID(NULL, "fff84000.i2c", &twi0_clk),
         CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi1_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff200.gpio", &pioA_clk),
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
index 2c7a2f4a7568..13cdbcd48f51 100644
--- a/arch/arm/mach-at91/at91sam9n12.c
+++ b/arch/arm/mach-at91/at91sam9n12.c
@@ -172,6 +172,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma_clk),
         CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),
         CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "f0000000.spi", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "f0004000.spi", &spi1_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioAB_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioAB_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCD_clk),
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index 3a1a7993c125..e631fec040ce 100644
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -237,6 +237,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),
         CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),
         CLKDEV_CON_DEV_ID(NULL, "f8018000.i2c", &twi2_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "f0000000.spi", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "f0004000.spi", &spi1_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioAB_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioAB_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCD_clk),
diff --git a/arch/arm/mach-at91/at91x40_time.c b/arch/arm/mach-at91/at91x40_time.c
index 0c07a4459cb2..2919eba41ff4 100644
--- a/arch/arm/mach-at91/at91x40_time.c
+++ b/arch/arm/mach-at91/at91x40_time.c
@@ -33,7 +33,7 @@
         __raw_readl(AT91_IO_P2V(AT91_TC) + field)
 
 #define at91_tc_write(field, value) \
-        __raw_writel(value, AT91_IO_P2V(AT91_TC) + field);
+        __raw_writel(value, AT91_IO_P2V(AT91_TC) + field)
 
 /*
  *      3 counter/timer units present.
diff --git a/arch/arm/mach-at91/cpuidle.c b/arch/arm/mach-at91/cpuidle.c
index 0c6381516a5a..48f1228c611c 100644
--- a/arch/arm/mach-at91/cpuidle.c
+++ b/arch/arm/mach-at91/cpuidle.c
@@ -27,8 +27,6 @@
 
 #define AT91_MAX_STATES 2
 
-static DEFINE_PER_CPU(struct cpuidle_device, at91_cpuidle_device);
-
 /* Actual code that puts the SoC in different idle states */
 static int at91_enter_idle(struct cpuidle_device *dev,
                         struct cpuidle_driver *drv,
@@ -47,7 +45,6 @@ static int at91_enter_idle(struct cpuidle_device *dev,
 static struct cpuidle_driver at91_idle_driver = {
         .name                   = "at91_idle",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
         .states[0]              = ARM_CPUIDLE_WFI_STATE,
         .states[1]              = {
                 .enter                  = at91_enter_idle,
@@ -61,20 +58,9 @@ static struct cpuidle_driver at91_idle_driver = {
 };
 
 /* Initialize CPU idle by registering the idle states */
-static int at91_init_cpuidle(void)
+static int __init at91_init_cpuidle(void)
 {
-        struct cpuidle_device *device;
-
-        device = &per_cpu(at91_cpuidle_device, smp_processor_id());
-        device->state_count = AT91_MAX_STATES;
-
-        cpuidle_register_driver(&at91_idle_driver);
-
-        if (cpuidle_register_device(device)) {
-                printk(KERN_ERR "at91_init_cpuidle: Failed registering\n");
-                return -EIO;
-        }
-        return 0;
+        return cpuidle_register(&at91_idle_driver, NULL);
 }
 
 device_initcall(at91_init_cpuidle);
diff --git a/arch/arm/mach-at91/include/mach/at91_dbgu.h b/arch/arm/mach-at91/include/mach/at91_dbgu.h
index 2aa0c5e13495..3b5948566e52 100644
--- a/arch/arm/mach-at91/include/mach/at91_dbgu.h
+++ b/arch/arm/mach-at91/include/mach/at91_dbgu.h
@@ -16,9 +16,6 @@
 #ifndef AT91_DBGU_H
 #define AT91_DBGU_H
 
-#define dbgu_readl(dbgu, field) \
-        __raw_readl(AT91_VA_BASE_SYS + dbgu + AT91_DBGU_ ## field)
-
 #if !defined(CONFIG_ARCH_AT91X40)
 #define AT91_DBGU_CR            (0x00)  /* Control Register */
 #define AT91_DBGU_MR            (0x04)  /* Mode Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_matrix.h b/arch/arm/mach-at91/include/mach/at91_matrix.h
index 02fae9de746b..f8996c954131 100644
--- a/arch/arm/mach-at91/include/mach/at91_matrix.h
+++ b/arch/arm/mach-at91/include/mach/at91_matrix.h
@@ -14,7 +14,7 @@ extern void __iomem *at91_matrix_base;
         __raw_readl(at91_matrix_base + field)
 
 #define at91_matrix_write(field, value) \
-        __raw_writel(value, at91_matrix_base + field);
+        __raw_writel(value, at91_matrix_base + field)
 
 #else
 .extern at91_matrix_base
diff --git a/arch/arm/mach-at91/include/mach/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h
index 969aac27109f..67fdbd13c3ed 100644
--- a/arch/arm/mach-at91/include/mach/at91_st.h
+++ b/arch/arm/mach-at91/include/mach/at91_st.h
@@ -23,7 +23,7 @@ extern void __iomem *at91_st_base;
         __raw_readl(at91_st_base + field)
 
 #define at91_st_write(field, value) \
-        __raw_writel(value, at91_st_base + field);
+        __raw_writel(value, at91_st_base + field)
 #else
 .extern at91_st_base
 #endif
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 2ecd1693c804..e8491e77b1f7 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -360,7 +360,7 @@ static void at91_dt_rstc(void)
 
         of_id = of_match_node(rstc_ids, np);
         if (!of_id)
-                panic("AT91: rtsc no restart function availlable\n");
+                panic("AT91: rtsc no restart function available\n");
 
         arm_pm_restart = of_id->data;
 
@@ -380,7 +380,7 @@ static void at91_dt_ramc(void)
 
         np = of_find_matching_node(NULL, ramc_ids);
         if (!np)
-                panic("unable to find compatible ram conroller node in dtb\n");
+                panic("unable to find compatible ram controller node in dtb\n");
 
         at91_ramc_base[0] = of_iomap(np, 0);
         if (!at91_ramc_base[0])
@@ -430,7 +430,7 @@ static void at91_dt_shdwc(void)
 
         np = of_find_matching_node(NULL, shdwc_ids);
         if (!np) {
-                pr_debug("AT91: unable to find compatible shutdown (shdwc) conroller node in dtb\n");
+                pr_debug("AT91: unable to find compatible shutdown (shdwc) controller node in dtb\n");
                 return;
         }
 
@@ -446,7 +446,7 @@ static void at91_dt_shdwc(void)
 
         if (!of_property_read_u32(np, "atmel,wakeup-counter", &reg)) {
                 if (reg > AT91_SHDW_CPTWK0_MAX) {
-                        pr_warn("AT91: shdwc wakeup conter 0x%x > 0x%x reduce it to 0x%x\n",
+                        pr_warn("AT91: shdwc wakeup counter 0x%x > 0x%x reduce it to 0x%x\n",
                                 reg, AT91_SHDW_CPTWK0_MAX, AT91_SHDW_CPTWK0_MAX);
                         reg = AT91_SHDW_CPTWK0_MAX;
                 }