Commit 6437c029 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'armsoc-build-fixes' of... 

Merge branch 'armsoc-build-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc into arm/fixes

ARM: SoC fixes

These are three fixes for mistakes I discovered during the preparation
of the boardfile removal. Robert noticed the accidental removal
of PXA310 and PXA320 support because of a misplaced Kconfig statement,
and the two OMAP patches were build failures that got introduced
earlier but that I found while testing the removal.

* 'armsoc-build-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: omap1: fix building gpio15xx
  ARM: omap1: fix !ARCH_OMAP1_ANY link failures
  ARM: pxa: enable PXA310/PXA320 for DT-only build
parents daec8b54 9d46ce57

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/gpio15xx.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/gpio.h>

#include <linux/platform_data/gpio-omap.h>

#include <linux/soc/ti/omap1-soc.h>

#include <asm/irq.h>



#include "irqs.h"

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)