davinci: da850: move da850_evm specific mcasp pins to board file.

The da850_mcasp_pins pinmux array is specific to the da850_evm, and is
not generic.  Move the array to the board file, make it static initdata,
and rename it accordingly.

Signed-off-by: Michael Williamson <michael.williamson@criticallink.com>
Tested-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index b01fb2ab944a33d43414d231343cffd698ec7a2d..c4c0b7562d9687471f5d34951de42a37178654b7 100644 (file)
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -664,6 +664,13 @@ static struct snd_platform_data da850_evm_snd_data = {
        .rxnumevt       = 1,
 };
 
+static const short da850_evm_mcasp_pins[] __initconst = {
+       DA850_AHCLKX, DA850_ACLKX, DA850_AFSX,
+       DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE,
+       DA850_AXR_11, DA850_AXR_12,
+       -1
+};
+
 static int da850_evm_mmc_get_ro(int index)
 {
        return gpio_get_value(DA850_MMCSD_WP_PIN);
@@ -1106,7 +1113,7 @@ static __init void da850_evm_init(void)
        __raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30);
        __raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30);
 
-       ret = davinci_cfg_reg_list(da850_mcasp_pins);
+       ret = davinci_cfg_reg_list(da850_evm_mcasp_pins);
        if (ret)
                pr_warning("da850_evm_init: mcasp mux setup failed: %d\n",
                                ret);

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 1cf3d7fc47009e3cde3b21dd81e6adef55530b74..9cb769c2890b17156ffcb1dcc4d3f9b8f1c0da27 100644 (file)
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -597,13 +597,6 @@ const short da850_i2c1_pins[] __initdata = {
        -1
 };
 
-const short da850_mcasp_pins[] __initdata = {
-       DA850_AHCLKX, DA850_ACLKX, DA850_AFSX,
-       DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE,
-       DA850_AXR_11, DA850_AXR_12,
-       -1
-};
-
 const short da850_lcdcntl_pins[] __initdata = {
        DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3,
        DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7,

diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 4297f1ecffac6629faa6002aa003f5993ba5d764..89668b402e23b84c357a75f259d90d0192e31845 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -128,7 +128,6 @@ extern const short da850_uart1_pins[];
 extern const short da850_uart2_pins[];
 extern const short da850_i2c0_pins[];
 extern const short da850_i2c1_pins[];
-extern const short da850_mcasp_pins[];
 extern const short da850_lcdcntl_pins[];
 extern const short da850_mmcsd0_pins[];