All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices
@ 2010-12-01 13:11 Fabio Estevam
  2010-12-01 13:11 ` [PATCH v6 2/2] ARM: mx5: dynamically allocate imx-keypad devices Fabio Estevam
  2010-12-07 19:20 ` [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices Fabio Estevam
  0 siblings, 2 replies; 6+ messages in thread
From: Fabio Estevam @ 2010-12-01 13:11 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/mach-mx5/devices-imx51.h            |    4 ++++
 arch/arm/plat-mxc/devices/platform-mxc_pwm.c |    9 +++++++++
 arch/arm/plat-mxc/include/mach/mx51.h        |    4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h
index 939d2e8..e4bc426 100644
--- a/arch/arm/mach-mx5/devices-imx51.h
+++ b/arch/arm/mach-mx5/devices-imx51.h
@@ -47,3 +47,7 @@ extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
 extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data __initconst;
 #define imx51_imx2_wdt_data(pdata)	\
 	imx_add_imx2_wdt_data(&imx51_imx2_wdt_data, pdata)
+
+extern const struct imx_mxc_pwm_data imx51_mxc_pwm_data[] __initconst;
+#define imx51_add_mxc_pwm(id, pdata)	\
+	imx_add_mxc_pwm(&imx51_mxc_pwm_data[id], pdata)
diff --git a/arch/arm/plat-mxc/devices/platform-mxc_pwm.c b/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
index 3d8ebdb..b0c4ae2 100644
--- a/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
+++ b/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
@@ -40,6 +40,15 @@ const struct imx_mxc_pwm_data imx27_mxc_pwm_data __initconst =
 	imx_mxc_pwm_data_entry_single(MX27, 0, , SZ_4K);
 #endif /* ifdef CONFIG_SOC_IMX27 */
 
+#ifdef CONFIG_SOC_IMX51
+const struct imx_mxc_pwm_data imx51_mxc_pwm_data[] __initconst = {
+#define imx51_mxc_pwm_data_entry(_id, _hwid)				\
+	imx_mxc_pwm_data_entry(MX51, _id, _hwid, SZ_16K)
+	imx51_mxc_pwm_data_entry(0, 1),
+	imx51_mxc_pwm_data_entry(1, 2),
+};
+#endif /* ifdef CONFIG_SOC_IMX51 */
+
 struct platform_device *__init imx_add_mxc_pwm(
 		const struct imx_mxc_pwm_data *data)
 {
diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
index 8fddfef..54b58a0 100644
--- a/arch/arm/plat-mxc/include/mach/mx51.h
+++ b/arch/arm/plat-mxc/include/mach/mx51.h
@@ -302,7 +302,7 @@
 #define MX51_MXC_INT_WDOG1		58
 #define MX51_MXC_INT_WDOG2		59
 #define MX51_MXC_INT_KPP		60
-#define MX51_MXC_INT_PWM1		61
+#define MX51_INT_PWM1			61
 #define MX51_INT_I2C1			62
 #define MX51_INT_I2C2			63
 #define MX51_MXC_INT_HS_I2C		64
@@ -335,7 +335,7 @@
 #define MX51_MXC_INT_SPDIF		91
 #define MX51_MXC_INT_TVE		92
 #define MX51_MXC_INT_FIRI		93
-#define MX51_MXC_INT_PWM2		94
+#define MX51_INT_PWM2			94
 #define MX51_MXC_INT_SLIM_EXP		95
 #define MX51_MXC_INT_SSI3		96
 #define MX51_MXC_INT_EMI_BOOT		97
-- 
1.6.0.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH v6 2/2] ARM: mx5: dynamically allocate imx-keypad devices
  2010-12-01 13:11 [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices Fabio Estevam
@ 2010-12-01 13:11 ` Fabio Estevam
  2010-12-07 19:20 ` [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices Fabio Estevam
  1 sibling, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2010-12-01 13:11 UTC (permalink / raw)
  To: linux-arm-kernel

Add support for dynamical allocation of imx-keypad on mx5 platform.

After moving to dynamically registration of the keypad, the keypad clock
name needs to change accordingly.

The reason is that the original mx5 keypad platform_device id was 0,
now we use id=-1 as per arch/arm/plat-mxc/devices/platform-imx-keypad.c.

Tested keypad successfully on a MX51_3DS board.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/mach-mx5/Kconfig                       |    2 ++
 arch/arm/mach-mx5/board-mx51_3ds.c              |    5 ++---
 arch/arm/mach-mx5/clock-mx51-mx53.c             |    2 +-
 arch/arm/mach-mx5/devices-imx51.h               |    4 ++++
 arch/arm/mach-mx5/devices.c                     |   19 -------------------
 arch/arm/mach-mx5/devices.h                     |    1 -
 arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c    |    5 ++---
 arch/arm/plat-mxc/devices/platform-imx-keypad.c |    5 +++++
 arch/arm/plat-mxc/include/mach/mx51.h           |    2 +-
 9 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index 7f5a696..0f61f03 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -29,6 +29,7 @@ config MACH_MX51_BABBAGE
 config MACH_MX51_3DS
 	bool "Support MX51PDK (3DS)"
 	select SOC_IMX51
+	select IMX_HAVE_PLATFORM_IMX_KEYPAD
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
 	select IMX_HAVE_PLATFORM_SPI_IMX
@@ -56,6 +57,7 @@ choice
 config MACH_EUKREA_MBIMX51_BASEBOARD
 	prompt "Eukrea MBIMX51 development board"
 	bool
+	select IMX_HAVE_PLATFORM_IMX_KEYPAD
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
 	help
 	  This adds board specific devices that can be found on Eukrea's
diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c
index 6cc2805..43cd5ab 100644
--- a/arch/arm/mach-mx5/board-mx51_3ds.c
+++ b/arch/arm/mach-mx5/board-mx51_3ds.c
@@ -12,7 +12,6 @@
 
 #include <linux/irq.h>
 #include <linux/platform_device.h>
-#include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
 
 #include <asm/mach-types.h>
@@ -120,14 +119,14 @@ static int mx51_3ds_board_keymap[] = {
 	KEY(3, 5, KEY_BACK)
 };
 
-static struct matrix_keymap_data mx51_3ds_map_data = {
+static const struct matrix_keymap_data mx51_3ds_map_data __initconst = {
 	.keymap		= mx51_3ds_board_keymap,
 	.keymap_size	= ARRAY_SIZE(mx51_3ds_board_keymap),
 };
 
 static void mxc_init_keypad(void)
 {
-	mxc_register_device(&mxc_keypad_device, &mx51_3ds_map_data);
+	imx51_add_imx_keypad(&mx51_3ds_map_data);
 }
 #else
 static inline void mxc_init_keypad(void)
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c
index 344ee8e..57fea05 100644
--- a/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
@@ -1091,7 +1091,7 @@ static struct clk_lookup mx51_lookups[] = {
 	_REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", ahb_clk)
 	_REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk)
 	_REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk)
-	_REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk)
+	_REGISTER_CLOCK("imx-keypad", NULL, kpp_clk)
 	_REGISTER_CLOCK("mxc_nand", NULL, nfc_clk)
 	_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
 	_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h
index e4bc426..b98b4d3 100644
--- a/arch/arm/mach-mx5/devices-imx51.h
+++ b/arch/arm/mach-mx5/devices-imx51.h
@@ -51,3 +51,7 @@ extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data __initconst;
 extern const struct imx_mxc_pwm_data imx51_mxc_pwm_data[] __initconst;
 #define imx51_add_mxc_pwm(id, pdata)	\
 	imx_add_mxc_pwm(&imx51_mxc_pwm_data[id], pdata)
+
+extern const struct imx_imx_keypad_data imx51_imx_keypad_data __initconst;
+#define imx51_add_imx_keypad(pdata)	\
+	imx_add_imx_keypad(&imx51_imx_keypad_data, pdata)
diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c
index ac55f7f..d733a97 100644
--- a/arch/arm/mach-mx5/devices.c
+++ b/arch/arm/mach-mx5/devices.c
@@ -97,25 +97,6 @@ struct platform_device mxc_usbh1_device = {
 	},
 };
 
-static struct resource mxc_kpp_resources[] = {
-	{
-		.start = MX51_MXC_INT_KPP,
-		.end = MX51_MXC_INT_KPP,
-		.flags = IORESOURCE_IRQ,
-	} , {
-		.start = MX51_KPP_BASE_ADDR,
-		.end = MX51_KPP_BASE_ADDR + 0x8 - 1,
-		.flags = IORESOURCE_MEM,
-	},
-};
-
-struct platform_device mxc_keypad_device = {
-	.name = "imx-keypad",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(mxc_kpp_resources),
-	.resource = mxc_kpp_resources,
-};
-
 static struct mxc_gpio_port mxc_gpio_ports[] = {
 	{
 		.chip.label = "gpio-0",
diff --git a/arch/arm/mach-mx5/devices.h b/arch/arm/mach-mx5/devices.h
index ccb7cdc..0905843 100644
--- a/arch/arm/mach-mx5/devices.h
+++ b/arch/arm/mach-mx5/devices.h
@@ -2,4 +2,3 @@ extern struct platform_device mxc_usbdr_host_device;
 extern struct platform_device mxc_usbh1_device;
 extern struct platform_device mxc_usbdr_udc_device;
 extern struct platform_device mxc_hsi2c_device;
-extern struct platform_device mxc_keypad_device;
diff --git a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c b/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
index 94c293f..e86ade4 100644
--- a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
+++ b/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
@@ -21,7 +21,6 @@
 #include <linux/fsl_devices.h>
 #include <linux/i2c/tsc2007.h>
 #include <linux/leds.h>
-#include <linux/input/matrix_keypad.h>
 
 #include <mach/common.h>
 #include <mach/hardware.h>
@@ -157,7 +156,7 @@ static int mbimx51_keymap[] = {
 	KEY(3, 3, KEY_ENTER),
 };
 
-static struct matrix_keymap_data mbimx51_map_data = {
+static const struct matrix_keymap_data mbimx51_map_data __initconst = {
 	.keymap		= mbimx51_keymap,
 	.keymap_size	= ARRAY_SIZE(mbimx51_keymap),
 };
@@ -209,7 +208,7 @@ void __init eukrea_mbimx51_baseboard_init(void)
 
 	platform_add_devices(devices, ARRAY_SIZE(devices));
 
-	mxc_register_device(&mxc_keypad_device, &mbimx51_map_data);
+	imx51_add_imx_keypad(&mbimx51_map_data);
 
 	gpio_request(MBIMX51_TSC2007_GPIO, "tsc2007_irq");
 	gpio_direction_input(MBIMX51_TSC2007_GPIO);
diff --git a/arch/arm/plat-mxc/devices/platform-imx-keypad.c b/arch/arm/plat-mxc/devices/platform-imx-keypad.c
index 40238f0..2636611 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-keypad.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-keypad.c
@@ -41,6 +41,11 @@ const struct imx_imx_keypad_data imx35_imx_keypad_data __initconst =
 	imx_imx_keypad_data_entry_single(MX35, SZ_16);
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
+#ifdef CONFIG_SOC_IMX51
+const struct imx_imx_keypad_data imx51_imx_keypad_data __initconst =
+	imx_imx_keypad_data_entry_single(MX51, SZ_16);
+#endif /* ifdef CONFIG_SOC_IMX51 */
+
 struct platform_device *__init imx_add_imx_keypad(
 		const struct imx_imx_keypad_data *data,
 		const struct matrix_keymap_data *pdata)
diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
index 54b58a0..808a626 100644
--- a/arch/arm/plat-mxc/include/mach/mx51.h
+++ b/arch/arm/plat-mxc/include/mach/mx51.h
@@ -301,7 +301,7 @@
 #define MX51_MXC_INT_GPIO4_HIGH		57
 #define MX51_MXC_INT_WDOG1		58
 #define MX51_MXC_INT_WDOG2		59
-#define MX51_MXC_INT_KPP		60
+#define MX51_INT_KPP			60
 #define MX51_INT_PWM1			61
 #define MX51_INT_I2C1			62
 #define MX51_INT_I2C2			63
-- 
1.6.0.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices
  2010-12-01 13:11 [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices Fabio Estevam
  2010-12-01 13:11 ` [PATCH v6 2/2] ARM: mx5: dynamically allocate imx-keypad devices Fabio Estevam
@ 2010-12-07 19:20 ` Fabio Estevam
  2011-01-04 17:26   ` Fabio Estevam
  1 sibling, 1 reply; 6+ messages in thread
From: Fabio Estevam @ 2010-12-07 19:20 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Uwe,

Does this series look OK now?

Thanks,

Fabio Estevam


On Wed, Dec 1, 2010 at 11:11 AM, Fabio Estevam
<fabio.estevam@freescale.com> wrote:
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> ?arch/arm/mach-mx5/devices-imx51.h ? ? ? ? ? ?| ? ?4 ++++
> ?arch/arm/plat-mxc/devices/platform-mxc_pwm.c | ? ?9 +++++++++
> ?arch/arm/plat-mxc/include/mach/mx51.h ? ? ? ?| ? ?4 ++--
> ?3 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h
> index 939d2e8..e4bc426 100644
> --- a/arch/arm/mach-mx5/devices-imx51.h
> +++ b/arch/arm/mach-mx5/devices-imx51.h
> @@ -47,3 +47,7 @@ extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
> ?extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data __initconst;
> ?#define imx51_imx2_wdt_data(pdata) ? ? \
> ? ? ? ?imx_add_imx2_wdt_data(&imx51_imx2_wdt_data, pdata)
> +
> +extern const struct imx_mxc_pwm_data imx51_mxc_pwm_data[] __initconst;
> +#define imx51_add_mxc_pwm(id, pdata) ? \
> + ? ? ? imx_add_mxc_pwm(&imx51_mxc_pwm_data[id], pdata)
> diff --git a/arch/arm/plat-mxc/devices/platform-mxc_pwm.c b/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
> index 3d8ebdb..b0c4ae2 100644
> --- a/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
> +++ b/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
> @@ -40,6 +40,15 @@ const struct imx_mxc_pwm_data imx27_mxc_pwm_data __initconst =
> ? ? ? ?imx_mxc_pwm_data_entry_single(MX27, 0, , SZ_4K);
> ?#endif /* ifdef CONFIG_SOC_IMX27 */
>
> +#ifdef CONFIG_SOC_IMX51
> +const struct imx_mxc_pwm_data imx51_mxc_pwm_data[] __initconst = {
> +#define imx51_mxc_pwm_data_entry(_id, _hwid) ? ? ? ? ? ? ? ? ? ? ? ? ? \
> + ? ? ? imx_mxc_pwm_data_entry(MX51, _id, _hwid, SZ_16K)
> + ? ? ? imx51_mxc_pwm_data_entry(0, 1),
> + ? ? ? imx51_mxc_pwm_data_entry(1, 2),
> +};
> +#endif /* ifdef CONFIG_SOC_IMX51 */
> +
> ?struct platform_device *__init imx_add_mxc_pwm(
> ? ? ? ? ? ? ? ?const struct imx_mxc_pwm_data *data)
> ?{
> diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
> index 8fddfef..54b58a0 100644
> --- a/arch/arm/plat-mxc/include/mach/mx51.h
> +++ b/arch/arm/plat-mxc/include/mach/mx51.h
> @@ -302,7 +302,7 @@
> ?#define MX51_MXC_INT_WDOG1 ? ? ? ? ? ? 58
> ?#define MX51_MXC_INT_WDOG2 ? ? ? ? ? ? 59
> ?#define MX51_MXC_INT_KPP ? ? ? ? ? ? ? 60
> -#define MX51_MXC_INT_PWM1 ? ? ? ? ? ? ?61
> +#define MX51_INT_PWM1 ? ? ? ? ? ? ? ? ?61
> ?#define MX51_INT_I2C1 ? ? ? ? ? ? ? ? ?62
> ?#define MX51_INT_I2C2 ? ? ? ? ? ? ? ? ?63
> ?#define MX51_MXC_INT_HS_I2C ? ? ? ? ? ?64
> @@ -335,7 +335,7 @@
> ?#define MX51_MXC_INT_SPDIF ? ? ? ? ? ? 91
> ?#define MX51_MXC_INT_TVE ? ? ? ? ? ? ? 92
> ?#define MX51_MXC_INT_FIRI ? ? ? ? ? ? ?93
> -#define MX51_MXC_INT_PWM2 ? ? ? ? ? ? ?94
> +#define MX51_INT_PWM2 ? ? ? ? ? ? ? ? ?94
> ?#define MX51_MXC_INT_SLIM_EXP ? ? ? ? ?95
> ?#define MX51_MXC_INT_SSI3 ? ? ? ? ? ? ?96
> ?#define MX51_MXC_INT_EMI_BOOT ? ? ? ? ?97
> --
> 1.6.0.4
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices
  2010-12-07 19:20 ` [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices Fabio Estevam
@ 2011-01-04 17:26   ` Fabio Estevam
  2011-01-04 21:05     ` Uwe Kleine-König
  0 siblings, 1 reply; 6+ messages in thread
From: Fabio Estevam @ 2011-01-04 17:26 UTC (permalink / raw)
  To: linux-arm-kernel

Uwe/Sascha,

Any comments about this series?

Regards,

Fabio Estevam

On Tue, Dec 7, 2010 at 5:20 PM, Fabio Estevam <festevam@gmail.com> wrote:
> Hi Uwe,
>
> Does this series look OK now?
>
> Thanks,
>
> Fabio Estevam
>
>
> On Wed, Dec 1, 2010 at 11:11 AM, Fabio Estevam
> <fabio.estevam@freescale.com> wrote:
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>> ---
>> ?arch/arm/mach-mx5/devices-imx51.h ? ? ? ? ? ?| ? ?4 ++++
>> ?arch/arm/plat-mxc/devices/platform-mxc_pwm.c | ? ?9 +++++++++
>> ?arch/arm/plat-mxc/include/mach/mx51.h ? ? ? ?| ? ?4 ++--
>> ?3 files changed, 15 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h
>> index 939d2e8..e4bc426 100644
>> --- a/arch/arm/mach-mx5/devices-imx51.h
>> +++ b/arch/arm/mach-mx5/devices-imx51.h
>> @@ -47,3 +47,7 @@ extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
>> ?extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data __initconst;
>> ?#define imx51_imx2_wdt_data(pdata) ? ? \
>> ? ? ? ?imx_add_imx2_wdt_data(&imx51_imx2_wdt_data, pdata)
>> +
>> +extern const struct imx_mxc_pwm_data imx51_mxc_pwm_data[] __initconst;
>> +#define imx51_add_mxc_pwm(id, pdata) ? \
>> + ? ? ? imx_add_mxc_pwm(&imx51_mxc_pwm_data[id], pdata)
>> diff --git a/arch/arm/plat-mxc/devices/platform-mxc_pwm.c b/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
>> index 3d8ebdb..b0c4ae2 100644
>> --- a/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
>> +++ b/arch/arm/plat-mxc/devices/platform-mxc_pwm.c
>> @@ -40,6 +40,15 @@ const struct imx_mxc_pwm_data imx27_mxc_pwm_data __initconst =
>> ? ? ? ?imx_mxc_pwm_data_entry_single(MX27, 0, , SZ_4K);
>> ?#endif /* ifdef CONFIG_SOC_IMX27 */
>>
>> +#ifdef CONFIG_SOC_IMX51
>> +const struct imx_mxc_pwm_data imx51_mxc_pwm_data[] __initconst = {
>> +#define imx51_mxc_pwm_data_entry(_id, _hwid) ? ? ? ? ? ? ? ? ? ? ? ? ? \
>> + ? ? ? imx_mxc_pwm_data_entry(MX51, _id, _hwid, SZ_16K)
>> + ? ? ? imx51_mxc_pwm_data_entry(0, 1),
>> + ? ? ? imx51_mxc_pwm_data_entry(1, 2),
>> +};
>> +#endif /* ifdef CONFIG_SOC_IMX51 */
>> +
>> ?struct platform_device *__init imx_add_mxc_pwm(
>> ? ? ? ? ? ? ? ?const struct imx_mxc_pwm_data *data)
>> ?{
>> diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
>> index 8fddfef..54b58a0 100644
>> --- a/arch/arm/plat-mxc/include/mach/mx51.h
>> +++ b/arch/arm/plat-mxc/include/mach/mx51.h
>> @@ -302,7 +302,7 @@
>> ?#define MX51_MXC_INT_WDOG1 ? ? ? ? ? ? 58
>> ?#define MX51_MXC_INT_WDOG2 ? ? ? ? ? ? 59
>> ?#define MX51_MXC_INT_KPP ? ? ? ? ? ? ? 60
>> -#define MX51_MXC_INT_PWM1 ? ? ? ? ? ? ?61
>> +#define MX51_INT_PWM1 ? ? ? ? ? ? ? ? ?61
>> ?#define MX51_INT_I2C1 ? ? ? ? ? ? ? ? ?62
>> ?#define MX51_INT_I2C2 ? ? ? ? ? ? ? ? ?63
>> ?#define MX51_MXC_INT_HS_I2C ? ? ? ? ? ?64
>> @@ -335,7 +335,7 @@
>> ?#define MX51_MXC_INT_SPDIF ? ? ? ? ? ? 91
>> ?#define MX51_MXC_INT_TVE ? ? ? ? ? ? ? 92
>> ?#define MX51_MXC_INT_FIRI ? ? ? ? ? ? ?93
>> -#define MX51_MXC_INT_PWM2 ? ? ? ? ? ? ?94
>> +#define MX51_INT_PWM2 ? ? ? ? ? ? ? ? ?94
>> ?#define MX51_MXC_INT_SLIM_EXP ? ? ? ? ?95
>> ?#define MX51_MXC_INT_SSI3 ? ? ? ? ? ? ?96
>> ?#define MX51_MXC_INT_EMI_BOOT ? ? ? ? ?97
>> --
>> 1.6.0.4
>>
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices
  2011-01-04 17:26   ` Fabio Estevam
@ 2011-01-04 21:05     ` Uwe Kleine-König
  2011-01-11 15:38       ` Fabio Estevam
  0 siblings, 1 reply; 6+ messages in thread
From: Uwe Kleine-König @ 2011-01-04 21:05 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jan 04, 2011 at 03:26:01PM -0200, Fabio Estevam wrote:
> Uwe/Sascha,
> 
> Any comments about this series?
Looks good.  Ack for both and sorry for not replying earlier.

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices
  2011-01-04 21:05     ` Uwe Kleine-König
@ 2011-01-11 15:38       ` Fabio Estevam
  0 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2011-01-11 15:38 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Sascha,

2011/1/4 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>:
> On Tue, Jan 04, 2011 at 03:26:01PM -0200, Fabio Estevam wrote:
>> Uwe/Sascha,
>>
>> Any comments about this series?
> Looks good. ?Ack for both and sorry for not replying earlier.

Any comments?

Regards,

Fabio Estevam

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-11 15:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-01 13:11 [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices Fabio Estevam
2010-12-01 13:11 ` [PATCH v6 2/2] ARM: mx5: dynamically allocate imx-keypad devices Fabio Estevam
2010-12-07 19:20 ` [PATCH v6 1/2] ARM: mx5: dynamically allocate pwm devices Fabio Estevam
2011-01-04 17:26   ` Fabio Estevam
2011-01-04 21:05     ` Uwe Kleine-König
2011-01-11 15:38       ` Fabio Estevam

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.