Merge branches 'cleanup-part3', 'voltage', 'dmtimer' and 'l3' into dt-base (c541c15f) · Commits · e / devices / android_kernel_fairphone_FP4

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/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@

		# Common support
		obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o
		obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o
		obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o

		obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

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-omap1/timer.c

0 → 100644

+173 −0

Original line number	Diff line number	Diff line
		/**
		* OMAP1 Dual-Mode Timers - platform device registration
		*
		* Contains first level initialization routines which internally
		* generates timer device information and registers with linux
		* device model. It also has low level function to chnage the timer
		* input clock source.
		*
		* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
		* Tarun Kanti DebBarma <tarun.kanti@ti.com>
		* Thara Gopinath <thara@ti.com>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*
		* This program is distributed "as is" WITHOUT ANY WARRANTY of any
		* kind, whether express or implied; without even the implied warranty
		* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#include <linux/clk.h>
		#include <linux/io.h>
		#include <linux/err.h>
		#include <linux/slab.h>
		#include <linux/platform_device.h>

		#include <mach/irqs.h>

		#include <plat/dmtimer.h>

		#define OMAP1610_GPTIMER1_BASE 0xfffb1400
		#define OMAP1610_GPTIMER2_BASE 0xfffb1c00
		#define OMAP1610_GPTIMER3_BASE 0xfffb2400
		#define OMAP1610_GPTIMER4_BASE 0xfffb2c00
		#define OMAP1610_GPTIMER5_BASE 0xfffb3400
		#define OMAP1610_GPTIMER6_BASE 0xfffb3c00
		#define OMAP1610_GPTIMER7_BASE 0xfffb7400
		#define OMAP1610_GPTIMER8_BASE 0xfffbd400

		#define OMAP1_DM_TIMER_COUNT 8

		static int omap1_dm_timer_set_src(struct platform_device *pdev,
		int source)
		{
		int n = (pdev->id - 1) << 1;
		u32 l;

		l = __raw_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
		l \|= source << n;
		__raw_writel(l, MOD_CONF_CTRL_1);

		return 0;
		}


		int __init omap1_dm_timer_init(void)
		{
		int i;
		int ret;
		struct dmtimer_platform_data *pdata;
		struct platform_device *pdev;

		if (!cpu_is_omap16xx())
		return 0;

		for (i = 1; i <= OMAP1_DM_TIMER_COUNT; i++) {
		struct resource res[2];
		u32 base, irq;

		switch (i) {
		case 1:
		base = OMAP1610_GPTIMER1_BASE;
		irq = INT_1610_GPTIMER1;
		break;
		case 2:
		base = OMAP1610_GPTIMER2_BASE;
		irq = INT_1610_GPTIMER2;
		break;
		case 3:
		base = OMAP1610_GPTIMER3_BASE;
		irq = INT_1610_GPTIMER3;
		break;
		case 4:
		base = OMAP1610_GPTIMER4_BASE;
		irq = INT_1610_GPTIMER4;
		break;
		case 5:
		base = OMAP1610_GPTIMER5_BASE;
		irq = INT_1610_GPTIMER5;
		break;
		case 6:
		base = OMAP1610_GPTIMER6_BASE;
		irq = INT_1610_GPTIMER6;
		break;
		case 7:
		base = OMAP1610_GPTIMER7_BASE;
		irq = INT_1610_GPTIMER7;
		break;
		case 8:
		base = OMAP1610_GPTIMER8_BASE;
		irq = INT_1610_GPTIMER8;
		break;
		default:
		/*
		* not supposed to reach here.
		* this is to remove warning.
		*/
		return -EINVAL;
		}

		pdev = platform_device_alloc("omap_timer", i);
		if (!pdev) {
		pr_err("%s: Failed to device alloc for dmtimer%d\n",
		__func__, i);
		return -ENOMEM;
		}

		memset(res, 0, 2 * sizeof(struct resource));
		res[0].start = base;
		res[0].end = base + 0x46;
		res[0].flags = IORESOURCE_MEM;
		res[1].start = irq;
		res[1].end = irq;
		res[1].flags = IORESOURCE_IRQ;
		ret = platform_device_add_resources(pdev, res,
		ARRAY_SIZE(res));
		if (ret) {
		dev_err(&pdev->dev, "%s: Failed to add resources.\n",
		__func__);
		goto err_free_pdev;
		}

		pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
		if (!pdata) {
		dev_err(&pdev->dev, "%s: Failed to allocate pdata.\n",
		__func__);
		ret = -ENOMEM;
		goto err_free_pdata;
		}

		pdata->set_timer_src = omap1_dm_timer_set_src;
		pdata->needs_manual_reset = 1;

		ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
		if (ret) {
		dev_err(&pdev->dev, "%s: Failed to add platform data.\n",
		__func__);
		goto err_free_pdata;
		}

		ret = platform_device_add(pdev);
		if (ret) {
		dev_err(&pdev->dev, "%s: Failed to add platform device.\n",
		__func__);
		goto err_free_pdata;
		}

		dev_dbg(&pdev->dev, " Registered.\n");
		}

		return 0;

		err_free_pdata:
		kfree(pdata);

		err_free_pdev:
		platform_device_unregister(pdev);

		return ret;
		}
		arch_initcall(omap1_dm_timer_init);

