Commit 980a637d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap1: fix !ARCH_OMAP1_ANY link failures 



While compile-testing randconfig builds for the upcoming boardfile
removal, I noticed that an earlier patch of mine was completely
broken, and the introduction of CONFIG_ARCH_OMAP1_ANY only replaced
one set of build failures with another one, now resulting in
link failures like

ld: drivers/video/fbdev/omap/omapfb_main.o: in function `omapfb_do_probe':
drivers/video/fbdev/omap/omapfb_main.c:1703: undefined reference to `omap_set_dma_priority'
ld: drivers/dma/ti/omap-dma.o: in function `omap_dma_free_chan_resources':
drivers/dma/ti/omap-dma.c:777: undefined reference to `omap_free_dma'
drivers/dma/ti/omap-dma.c:1685: undefined reference to `omap_get_plat_info'
ld: drivers/usb/gadget/udc/omap_udc.o: in function `next_in_dma':
drivers/usb/gadget/udc/omap_udc.c:820: undefined reference to `omap_get_dma_active_status'

I tried reworking it, but the resulting patch ended up much bigger than
simply avoiding the original problem of unused-function warnings like

arch/arm/mach-omap1/mcbsp.c:76:30: error: unused variable 'omap1_mcbsp_ops' [-Werror,-Wunused-variable]

As a result, revert the previous fix, and rearrange the code that
produces warnings to hide them. For mcbsp, the #ifdef check can
simply be removed as the cpu_is_omapxxx() checks already achieve
the same result, while in the io.c the easiest solution appears to
be to merge the common map bits into each soc specific portion.
This gets cleaned in a nicer way after omap7xx support gets dropped,
as the remaining SoCs all have the exact same I/O map.

Fixes: 615dce5b ("ARM: omap1: fix build with no SoC selected")
Cc: stable@vger.kernel.org
Acked-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent cd2d0d45

arch/arm/mach-omap1/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ menuconfig ARCH_OMAP1 
	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5

	depends on CPU_LITTLE_ENDIAN

	depends on ATAGS

	select ARCH_OMAP

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_OMAP

	select CLKSRC_MMIO
@@ -45,10 +46,6 @@ config ARCH_OMAP16XX 
	select CPU_ARM926T

	select OMAP_DM_TIMER



config ARCH_OMAP1_ANY

	select ARCH_OMAP

	def_bool ARCH_OMAP730 || ARCH_OMAP850 || ARCH_OMAP15XX || ARCH_OMAP16XX



config ARCH_OMAP

	bool

arch/arm/mach-omap1/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
# Makefile for the linux kernel.

#



ifdef CONFIG_ARCH_OMAP1_ANY



# Common support

obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \

	 serial.o devices.o dma.o omap-dma.o fb.o
@@ -59,5 +57,3 @@ obj-$(CONFIG_ARCH_OMAP730) += gpio7xx.o 
obj-$(CONFIG_ARCH_OMAP850)		+= gpio7xx.o

obj-$(CONFIG_ARCH_OMAP15XX)		+= gpio15xx.o

obj-$(CONFIG_ARCH_OMAP16XX)		+= gpio16xx.o
 


endif

arch/arm/mach-omap1/io.c

+15 −17
Original line number Diff line number Diff line
@@ -22,17 +22,14 @@ 
 * The machine specific code may provide the extra mapping besides the

 * default mapping provided here.

 */

static struct map_desc omap_io_desc[] __initdata = {

#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)

static struct map_desc omap7xx_io_desc[] __initdata = {

	{

		.virtual	= OMAP1_IO_VIRT,

		.pfn		= __phys_to_pfn(OMAP1_IO_PHYS),

		.length		= OMAP1_IO_SIZE,

		.type		= MT_DEVICE

	}

};



#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)

static struct map_desc omap7xx_io_desc[] __initdata = {

	},

	{

		.virtual	= OMAP7XX_DSP_BASE,

		.pfn		= __phys_to_pfn(OMAP7XX_DSP_START),
@@ -49,6 +46,12 @@ static struct map_desc omap7xx_io_desc[] __initdata = { 


#ifdef CONFIG_ARCH_OMAP15XX

static struct map_desc omap1510_io_desc[] __initdata = {

	{

		.virtual	= OMAP1_IO_VIRT,

		.pfn		= __phys_to_pfn(OMAP1_IO_PHYS),

		.length		= OMAP1_IO_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= OMAP1510_DSP_BASE,

		.pfn		= __phys_to_pfn(OMAP1510_DSP_START),
@@ -65,6 +68,12 @@ static struct map_desc omap1510_io_desc[] __initdata = { 


#if defined(CONFIG_ARCH_OMAP16XX)

static struct map_desc omap16xx_io_desc[] __initdata = {

	{

		.virtual	= OMAP1_IO_VIRT,

		.pfn		= __phys_to_pfn(OMAP1_IO_PHYS),

		.length		= OMAP1_IO_SIZE,

		.type		= MT_DEVICE

	},

	{

		.virtual	= OMAP16XX_DSP_BASE,

		.pfn		= __phys_to_pfn(OMAP16XX_DSP_START),
@@ -79,18 +88,9 @@ static struct map_desc omap16xx_io_desc[] __initdata = { 
};

#endif



/*

 * Maps common IO regions for omap1

 */

static void __init omap1_map_common_io(void)

{

	iotable_init(omap_io_desc, ARRAY_SIZE(omap_io_desc));

}



#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)

void __init omap7xx_map_io(void)

{

	omap1_map_common_io();

	iotable_init(omap7xx_io_desc, ARRAY_SIZE(omap7xx_io_desc));

}

#endif
@@ -98,7 +98,6 @@ void __init omap7xx_map_io(void) 
#ifdef CONFIG_ARCH_OMAP15XX

void __init omap15xx_map_io(void)

{

	omap1_map_common_io();

	iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));

}

#endif
@@ -106,7 +105,6 @@ void __init omap15xx_map_io(void) 
#if defined(CONFIG_ARCH_OMAP16XX)

void __init omap16xx_map_io(void)

{

	omap1_map_common_io();

	iotable_init(omap16xx_io_desc, ARRAY_SIZE(omap16xx_io_desc));

}

#endif

arch/arm/mach-omap1/mcbsp.c

+0 −21
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = { 
#define OMAP1610_MCBSP2_BASE	0xfffb1000

#define OMAP1610_MCBSP3_BASE	0xe1017000



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

struct resource omap7xx_mcbsp_res[][6] = {

	{

		{
@@ -159,14 +158,7 @@ static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = { 
};

#define OMAP7XX_MCBSP_RES_SZ		ARRAY_SIZE(omap7xx_mcbsp_res[1])

#define OMAP7XX_MCBSP_COUNT		ARRAY_SIZE(omap7xx_mcbsp_res)

#else

#define omap7xx_mcbsp_res_0		NULL

#define omap7xx_mcbsp_pdata		NULL

#define OMAP7XX_MCBSP_RES_SZ		0

#define OMAP7XX_MCBSP_COUNT		0

#endif



#ifdef CONFIG_ARCH_OMAP15XX

struct resource omap15xx_mcbsp_res[][6] = {

	{

		{
@@ -266,14 +258,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { 
};

#define OMAP15XX_MCBSP_RES_SZ		ARRAY_SIZE(omap15xx_mcbsp_res[1])

#define OMAP15XX_MCBSP_COUNT		ARRAY_SIZE(omap15xx_mcbsp_res)

#else

#define omap15xx_mcbsp_res_0		NULL

#define omap15xx_mcbsp_pdata		NULL

#define OMAP15XX_MCBSP_RES_SZ		0

#define OMAP15XX_MCBSP_COUNT		0

#endif



#ifdef CONFIG_ARCH_OMAP16XX

struct resource omap16xx_mcbsp_res[][6] = {

	{

		{
@@ -373,12 +358,6 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { 
};

#define OMAP16XX_MCBSP_RES_SZ		ARRAY_SIZE(omap16xx_mcbsp_res[1])

#define OMAP16XX_MCBSP_COUNT		ARRAY_SIZE(omap16xx_mcbsp_res)

#else

#define omap16xx_mcbsp_res_0		NULL

#define omap16xx_mcbsp_pdata		NULL

#define OMAP16XX_MCBSP_RES_SZ		0

#define OMAP16XX_MCBSP_COUNT		0

#endif



static void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,

			struct omap_mcbsp_platform_data *config, int size)

arch/arm/mach-omap1/pm.h

+0 −7
Original line number Diff line number Diff line
@@ -106,13 +106,6 @@ 
#define OMAP7XX_IDLECT3		0xfffece24

#define OMAP7XX_IDLE_LOOP_REQUEST	0x0C00



#if     !defined(CONFIG_ARCH_OMAP730) && \

	!defined(CONFIG_ARCH_OMAP850) && \

	!defined(CONFIG_ARCH_OMAP15XX) && \

	!defined(CONFIG_ARCH_OMAP16XX)

#warning "Power management for this processor not implemented yet"

#endif



#ifndef __ASSEMBLER__



#include <linux/clk.h>