Merge branch 'omap/cleanup' into next/cleanup (2cd05006) · Commits · e / devices / android_kernel_teracube_mt6765

arch/arm/include/asm/device.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -12,7 +12,12 @@ struct dev_archdata {
		#endif
		};

		struct omap_device;

		struct pdev_archdata {
		#ifdef CONFIG_ARCH_OMAP
		struct omap_device *od;
		#endif
		};

		#endif

arch/arm/mach-omap1/mcbsp.c

+45 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		static int dsp_use;
		static struct clk *api_clk;
		static struct clk *dsp_clk;
		static struct platform_device **omap_mcbsp_devices;

		static void omap1_mcbsp_request(unsigned int id)
		{
		@@ -78,6 +79,17 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = {
		.free = omap1_mcbsp_free,
		};

		#define OMAP7XX_MCBSP1_BASE 0xfffb1000
		#define OMAP7XX_MCBSP2_BASE 0xfffb1800

		#define OMAP1510_MCBSP1_BASE 0xe1011800
		#define OMAP1510_MCBSP2_BASE 0xfffb1000
		#define OMAP1510_MCBSP3_BASE 0xe1017000

		#define OMAP1610_MCBSP1_BASE 0xe1011800
		#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] = {
		{
		@@ -369,6 +381,39 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {
		#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)
		{
		int i;

		omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),
		GFP_KERNEL);
		if (!omap_mcbsp_devices) {
		printk(KERN_ERR "Could not register McBSP devices\n");
		return;
		}

		for (i = 0; i < size; i++) {
		struct platform_device *new_mcbsp;
		int ret;

		new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);
		if (!new_mcbsp)
		continue;
		platform_device_add_resources(new_mcbsp, &res[i * res_count],
		res_count);
		config[i].reg_size = 2;
		config[i].reg_step = 2;
		new_mcbsp->dev.platform_data = &config[i];
		ret = platform_device_add(new_mcbsp);
		if (ret) {
		platform_device_put(new_mcbsp);
		continue;
		}
		omap_mcbsp_devices[i] = new_mcbsp;
		}
		}

		static int __init omap1_mcbsp_init(void)
		{
		if (!cpu_class_is_omap1())

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -243,17 +243,11 @@ static void __init omap_2430sdp_init(void)
		"Secondary LCD backlight");
		}

		static void __init omap_2430sdp_map_io(void)
		{
		omap2_set_globals_243x();
		omap243x_map_common_io();
		}

		MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")
		/* Maintainer: Syed Khasim - Texas Instruments Inc */
		.boot_params = 0x80000100,
		.reserve = omap_reserve,
		.map_io = omap_2430sdp_map_io,
		.map_io = omap243x_map_io,
		.init_early = omap2430_init_early,
		.init_irq = omap2_init_irq,
		.init_machine = omap_2430sdp_init,

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -825,17 +825,11 @@ static void __init omap_4430sdp_init(void)
		omap_4430sdp_display_init();
		}

		static void __init omap_4430sdp_map_io(void)
		{
		omap2_set_globals_443x();
		omap44xx_map_common_io();
		}

		MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")
		/* Maintainer: Santosh Shilimkar - Texas Instruments Inc */
		.boot_params = 0x80000100,
		.reserve = omap_reserve,
		.map_io = omap_4430sdp_map_io,
		.map_io = omap4_map_io,
		.init_early = omap4430_init_early,
		.init_irq = gic_init_irq,
		.init_machine = omap_4430sdp_init,

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -337,17 +337,11 @@ static void __init omap_apollon_init(void)
		omap_sdrc_init(NULL, NULL);
		}

		static void __init omap_apollon_map_io(void)
		{
		omap2_set_globals_242x();
		omap242x_map_common_io();
		}

		MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon")
		/* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */
		.boot_params = 0x80000100,
		.reserve = omap_reserve,
		.map_io = omap_apollon_map_io,
		.map_io = omap242x_map_io,
		.init_early = omap2420_init_early,
		.init_irq = omap2_init_irq,
		.init_machine = omap_apollon_init,