Commit 2c757fd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull arm-soc cleanups (part 2) from Olof Johansson:
 "More cleanups, continuing an earlier set with omap and samsung
  specific cleanups.  These could not go into the first set because they
  have dependencies on various other series that in turn depend on the
  first cleanups."

Fixed up conflicts in arch/arm/plat-omap/counter_32k.c due to commit
bd0493ea: "move read_{boot,persistent}_clock to the architecture
level" that changed how the persistent clocks were handled.  And trivial
conflicts in arch/arm/mach-omap1/common.h due to just independent
changes close to each other.

* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (35 commits)
  ARM: SAMSUNG: merge plat-s5p into plat-samsung
  ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig
  ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung
  ARM: SAMSUNG: move platform device for s5p uart into plat-samsung
  ARM: SAMSUNG: move hr timer for common s5p into plat-samsung
  ARM: SAMSUNG: move pm part for common s5p into plat-samsung
  ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung
  ARM: SAMSUNG: move clock part for common s5p into plat-samsung
  ARM: S3C24XX: Use common macro to define resources on dev-uart.c
  ARM: S3C24XX: move common clock init into common.c
  ARM: S3C24XX: move common power-management code to mach-s3c24xx
  ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c
  ARM: S3C24XX: move plat-s3c24xx/cpu.c
  ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX
  ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX
  GPMC: add ECC control definitions
  ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore
  ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx
  ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505
  ARM: OMAP1: Pass dma request lines in platform data to MMC driver
  ...
parents ce53044c 42466356

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,6 @@ source "arch/arm/mach-sa1100/Kconfig" 


source "arch/arm/plat-samsung/Kconfig"

source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s5p/Kconfig"



source "arch/arm/plat-spear/Kconfig"

arch/arm/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -160,9 +160,7 @@ machine-$(CONFIG_ARCH_MXS) := mxs 
machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

machine-$(CONFIG_ARCH_OMAP1)		:= omap1

machine-$(CONFIG_ARCH_OMAP2)		:= omap2

machine-$(CONFIG_ARCH_OMAP3)		:= omap2

machine-$(CONFIG_ARCH_OMAP4)		:= omap2

machine-$(CONFIG_ARCH_OMAP2PLUS)	:= omap2

machine-$(CONFIG_ARCH_ORION5X)		:= orion5x

machine-$(CONFIG_ARCH_PICOXCELL)	:= picoxcell

machine-$(CONFIG_ARCH_PNX4008)		:= pnx4008
@@ -205,7 +203,7 @@ plat-$(CONFIG_PLAT_NOMADIK) := nomadik 
plat-$(CONFIG_PLAT_ORION)	:= orion

plat-$(CONFIG_PLAT_PXA)		:= pxa

plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung

plat-$(CONFIG_PLAT_S5P)		:= s5p samsung

plat-$(CONFIG_PLAT_S5P)		:= samsung

plat-$(CONFIG_PLAT_SPEAR)	:= spear

plat-$(CONFIG_PLAT_VERSATILE)	:= versatile

arch/arm/mach-omap1/common.h

+8 −1
Original line number Diff line number Diff line
@@ -63,7 +63,14 @@ extern void omap1_nand_cmd_ctl(struct mtd_info *mtd, int cmd, 
			       unsigned int ctrl);



extern struct sys_timer omap1_timer;

extern bool omap_32k_timer_init(void);

#ifdef CONFIG_OMAP_32K_TIMER

extern int omap_32k_timer_init(void);

#else

static inline int __init omap_32k_timer_init(void)

{

	return -ENODEV;

}

#endif



extern u32 omap_irq_flags;

arch/arm/mach-omap1/devices.c

+110 −11
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <plat/tc.h>

#include <plat/board.h>

#include <plat/mux.h>

#include <plat/dma.h>

#include <plat/mmc.h>

#include <plat/omap7xx.h>
@@ -31,6 +32,22 @@ 
#include "common.h"

#include "clock.h"



#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)



static struct platform_device omap_pcm = {

	.name	= "omap-pcm-audio",

	.id	= -1,

};



static void omap_init_audio(void)

{

	platform_device_register(&omap_pcm);

}



#else

static inline void omap_init_audio(void) {}

#endif



/*-------------------------------------------------------------------------*/



#if defined(CONFIG_RTC_DRV_OMAP) || defined(CONFIG_RTC_DRV_OMAP_MODULE)
@@ -128,6 +145,56 @@ static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller, 
	}

}



#define OMAP_MMC_NR_RES		4



/*

 * Register MMC devices.

 */

static int __init omap_mmc_add(const char *name, int id, unsigned long base,

				unsigned long size, unsigned int irq,

				unsigned rx_req, unsigned tx_req,

				struct omap_mmc_platform_data *data)

{

	struct platform_device *pdev;

	struct resource res[OMAP_MMC_NR_RES];

	int ret;



	pdev = platform_device_alloc(name, id);

	if (!pdev)

		return -ENOMEM;



	memset(res, 0, OMAP_MMC_NR_RES * sizeof(struct resource));