arch/arm/mach-omap2/Makefile

+39 −49

Original line number	Diff line number	Diff line
		@@ -89,14 +89,13 @@ obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \
		vp44xx_data.o

		# OMAP voltage domains
		ifeq ($(CONFIG_PM),y)
		voltagedomain-common := voltage.o
		obj-$(CONFIG_ARCH_OMAP2) += $(voltagedomain-common)
		voltagedomain-common := voltage.o vc.o vp.o
		obj-$(CONFIG_ARCH_OMAP2) += $(voltagedomain-common) \
		voltagedomains2xxx_data.o
		obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) \
		voltagedomains3xxx_data.o
		obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) \
		voltagedomains44xx_data.o
		endif

		# OMAP powerdomain framework
		powerdomain-common += powerdomain.o powerdomain-common.o
		@@ -116,9 +115,12 @@ obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) \
		obj-$(CONFIG_ARCH_OMAP2) += clockdomain.o \
		clockdomain2xxx_3xxx.o \
		clockdomains2xxx_3xxx_data.o
		obj-$(CONFIG_SOC_OMAP2420) += clockdomains2420_data.o
		obj-$(CONFIG_SOC_OMAP2430) += clockdomains2430_data.o
		obj-$(CONFIG_ARCH_OMAP3) += clockdomain.o \
		clockdomain2xxx_3xxx.o \
		clockdomains2xxx_3xxx_data.o
		clockdomains2xxx_3xxx_data.o \
		clockdomains3xxx_data.o
		obj-$(CONFIG_ARCH_OMAP4) += clockdomain.o \
		clockdomain44xx.o \
		clockdomains44xx_data.o
		@@ -185,78 +187,66 @@ endif
		# Specific board support
		obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
		obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o
		obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o
		obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o
		obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \
		hsmmc.o
		obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \
		board-flash.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OMAP3530_LV_SOM) += board-omap3logic.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OMAP3_TORPEDO) += board-omap3logic.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OVERO) += board-overo.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
		hsmmc.o \
		board-flash.o
		obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o
		obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o
		obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o
		obj-$(CONFIG_MACH_OMAP3530_LV_SOM) += board-omap3logic.o
		obj-$(CONFIG_MACH_OMAP3_TORPEDO) += board-omap3logic.o
		obj-$(CONFIG_MACH_ENCORE) += board-omap3encore.o
		obj-$(CONFIG_MACH_OVERO) += board-overo.o
		obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o
		obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o
		obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o
		obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
		obj-$(CONFIG_MACH_NOKIA_RM680) += board-rm680.o \
		sdram-nokia.o \
		hsmmc.o
		sdram-nokia.o
		obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
		sdram-nokia.o \
		board-rx51-peripherals.o \
		board-rx51-video.o \
		hsmmc.o
		board-rx51-video.o
		obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom.o \
		board-zoom-peripherals.o \
		board-zoom-display.o \
		board-flash.o \
		hsmmc.o \
		board-zoom-debugboard.o
		obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom.o \
		board-zoom-peripherals.o \
		board-zoom-display.o \
		board-flash.o \
		hsmmc.o \
		board-zoom-debugboard.o
		obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \
		board-zoom-peripherals.o \
		board-zoom-display.o \
		board-flash.o \
		hsmmc.o
		obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \
		hsmmc.o
		board-zoom-display.o
		obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o
		obj-$(CONFIG_MACH_CM_T3517) += board-cm-t3517.o
		obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \
		hsmmc.o
		obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o
		obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o
		obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \
		hsmmc.o \
		omap_phy_internal.o
		obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \
		hsmmc.o \
		omap_phy_internal.o

		obj-$(CONFIG_MACH_PCM049) += board-omap4pcm049.o \
		omap_phy_internal.o

		obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o \
		omap_phy_internal.o \
		omap_phy_internal.o

		obj-$(CONFIG_MACH_CRANEBOARD) += board-am3517crane.o

		obj-$(CONFIG_MACH_SBC3530) += board-omap3stalker.o \
		hsmmc.o
		obj-$(CONFIG_MACH_SBC3530) += board-omap3stalker.o
		obj-$(CONFIG_MACH_TI8168EVM) += board-ti8168evm.o

		# Platform specific device init code

		omap-flash-$(CONFIG_MTD_NAND_OMAP2) := board-flash.o
		omap-flash-$(CONFIG_MTD_ONENAND_OMAP2) := board-flash.o
		obj-y += $(omap-flash-y) $(omap-flash-m)

		omap-hsmmc-$(CONFIG_MMC_OMAP_HS) := hsmmc.o
		obj-y += $(omap-hsmmc-m) $(omap-hsmmc-y)


		usbfs-$(CONFIG_ARCH_OMAP_OTG) := usb-fs.o
		obj-y += $(usbfs-m) $(usbfs-y)
		obj-y += usb-musb.o