ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files.

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-spear3xx / spear300.c

diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
index 3560f8c1e723783e3aa45b33b457a6dcd7e6735f..80ca04a80491b27bf62ec8ce713568543c28844d 100644 (file)
--- a/arch/arm/mach-spear3xx/spear300.c
+++ b/arch/arm/mach-spear3xx/spear300.c
@@ -15,9 +15,9 @@
 #include <linux/amba/pl061.h>
 #include <linux/ptrace.h>
 #include <asm/irq.h>
+#include <plat/shirq.h>
 #include <mach/generic.h>
 #include <mach/spear.h>
-#include <plat/shirq.h>
 
 /* pad multiplexing support */
 /* muxing registers */
@@ -371,7 +371,7 @@ struct pmx_driver pmx_driver = {
 };
 
 /* Add spear300 specific devices here */
-/* arm gpio1 device registeration */
+/* arm gpio1 device registration */
 static struct pl061_platform_data gpio1_plat_data = {
        .gpio_base      = 8,
        .irq_base       = SPEAR_GPIO1_INT_BASE,
@@ -451,7 +451,7 @@ void __init spear300_init(void)
        /* call spear3xx family common init function */
        spear3xx_init();
 
-       /* shared irq registeration */
+       /* shared irq registration */
        shirq_ras1.regs.base =
                ioremap(SPEAR300_TELECOM_BASE, SPEAR300_TELECOM_REG_SIZE);
        if (shirq_ras1.regs.base) {
@@ -459,10 +459,16 @@ void __init spear300_init(void)
                if (ret)
                        printk(KERN_ERR "Error registering Shared IRQ\n");
        }
-}
 
-void spear300_pmx_init(void)
-{
-       spear_pmx_init(&pmx_driver, SPEAR300_SOC_CONFIG_BASE,
+       /* pmx initialization */
+       pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE,
                        SPEAR300_SOC_CONFIG_SIZE);
+       if (pmx_driver.base) {
+               ret = pmx_register(&pmx_driver);
+               if (ret)
+                       printk(KERN_ERR "padmux: registeration failed. err no"
+                                       ": %d\n", ret);
+               /* Free Mapping, device selection already done */
+               iounmap(pmx_driver.base);
+       }
 }