Skip to contentSkip to conversation

ARM: OMAP: cleanup plat/board.h file

PATCH New Igor Grinberg 4 participants 15 messages Aug 28, 2012 – Aug 30, 2012

Subsystems (13)
Arm (32-bit) Arm sub-architectures Memory technology devices (MTD) Framebuffer layer +9 more subsystems
lore
Share & tools
lore

Igor Grinberg

author
#0 lore raw

cover ARM: OMAP: cleanup plat/board.h file

This patch series cleans up the plat/board.h and related files.

Remove confusingly empty struct omap_board_config_kernel structures and unused omap_get_nr_config() macro along with
unused omap_get_var_config() function.
Those apparently were never used in upstream kernels.

Move OMAP3EVM revision bits to the board file as those are not used (and never have been used) outside of the board file in upstream kernels.

Remove the tags part of the sti console workaround on OMAP2. Also remove the crystal type tag parsing code on OMAP1. Since the tags were never used upstream, the sti console workaround and the crystal type tag parsing code have never fired.

OMAP custom tags code is not used - remove it.
Finally, move all leftovers from the plat/board.h to include/linux/* and delete the plat/board.h file.

The series are based on Linus' v3.6-rc3, checkpatch clean, and have been compile tested with omap1|2plus_defconfig(s).

Igor Grinberg (9):
ARM: OMAP: cleanup struct omap_board_config_kernel
ARM: OMAP: omap3evm: cleanup revision bits
ARM: OMAP: remove the sti console workaround
ARM: OMAP1: remove the crystal type tag parsing
ARM: OMAP: remove the omap custom tags
ARM: OMAP1: move omap1_bl pdata out of arch/arm/*
ARM: OMAP1: move lcd pdata out of arch/arm/*
ARM: OMAP: move debug_card_init() function
ARM: OMAP: remove plat/board.h file

 arch/arm/mach-omap1/board-ams-delta.c           |    1 -
 arch/arm/mach-omap1/board-fsample.c             |    1 -
 arch/arm/mach-omap1/board-generic.c             |    6 -
 arch/arm/mach-omap1/board-htcherald.c           |    1 -
 arch/arm/mach-omap1/board-nokia770.c            |    1 -
 arch/arm/mach-omap1/board-osk.c                 |    1 +
 arch/arm/mach-omap1/board-palmte.c              |    2 +-
 arch/arm/mach-omap1/board-palmtt.c              |    2 +-
 arch/arm/mach-omap1/board-palmz71.c             |    2 +-
 arch/arm/mach-omap1/board-perseus2.c            |    1 -
 arch/arm/mach-omap1/board-sx1.c                 |    1 -
 arch/arm/mach-omap1/board-voiceblue.c           |    6 -
 arch/arm/mach-omap1/clock_data.c                |    8 --
 arch/arm/mach-omap1/devices.c                   |    1 -
 arch/arm/mach-omap1/serial.c                    |    1 -
 arch/arm/mach-omap2/board-2430sdp.c             |    1 -
 arch/arm/mach-omap2/board-3430sdp.c             |    6 -
 arch/arm/mach-omap2/board-3630sdp.c             |    6 -
 arch/arm/mach-omap2/board-4430sdp.c             |    1 -
 arch/arm/mach-omap2/board-am3517crane.c         |    9 --
 arch/arm/mach-omap2/board-am3517evm.c           |    6 -
 arch/arm/mach-omap2/board-apollon.c             |    1 -
 arch/arm/mach-omap2/board-cm-t35.c              |    6 -
 arch/arm/mach-omap2/board-cm-t3517.c            |    6 -
 arch/arm/mach-omap2/board-devkit8000.c          |    1 -
 arch/arm/mach-omap2/board-generic.c             |    1 -
 arch/arm/mach-omap2/board-h4.c                  |    2 +-
 arch/arm/mach-omap2/board-igep0020.c            |    1 -
 arch/arm/mach-omap2/board-ldp.c                 |    1 -
 arch/arm/mach-omap2/board-n8x0.c                |    1 -
 arch/arm/mach-omap2/board-omap3beagle.c         |    1 -
 arch/arm/mach-omap2/board-omap3evm.c            |   19 ++-
 arch/arm/mach-omap2/board-omap3logic.c          |    1 -
 arch/arm/mach-omap2/board-omap3pandora.c        |    1 -
 arch/arm/mach-omap2/board-omap3stalker.c        |    6 -
 arch/arm/mach-omap2/board-omap3touchbook.c      |    1 -
 arch/arm/mach-omap2/board-omap4panda.c          |    1 -
 arch/arm/mach-omap2/board-overo.c               |    1 -
 arch/arm/mach-omap2/board-rx51-peripherals.c    |    1 -
 arch/arm/mach-omap2/board-rx51.c                |    1 -
 arch/arm/mach-omap2/board-ti8168evm.c           |    6 -
 arch/arm/mach-omap2/board-zoom.c                |    1 -
 arch/arm/mach-omap2/common.c                    |    1 -
 arch/arm/mach-omap2/devices.c                   |    1 -
 arch/arm/mach-omap2/gpmc-nand.c                 |    1 -
 arch/arm/mach-omap2/gpmc-onenand.c              |    1 -
 arch/arm/mach-omap2/gpmc-smc91x.c               |    1 -
 arch/arm/mach-omap2/gpmc-smsc911x.c             |    1 -
 arch/arm/mach-omap2/pm-debug.c                  |    1 -
 arch/arm/mach-omap2/pm24xx.c                    |   11 --
 arch/arm/mach-omap2/serial.c                    |    1 -
 arch/arm/plat-omap/common.c                     |   40 -------
 arch/arm/plat-omap/counter_32k.c                |    1 -
 arch/arm/plat-omap/debug-devices.c              |    3 -
 arch/arm/plat-omap/devices.c                    |    1 -
 arch/arm/plat-omap/fb.c                         |    2 -
 arch/arm/plat-omap/include/plat/board.h         |  138 -----------------------
 arch/arm/plat-omap/include/plat/debug-devices.h |    9 ++
 arch/arm/plat-omap/include/plat/mmc.h           |    1 -
 arch/arm/plat-omap/include/plat/usb.h           |    1 -
 arch/arm/plat-omap/sram.c                       |    1 -
 drivers/mmc/host/omap.c                         |    1 -
 drivers/mmc/host/omap_hsmmc.c                   |    1 -
 drivers/mtd/onenand/omap2.c                     |    2 -
 drivers/video/backlight/omap1_bl.c              |    2 +-
 include/linux/omapfb.h                          |    7 +-
 include/linux/platform_data/omap1_bl.h          |   11 ++
 67 files changed, 44 insertions(+), 320 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/plat/board.h
 create mode 100644 arch/arm/plat-omap/include/plat/debug-devices.h
 create mode 100644 include/linux/platform_data/omap1_bl.h
Signature · 1 line
1.7.8.6
author
#1 lore raw

PATCH 1/9 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 Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap1/board-generic.c      |    5 -----
 arch/arm/mach-omap1/board-voiceblue.c    |    5 -----
 arch/arm/mach-omap2/board-3430sdp.c      |    6 ------
 arch/arm/mach-omap2/board-3630sdp.c      |    6 ------
 arch/arm/mach-omap2/board-am3517crane.c  |    9 ---------
 arch/arm/mach-omap2/board-am3517evm.c    |    6 ------
 arch/arm/mach-omap2/board-cm-t35.c       |    6 ------
 arch/arm/mach-omap2/board-cm-t3517.c     |    6 ------
 arch/arm/mach-omap2/board-omap3evm.c     |    7 -------
 arch/arm/mach-omap2/board-omap3stalker.c |    6 ------
 arch/arm/mach-omap2/board-ti8168evm.c    |    6 ------
 arch/arm/plat-omap/common.c              |    5 -----
 arch/arm/plat-omap/include/plat/board.h  |    4 ----
 13 files changed, 0 insertions(+), 77 deletions(-)
arch/arm/mach-omap1/board-generic.c +0 -5
index 6ec385e..d032734 100644
@@ -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
index 3497769..11e1ff3 100644
@@ -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
index a98c688..0f78cdb 100644
@@ -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
index 2dc9ba5..8518b13 100644
@@ -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
index 92432c2..de92b08 100644
@@ -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",
arch/arm/mach-omap2/board-am3517evm.c +0 -6
index 18f6010..00abda1 100644
@@ -32,7 +32,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/usb.h>
 #include <video/omapdss.h>

@@ -324,9 +323,6 @@ static void am3517_evm_hecc_init(struct ti_hecc_platform_data *pdata)
 	platform_device_register(&am3517_hecc_device);
 }
 
-static struct omap_board_config_kernel am3517_evm_config[] __initdata = {
-};
-
 static struct omap2_hsmmc_info mmc[] = {
 	{
 		.mmc		= 1,

@@ -346,8 +342,6 @@ static struct omap2_hsmmc_info mmc[] = {
 
 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);
 
 	am3517_evm_i2c_init();
arch/arm/mach-omap2/board-cm-t35.c +0 -6
index 97d7190..d94a640 100644
@@ -37,7 +37,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/nand.h>
 #include <plat/gpmc.h>

@@ -714,13 +713,8 @@ static inline void cm_t35_init_mux(void) {}
 static inline void cm_t3730_init_mux(void) {}
 #endif
 
-static struct omap_board_config_kernel cm_t35_config[] __initdata = {
-};
-
 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);
 	omap_serial_init();
 	omap_sdrc_init(mt46h32m32lf6_sdrc_params,
arch/arm/mach-omap2/board-cm-t3517.c +0 -6
index a33ad46..57204f8 100644
@@ -38,7 +38,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/usb.h>
 #include <plat/nand.h>

@@ -249,9 +248,6 @@ static void __init cm_t3517_init_nand(void)
 static inline void cm_t3517_init_nand(void) {}
 #endif
 
-static struct omap_board_config_kernel cm_t3517_config[] __initdata = {
-};
-
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
 	/* GPIO186 - Green LED */

