Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-omap1/board-generic.c

+0 −5
Original line number Diff line number Diff line
@@ -52,9 +52,6 @@ static struct omap_usb_config generic1610_usb_config __initdata = { 
};

#endif



static struct omap_board_config_kernel generic_config[] __initdata = {

};



static void __init omap_generic_init(void)

{

#ifdef CONFIG_ARCH_OMAP15XX
@@ -76,8 +73,6 @@ static void __init omap_generic_init(void) 
	}

#endif



	omap_board_config = generic_config;

	omap_board_config_size = ARRAY_SIZE(generic_config);

	omap_serial_init();

	omap_register_i2c_bus(1, 100, NULL, 0);

}

arch/arm/mach-omap1/board-voiceblue.c

+0 −5
Original line number Diff line number Diff line
@@ -155,9 +155,6 @@ static struct omap_usb_config voiceblue_usb_config __initdata = { 
	.pins[2]	= 6,

};



static struct omap_board_config_kernel voiceblue_config[] = {

};



#define MACHINE_PANICED		1

#define MACHINE_REBOOTING	2

#define MACHINE_REBOOT		4
@@ -275,8 +272,6 @@ static void __init voiceblue_init(void) 
	voiceblue_smc91x_resources[1].start = gpio_to_irq(8);

	voiceblue_smc91x_resources[1].end = gpio_to_irq(8);

	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();

	omap1_usb_init(&voiceblue_usb_config);

	omap_register_i2c_bus(1, 100, NULL, 0);

arch/arm/mach-omap2/board-3430sdp.c

+0 −6
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <asm/mach/map.h>



#include <plat/mcspi.h>

#include <plat/board.h>

#include <plat/usb.h>

#include "common.h"

#include <plat/dma.h>
@@ -191,9 +190,6 @@ static struct omap_dss_board_info sdp3430_dss_data = { 
	.default_device	= &sdp3430_lcd_device,

};



static struct omap_board_config_kernel sdp3430_config[] __initdata = {

};



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,
@@ -576,8 +572,6 @@ static void __init omap_3430sdp_init(void) 
	int gpio_pendown;



	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);

	omap3430_i2c_init();

	omap_display_init(&sdp3430_dss_data);

arch/arm/mach-omap2/board-3630sdp.c

+0 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <asm/mach/arch.h>



#include "common.h"

#include <plat/board.h>

#include <plat/gpmc-smc91x.h>

#include <plat/usb.h>
@@ -67,9 +66,6 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = { 
	.reset_gpio_port[2]  = -EINVAL

};



static struct omap_board_config_kernel sdp_config[] __initdata = {

};



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },
@@ -197,8 +193,6 @@ static struct flash_partitions sdp_flash_partitions[] = { 
static void __init omap_sdp_init(void)

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);

	omap_board_config = sdp_config;

	omap_board_config_size = ARRAY_SIZE(sdp_config);

	zoom_peripherals_init();

	omap_sdrc_init(h8mbx00u0mer0em_sdrc_params,

				  h8mbx00u0mer0em_sdrc_params);

arch/arm/mach-omap2/board-am3517crane.c

+0 −9
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include <plat/board.h>

#include "common.h"

#include <plat/usb.h>
@@ -37,11 +36,6 @@ 
#define GPIO_USB_POWER		35

#define GPIO_USB_NRESET		38





/* Board initialization */

static struct omap_board_config_kernel am3517_crane_config[] __initdata = {

};



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },
@@ -67,9 +61,6 @@ static void __init am3517_crane_init(void) 
	omap_serial_init();

	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 */

	if (omap_mux_init_gpio(GPIO_USB_NRESET, OMAP_PIN_OUTPUT)) {

		pr_err("Can not configure mux for GPIO_USB_NRESET %d\n",