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

Commit bf182bcc authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: dynamically allocate mxc_pwm devices 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent c0624657

arch/arm/mach-imx/devices.c

+0 −19
Original line number Diff line number Diff line
@@ -77,25 +77,6 @@ int __init imx1_register_gpios(void) 
#endif



#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)

static struct resource mxc_pwm_resources[] = {

	{

		.start = MX2x_PWM_BASE_ADDR,

		.end = MX2x_PWM_BASE_ADDR + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MX2x_INT_PWM,

		.end = MX2x_INT_PWM,

		.flags = IORESOURCE_IRQ,

	}

};



struct platform_device mxc_pwm_device = {

	.name = "mxc_pwm",

	.id = 0,

	.num_resources = ARRAY_SIZE(mxc_pwm_resources),

	.resource = mxc_pwm_resources,

};



#define DEFINE_MXC_MMC_DEVICE(n, baseaddr, irq, dmareq)			\

	static struct resource mxc_sdhc_resources ## n[] = {		\

		{							\

arch/arm/mach-imx/devices.h

+0 −1
Original line number Diff line number Diff line 
#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)

extern struct platform_device mxc_pwm_device;

extern struct platform_device mxc_sdhc_device0;

extern struct platform_device mxc_sdhc_device1;

extern struct platform_device mxc_otg_udc_device;

arch/arm/plat-mxc/devices/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ config IMX_HAVE_PLATFORM_MX2_CAMERA 
config IMX_HAVE_PLATFORM_MXC_NAND

	bool



config IMX_HAVE_PLATFORM_MXC_PWM

	bool



config IMX_HAVE_PLATFORM_MXC_W1

	bool

arch/arm/plat-mxc/devices/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,5 +12,6 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UDC) += platform-imx_udc.o 
obj-$(CONFIG_IMX_HAVE_PLATFORM_MX1_CAMERA) += platform-mx1-camera.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_PWM) += platform-mxc_pwm.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_W1) += platform-mxc_w1.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) +=  platform-spi_imx.o

arch/arm/plat-mxc/devices/platform-mxc_pwm.c

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009-2010 Pengutronix

 * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>

 *

 * 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.

 */

#include <mach/hardware.h>

#include <mach/devices-common.h>



#define imx_mxc_pwm_data_entry_single(soc)				\

	{								\

		.iobase = soc ## _PWM_BASE_ADDR,			\

		.irq = soc ## _INT_PWM,					\

	}



#ifdef CONFIG_SOC_IMX21

const struct imx_mxc_pwm_data imx21_mxc_pwm_data __initconst =

	imx_mxc_pwm_data_entry_single(MX21);

#endif /* ifdef CONFIG_SOC_IMX21 */



#ifdef CONFIG_SOC_IMX27

const struct imx_mxc_pwm_data imx27_mxc_pwm_data __initconst =

	imx_mxc_pwm_data_entry_single(MX27);

#endif /* ifdef CONFIG_SOC_IMX27 */



struct platform_device *__init imx_add_mxc_pwm(

		const struct imx_mxc_pwm_data *data)

{

	struct resource res[] = {

		{

			.start = data->iobase,

			.end = data->iobase + SZ_4K - 1,

			.flags = IORESOURCE_MEM,

		}, {

			.start = data->irq,

			.end = data->irq,

			.flags = IORESOURCE_IRQ,

		},

	};



	return imx_add_platform_device("mxc_pwm", 0,

			res, ARRAY_SIZE(res), NULL, 0);

}