@@ -285,8 +281,6 @@ static void __init cm_t3517_init(void)
 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 	omap_serial_init();
 	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_nand();
 	cm_t3517_init_rtc();
arch/arm/mach-omap2/board-omap3evm.c +0 -7
index ef230a0..5be082b 100644
@@ -45,7 +45,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/board.h>
 #include <plat/usb.h>
 #include <plat/nand.h>
 #include "common.h"

@@ -525,9 +524,6 @@ static int __init omap3_evm_i2c_init(void)
 	return 0;
 }
 
-static struct omap_board_config_kernel omap3_evm_config[] __initdata = {
-};
-
 static struct usbhs_omap_board_data usbhs_bdata __initdata = {
 
 	.port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,

@@ -687,9 +683,6 @@ static void __init omap3_evm_init(void)
 	obm = (cpu_is_omap3630()) ? omap36x_board_mux : omap35x_board_mux;
 	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_hsmmc_init(mmc);
arch/arm/mach-omap2/board-omap3stalker.c +0 -6
index b318f56..421fb8e 100644
@@ -35,7 +35,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
 #include <plat/nand.h>

@@ -362,9 +361,6 @@ static int __init omap3_stalker_i2c_init(void)
 
 #define OMAP3_STALKER_TS_GPIO	175
 
-static struct omap_board_config_kernel omap3_stalker_config[] __initdata = {
-};
-
 static struct platform_device *omap3_stalker_devices[] __initdata = {
 	&keys_gpio,
 };

@@ -399,8 +395,6 @@ static void __init omap3_stalker_init(void)
 {
 	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
 	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_hsmmc_init(mmc);
arch/arm/mach-omap2/board-ti8168evm.c +0 -6
index d4c8392..da4679d 100644
@@ -21,7 +21,6 @@
 #include <asm/mach/map.h>
 
 #include <plat/irqs.h>
-#include <plat/board.h>
 #include "common.h"
 #include <plat/usb.h>
 

@@ -32,15 +31,10 @@ static struct omap_musb_board_data musb_board_data = {
 	.power		= 500,
 };
 
-static struct omap_board_config_kernel ti81xx_evm_config[] __initdata = {
-};
-
 static void __init ti81xx_evm_init(void)
 {
 	omap_serial_init();
 	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);
 }
arch/arm/plat-omap/common.c +0 -5
index 89a3723..af98971 100644
@@ -58,11 +58,6 @@ const void *__init __omap_get_config(u16 tag, size_t len, int nr)
         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)
 {
 	omap_vram_reserve_sdram_memblock();
arch/arm/plat-omap/include/plat/board.h +0 -4
index e62f20a..e6a8d79 100644
@@ -117,10 +117,6 @@ extern const void *__init __omap_get_config(u16 tag, size_t len, int nr);
 
 #define omap_get_config(tag, type) \
 	((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 int omap_board_config_size;
Signature · 1 line
1.7.8.6
author
#2 lore raw

PATCH 2/9 ARM: OMAP: omap3evm: cleanup revision bits

In reply to Igor Grinberg

The omap3evm has its revision information bits inside the plat/board.h file. Those bits are not used anywhere in the upstream tree besides the board-omap3evm.c file.
Move the OMAP3EVM_BOARD_GEN_* bits to the board file and remove the get_omap3_evm_rev() function declaration.

Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap2/board-omap3evm.c    |   12 ++++++++++++
 arch/arm/plat-omap/include/plat/board.h |   18 ------------------
 2 files changed, 12 insertions(+), 18 deletions(-)
arch/arm/mach-omap2/board-omap3evm.c +12 -0
index 5be082b..8477137 100644
@@ -73,6 +73,18 @@
 #define OMAP3EVM_GEN1_ETHR_GPIO_RST	64
 #define OMAP3EVM_GEN2_ETHR_GPIO_RST	7
 
+/*
+ * OMAP35x EVM revision
+ * Run time detection of EVM revision is done by reading Ethernet
+ * PHY ID -
+ *	GEN_1	= 0x01150000
+ *	GEN_2	= 0x92200000
+ */
+enum {
+	OMAP3EVM_BOARD_GEN_1 = 0,	/* EVM Rev between  A - D */
+	OMAP3EVM_BOARD_GEN_2,		/* EVM Rev >= Rev E */
+};
+
 static u8 omap3_evm_version;
 
 u8 get_omap3_evm_rev(void)
arch/arm/plat-omap/include/plat/board.h +0 -18
index e6a8d79..db3bdc1 100644
@@ -14,18 +14,6 @@
 
 #include <plat/gpio-switch.h>
 
-/*
- * OMAP35x EVM revision
- * Run time detection of EVM revision is done by reading Ethernet
- * PHY ID -
- *	GEN_1	= 0x01150000
- *	GEN_2	= 0x92200000
- */
-enum {
-	OMAP3EVM_BOARD_GEN_1 = 0,	/* EVM Rev between  A - D */
-	OMAP3EVM_BOARD_GEN_2,		/* EVM Rev >= Rev E */
-};
-
 /* Different peripheral ids */
 #define OMAP_TAG_CLOCK		0x4f01
 #define OMAP_TAG_GPIO_SWITCH	0x4f06

@@ -125,10 +113,4 @@ extern int omap_board_config_size;
 /* for TI reference platforms sharing the same debug card */
 extern int debug_card_init(u32 addr, unsigned gpio);
 
-/* OMAP3EVM revision */
-#if defined(CONFIG_MACH_OMAP3EVM)
-u8 get_omap3_evm_rev(void);
-#else
-#define get_omap3_evm_rev() (-EINVAL)
-#endif
 #endif
Signature · 1 line
1.7.8.6
author
#3 lore raw

PATCH 3/9 ARM: OMAP: remove the sti console workaround

In reply to Igor Grinberg

The sti console workaround uses the OMAP custom tags.
Those tags are not used in upstream kernel and therefore the workaround never fires on upstream kernels.
Remove the sti console workaround tags part.
This leaves the workaround functional part intact so can be reused if needed.

Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap2/pm24xx.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
arch/arm/mach-omap2/pm24xx.c +0 -10
index 2edeffc..9e54dc9 100644
@@ -352,16 +352,6 @@ int __init omap2_pm_init(void)
 
 	prcm_setup_regs();
 
-	/* Hack to prevent MPU retention when STI console is enabled. */
-	{
-		const struct omap_sti_console_config *sti;
-
-		sti = omap_get_config(OMAP_TAG_STI_CONSOLE,
-				      struct omap_sti_console_config);
-		if (sti != NULL && sti->enable)
-			sti_console_enabled = 1;
-	}
-
 	/*
 	 * We copy the assembler sleep/wakeup routines to SRAM.
 	 * These routines need to be in SRAM as that's the only
Signature · 1 line
1.7.8.6
author
#4 lore raw

PATCH 4/9 ARM: OMAP1: remove the crystal type tag parsing

In reply to Igor Grinberg

The omap1 crystal setting uses the OMAP custom tags. Those tags are not used in upstream kernel and therefore the crystal type is never set by the tag parsing code on upstream kernels. Remove the crystal tag parsing code.

Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap1/clock_data.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
arch/arm/mach-omap1/clock_data.c +0 -8
index c007d80..6a32b9b 100644
@@ -25,7 +25,6 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/clkdev_omap.h>
-#include <plat/board.h>
 #include <plat/sram.h>	/* for omap_sram_reprogram_clock() */
 
 #include <mach/hardware.h>

@@ -788,7 +787,6 @@ u32 cpu_mask;
 int __init omap1_clk_init(void)
 {
 	struct omap_clk *c;
-	const struct omap_clock_config *info;
 	int crystal_type = 0; /* Default 12 MHz */
 	u32 reg;
 

@@ -837,12 +835,6 @@ int __init omap1_clk_init(void)
 	ck_dpll1_p = clk_get(NULL, "ck_dpll1");
 	ck_ref_p = clk_get(NULL, "ck_ref");
 
-	info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config);
-	if (info != NULL) {
-		if (!cpu_is_omap15xx())
-			crystal_type = info->system_clock_type;
-	}
-
 	if (cpu_is_omap7xx())
 		ck_ref.rate = 13000000;
 	if (cpu_is_omap16xx() && crystal_type == 2)
Signature · 1 line
1.7.8.6
author
#5 lore raw

PATCH 5/9 ARM: OMAP: remove the omap custom tags

In reply to Igor Grinberg

The omap custom initialization tags are not used anymore (if ever) by the mainline kernel.
Thus remove the omap custom initialization tags.

Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/plat-omap/common.c             |   34 ------------
 arch/arm/plat-omap/include/plat/board.h |   84 -------------------------------
 2 files changed, 0 insertions(+), 118 deletions(-)
arch/arm/plat-omap/common.c +0 -34
index af98971..7c04748 100644
@@ -24,40 +24,6 @@
 
 #include <plat/omap-secure.h>
 
-
-#define NO_LENGTH_CHECK 0xffffffff
-
-struct omap_board_config_kernel *omap_board_config __initdata;
-int omap_board_config_size;
-
-static const void *__init get_config(u16 tag, size_t len,
-		int skip, size_t *len_out)
-{
-	struct omap_board_config_kernel *kinfo = NULL;
-	int i;
-
-	/* Try to find the config from the board-specific structures
-	 * in the kernel. */
-	for (i = 0; i < omap_board_config_size; i++) {
-		if (omap_board_config[i].tag == tag) {
-			if (skip == 0) {
-				kinfo = &omap_board_config[i];
-				break;
-			} else {
-				skip--;
-			}
-		}
-	}
-	if (kinfo == NULL)
-		return NULL;
-	return kinfo->data;
-}
-
-const void *__init __omap_get_config(u16 tag, size_t len, int nr)
-{
-        return get_config(tag, len, nr, NULL);
-}
-
 void __init omap_reserve(void)
 {
 	omap_vram_reserve_sdram_memblock();
arch/arm/plat-omap/include/plat/board.h +0 -84

96 lines not on this page · raw message

Signature · 1 line
1.7.8.6
author
#6 lore raw

PATCH 6/9 ARM: OMAP1: move omap1_bl pdata out of arch/arm/*

In reply to Igor Grinberg

omap1 backlight platform data resides inside plat/board.h while it should be inside include/linux/...
Move the omap1 backlight platform data to include/linux/platform_data/.

Cc Richard Purdie <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc linux-fbdev at vger.kernel.org
Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap1/board-osk.c         |    1 +
 arch/arm/mach-omap1/board-palmte.c      |    1 +
 arch/arm/mach-omap1/board-palmtt.c      |    1 +
 arch/arm/mach-omap1/board-palmz71.c     |    1 +
 arch/arm/plat-omap/include/plat/board.h |    7 -------
 drivers/video/backlight/omap1_bl.c      |    2 +-
 include/linux/platform_data/omap1_bl.h  |   11 +++++++++++
 7 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 include/linux/platform_data/omap1_bl.h
arch/arm/mach-omap1/board-osk.c +1 -0
index 8784705..569b687 100644
@@ -39,6 +39,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/i2c/tps65010.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/mach-omap1/board-palmte.c +1 -0
index 26bcb9d..7bf00ba 100644
@@ -28,6 +28,7 @@
 #include <linux/interrupt.h>
 #include <linux/apm-emulation.h>
 #include <linux/omapfb.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/mach-omap1/board-palmtt.c +1 -0
index 4d09944..2cce505 100644
@@ -27,6 +27,7 @@
 #include <linux/omapfb.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/mach-omap1/board-palmz71.c +1 -0
index 3559803..45ab9f0 100644
@@ -30,6 +30,7 @@
 #include <linux/omapfb.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/plat-omap/include/plat/board.h +0 -7
index 5938c72..d0bc46e 100644
@@ -19,13 +19,6 @@ struct omap_lcd_config {
 	u8   data_lines;
 };
 
-struct device;
-struct fb_info;
-struct omap_backlight_config {
-	int default_intensity;
-	int (*set_power)(struct device *dev, int state);
-};
-
 /* for TI reference platforms sharing the same debug card */
 extern int debug_card_init(u32 addr, unsigned gpio);
drivers/video/backlight/omap1_bl.c +1 -1
index bfdc5fb..92257ef 100644
@@ -27,9 +27,9 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/slab.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <mach/hardware.h>
-#include <plat/board.h>
 #include <plat/mux.h>
 
 #define OMAPBL_MAX_INTENSITY		0xff
include/linux/platform_data/omap1_bl.h new file +11 -0
new file mode 100644
index 0000000..881a8e9
@@ -0,0 +1,11 @@
+#ifndef __OMAP1_BL_H__
+#define __OMAP1_BL_H__
+
+#include <linux/device.h>
+
+struct omap_backlight_config {
+	int default_intensity;
+	int (*set_power)(struct device *dev, int state);
+};
+
+#endif
Signature · 1 line
1.7.8.6
#7 lore raw

PATCH 6/9 ARM: OMAP1: move omap1_bl pdata out of arch/arm/*

Quoted 107 lines · Igor Grinberg

omap1 backlight platform data resides inside plat/board.h while it should be inside include/linux/...
Move the omap1 backlight platform data to include/linux/platform_data/.

Cc Richard Purdie <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc linux-fbdev at vger.kernel.org
Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap1/board-osk.c         |    1 +
 arch/arm/mach-omap1/board-palmte.c      |    1 +
 arch/arm/mach-omap1/board-palmtt.c      |    1 +
 arch/arm/mach-omap1/board-palmz71.c     |    1 +
 arch/arm/plat-omap/include/plat/board.h |    7 -------
 drivers/video/backlight/omap1_bl.c      |    2 +-
 include/linux/platform_data/omap1_bl.h  |   11 +++++++++++
 7 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 include/linux/platform_data/omap1_bl.h
arch/arm/mach-omap1/board-osk.c +1 -0
index 8784705..569b687 100644
@@ -39,6 +39,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/i2c/tps65010.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/mach-omap1/board-palmte.c +1 -0
index 26bcb9d..7bf00ba 100644
@@ -28,6 +28,7 @@
 #include <linux/interrupt.h>
 #include <linux/apm-emulation.h>
 #include <linux/omapfb.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/mach-omap1/board-palmtt.c +1 -0
index 4d09944..2cce505 100644
@@ -27,6 +27,7 @@
 #include <linux/omapfb.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/mach-omap1/board-palmz71.c +1 -0
index 3559803..45ab9f0 100644
@@ -30,6 +30,7 @@
 #include <linux/omapfb.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/plat-omap/include/plat/board.h +0 -7
index 5938c72..d0bc46e 100644
@@ -19,13 +19,6 @@ struct omap_lcd_config {
 	u8   data_lines;
 };
 
-struct device;
-struct fb_info;
-struct omap_backlight_config {
-	int default_intensity;
-	int (*set_power)(struct device *dev, int state);
-};
-
 /* for TI reference platforms sharing the same debug card */
 extern int debug_card_init(u32 addr, unsigned gpio);
drivers/video/backlight/omap1_bl.c +1 -1
index bfdc5fb..92257ef 100644
@@ -27,9 +27,9 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/slab.h>
+#include <linux/platform_data/omap1_bl.h>
 
 #include <mach/hardware.h>
-#include <plat/board.h>
 #include <plat/mux.h>
 
 #define OMAPBL_MAX_INTENSITY		0xff
include/linux/platform_data/omap1_bl.h new file +0 -0
new file mode 100644
index 0000000..881a8e9

include/linux/platform_data/omap1_bl.h line 4

Quoted 4 lines
include/linux/platform_data/omap1_bl.h new file +4 -0
@@ -0,0 +1,11 @@
+#ifndef __OMAP1_BL_H__
+#define __OMAP1_BL_H__
+
+#include <linux/device.h>

You could use struct device; here.

include/linux/platform_data/omap1_bl.h line 11

Quoted 7 lines
include/linux/platform_data/omap1_bl.h new file +7 -0
+
+struct omap_backlight_config {
+	int default_intensity;
+	int (*set_power)(struct device *dev, int state);
+};
+
+#endif
Acked-by Tomi Valkeinen <[email protected]>

Tomi

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120829/ca68f5be/attachment.sig>

author
#8 lore raw

PATCH 6/9 ARM: OMAP1: move omap1_bl pdata out of arch/arm/*

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 20 lines · Tomi Valkeinen
Quoted 19 lines · Igor Grinberg

omap1 backlight platform data resides inside plat/board.h while it should be inside include/linux/...
Move the omap1 backlight platform data to include/linux/platform_data/.

Cc Richard Purdie <[email protected]>
Cc Florian Tobias Schandinat <[email protected]>
Cc linux-fbdev at vger.kernel.org
Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap1/board-osk.c         |    1 +
 arch/arm/mach-omap1/board-palmte.c      |    1 +
 arch/arm/mach-omap1/board-palmtt.c      |    1 +
 arch/arm/mach-omap1/board-palmz71.c     |    1 +
 arch/arm/plat-omap/include/plat/board.h |    7 -------
 drivers/video/backlight/omap1_bl.c      |    2 +-
 include/linux/platform_data/omap1_bl.h  |   11 +++++++++++
 7 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 include/linux/platform_data/omap1_bl.h

[...]

Quoted 4 lines
Quoted 4 lines
include/linux/platform_data/omap1_bl.h new file +0 -1
new file mode 100644
index 0000000..881a8e9
--- /dev/null
Quoted 8 lines

include/linux/platform_data/omap1_bl.h line 4

Quoted 6 lines

+++ b/include/linux/platform_data/omap1_bl.h

include/linux/platform_data/omap1_bl.h new file +4 -0
@@ -0,0 +1,11 @@
+#ifndef __OMAP1_BL_H__
+#define __OMAP1_BL_H__
+
+#include <linux/device.h>

You could use struct device; here.

Yes I know, but I don't think it is any better.

Quoted 10 lines

include/linux/platform_data/omap1_bl.h line 11

Quoted 8 lines
include/linux/platform_data/omap1_bl.h new file +7 -0
+
+struct omap_backlight_config {
+	int default_intensity;
+	int (*set_power)(struct device *dev, int state);
+};
+
+#endif
Acked-by Tomi Valkeinen <[email protected]>

Thanks!

- --
Regards,
Igor.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJQPozJAAoJEBDE8YO64EfasmQP/2v38LY4t30rnl3jOvs6vvsa RPFFQG1lxkFTpMHMkOvb4pW/k00IHxkcv2hRrGmoBWbEJqel7b0LyEFVV+M+uCSo nCVsnd/Pu7jftCwC2Ggy2PBE16n+9I6UttN4Vsh7a8f2qwtXdOxL01xxyM7cVtn4 YQRhyVrKMiiKhNfKtvQV2V0npsVVksgnKm0K1zNRiZkTuKjZ4sJrliGYaU6B5F32 MHx31U0r1VbxZwOi9m19Ucyuf1CYvVKhlmeMop1fE4+3Dkt1708pMWOpK9iknMQU m5cA+25a7YolDIluvfXlH+7hDFZixDUd5pFeJA0llaqOv2PSHGT0kYDOTmtRyKvD D3mq22amwPlqgjXdxJMS5gckF6N3KrBjA3AHW4FpoTQjdCciiql3k+DMaRNM6Dzm WjCCZBOQHy5dSRn6HzNo2iSP+B8mANh8eoJJAoyS3JJ+ihf4hiV1PEC9jXxWTg1H M449feGQccXUfYj8pTlXtTXEk8L5x3kBlU9VMMzlA1kQN0VoFOQRhSl+UVdu2ckA SPotVgiUCUzT9x1xEoIBjrz+kLAk0bYvRv2vUflzzH8lf+/MYz4UxDikSCsifpF1 s/5evCRgSUokm1VxlFEMLiUG0gb8FJR3TylJU4CD5U9dbkel2urKoE1zfc4LyPRT ycdLeCP+C7ZcsaNApWMS
=kElj
-----END PGP SIGNATURE-----

author
#9 lore raw

PATCH 7/9 ARM: OMAP1: move lcd pdata out of arch/arm/*

In reply to Igor Grinberg

omap1 lcd platform data resides inside plat/board.h while it should be inside include/linux/...
Move the omap1 lcd platform data to include/linux/omapfb.h.

Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap1/board-ams-delta.c   |    1 -
 arch/arm/mach-omap1/board-fsample.c     |    1 -
 arch/arm/mach-omap1/board-htcherald.c   |    1 -
 arch/arm/mach-omap1/board-nokia770.c    |    1 -
 arch/arm/mach-omap1/board-palmte.c      |    1 -
 arch/arm/mach-omap1/board-palmtt.c      |    1 -
 arch/arm/mach-omap1/board-palmz71.c     |    1 -
 arch/arm/mach-omap1/board-perseus2.c    |    1 -
 arch/arm/mach-omap1/board-sx1.c         |    1 -
 arch/arm/plat-omap/fb.c                 |    2 --
 arch/arm/plat-omap/include/plat/board.h |    7 -------
 include/linux/omapfb.h                  |    7 ++++++-
 12 files changed, 6 insertions(+), 19 deletions(-)
arch/arm/mach-omap1/board-ams-delta.c +0 -1
index c534698..c162369 100644
@@ -37,7 +37,6 @@
 #include <plat/board-ams-delta.h>
 #include <plat/keypad.h>
 #include <plat/mux.h>
-#include <plat/board.h>
 
 #include <mach/hardware.h>
 #include <mach/ams-delta-fiq.h>
arch/arm/mach-omap1/board-fsample.c +0 -1
index 6872f3f..6d98552 100644
@@ -32,7 +32,6 @@
 #include <plat/flash.h>
 #include <plat/fpga.h>
 #include <plat/keypad.h>
-#include <plat/board.h>
 
 #include <mach/hardware.h>
arch/arm/mach-omap1/board-htcherald.c +0 -1
index b3f6e94..b9771b5 100644
@@ -42,7 +42,6 @@
 #include <asm/mach/arch.h>
 
 #include <plat/omap7xx.h>
-#include <plat/board.h>
 #include <plat/keypad.h>
 #include <plat/mmc.h>
arch/arm/mach-omap1/board-nokia770.c +0 -1
index 2c0ca8f..ec01f03 100644
@@ -26,7 +26,6 @@
 #include <asm/mach/map.h>
 
 #include <plat/mux.h>
-#include <plat/board.h>
 #include <plat/keypad.h>
 #include <plat/lcd_mipid.h>
 #include <plat/mmc.h>
arch/arm/mach-omap1/board-palmte.c +0 -1
index 7bf00ba..49f8d74 100644
@@ -38,7 +38,6 @@
 #include <plat/mux.h>
 #include <plat/tc.h>
 #include <plat/dma.h>
-#include <plat/board.h>
 #include <plat/irda.h>
 #include <plat/keypad.h>
arch/arm/mach-omap1/board-palmtt.c +0 -1
index 2cce505..01523cd 100644
@@ -38,7 +38,6 @@
 #include <plat/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
-#include <plat/board.h>
 #include <plat/irda.h>
 #include <plat/keypad.h>
arch/arm/mach-omap1/board-palmz71.c +0 -1
index 45ab9f0..a7abce6 100644
@@ -40,7 +40,6 @@
 #include <plat/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
-#include <plat/board.h>
 #include <plat/irda.h>
 #include <plat/keypad.h>
arch/arm/mach-omap1/board-perseus2.c +0 -1
index 703d55e..277e0bc 100644
@@ -32,7 +32,6 @@
 #include <plat/fpga.h>
 #include <plat/flash.h>
 #include <plat/keypad.h>
-#include <plat/board.h>
 
 #include <mach/hardware.h>
arch/arm/mach-omap1/board-sx1.c +0 -1
index 8c665bd..2e1fff2 100644
@@ -38,7 +38,6 @@
 #include <plat/dma.h>
 #include <plat/irda.h>
 #include <plat/tc.h>
-#include <plat/board.h>
 #include <plat/keypad.h>
 #include <plat/board-sx1.h>
arch/arm/plat-omap/fb.c +0 -2
index dd6f92c..bcbb9d5 100644
@@ -33,8 +33,6 @@
 #include <mach/hardware.h>
 #include <asm/mach/map.h>
 
-#include <plat/board.h>
-
 #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)
 
 static bool omapfb_lcd_configured;
arch/arm/plat-omap/include/plat/board.h +0 -7
index d0bc46e..2ddc198 100644
@@ -12,13 +12,6 @@
 
 #include <linux/types.h>
 
-struct omap_lcd_config {
-	char panel_name[16];
-	char ctrl_name[16];
-	s16  nreset_gpio;
-	u8   data_lines;
-};
-
 /* for TI reference platforms sharing the same debug card */
 extern int debug_card_init(u32 addr, unsigned gpio);
include/linux/omapfb.h +6 -1
index 4ff57e8..85af818 100644
@@ -220,7 +220,12 @@ struct omapfb_display_info {
 
 #ifdef __KERNEL__
 
-#include <plat/board.h>
+struct omap_lcd_config {
+	char panel_name[16];
+	char ctrl_name[16];
+	s16  nreset_gpio;
+	u8   data_lines;
+};
 
 struct omapfb_platform_data {
 	struct omap_lcd_config		lcd;
Signature · 1 line
1.7.8.6
#10 lore raw

PATCH 7/9 ARM: OMAP1: move lcd pdata out of arch/arm/*

Quoted 5 lines · Igor Grinberg

omap1 lcd platform data resides inside plat/board.h while it should be inside include/linux/...
Move the omap1 lcd platform data to include/linux/omapfb.h.

Signed-off-by Igor Grinberg <[email protected]>
Quoted 15 lines
---
 arch/arm/mach-omap1/board-ams-delta.c   |    1 -
 arch/arm/mach-omap1/board-fsample.c     |    1 -
 arch/arm/mach-omap1/board-htcherald.c   |    1 -
 arch/arm/mach-omap1/board-nokia770.c    |    1 -
 arch/arm/mach-omap1/board-palmte.c      |    1 -
 arch/arm/mach-omap1/board-palmtt.c      |    1 -
 arch/arm/mach-omap1/board-palmz71.c     |    1 -
 arch/arm/mach-omap1/board-perseus2.c    |    1 -
 arch/arm/mach-omap1/board-sx1.c         |    1 -
 arch/arm/plat-omap/fb.c                 |    2 --
 arch/arm/plat-omap/include/plat/board.h |    7 -------
 include/linux/omapfb.h                  |    7 ++++++-
 12 files changed, 6 insertions(+), 19 deletions(-)
Acked-by Tomi Valkeinen <[email protected]>

Tomi

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120829/9e75c995/attachment-0001.sig>

author
#11 lore raw

PATCH 8/9 ARM: OMAP: move debug_card_init() function

In reply to Igor Grinberg

debug_card_init() function resides in the plat/board.h file. Move it to a separate header file under plat/ so the board.h file can be removed.

Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap2/board-h4.c                  |    2 +-
 arch/arm/plat-omap/include/plat/board.h         |    5 -----
 arch/arm/plat-omap/include/plat/debug-devices.h |    9 +++++++++
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/plat-omap/include/plat/debug-devices.h
arch/arm/mach-omap2/board-h4.c +1 -1
index ace2048..5be30e6 100644
@@ -32,11 +32,11 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/menelaus.h>
 #include <plat/dma.h>
 #include <plat/gpmc.h>
+#include <plat/debug-devices.h>
 
 #include <video/omapdss.h>
 #include <video/omap-panel-generic-dpi.h>
arch/arm/plat-omap/include/plat/board.h +0 -5
index 2ddc198..d92f1b5 100644
@@ -10,9 +10,4 @@
 #ifndef _OMAP_BOARD_H
 #define _OMAP_BOARD_H
 
-#include <linux/types.h>
-
-/* for TI reference platforms sharing the same debug card */
-extern int debug_card_init(u32 addr, unsigned gpio);
-
 #endif
arch/arm/plat-omap/include/plat/debug-devices.h new file +9 -0
new file mode 100644
index 0000000..a4edbd2
@@ -0,0 +1,9 @@
+#ifndef _OMAP_DEBUG_DEVICES_H
+#define _OMAP_DEBUG_DEVICES_H
+
+#include <linux/types.h>
+
+/* for TI reference platforms sharing the same debug card */
+extern int debug_card_init(u32 addr, unsigned gpio);
+
+#endif
Signature · 1 line
1.7.8.6
author
#12 lore raw

PATCH 9/9 ARM: OMAP: remove plat/board.h file

In reply to Igor Grinberg

plat/board.h file is now empty - remove it.

Cc Jarkko Lavinen <[email protected]>
Cc Chris Ball <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc linux-mmc at vger.kernel.org
Cc linux-mtd at lists.infradead.org
Signed-off-by Igor Grinberg <[email protected]>
---
 arch/arm/mach-omap1/board-generic.c          |    1 -
 arch/arm/mach-omap1/board-voiceblue.c        |    1 -
 arch/arm/mach-omap1/devices.c                |    1 -
 arch/arm/mach-omap1/serial.c                 |    1 -
 arch/arm/mach-omap2/board-2430sdp.c          |    1 -
 arch/arm/mach-omap2/board-4430sdp.c          |    1 -
 arch/arm/mach-omap2/board-apollon.c          |    1 -
 arch/arm/mach-omap2/board-devkit8000.c       |    1 -
 arch/arm/mach-omap2/board-generic.c          |    1 -
 arch/arm/mach-omap2/board-igep0020.c         |    1 -
 arch/arm/mach-omap2/board-ldp.c              |    1 -
 arch/arm/mach-omap2/board-n8x0.c             |    1 -
 arch/arm/mach-omap2/board-omap3beagle.c      |    1 -
 arch/arm/mach-omap2/board-omap3logic.c       |    1 -
 arch/arm/mach-omap2/board-omap3pandora.c     |    1 -
 arch/arm/mach-omap2/board-omap3touchbook.c   |    1 -
 arch/arm/mach-omap2/board-omap4panda.c       |    1 -
 arch/arm/mach-omap2/board-overo.c            |    1 -
 arch/arm/mach-omap2/board-rx51-peripherals.c |    1 -
 arch/arm/mach-omap2/board-rx51.c             |    1 -
 arch/arm/mach-omap2/board-zoom.c             |    1 -
 arch/arm/mach-omap2/common.c                 |    1 -
 arch/arm/mach-omap2/devices.c                |    1 -
 arch/arm/mach-omap2/gpmc-nand.c              |    1 -
 arch/arm/mach-omap2/gpmc-onenand.c           |    1 -
 arch/arm/mach-omap2/gpmc-smc91x.c            |    1 -
 arch/arm/mach-omap2/gpmc-smsc911x.c          |    1 -
 arch/arm/mach-omap2/pm-debug.c               |    1 -
 arch/arm/mach-omap2/pm24xx.c                 |    1 -
 arch/arm/mach-omap2/serial.c                 |    1 -
 arch/arm/plat-omap/common.c                  |    1 -
 arch/arm/plat-omap/counter_32k.c             |    1 -
 arch/arm/plat-omap/debug-devices.c           |    3 ---
 arch/arm/plat-omap/devices.c                 |    1 -
 arch/arm/plat-omap/include/plat/board.h      |   13 -------------
 arch/arm/plat-omap/include/plat/mmc.h        |    1 -
 arch/arm/plat-omap/include/plat/usb.h        |    1 -
 arch/arm/plat-omap/sram.c                    |    1 -
 drivers/mmc/host/omap.c                      |    1 -
 drivers/mmc/host/omap_hsmmc.c                |    1 -
 drivers/mtd/onenand/omap2.c                  |    2 --
 41 files changed, 0 insertions(+), 56 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/plat/board.h
arch/arm/mach-omap1/board-generic.c +0 -1
index d032734..04b5fda 100644
@@ -23,7 +23,6 @@
 #include <asm/mach/map.h>
 
 #include <plat/mux.h>
-#include <plat/board.h>
 
 #include <mach/usb.h>
arch/arm/mach-omap1/board-voiceblue.c +0 -1
index 11e1ff3..1668af3 100644
@@ -35,7 +35,6 @@
 #include <plat/flash.h>
 #include <plat/mux.h>
 #include <plat/tc.h>
-#include <plat/board.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>
arch/arm/mach-omap1/devices.c +0 -1
index fa1fa4d..1feca35 100644
@@ -20,7 +20,6 @@
 #include <asm/mach/map.h>
 
 #include <plat/tc.h>
-#include <plat/board.h>
 #include <plat/mux.h>
 #include <plat/dma.h>
 #include <plat/mmc.h>
arch/arm/mach-omap1/serial.c +0 -1
index 6809c9e..0d1709b 100644
@@ -22,7 +22,6 @@
 
 #include <asm/mach-types.h>
 
-#include <plat/board.h>
 #include <plat/mux.h>
 #include <plat/fpga.h>
arch/arm/mach-omap2/board-2430sdp.c +0 -1
index 9511584..36eee4b 100644
@@ -33,7 +33,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
 #include <plat/usb.h>
arch/arm/mach-omap2/board-4430sdp.c +0 -1
index ad8a7d9..04e8574 100644
@@ -34,7 +34,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/usb.h>
 #include <plat/mmc.h>
arch/arm/mach-omap2/board-apollon.c +0 -1
index e5fa46b..a6a1b48 100644
@@ -35,7 +35,6 @@
 #include <asm/mach/flash.h>
 
 #include <plat/led.h>
-#include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
arch/arm/mach-omap2/board-devkit8000.c +0 -1
index 6567c1c..870a2a5 100644
@@ -40,7 +40,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
 #include <plat/nand.h>
arch/arm/mach-omap2/board-generic.c +0 -1
index 6f93a20..38024a5 100644
@@ -20,7 +20,6 @@
 #include <asm/hardware/gic.h>
 #include <asm/mach/arch.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include "common-board-devices.h"
arch/arm/mach-omap2/board-igep0020.c +0 -1
index 7491529..c4f17bb 100644
@@ -29,7 +29,6 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
 #include <plat/usb.h>
arch/arm/mach-omap2/board-ldp.c +0 -1
index ef9e829..c37c2a1 100644
@@ -35,7 +35,6 @@
 #include <asm/mach/map.h>
 
 #include <plat/mcspi.h>
-#include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
 #include <mach/board-zoom.h>
arch/arm/mach-omap2/board-n8x0.c +0 -1
index 677357f..5397209 100644
@@ -25,7 +25,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/menelaus.h>
 #include <mach/irqs.h>
arch/arm/mach-omap2/board-omap3beagle.c +0 -1
index 6202fc7..293e3b2 100644
@@ -39,7 +39,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <video/omapdss.h>
 #include <video/omap-panel-tfp410.h>
arch/arm/mach-omap2/board-omap3logic.c +0 -1
index fca93d1..a63a49d 100644
@@ -41,7 +41,6 @@
 #include "common-board-devices.h"
 
 #include <plat/mux.h>
-#include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc-smsc911x.h>
 #include <plat/gpmc.h>
arch/arm/mach-omap2/board-omap3pandora.c +0 -1
index 57aebee..633c445 100644
@@ -40,7 +40,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <mach/hardware.h>
 #include <plat/mcspi.h>
arch/arm/mach-omap2/board-omap3touchbook.c +0 -1
index 485d14d..d3556c9 100644
@@ -44,7 +44,6 @@
 #include <asm/mach/flash.h>
 #include <asm/system_info.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/gpmc.h>
 #include <plat/nand.h>
arch/arm/mach-omap2/board-omap4panda.c +0 -1
index 70f6d1d..3911c13 100644
@@ -39,7 +39,6 @@
 #include <asm/mach/map.h>
 #include <video/omapdss.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/usb.h>
 #include <plat/mmc.h>
arch/arm/mach-omap2/board-overo.c +0 -1
index 779734d..193d160 100644
@@ -42,7 +42,6 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <video/omapdss.h>
 #include <video/omap-panel-generic-dpi.h>
arch/arm/mach-omap2/board-rx51-peripherals.c +0 -1
index df2534d..3b9fc61 100644
@@ -28,7 +28,6 @@
 #include <asm/system_info.h>
 
 #include <plat/mcspi.h>
-#include <plat/board.h>
 #include "common.h"
 #include <plat/dma.h>
 #include <plat/gpmc.h>
arch/arm/mach-omap2/board-rx51.c +0 -1
index 345dd93..92924eb 100644
@@ -24,7 +24,6 @@
 #include <asm/mach/map.h>
 
 #include <plat/mcspi.h>
-#include <plat/board.h>
 #include "common.h"
 #include <plat/dma.h>
 #include <plat/gpmc.h>
arch/arm/mach-omap2/board-zoom.c +0 -1
index 4e7e561..4994438 100644
@@ -22,7 +22,6 @@
 #include <asm/mach/arch.h>
 
 #include "common.h"
-#include <plat/board.h>
 #include <plat/usb.h>
 
 #include <mach/board-zoom.h>
arch/arm/mach-omap2/common.c +0 -1
index 069f972..6c2ff4f 100644
@@ -18,7 +18,6 @@
 #include <linux/io.h>
 
 #include <plat/hardware.h>
-#include <plat/board.h>
 #include <plat/mux.h>
 #include <plat/clock.h>
arch/arm/mach-omap2/devices.c +0 -1
index c00c689..56dfa2d 100644
@@ -26,7 +26,6 @@
 #include <asm/pmu.h>
 
 #include "iomap.h"
-#include <plat/board.h>
 #include <plat/dma.h>
 #include <plat/omap_hwmod.h>
 #include <plat/omap_device.h>
arch/arm/mach-omap2/gpmc-nand.c +0 -1
index 386dec8..513ed9e 100644
@@ -18,7 +18,6 @@
 
 #include <plat/cpu.h>
 #include <plat/nand.h>
-#include <plat/board.h>
 #include <plat/gpmc.h>
 
 static struct resource gpmc_nand_resource = {
arch/arm/mach-omap2/gpmc-onenand.c +0 -1
index a0fa9bb..c5f005e 100644
@@ -20,7 +20,6 @@
 
 #include <plat/cpu.h>
 #include <plat/onenand.h>
-#include <plat/board.h>
 #include <plat/gpmc.h>
 
 static struct omap_onenand_platform_data *gpmc_onenand_data;
arch/arm/mach-omap2/gpmc-smc91x.c +0 -1
index ba10c24..3f75ff0 100644
@@ -17,7 +17,6 @@
 #include <linux/io.h>
 #include <linux/smc91x.h>
 
-#include <plat/board.h>
 #include <plat/gpmc.h>
 #include <plat/gpmc-smc91x.h>
arch/arm/mach-omap2/gpmc-smsc911x.c +0 -1
index b6c77be..a3a2887 100644
@@ -20,7 +20,6 @@
 #include <linux/io.h>
 #include <linux/smsc911x.h>
 
-#include <plat/board.h>
 #include <plat/gpmc.h>
 #include <plat/gpmc-smsc911x.h>
arch/arm/mach-omap2/pm-debug.c +0 -1
index 814bcd9..3e1345f 100644
@@ -28,7 +28,6 @@
 #include <linux/slab.h>
 
 #include <plat/clock.h>
-#include <plat/board.h>
 #include "powerdomain.h"
 #include "clockdomain.h"
 #include <plat/dmtimer.h>
arch/arm/mach-omap2/pm24xx.c +0 -1
index 9e54dc9..de1caf1 100644
@@ -38,7 +38,6 @@
 #include <plat/clock.h>
 #include <plat/sram.h>
 #include <plat/dma.h>
-#include <plat/board.h>
 
 #include <mach/irqs.h>
arch/arm/mach-omap2/serial.c +0 -1
index c1b93c7..10f7f02 100644
@@ -29,7 +29,6 @@
 
 #include <plat/omap-serial.h>
 #include "common.h"
-#include <plat/board.h>
 #include <plat/dma.h>
 #include <plat/omap_hwmod.h>
 #include <plat/omap_device.h>
arch/arm/plat-omap/common.c +0 -1
index 7c04748..e5778ed 100644
@@ -17,7 +17,6 @@
 #include <linux/dma-mapping.h>
 
 #include <plat/common.h>
-#include <plat/board.h>
 #include <plat/vram.h>
 #include <plat/dsp.h>
 #include <plat/dma.h>
arch/arm/plat-omap/counter_32k.c +0 -1
index dbf1e03..902d2ff 100644
@@ -24,7 +24,6 @@
 
 #include <plat/hardware.h>
 #include <plat/common.h>
-#include <plat/board.h>
 
 #include <plat/clock.h>
arch/arm/plat-omap/debug-devices.c +0 -3
index caa1f7b..c7a4c09 100644
@@ -17,9 +17,6 @@
 
 #include <mach/hardware.h>
 
-#include <plat/board.h>
-
-
 /* Many OMAP development platforms reuse the same "debug board"; these
  * platforms include H2, H3, H4, and Perseus2.
  */
arch/arm/plat-omap/devices.c +0 -1
index 1cba927..287ac37 100644
@@ -23,7 +23,6 @@
 #include <asm/memblock.h>
 
 #include <plat/tc.h>
-#include <plat/board.h>
 #include <plat/mmc.h>
 #include <plat/menelaus.h>
 #include <plat/omap44xx.h>
arch/arm/plat-omap/include/plat/board.h deleted +0 -13
deleted file mode 100644
index d92f1b5..0000000
@@ -1,13 +0,0 @@
-/*
- *  arch/arm/plat-omap/include/mach/board.h
- *
- *  Information structures for board-specific data
- *
- *  Copyright (C) 2004	Nokia Corporation
- *  Written by Juha Yrj?l? <[email protected]>
- */
-
-#ifndef _OMAP_BOARD_H
-#define _OMAP_BOARD_H
-
-#endif
arch/arm/plat-omap/include/plat/mmc.h +0 -1
index eb3e4d5..8b4e4f2 100644
@@ -15,7 +15,6 @@
 #include <linux/device.h>
 #include <linux/mmc/host.h>
 
-#include <plat/board.h>
 #include <plat/omap_hwmod.h>
 
 #define OMAP15XX_NR_MMC		1
arch/arm/plat-omap/include/plat/usb.h +0 -1
index 548a4c8..bd20588 100644
@@ -5,7 +5,6 @@
 
 #include <linux/io.h>
 #include <linux/usb/musb.h>
-#include <plat/board.h>
 
 #define OMAP3_HS_USB_PORTS	3
arch/arm/plat-omap/sram.c +0 -1
index 766181c..d861aa7 100644
@@ -26,7 +26,6 @@
 #include <asm/mach/map.h>
 
 #include <plat/sram.h>
-#include <plat/board.h>
 #include <plat/cpu.h>
 
 #include "sram.h"
drivers/mmc/host/omap.c +0 -1
index 50e08f0..5b7d420 100644
@@ -33,7 +33,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <plat/board.h>
 #include <plat/mmc.h>
 #include <asm/gpio.h>
 #include <plat/dma.h>
drivers/mmc/host/omap_hsmmc.c +0 -1
index 3a09f93..f871b31 100644
@@ -40,7 +40,6 @@
 #include <linux/regulator/consumer.h>
 #include <linux/pm_runtime.h>
 #include <mach/hardware.h>
-#include <plat/board.h>
 #include <plat/mmc.h>
 #include <plat/cpu.h>
drivers/mtd/onenand/omap2.c +0 -2
index 398a827..10ed992 100644
@@ -44,8 +44,6 @@
 
 #include <plat/dma.h>
 
-#include <plat/board.h>
-
 #define DRIVER_NAME "omap2-onenand"
 
 #define ONENAND_IO_SIZE		SZ_128K
Signature · 1 line
1.7.8.6
maintainer
#14 lore raw

cover ARM: OMAP: cleanup plat/board.h file

In reply to Igor Grinberg
Quoted 1 line · Igor Grinberg

This patch series cleans up the plat/board.h and related files.

Great, thanks for doing this! Nice that we can finally remove all of that. I've also tested that 770 boots after this, so looks like we've already fixed up whatever it was depending on.

I'll be applying this into the cleanup branch as soon as I'll have an immutable commit for Arnd's treewide changes to move the obvious things into include/linux/platform_data.

Regards,

Tony