From 076762aa52de48688f6e1b6999fe58d736479f37 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 1 Dec 2010 11:11:46 -0200 Subject: ARM: mx5: dynamically allocate pwm devices Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer --- arch/arm/mach-mx5/devices-imx51.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/mach-mx5/devices-imx51.h') diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h index 6302e46..39183ee 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_add_imx2_wdt(id, pdata) \ imx_add_imx2_wdt(&imx51_imx2_wdt_data[id]) + +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) -- cgit v1.1 From a5fcfef0b8db574098f2e42827117bc4accf2efd Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 1 Dec 2010 11:11:47 -0200 Subject: ARM: mx5: dynamically allocate imx-keypad devices 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 Signed-off-by: Sascha Hauer --- arch/arm/mach-mx5/devices-imx51.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/mach-mx5/devices-imx51.h') diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h index 39183ee..531f454 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) -- cgit v1.1 From 01c0761cc13a72c5aca5eab5870be8341eed214b Mon Sep 17 00:00:00 2001 From: "Arnaud Patard (Rtp)" Date: Thu, 13 Jan 2011 12:26:39 +0100 Subject: Fix pwm-related build failure Commit 076762aa52de48688f6e1b6999fe58d736479f37 is adding a macro whis is calling imx_add_mxc_pwm() but gives it 2 parameters while it's taking only one parameters. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer --- arch/arm/mach-mx5/devices-imx51.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-mx5/devices-imx51.h') diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h index 531f454..7fff485 100644 --- a/arch/arm/mach-mx5/devices-imx51.h +++ b/arch/arm/mach-mx5/devices-imx51.h @@ -49,8 +49,8 @@ extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data[] __initconst; imx_add_imx2_wdt(&imx51_imx2_wdt_data[id]) 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) +#define imx51_add_mxc_pwm(id) \ + imx_add_mxc_pwm(&imx51_mxc_pwm_data[id]) extern const struct imx_imx_keypad_data imx51_imx_keypad_data __initconst; #define imx51_add_imx_keypad(pdata) \ -- cgit v1.1