davinci: Rearrange the da830/omap-l137 macros and functions

Rearrange the PINMUX macros and pinmux_setup function which
are common between da830/omap-l137 and da850/omap-l138.

Also, replace the da830 string in function names to da8xx.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 9185a706d14c4ada1e2b7f9d512b82c9aee2cb08..90256693b8d82dbec9b0b07bf35106f679c34322 100644 (file)
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -61,7 +61,7 @@ static __init void da830_evm_init(void)
                pr_warning("da830_evm_init: edma registration failed: %d\n",
                                ret);
 
-       ret = da830_pinmux_setup(da830_i2c0_pins);
+       ret = da8xx_pinmux_setup(da830_i2c0_pins);
        if (ret)
                pr_warning("da830_evm_init: i2c0 mux setup failed: %d\n",
                                ret);
@@ -75,7 +75,7 @@ static __init void da830_evm_init(void)
        soc_info->emac_pdata->mdio_max_freq = DA830_EVM_MDIO_FREQUENCY;
        soc_info->emac_pdata->rmii_en = 1;
 
-       ret = da830_pinmux_setup(da830_cpgmac_pins);
+       ret = da8xx_pinmux_setup(da830_cpgmac_pins);
        if (ret)
                pr_warning("da830_evm_init: cpgmac mux setup failed: %d\n",
                                ret);

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 999f69c9372b4764956f844e5cf5f20f047ace98..3a9b6346c310e58a7eddf30d2512c99d6f2b0578 100644 (file)
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -428,27 +428,6 @@ static struct davinci_clk da830_clks[] = {
        CLK(NULL,               NULL,           NULL),
 };
 
-#define PINMUX0                        0x00
-#define PINMUX1                        0x04
-#define PINMUX2                        0x08
-#define PINMUX3                        0x0c
-#define PINMUX4                        0x10
-#define PINMUX5                        0x14
-#define PINMUX6                        0x18
-#define PINMUX7                        0x1c
-#define PINMUX8                        0x20
-#define PINMUX9                        0x24
-#define PINMUX10               0x28
-#define PINMUX11               0x2c
-#define PINMUX12               0x30
-#define PINMUX13               0x34
-#define PINMUX14               0x38
-#define PINMUX15               0x3c
-#define PINMUX16               0x40
-#define PINMUX17               0x44
-#define PINMUX18               0x48
-#define PINMUX19               0x4c
-
 /*
  * Device specific mux setup
  *
@@ -1036,20 +1015,6 @@ const short da830_eqep1_pins[] __initdata = {
        -1
 };
 
-int da830_pinmux_setup(const short pins[])
-{
-       int i, error = -EINVAL;
-
-       if (pins)
-               for (i = 0; pins[i] >= 0; i++) {
-                       error = davinci_cfg_reg(pins[i]);
-                       if (error)
-                               break;
-               }
-
-       return error;
-}
-
 /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
 static u8 da830_default_priorities[DA830_N_CP_INTC_IRQ] = {
        [IRQ_DA8XX_COMMTX]              = 7,

diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 65b42431ddeceb84b31f70a8c5b0ddfe55bfa664..8c8dc135472cefb6ce5093a0a87be51c09459b67 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -37,6 +37,27 @@
 #define DA8XX_GPIO_BASE                0x01e26000
 #define DA8XX_PSC1_BASE                0x01e27000
 
+#define PINMUX0                        0x00
+#define PINMUX1                        0x04
+#define PINMUX2                        0x08
+#define PINMUX3                        0x0c
+#define PINMUX4                        0x10
+#define PINMUX5                        0x14
+#define PINMUX6                        0x18
+#define PINMUX7                        0x1c
+#define PINMUX8                        0x20
+#define PINMUX9                        0x24
+#define PINMUX10               0x28
+#define PINMUX11               0x2c
+#define PINMUX12               0x30
+#define PINMUX13               0x34
+#define PINMUX14               0x38
+#define PINMUX15               0x3c
+#define PINMUX16               0x40
+#define PINMUX17               0x44
+#define PINMUX18               0x48
+#define PINMUX19               0x4c
+
 void __init da830_init(void);
 
 int da8xx_register_edma(void);
@@ -72,6 +93,6 @@ extern const short da830_ecap2_pins[];
 extern const short da830_eqep0_pins[];
 extern const short da830_eqep1_pins[];
 
-int da830_pinmux_setup(const short pins[]);
+int da8xx_pinmux_setup(const short pins[]);
 
 #endif /* __ASM_ARCH_DAVINCI_DA8XX_H */

diff --git a/arch/arm/mach-davinci/mux.c b/arch/arm/mach-davinci/mux.c
index d310f579aa853329f811699d7ed93cf22525b2bf..898905e4894698e2a6a444142854f6c08f2e2e17 100644 (file)
--- a/arch/arm/mach-davinci/mux.c
+++ b/arch/arm/mach-davinci/mux.c
@@ -91,3 +91,17 @@ int __init_or_module davinci_cfg_reg(const unsigned long index)
        return 0;
 }
 EXPORT_SYMBOL(davinci_cfg_reg);
+
+int da8xx_pinmux_setup(const short pins[])
+{
+       int i, error = -EINVAL;
+
+       if (pins)
+               for (i = 0; pins[i] >= 0; i++) {
+                       error = davinci_cfg_reg(pins[i]);
+                       if (error)
+                               break;
+               }
+
+       return error;
+}