Skip to content

L
linux
Commit 761d4c9d authored by Igor Grinberg's avatar Igor Grinberg Committed by Tony Lindgren
Browse files
Options

ARM: OMAP: cleanup struct omap_board_config_kernel 

struct omap_board_config_kernel defined in the board files
is always empty and does not bring any added value.
Remove the struct omap_board_config_kernel instances from the board
files.
Also remove the omap_get_nr_config() macro and the omap_get_var_config()
function as both are not used for quite a long time (if ever).
Signed-off-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 55d512e2
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 77 deletions
arch/arm/mach-omap1/board-generic.c
View file @ 761d4c9d
...@@ -52,9 +52,6 @@ static struct omap_usb_config generic1610_usb_config __initdata = { ...@@ -52,9 +52,6 @@ static struct omap_usb_config generic1610_usb_config __initdata = {
}; };
#endif #endif
static struct omap_board_config_kernel generic_config[] __initdata = {
};
static void __init omap_generic_init(void) static void __init omap_generic_init(void)
{ {
#ifdef CONFIG_ARCH_OMAP15XX #ifdef CONFIG_ARCH_OMAP15XX
...@@ -76,8 +73,6 @@ static void __init omap_generic_init(void) ...@@ -76,8 +73,6 @@ static void __init omap_generic_init(void)
} }
#endif #endif
omap_board_config = generic_config;
omap_board_config_size = ARRAY_SIZE(generic_config);
omap_serial_init(); omap_serial_init();
omap_register_i2c_bus(1, 100, NULL, 0); omap_register_i2c_bus(1, 100, NULL, 0);
} }
......
arch/arm/mach-omap1/board-voiceblue.c
View file @ 761d4c9d
...@@ -155,9 +155,6 @@ static struct omap_usb_config voiceblue_usb_config __initdata = { ...@@ -155,9 +155,6 @@ static struct omap_usb_config voiceblue_usb_config __initdata = {
.pins[2] = 6, .pins[2] = 6,
}; };
static struct omap_board_config_kernel voiceblue_config[] = {
};
#define MACHINE_PANICED 1 #define MACHINE_PANICED 1
#define MACHINE_REBOOTING 2 #define MACHINE_REBOOTING 2
#define MACHINE_REBOOT 4 #define MACHINE_REBOOT 4
...@@ -275,8 +272,6 @@ static void __init voiceblue_init(void) ...@@ -275,8 +272,6 @@ static void __init voiceblue_init(void)
voiceblue_smc91x_resources[1].start = gpio_to_irq(8); voiceblue_smc91x_resources[1].start = gpio_to_irq(8);
voiceblue_smc91x_resources[1].end = gpio_to_irq(8); voiceblue_smc91x_resources[1].end = gpio_to_irq(8);
platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices)); platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices));
omap_board_config = voiceblue_config;
omap_board_config_size = ARRAY_SIZE(voiceblue_config);
omap_serial_init(); omap_serial_init();
omap1_usb_init(&voiceblue_usb_config); omap1_usb_init(&voiceblue_usb_config);
omap_register_i2c_bus(1, 100, NULL, 0); omap_register_i2c_bus(1, 100, NULL, 0);
......
arch/arm/mach-omap2/board-3430sdp.c
View file @ 761d4c9d
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/mcspi.h> #include <plat/mcspi.h>
#include <plat/board.h>
#include <plat/usb.h> #include <plat/usb.h>
#include "common.h" #include "common.h"
#include <plat/dma.h> #include <plat/dma.h>
...@@ -191,9 +190,6 @@ static struct omap_dss_board_info sdp3430_dss_data = { ...@@ -191,9 +190,6 @@ static struct omap_dss_board_info sdp3430_dss_data = {
.default_device = &sdp3430_lcd_device, .default_device = &sdp3430_lcd_device,
}; };
static struct omap_board_config_kernel sdp3430_config[] __initdata = {
};
static struct omap2_hsmmc_info mmc[] = { static struct omap2_hsmmc_info mmc[] = {
{ {
.mmc = 1, .mmc = 1,
...@@ -576,8 +572,6 @@ static void __init omap_3430sdp_init(void) ...@@ -576,8 +572,6 @@ static void __init omap_3430sdp_init(void)
int gpio_pendown; int gpio_pendown;
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
omap_board_config = sdp3430_config;
omap_board_config_size = ARRAY_SIZE(sdp3430_config);
omap_hsmmc_init(mmc); omap_hsmmc_init(mmc);
omap3430_i2c_init(); omap3430_i2c_init();
omap_display_init(&sdp3430_dss_data); omap_display_init(&sdp3430_dss_data);
......
arch/arm/mach-omap2/board-3630sdp.c
View file @ 761d4c9d
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include "common.h" #include "common.h"
#include <plat/board.h>
#include <plat/gpmc-smc91x.h> #include <plat/gpmc-smc91x.h>
#include <plat/usb.h> #include <plat/usb.h>
...@@ -67,9 +66,6 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = { ...@@ -67,9 +66,6 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
.reset_gpio_port[2] = -EINVAL .reset_gpio_port[2] = -EINVAL
}; };
static struct omap_board_config_kernel sdp_config[] __initdata = {
};
#ifdef CONFIG_OMAP_MUX #ifdef CONFIG_OMAP_MUX
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
...@@ -197,8 +193,6 @@ static struct flash_partitions sdp_flash_partitions[] = { ...@@ -197,8 +193,6 @@ static struct flash_partitions sdp_flash_partitions[] = {
static void __init omap_sdp_init(void) static void __init omap_sdp_init(void)
{ {
omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
omap_board_config = sdp_config;
omap_board_config_size = ARRAY_SIZE(sdp_config);
zoom_peripherals_init(); zoom_peripherals_init();
omap_sdrc_init(h8mbx00u0mer0em_sdrc_params, omap_sdrc_init(h8mbx00u0mer0em_sdrc_params,
h8mbx00u0mer0em_sdrc_params); h8mbx00u0mer0em_sdrc_params);
......
arch/arm/mach-omap2/board-am3517crane.c
View file @ 761d4c9d
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/board.h>
#include "common.h" #include "common.h"
#include <plat/usb.h> #include <plat/usb.h>
...@@ -37,11 +36,6 @@ ...@@ -37,11 +36,6 @@
#define GPIO_USB_POWER 35 #define GPIO_USB_POWER 35
#define GPIO_USB_NRESET 38 #define GPIO_USB_NRESET 38
/* Board initialization */
static struct omap_board_config_kernel am3517_crane_config[] __initdata = {
};
#ifdef CONFIG_OMAP_MUX #ifdef CONFIG_OMAP_MUX
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
...@@ -67,9 +61,6 @@ static void __init am3517_crane_init(void) ...@@ -67,9 +61,6 @@ static void __init am3517_crane_init(void)
omap_serial_init(); omap_serial_init();
omap_sdrc_init(NULL, NULL); omap_sdrc_init(NULL, NULL);
omap_board_config = am3517_crane_config;
omap_board_config_size = ARRAY_SIZE(am3517_crane_config);
/* Configure GPIO for EHCI port */ /* Configure GPIO for EHCI port */
if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) { if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) {
pr_err("Can not configure mux for GPIO_USB_NRESET %d\n", pr_err("Can not configure mux for GPIO_USB_NRESET %d\n",
......
arch/arm/mach-omap2/board-am3517evm.c
View file @ 761d4c9d
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/board.h>
#include "common.h" #include "common.h"
#include <plat/usb.h> #include <plat/usb.h>
#include <video/omapdss.h> #include <video/omapdss.h>
...@@ -324,9 +323,6 @@ static void am3517_evm_hecc_init(struct ti_hecc_platform_data *pdata) ...@@ -324,9 +323,6 @@ static void am3517_evm_hecc_init(struct ti_hecc_platform_data *pdata)
platform_device_register(&am3517_hecc_device); platform_device_register(&am3517_hecc_device);
} }
static struct omap_board_config_kernel am3517_evm_config[] __initdata = {
};
static struct omap2_hsmmc_info mmc[] = { static struct omap2_hsmmc_info mmc[] = {
{ {
.mmc = 1, .mmc = 1,
...@@ -346,8 +342,6 @@ static struct omap2_hsmmc_info mmc[] = { ...@@ -346,8 +342,6 @@ static struct omap2_hsmmc_info mmc[] = {
static void __init am3517_evm_init(void) static void __init am3517_evm_init(void)
{ {
omap_board_config = am3517_evm_config;
omap_board_config_size = ARRAY_SIZE(am3517_evm_config);
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
am3517_evm_i2c_init(); am3517_evm_i2c_init();
......
arch/arm/mach-omap2/board-cm-t35.c
View file @ 761d4c9d
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/board.h>
#include "common.h" #include "common.h"
#include <plat/nand.h> #include <plat/nand.h>
#include <plat/gpmc.h> #include <plat/gpmc.h>
...@@ -714,13 +713,8 @@ static inline void cm_t35_init_mux(void) {} ...@@ -714,13 +713,8 @@ static inline void cm_t35_init_mux(void) {}
static inline void cm_t3730_init_mux(void) {} static inline void cm_t3730_init_mux(void) {}
#endif #endif
static struct omap_board_config_kernel cm_t35_config[] __initdata = {
};
static void __init cm_t3x_common_init(void) static void __init cm_t3x_common_init(void)
{ {
omap_board_config = cm_t35_config;
omap_board_config_size = ARRAY_SIZE(cm_t35_config);
omap3_mux_init(board_mux, OMAP_PACKAGE_CUS); omap3_mux_init(board_mux, OMAP_PACKAGE_CUS);
omap_serial_init(); omap_serial_init();
omap_sdrc_init(mt46h32m32lf6_sdrc_params, omap_sdrc_init(mt46h32m32lf6_sdrc_params,
......
arch/arm/mach-omap2/board-cm-t3517.c
View file @ 761d4c9d
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/board.h>
#include "common.h" #include "common.h"
#include <plat/usb.h> #include <plat/usb.h>
#include <plat/nand.h> #include <plat/nand.h>
...@@ -249,9 +248,6 @@ static void __init cm_t3517_init_nand(void) ...@@ -249,9 +248,6 @@ static void __init cm_t3517_init_nand(void)
static inline void cm_t3517_init_nand(void) {} static inline void cm_t3517_init_nand(void) {}
#endif #endif
static struct omap_board_config_kernel cm_t3517_config[] __initdata = {
};
#ifdef CONFIG_OMAP_MUX #ifdef CONFIG_OMAP_MUX
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
/* GPIO186 - Green LED */ /* GPIO186 - Green LED */
...@@ -285,8 +281,6 @@ static void __init cm_t3517_init(void) ...@@ -285,8 +281,6 @@ static void __init cm_t3517_init(void)
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
omap_serial_init(); omap_serial_init();
omap_sdrc_init(NULL, NULL); omap_sdrc_init(NULL, NULL);
omap_board_config = cm_t3517_config;
omap_board_config_size = ARRAY_SIZE(cm_t3517_config);
cm_t3517_init_leds(); cm_t3517_init_leds();
cm_t3517_init_nand(); cm_t3517_init_nand();
cm_t3517_init_rtc(); cm_t3517_init_rtc();
......
arch/arm/mach-omap2/board-omap3evm.c
View file @ 761d4c9d
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/usb.h> #include <plat/usb.h>
#include <plat/nand.h> #include <plat/nand.h>
#include "common.h" #include "common.h"
...@@ -526,9 +525,6 @@ static int __init omap3_evm_i2c_init(void) ...@@ -526,9 +525,6 @@ static int __init omap3_evm_i2c_init(void)
return 0; return 0;
} }
static struct omap_board_config_kernel omap3_evm_config[] __initdata = {
};
static struct usbhs_omap_board_data usbhs_bdata __initdata = { static struct usbhs_omap_board_data usbhs_bdata __initdata = {
.port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
...@@ -688,9 +684,6 @@ static void __init omap3_evm_init(void) ...@@ -688,9 +684,6 @@ static void __init omap3_evm_init(void)
obm = (cpu_is_omap3630()) ? omap36x_board_mux : omap35x_board_mux; obm = (cpu_is_omap3630()) ? omap36x_board_mux : omap35x_board_mux;
omap3_mux_init(obm, OMAP_PACKAGE_CBB); omap3_mux_init(obm, OMAP_PACKAGE_CBB);
omap_board_config = omap3_evm_config;
omap_board_config_size = ARRAY_SIZE(omap3_evm_config);
omap_mux_init_gpio(63, OMAP_PIN_INPUT); omap_mux_init_gpio(63, OMAP_PIN_INPUT);
omap_hsmmc_init(mmc); omap_hsmmc_init(mmc);
......
arch/arm/mach-omap2/board-omap3stalker.c
View file @ 761d4c9d
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <plat/board.h>
#include "common.h" #include "common.h"
#include <plat/gpmc.h> #include <plat/gpmc.h>
#include <plat/nand.h> #include <plat/nand.h>
...@@ -362,9 +361,6 @@ static int __init omap3_stalker_i2c_init(void) ...@@ -362,9 +361,6 @@ static int __init omap3_stalker_i2c_init(void)
#define OMAP3_STALKER_TS_GPIO 175 #define OMAP3_STALKER_TS_GPIO 175
static struct omap_board_config_kernel omap3_stalker_config[] __initdata = {
};
static struct platform_device *omap3_stalker_devices[] __initdata = { static struct platform_device *omap3_stalker_devices[] __initdata = {
&keys_gpio, &keys_gpio,
}; };
...@@ -399,8 +395,6 @@ static void __init omap3_stalker_init(void) ...@@ -399,8 +395,6 @@ static void __init omap3_stalker_init(void)
{ {
regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
omap3_mux_init(board_mux, OMAP_PACKAGE_CUS); omap3_mux_init(board_mux, OMAP_PACKAGE_CUS);
omap_board_config = omap3_stalker_config;
omap_board_config_size = ARRAY_SIZE(omap3_stalker_config);
omap_mux_init_gpio(23, OMAP_PIN_INPUT); omap_mux_init_gpio(23, OMAP_PIN_INPUT);
omap_hsmmc_init(mmc); omap_hsmmc_init(mmc);
......
arch/arm/mach-omap2/board-ti8168evm.c
View file @ 761d4c9d
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/irqs.h> #include <plat/irqs.h>
#include <plat/board.h>
#include "common.h" #include "common.h"
#include <plat/usb.h> #include <plat/usb.h>
...@@ -32,15 +31,10 @@ static struct omap_musb_board_data musb_board_data = { ...@@ -32,15 +31,10 @@ static struct omap_musb_board_data musb_board_data = {
.power = 500, .power = 500,
}; };
static struct omap_board_config_kernel ti81xx_evm_config[] __initdata = {
};
static void __init ti81xx_evm_init(void) static void __init ti81xx_evm_init(void)
{ {
omap_serial_init(); omap_serial_init();
omap_sdrc_init(NULL, NULL); omap_sdrc_init(NULL, NULL);
omap_board_config = ti81xx_evm_config;
omap_board_config_size = ARRAY_SIZE(ti81xx_evm_config);
usb_musb_init(&musb_board_data); usb_musb_init(&musb_board_data);
} }
......
arch/arm/plat-omap/common.c
View file @ 761d4c9d
...@@ -58,11 +58,6 @@ const void *__init __omap_get_config(u16 tag, size_t len, int nr) ...@@ -58,11 +58,6 @@ const void *__init __omap_get_config(u16 tag, size_t len, int nr)
return get_config(tag, len, nr, NULL); return get_config(tag, len, nr, NULL);
} }
const void *__init omap_get_var_config(u16 tag, size_t *len)
{
return get_config(tag, NO_LENGTH_CHECK, 0, len);
}
void __init omap_reserve(void) void __init omap_reserve(void)
{ {
omap_vram_reserve_sdram_memblock(); omap_vram_reserve_sdram_memblock();
......
arch/arm/plat-omap/include/plat/board.h
View file @ 761d4c9d
...@@ -117,10 +117,6 @@ extern const void *__init __omap_get_config(u16 tag, size_t len, int nr); ...@@ -117,10 +117,6 @@ extern const void *__init __omap_get_config(u16 tag, size_t len, int nr);
#define omap_get_config(tag, type) \ #define omap_get_config(tag, type) \
((const type *) __omap_get_config((tag), sizeof(type), 0)) ((const type *) __omap_get_config((tag), sizeof(type), 0))
#define omap_get_nr_config(tag, type, nr) \
((const type *) __omap_get_config((tag), sizeof(type), (nr)))
extern const void *__init omap_get_var_config(u16 tag, size_t *len);
extern struct omap_board_config_kernel *omap_board_config; extern struct omap_board_config_kernel *omap_board_config;
extern int omap_board_config_size; extern int omap_board_config_size;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7