ARM: davinci: serial: get rid of davinci_uart_config

"struct davinci_uart_config" was introduced to specify
UART ports brought out or enabled on the board. But
none of the boards use it for that purpose and we are
not going to add anymore board files, so remove the
structure.

Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
Suggested-by: Sekhar Nori <nsekhar@ti.com>
[nsekhar@ti.com: split patch to remove davinci_serial_setup_clk()
		 changes.]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 1332de8c52c99dce492c57612e778229ec6a64bd..c4bdc0a1c36e7795a21862f8a69a7e8ead71a43b 100644 (file)
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -185,10 +185,6 @@ static __init void da830_evm_usb_init(void)
                           __func__, ret);
 }
 
-static struct davinci_uart_config da830_evm_uart_config __initdata = {
-       .enabled_uarts = 0x7,
-};
-
 static const short da830_evm_mcasp1_pins[] = {
        DA830_AHCLKX1, DA830_ACLKX1, DA830_AFSX1, DA830_AHCLKR1, DA830_AFSR1,
        DA830_AMUTE1, DA830_AXR1_0, DA830_AXR1_1, DA830_AXR1_2, DA830_AXR1_5,
@@ -630,7 +626,7 @@ static __init void da830_evm_init(void)
                pr_warning("da830_evm_init: watchdog registration failed: %d\n",
                                ret);
 
-       davinci_serial_init(&da830_evm_uart_config);
+       davinci_serial_init(da8xx_serial_device);
        i2c_register_board_info(1, da830_evm_i2c_devices,
                        ARRAY_SIZE(da830_evm_i2c_devices));
 

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index bea6793a7ede41cb04822303956d28347037460b..9afd687f9e30ae0f5dbf34947736d57bd73e4279 100644 (file)
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -746,10 +746,6 @@ static struct davinci_i2c_platform_data da850_evm_i2c_0_pdata = {
        .bus_delay      = 0,    /* usec */
 };
 
-static struct davinci_uart_config da850_evm_uart_config __initdata = {
-       .enabled_uarts = 0x7,
-};
-
 /* davinci da850 evm audio machine driver */
 static u8 da850_iis_serializer_direction[] = {
        INACTIVE_MODE,  INACTIVE_MODE,  INACTIVE_MODE,  INACTIVE_MODE,
@@ -1494,7 +1490,7 @@ static __init void da850_evm_init(void)
                                __func__, ret);
        }
 
-       davinci_serial_init(&da850_evm_uart_config);
+       davinci_serial_init(da8xx_serial_device);
 
        i2c_register_board_info(1, da850_evm_i2c_devices,
                        ARRAY_SIZE(da850_evm_i2c_devices));

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index c2a0a67d09e011446a60d8de0e913459f6139d86..42b23a3194a05d9052026e2f14c4a0fe5a9cc67e 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -314,10 +314,6 @@ static struct platform_device *davinci_evm_devices[] __initdata = {
        &davinci_nand_device,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-       .enabled_uarts = (1 << 0),
-};
-
 static void __init dm355_evm_map_io(void)
 {
        dm355_init();
@@ -393,7 +389,7 @@ static __init void dm355_evm_init(void)
        platform_add_devices(davinci_evm_devices,
                             ARRAY_SIZE(davinci_evm_devices));
        evm_init_i2c();
-       davinci_serial_init(&uart_config);
+       davinci_serial_init(dm355_serial_device);
 
        /* NOTE:  NAND flash timings set by the UBL are slower than
         * needed by MT29F16G08FAA chips ... EMIF.A1CR is 0x40400204

diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index dff4ddc5ef81312590cd3a2cdb1ad4b40e3741ab..d9eb1c9bb56a47b8a93c1c0ee7fbbc77a390ad8b 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -172,10 +172,6 @@ static struct platform_device *davinci_leopard_devices[] __initdata = {
        &davinci_nand_device,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-       .enabled_uarts = (1 << 0),
-};
-
 static void __init dm355_leopard_map_io(void)
 {
        dm355_init();
@@ -251,7 +247,7 @@ static __init void dm355_leopard_init(void)
        platform_add_devices(davinci_leopard_devices,
                             ARRAY_SIZE(davinci_leopard_devices));
        leopard_init_i2c();
-       davinci_serial_init(&uart_config);
+       davinci_serial_init(dm355_serial_device);
 
        /* NOTE:  NAND flash timings set by the UBL are slower than
         * needed by MT29F16G08FAA chips ... EMIF.A1CR is 0x40400204

diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index afbc439f11d4fba53bd3882535eda6b41540fe2f..000e2ab8ff3d4002d3d52f7cb106c000f225b527 100644 (file)
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -718,10 +718,6 @@ fail:
        /* REVISIT export switches: NTSC/PAL (SW5.6), EXTRA1 (SW5.2), etc */
 }
 
-static struct davinci_uart_config uart_config __initdata = {
-       .enabled_uarts = (1 << 0),
-};
-
 static void __init dm365_evm_map_io(void)
 {
        dm365_init();
@@ -748,7 +744,7 @@ static struct spi_board_info dm365_evm_spi_info[] __initconst = {
 static __init void dm365_evm_init(void)
 {
        evm_init_i2c();
-       davinci_serial_init(&uart_config);
+       davinci_serial_init(dm365_serial_device);
 
        dm365evm_emac_configure();
        dm365evm_mmc_configure();

diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index a33686a6fbb226f9b880c2268a87beeb6b6f98e9..462812b37e4deaa8c83469cb9e1498e95ee96ca9 100644 (file)
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -726,10 +726,6 @@ static struct platform_device *davinci_evm_devices[] __initdata = {
        &rtc_dev,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-       .enabled_uarts = (1 << 0),
-};
-
 static void __init
 davinci_evm_map_io(void)
 {
@@ -791,7 +787,7 @@ static __init void davinci_evm_init(void)
        davinci_setup_mmc(0, &dm6446evm_mmc_config);
        dm644x_init_video(&dm644xevm_capture_cfg, &dm644xevm_display_cfg);
 
-       davinci_serial_init(&uart_config);
+       davinci_serial_init(dm644x_serial_device);
        dm644x_init_asp(&dm644x_evm_snd_data);
 
        /* irlml6401 switches over 1A, in under 8 msec */

diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index fbb8e5ab1dc19bbd56e3508a5505929bb6c71406..734cc02725194e339937a6ac03bb36beabd4b0e2 100644 (file)
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -749,10 +749,6 @@ static void __init davinci_map_io(void)
        cdce_clk_init();
 }
 
-static struct davinci_uart_config uart_config __initdata = {
-       .enabled_uarts = (1 << 0),
-};
-
 #define DM646X_EVM_PHY_ID              "davinci_mdio-0:01"
 /*
  * The following EDMA channels/slots are not being used by drivers (for
@@ -792,7 +788,7 @@ static __init void evm_init(void)
        struct davinci_soc_info *soc_info = &davinci_soc_info;
 
        evm_init_i2c();
-       davinci_serial_init(&uart_config);
+       davinci_serial_init(dm646x_serial_device);
        dm646x_init_mcasp0(&dm646x_evm_snd_data[0]);
        dm646x_init_mcasp1(&dm646x_evm_snd_data[1]);
 

diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index 9549d53aa63f0489f741a6a7f43b83b9a2505a05..cd0f58730c2ba63234fb5e673156c10214300a80 100644 (file)
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -434,10 +434,6 @@ static void __init mityomapl138_setup_nand(void)
                                 ARRAY_SIZE(mityomapl138_devices));
 }
 
-static struct davinci_uart_config mityomapl138_uart_config __initdata = {
-       .enabled_uarts = 0x7,
-};
-
 static const short mityomap_mii_pins[] = {
        DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3,
        DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER,
@@ -517,7 +513,7 @@ static void __init mityomapl138_init(void)
        if (ret)
                pr_warning("watchdog registration failed: %d\n", ret);
 
-       davinci_serial_init(&mityomapl138_uart_config);
+       davinci_serial_init(da8xx_serial_device);
 
        ret = da8xx_register_i2c(0, &mityomap_i2c_0_pdata);
        if (ret)

diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 2bc112adf565495aed9505bfc23a401e53341d52..8e156e07c5ad0769dd782e4bd166327f634a02fd 100644 (file)
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -153,10 +153,6 @@ static struct platform_device *davinci_ntosd2_devices[] __initdata = {
        &ntosd2_leds_dev,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-       .enabled_uarts = (1 << 0),
-};
-
 static void __init davinci_ntosd2_map_io(void)
 {
        dm644x_init();
@@ -197,7 +193,7 @@ static __init void davinci_ntosd2_init(void)
        platform_add_devices(davinci_ntosd2_devices,
                                ARRAY_SIZE(davinci_ntosd2_devices));
 
-       davinci_serial_init(&uart_config);
+       davinci_serial_init(dm644x_serial_device);
        dm644x_init_asp(&dm644x_ntosd2_snd_data);
 
        soc_info->emac_pdata->phy_id = NEUROS_OSD2_PHY_ID;

diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index b8c20de10ca2b07b276d03bd1f3d37ae9a9701e2..ab98c75cabb48b7ed2cee6518fddca615f58f6e3 100644 (file)
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -286,15 +286,11 @@ usb11_setup_oc_fail:
        gpio_free(DA850_USB1_VBUS_PIN);
 }
 
-static struct davinci_uart_config omapl138_hawk_uart_config __initdata = {
-       .enabled_uarts = 0x7,
-};
-
 static __init void omapl138_hawk_init(void)
 {
        int ret;
 
-       davinci_serial_init(&omapl138_hawk_uart_config);
+       davinci_serial_init(da8xx_serial_device);
 
        omapl138_hawk_config_emac();
 

diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 513eee14f77dd059145d16078d19647546cad57b..d84360148100831265561696b1e661f16a035361 100644 (file)
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -125,10 +125,6 @@ static struct platform_device *davinci_sffsdr_devices[] __initdata = {
        &davinci_sffsdr_nandflash_device,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-       .enabled_uarts = (1 << 0),
-};
-
 static void __init davinci_sffsdr_map_io(void)
 {
        dm644x_init();
@@ -141,7 +137,7 @@ static __init void davinci_sffsdr_init(void)
        platform_add_devices(davinci_sffsdr_devices,
                             ARRAY_SIZE(davinci_sffsdr_devices));
        sffsdr_init_i2c();
-       davinci_serial_init(&uart_config);
+       davinci_serial_init(dm644x_serial_device);
        soc_info->emac_pdata->phy_id = SFFSDR_PHY_ID;
        davinci_setup_usb(0, 0); /* We support only peripheral mode. */
 

diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index a883043d0820c7afe14db5f2b7f00f101606d662..2ab5d577186f4177fd06c414b31d25c21d295f8f 100644 (file)
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -106,4 +106,9 @@ int dm646x_init_edma(struct edma_rsv_info *rsv);
 void dm646x_video_init(void);
 void dm646x_setup_vpif(struct vpif_display_config *,
                       struct vpif_capture_config *);
+
+extern struct platform_device dm365_serial_device[];
+extern struct platform_device dm355_serial_device[];
+extern struct platform_device dm644x_serial_device[];
+extern struct platform_device dm646x_serial_device[];
 #endif /*__DAVINCI_H */

diff --git a/arch/arm/mach-davinci/devices-tnetv107x.c b/arch/arm/mach-davinci/devices-tnetv107x.c
index fc4a0feb4a472bc9a309610aa92afeaf637a4d39..01d8686e553c8e6279ee5c837237ed74d6d47e0a 100644 (file)
--- a/arch/arm/mach-davinci/devices-tnetv107x.c
+++ b/arch/arm/mach-davinci/devices-tnetv107x.c
@@ -410,7 +410,7 @@ void __init tnetv107x_devices_init(struct tnetv107x_device_info *info)
        platform_device_register(&tsc_device);
 
        if (info->serial_config)
-               davinci_serial_init(info->serial_config);
+               davinci_serial_init(tnetv107x_serial_device);
 
        for (i = 0; i < 2; i++)
                if (info->mmc_config[i]) {

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 29fdbae16995221dba4f123cee6a4ad3fb13f923..85367350e3d941bcf8fa488a53058a4b217b948c 100644 (file)
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -962,7 +962,7 @@ static struct plat_serial8250_port dm355_serial2_platform_data[] = {
        }
 };
 
-static struct platform_device dm355_serial_device[] = {
+struct platform_device dm355_serial_device[] = {
        {
                .name                   = "serial8250",
                .id                     = PLAT8250_DEV_PLATFORM,

diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index b60118989f0c202c696add984f90fb3083d7b05c..fa5c693cf16b6da4d6dbf489c6a54e5a8de55681 100644 (file)
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -1068,7 +1068,7 @@ static struct plat_serial8250_port dm365_serial1_platform_data[] = {
        }
 };
 
-static struct platform_device dm365_serial_device[] = {
+struct platform_device dm365_serial_device[] = {
        {
                .name                   = "serial8250",
                .id                     = PLAT8250_DEV_PLATFORM,

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 490eb8cd1dd34048140c6fc1639f2887876f82f8..3969289416a5f3b5010a4644f36e99ee36395baf 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -853,7 +853,7 @@ static struct plat_serial8250_port dm644x_serial2_platform_data[] = {
        }
 };
 
-static struct platform_device dm644x_serial_device[] = {
+struct platform_device dm644x_serial_device[] = {
        {
                .name                   = "serial8250",
                .id                     = PLAT8250_DEV_PLATFORM,

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 23609b1141fe10d1c347410e035e244c8261a577..331a9ec8e7f2847c1ca908ad38c96332132f0dcd 100644 (file)
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -830,7 +830,7 @@ static struct plat_serial8250_port dm646x_serial2_platform_data[] = {
        }
 };
 
-static struct platform_device dm646x_serial_device[] = {
+struct platform_device dm646x_serial_device[] = {
        {
                .name                   = "serial8250",
                .id                     = PLAT8250_DEV_PLATFORM,

diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h
index 62ad300440f5e51a18ef84632c0a15b4570ec179..36bf59155f4bbe42c7edf35b4818e9cfa9170943 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/serial.h
+++ b/arch/arm/mach-davinci/include/mach/serial.h
@@ -15,6 +15,8 @@
 
 #include <mach/hardware.h>
 
+#include <linux/platform_device.h>
+
 #define DAVINCI_UART0_BASE     (IO_PHYS + 0x20000)
 #define DAVINCI_UART1_BASE     (IO_PHYS + 0x20400)
 #define DAVINCI_UART2_BASE     (IO_PHYS + 0x20800)
@@ -37,12 +39,7 @@
 #define UART_DM646X_SCR_TX_WATERMARK   0x08
 
 #ifndef __ASSEMBLY__
-struct davinci_uart_config {
-       /* Bit field of UARTs present; bit 0 --> UART0 */
-       unsigned int enabled_uarts;
-};
-
-extern int davinci_serial_init(struct davinci_uart_config *);
+extern int davinci_serial_init(struct platform_device *);
 extern int davinci_serial_setup_clk(unsigned instance, unsigned int *rate);
 #endif
 

diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h
index beb7c0e9114dcbab6d4e7268f6719d0c7368f610..494fcf5ccfe1bbcc4fabaf927cbe1dfd2adec8e3 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/tnetv107x.h
+++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
@@ -42,7 +42,6 @@
 #include <mach/serial.h>
 
 struct tnetv107x_device_info {
-       struct davinci_uart_config      *serial_config;
        struct davinci_mmc_config       *mmc_config[2];  /* 2 controllers */
        struct davinci_nand_pdata       *nand_config[4]; /* 4 chipsels */
        struct matrix_keypad_platform_data *keypad_config;

diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c
index 2bc74c2a8d4526693ce730fc4be6fcf11357ff5c..45bd41a924db53c05dd688fda06b7b1dab7e8bcf 100644 (file)
--- a/arch/arm/mach-davinci/serial.c
+++ b/arch/arm/mach-davinci/serial.c
@@ -92,10 +92,9 @@ int __init davinci_serial_setup_clk(unsigned instance, unsigned int *rate)
        return 0;
 }
 
-int __init davinci_serial_init(struct davinci_uart_config *info)
+int __init davinci_serial_init(struct platform_device *serial_dev)
 {
        int i, ret = 0;
-       struct davinci_soc_info *soc_info = &davinci_soc_info;
        struct device *dev;
        struct plat_serial8250_port *p;
 
@@ -103,13 +102,11 @@ int __init davinci_serial_init(struct davinci_uart_config *info)
         * Make sure the serial ports are muxed on at this point.
         * You have to mux them off in device drivers later on if not needed.
         */
-       for (i = 0; soc_info->serial_dev[i].dev.platform_data != NULL; i++) {
-               dev = &soc_info->serial_dev[i].dev;
+       for (i = 0; serial_dev[i].dev.platform_data != NULL; i++) {
+               dev = &serial_dev[i].dev;
                p = dev->platform_data;
-               if (!(info->enabled_uarts & (1 << i)))
-                       continue;
 
-               ret = platform_device_register(&soc_info->serial_dev[i]);
+               ret = platform_device_register(&serial_dev[i]);
                if (ret)
                        continue;