	res[0].start = base;

	res[0].end = base + size - 1;

	res[0].flags = IORESOURCE_MEM;

	res[1].start = res[1].end = irq;

	res[1].flags = IORESOURCE_IRQ;

	res[2].start = rx_req;

	res[2].name = "rx";

	res[2].flags = IORESOURCE_DMA;

	res[3].start = tx_req;

	res[3].name = "tx";

	res[3].flags = IORESOURCE_DMA;



	ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res));

	if (ret == 0)

		ret = platform_device_add_data(pdev, data, sizeof(*data));

	if (ret)

		goto fail;



	ret = platform_device_add(pdev);

	if (ret)

		goto fail;



	/* return device handle to board setup code */

	data->dev = &pdev->dev;

	return 0;



fail:

	platform_device_put(pdev);

	return ret;

}



void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,

			int nr_controllers)

{
@@ -135,6 +202,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 


	for (i = 0; i < nr_controllers; i++) {

		unsigned long base, size;

		unsigned rx_req, tx_req;

		unsigned int irq = 0;



		if (!mmc_data[i])
@@ -146,19 +214,24 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 
		case 0:

			base = OMAP1_MMC1_BASE;

			irq = INT_MMC;

			rx_req = OMAP_DMA_MMC_RX;

			tx_req = OMAP_DMA_MMC_TX;

			break;

		case 1:

			if (!cpu_is_omap16xx())

				return;

			base = OMAP1_MMC2_BASE;

			irq = INT_1610_MMC2;

			rx_req = OMAP_DMA_MMC2_RX;

			tx_req = OMAP_DMA_MMC2_TX;

			break;

		default:

			continue;

		}

		size = OMAP1_MMC_SIZE;



		omap_mmc_add("mmci-omap", i, base, size, irq, mmc_data[i]);

		omap_mmc_add("mmci-omap", i, base, size, irq,

				rx_req, tx_req, mmc_data[i]);

	};

}
@@ -242,23 +315,48 @@ void __init omap1_camera_init(void *info) 


static inline void omap_init_sti(void) {}



#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)

/* Numbering for the SPI-capable controllers when used for SPI:

 * spi		= 1

 * uwire	= 2

 * mmc1..2	= 3..4

 * mcbsp1..3	= 5..7

 */



static struct platform_device omap_pcm = {

	.name	= "omap-pcm-audio",

#if defined(CONFIG_SPI_OMAP_UWIRE) || defined(CONFIG_SPI_OMAP_UWIRE_MODULE)



#define	OMAP_UWIRE_BASE		0xfffb3000



static struct resource uwire_resources[] = {

	{

		.start		= OMAP_UWIRE_BASE,

		.end		= OMAP_UWIRE_BASE + 0x20,

		.flags		= IORESOURCE_MEM,

	},

};



static struct platform_device omap_uwire_device = {

	.name	   = "omap_uwire",

	.id	     = -1,

	.num_resources	= ARRAY_SIZE(uwire_resources),

	.resource	= uwire_resources,

};



static void omap_init_audio(void)

static void omap_init_uwire(void)

{

	platform_device_register(&omap_pcm);

}

	/* FIXME define and use a boot tag; not all boards will be hooking

	 * up devices to the microwire controller, and multi-board configs

	 * mean that CONFIG_SPI_OMAP_UWIRE may be configured anyway...

	 */



	/* board-specific code must configure chipselects (only a few

	 * are normally used) and SCLK/SDI/SDO (each has two choices).

	 */

	(void) platform_device_register(&omap_uwire_device);

}

#else

static inline void omap_init_audio(void) {}

static inline void omap_init_uwire(void) {}

#endif



/*-------------------------------------------------------------------------*/



/*

 * This gets called after board-specific INIT_MACHINE, and initializes most
@@ -292,11 +390,12 @@ static int __init omap1_init_devices(void) 
	 * in alphabetical order so they're easier to sort through.

	 */



	omap_init_audio();

	omap_init_mbox();

	omap_init_rtc();

	omap_init_spi100k();

	omap_init_sti();

	omap_init_audio();

	omap_init_uwire();



	return 0;

}

arch/arm/mach-omap1/time.c

+1 −15
Original line number Diff line number Diff line
@@ -232,20 +232,6 @@ static inline void omap_mpu_timer_init(void) 
}

#endif	/* CONFIG_OMAP_MPU_TIMER */



static inline int omap_32k_timer_usable(void)

{

	int res = false;



	if (cpu_is_omap730() || cpu_is_omap15xx())

		return res;



#ifdef CONFIG_OMAP_32K_TIMER

	res = omap_32k_timer_init();

#endif



	return res;

}



/*

 * ---------------------------------------------------------------------------

 * Timer initialization
@@ -253,7 +239,7 @@ static inline int omap_32k_timer_usable(void) 
 */

static void __init omap1_timer_init(void)

{

	if (!omap_32k_timer_usable())

	if (omap_32k_timer_init() != 0)

		omap_mpu_timer_init();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE