ARM: mx5: dynamically allocate pwm devices
Subsystems (3)
PATCH v4 1/3 ARM: mx5: dynamically allocate pwm devices
--- arch/arm/plat-mxc/devices/platform-mxc_pwm.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
arch/arm/plat-mxc/devices/platform-mxc_pwm.c +9 -0
@@ -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) {
Signature · 1 line
1.6.0.4
PATCH v4 2/3 ARM: mx5: dynamically allocate imx-keypad devices
--- arch/arm/mach-mx5/Kconfig | 2 ++ arch/arm/mach-mx5/board-mx51_3ds.c | 5 ++--- 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 +- 8 files changed, 16 insertions(+), 27 deletions(-)
arch/arm/mach-mx5/Kconfig +2 -0
@@ -30,6 +30,7 @@ config MACH_MX51_3DS bool "Support MX51PDK (3DS)" select SOC_IMX51 select IMX_HAVE_PLATFORM_IMX_UART + select IMX_HAVE_PLATFORM_IMX_KEYPAD select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX select IMX_HAVE_PLATFORM_SPI_IMX select MXC_DEBUG_BOARD
@@ -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
arch/arm/mach-mx5/board-mx51_3ds.c +2 -3
@@ -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 )
arch/arm/mach-mx5/devices-imx51.h +4 -0
@@ -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_imx_keypad_data imx51_imx_keypad_data__initconst ; +#define imx51_add_imx_keypad (pdata) \ + imx_add_imx_keypad(&imx51_imx_keypad_data, pdata)
arch/arm/mach-mx5/devices.c +0 -19
@@ -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" ,
arch/arm/mach-mx5/devices.h +0 -1
@@ -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;
arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c +2 -3
@@ -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 );
arch/arm/plat-mxc/devices/platform-imx-keypad.c +5 -0
@@ -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)
arch/arm/plat-mxc/include/mach/mx51.h +1 -1
@@ -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_MXC_INT_PWM1 61#define MX51_INT_I2C1 62#define MX51_INT_I2C2 63
Signature · 1 line
1.6.0.4
PATCH v4 3/3 ARM: mx5: fix keypad clock name
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.
--- arch/arm/mach-mx5/clock-mx51-mx53.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-mx5/clock-mx51-mx53.c +1 -1
@@ -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)
Signature · 1 line
1.6.0.4
PATCH v4 3/3 ARM: mx5: fix keypad clock name
Hi Fabio,
Quoted 7 lines · Fabio Estevam
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_deviceid was 0, now we use id=-1 as perarch/arm/plat-mxc/devices/platform-imx-keypad.c.Tested keypad successfully on a
MX51_3DSboard.
I'd squash that into the previous patch otherwise your keypad doesn't work for one commit.
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |