Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65af7c46 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer

parents b1e3be06 4c23c8da

arch/arm/mach-omap1/Makefile

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




# Common support

# 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 := 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

obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

arch/arm/mach-omap1/timer.c

0 → 100644
+173 −0
Original line number Original line 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

+36 −45
Original line number Original line Diff line number Diff line
@@ -116,9 +116,12 @@ obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) \ 
obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain.o \

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain.o \

					   clockdomain2xxx_3xxx.o \

					   clockdomain2xxx_3xxx.o \

					   clockdomains2xxx_3xxx_data.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 \

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomain.o \

					   clockdomain2xxx_3xxx.o \

					   clockdomain2xxx_3xxx.o \

					   clockdomains2xxx_3xxx_data.o

					   clockdomains2xxx_3xxx_data.o \

					   clockdomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain.o \

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain.o \

					   clockdomain44xx.o \

					   clockdomain44xx.o \

					   clockdomains44xx_data.o

					   clockdomains44xx_data.o
@@ -185,78 +188,66 @@ endif 
# Specific board support

# Specific board support

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o

obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o

obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o

obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o \

obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o

obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o

obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o \

obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o

					   hsmmc.o

obj-$(CONFIG_MACH_DEVKIT8000)     	+= board-devkit8000.o

obj-$(CONFIG_MACH_DEVKIT8000)     	+= board-devkit8000.o \

obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o

                                           hsmmc.o

obj-$(CONFIG_MACH_OMAP3530_LV_SOM)      += board-omap3logic.o

obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o \

obj-$(CONFIG_MACH_OMAP3_TORPEDO)        += board-omap3logic.o

					   board-flash.o \

obj-$(CONFIG_MACH_ENCORE)		+= board-omap3encore.o

					   hsmmc.o

obj-$(CONFIG_MACH_OVERO)		+= board-overo.o

obj-$(CONFIG_MACH_OMAP3530_LV_SOM)      += board-omap3logic.o \

obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP3_PANDORA)	+= board-omap3pandora.o

obj-$(CONFIG_MACH_OMAP3_TORPEDO)        += board-omap3logic.o \

obj-$(CONFIG_MACH_OMAP_3430SDP)		+= board-3430sdp.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_NOKIA_N8X0)		+= board-n8x0.o

obj-$(CONFIG_MACH_NOKIA_N8X0)		+= board-n8x0.o

obj-$(CONFIG_MACH_NOKIA_RM680)		+= board-rm680.o \

obj-$(CONFIG_MACH_NOKIA_RM680)		+= board-rm680.o \

					   sdram-nokia.o \

					   sdram-nokia.o

					   hsmmc.o

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o \

obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o \

					   sdram-nokia.o \

					   sdram-nokia.o \

					   board-rx51-peripherals.o \

					   board-rx51-peripherals.o \

					   board-rx51-video.o \

					   board-rx51-video.o

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom.o \

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom.o \

					   board-zoom-peripherals.o \

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-zoom-display.o \

					   board-flash.o \

					   hsmmc.o \

					   board-zoom-debugboard.o

					   board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom.o \

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom.o \

					   board-zoom-peripherals.o \

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-zoom-display.o \

					   board-flash.o \

					   hsmmc.o \

					   board-zoom-debugboard.o

					   board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-3630sdp.o \

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-3630sdp.o \

					   board-zoom-peripherals.o \

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-zoom-display.o

					   board-flash.o \

obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o

					   hsmmc.o

obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o \

					   hsmmc.o

obj-$(CONFIG_MACH_CM_T3517)		+= board-cm-t3517.o

obj-$(CONFIG_MACH_CM_T3517)		+= board-cm-t3517.o

obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o \

obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o

obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o \

obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o \

					   hsmmc.o \

					   omap_phy_internal.o

					   omap_phy_internal.o

obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.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

					   omap_phy_internal.o





obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.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_CRANEBOARD)		+= board-am3517crane.o





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

obj-$(CONFIG_MACH_SBC3530)		+= board-omap3stalker.o

					   hsmmc.o

obj-$(CONFIG_MACH_TI8168EVM)		+= board-ti8168evm.o

obj-$(CONFIG_MACH_TI8168EVM)		+= board-ti8168evm.o



# Platform specific device init code

# 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

usbfs-$(CONFIG_ARCH_OMAP_OTG)		:= usb-fs.o

obj-y					+= $(usbfs-m) $(usbfs-y)

obj-y					+= $(usbfs-m) $(usbfs-y)

obj-y					+= usb-musb.o

obj-y					+= usb-musb.o

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

+2 −7
Original line number Original line Diff line number Diff line
@@ -141,12 +141,6 @@ static struct omap_board_config_kernel sdp2430_config[] __initdata = { 
	{OMAP_TAG_LCD, &sdp2430_lcd_config},

	{OMAP_TAG_LCD, &sdp2430_lcd_config},

};

};





static void __init omap_2430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

}



static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {

static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};

};
@@ -235,6 +229,7 @@ static void __init omap_2430sdp_init(void) 




	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

	omap_serial_init();

	omap_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap2_hsmmc_init(mmc);

	omap2_hsmmc_init(mmc);

	omap2_usbfs_init(&sdp2430_usb_config);

	omap2_usbfs_init(&sdp2430_usb_config);
@@ -259,7 +254,7 @@ MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board") 
	.boot_params	= 0x80000100,

	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.reserve	= omap_reserve,

	.map_io		= omap_2430sdp_map_io,

	.map_io		= omap_2430sdp_map_io,

	.init_early	= omap_2430sdp_init_early,

	.init_early	= omap2430_init_early,

	.init_irq	= omap2_init_irq,

	.init_irq	= omap2_init_irq,

	.init_machine	= omap_2430sdp_init,

	.init_machine	= omap_2430sdp_init,

	.timer		= &omap2_timer,

	.timer		= &omap2_timer,

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

+2 −7
Original line number Original line Diff line number Diff line
@@ -225,12 +225,6 @@ static struct omap_dss_board_info sdp3430_dss_data = { 
static struct omap_board_config_kernel sdp3430_config[] __initdata = {

static struct omap_board_config_kernel sdp3430_config[] __initdata = {

};

};





static void __init omap_3430sdp_init_early(void)

{

	omap2_init_common_infrastructure();

	omap2_init_common_devices(hyb18m512160af6_sdrc_params, NULL);

}



static struct omap2_hsmmc_info mmc[] = {

static struct omap2_hsmmc_info mmc[] = {

	{

	{

		.mmc		= 1,

		.mmc		= 1,
@@ -719,6 +713,7 @@ static void __init omap_3430sdp_init(void) 
		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;

		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;

	omap_ads7846_init(1, gpio_pendown, 310, NULL);

	omap_ads7846_init(1, gpio_pendown, 310, NULL);

	board_serial_init();

	board_serial_init();

	omap_sdrc_init(hyb18m512160af6_sdrc_params, NULL);

	usb_musb_init(NULL);

	usb_musb_init(NULL);

	board_smc91x_init();

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_3430, 0);

	board_flash_init(sdp_flash_partitions, chip_sel_3430, 0);
@@ -732,7 +727,7 @@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board") 
	.boot_params	= 0x80000100,

	.boot_params	= 0x80000100,

	.reserve	= omap_reserve,

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.map_io		= omap3_map_io,

	.init_early	= omap_3430sdp_init_early,

	.init_early	= omap3430_init_early,

	.init_irq	= omap3_init_irq,

	.init_irq	= omap3_init_irq,

	.init_machine	= omap_3430sdp_init,

	.init_machine	= omap_3430sdp_init,

	.timer		= &omap3_timer,

	.timer		= &omap3_timer,