* [PATCH 0/3]Add imx51_3ds platform support
@ 2010-07-13 13:02 Jason Wang
2010-07-13 13:02 ` [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board Jason Wang
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Jason Wang @ 2010-07-13 13:02 UTC (permalink / raw)
To: linux-arm-kernel
part3:
[PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board
[PATCH 2/3] mx51: add imx_keypad device definition for mx51 platforms
[PATCH 3/3] mx51_3ds: add keypad support on 3ds platform
This patchset will add imx51_3ds platform in the linux kernel,
These 3 patches are generated based off imx-for-2.6.36 branch,
and passed build test.
But currently in imx-for-2.6.36 branch, there is a recently applied
patch which will affect all imx gpio chained irqs. The lan driver
on imx51_3ds can't raise irq(through gpio) because of this potential
issue. I generate the following patch to fix it.
[PATCH] imx: move gpio init after to irq init
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board 2010-07-13 13:02 [PATCH 0/3]Add imx51_3ds platform support Jason Wang @ 2010-07-13 13:02 ` Jason Wang 2010-07-13 13:02 ` [PATCH 2/3] mx51: add imx_keypad device definition for mx51 platforms Jason Wang ` (2 more replies) 2010-07-13 14:39 ` [PATCH 0/3]Add imx51_3ds platform support Amit Kucheria 2010-07-14 6:58 ` Sascha Hauer 2 siblings, 3 replies; 11+ messages in thread From: Jason Wang @ 2010-07-13 13:02 UTC (permalink / raw) To: linux-arm-kernel 3-stack is a reference board from Freescale for their i.MX51 SoC. Add board definition, Kconfig and Makefile to enable Freescale 3-stack board. Boot tested on a i.MX51 3-stack Rev2.0 board Signed-off-by: Jason Wang <jason77.wang@gmail.com> --- arch/arm/mach-mx5/Kconfig | 6 ++ arch/arm/mach-mx5/Makefile | 2 +- arch/arm/mach-mx5/board-mx51_3ds.c | 102 +++++++++++++++++++++++ arch/arm/plat-mxc/include/mach/board-mx51_3ds.h | 27 ++++++ 4 files changed, 136 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mx5/board-mx51_3ds.c create mode 100644 arch/arm/plat-mxc/include/mach/board-mx51_3ds.h diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index 1576d51..6ef3428 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig @@ -15,4 +15,10 @@ config MACH_MX51_BABBAGE u-boot. This includes specific configurations for the board and its peripherals. +config MACH_MX51_3DS + bool "Support MX51PDK (3DS)" + select MXC_DEBUG_BOARD + help + Include support for MX51PDK (3DS) platform. This includes specific + configurations for the board and its peripherals. endif diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile index bf23f86..c757c59 100644 --- a/arch/arm/mach-mx5/Makefile +++ b/arch/arm/mach-mx5/Makefile @@ -6,4 +6,4 @@ obj-y := cpu.o mm.o clock-mx51.o devices.o obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o - +obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c new file mode 100644 index 0000000..b51da63 --- /dev/null +++ b/arch/arm/mach-mx5/board-mx51_3ds.c @@ -0,0 +1,102 @@ +/* + * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2010 Jason Wang <jason77.wang@gmail.com> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include <linux/irq.h> +#include <linux/platform_device.h> + +#include <asm/mach-types.h> +#include <asm/mach/arch.h> +#include <asm/mach/time.h> + +#include <mach/hardware.h> +#include <mach/common.h> +#include <mach/iomux-mx51.h> +#include <mach/board-mx51_3ds.h> +#include <mach/imx-uart.h> +#include <mach/3ds_debugboard.h> + +#include "devices.h" + +static struct pad_desc mx51_3ds_pads[] = { + /* UART1 */ + MX51_PAD_UART1_RXD__UART1_RXD, + MX51_PAD_UART1_TXD__UART1_TXD, + MX51_PAD_UART1_RTS__UART1_RTS, + MX51_PAD_UART1_CTS__UART1_CTS, + + /* UART2 */ + MX51_PAD_UART2_RXD__UART2_RXD, + MX51_PAD_UART2_TXD__UART2_TXD, + MX51_PAD_EIM_D25__UART2_CTS, + MX51_PAD_EIM_D26__UART2_RTS, + + /* UART3 */ + MX51_PAD_UART3_RXD__UART3_RXD, + MX51_PAD_UART3_TXD__UART3_TXD, + MX51_PAD_EIM_D24__UART3_CTS, + MX51_PAD_EIM_D27__UART3_RTS, + + /* CPLD PARENT IRQ PIN */ + MX51_PAD_GPIO_1_6__GPIO_1_6, +}; + +/* Serial ports */ +#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE) +static struct imxuart_platform_data uart_pdata = { + .flags = IMXUART_HAVE_RTSCTS, +}; + +static inline void mxc_init_imx_uart(void) +{ + mxc_register_device(&mxc_uart_device0, &uart_pdata); + mxc_register_device(&mxc_uart_device1, &uart_pdata); + mxc_register_device(&mxc_uart_device2, &uart_pdata); +} +#else /* !SERIAL_IMX */ +static inline void mxc_init_imx_uart(void) +{ +} +#endif /* SERIAL_IMX */ + +/* + * Board specific initialization. + */ +static void __init mxc_board_init(void) +{ + mxc_iomux_v3_setup_multiple_pads(mx51_3ds_pads, + ARRAY_SIZE(mx51_3ds_pads)); + mxc_init_imx_uart(); + + if (mxc_expio_init(MX51_CS5_BASE_ADDR, EXPIO_PARENT_INT)) + printk(KERN_WARNING "Init of the debugboard failed, all " + "devices on the board are unusable.\n"); +} + +static void __init mx51_3ds_timer_init(void) +{ + mx51_clocks_init(32768, 24000000, 22579200, 0); +} + +static struct sys_timer mxc_timer = { + .init = mx51_3ds_timer_init, +}; + +MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board") + /* Maintainer: Freescale Semiconductor, Inc. */ + .phys_io = MX51_AIPS1_BASE_ADDR, + .io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, + .boot_params = PHYS_OFFSET + 0x100, + .map_io = mx51_map_io, + .init_irq = mx51_init_irq, + .init_machine = mxc_board_init, + .timer = &mxc_timer, +MACHINE_END diff --git a/arch/arm/plat-mxc/include/mach/board-mx51_3ds.h b/arch/arm/plat-mxc/include/mach/board-mx51_3ds.h new file mode 100644 index 0000000..c2aa016 --- /dev/null +++ b/arch/arm/plat-mxc/include/mach/board-mx51_3ds.h @@ -0,0 +1,27 @@ +/* + * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. + * + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#ifndef __ASM_ARCH_MXC_BOARD_MX51_3DS_H__ +#define __ASM_ARCH_MXC_BOARD_MX51_3DS_H__ + +/* + * plat-mxc/include/mach/board-mx51_3ds.h + * + * This file contains all the board level configuration options. + * + * It currently hold the options defined for MX51 3Stack Platform. + * + */ + +#define EXPIO_PARENT_INT (MXC_INTERNAL_IRQS + GPIO_PORTA + 6) + +#endif /* __ASM_ARCH_MXC_BOARD_MX51_3DS_H__ */ -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/3] mx51: add imx_keypad device definition for mx51 platforms 2010-07-13 13:02 ` [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board Jason Wang @ 2010-07-13 13:02 ` Jason Wang 2010-07-13 13:02 ` [PATCH 3/3] mx51_3ds: add keypad support on 3ds platform Jason Wang 2010-07-14 6:56 ` [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board Sascha Hauer 2010-07-14 13:33 ` Uwe Kleine-König 2 siblings, 1 reply; 11+ messages in thread From: Jason Wang @ 2010-07-13 13:02 UTC (permalink / raw) To: linux-arm-kernel add imx_keypad platform device definition and clocks for mx51 platforms. Signed-off-by: Jason Wang <jason77.wang@gmail.com> --- arch/arm/mach-mx5/clock-mx51.c | 5 +++++ arch/arm/mach-mx5/devices.c | 19 +++++++++++++++++++ arch/arm/mach-mx5/devices.h | 1 + 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-mx5/clock-mx51.c b/arch/arm/mach-mx5/clock-mx51.c index fd24092..6af69de 100644 --- a/arch/arm/mach-mx5/clock-mx51.c +++ b/arch/arm/mach-mx5/clock-mx51.c @@ -758,6 +758,10 @@ static struct clk gpt_32k_clk = { .parent = &ckil_clk, }; +static struct clk kpp_clk = { + .id = 0, +}; + #define DEFINE_CLOCK(name, i, er, es, gr, sr, p, s) \ static struct clk name = { \ .id = i, \ @@ -832,6 +836,7 @@ static struct clk_lookup 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) }; static void clk_tree_init(void) diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c index fa11864..aafa61c 100644 --- a/arch/arm/mach-mx5/devices.c +++ b/arch/arm/mach-mx5/devices.c @@ -226,6 +226,25 @@ struct platform_device mxc_wdt = { .resource = mxc_wdt_resources, }; +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 a853933..e509cfa 100644 --- a/arch/arm/mach-mx5/devices.h +++ b/arch/arm/mach-mx5/devices.h @@ -9,3 +9,4 @@ extern struct platform_device mxc_wdt; extern struct platform_device mxc_i2c_device0; extern struct platform_device mxc_i2c_device1; extern struct platform_device mxc_hsi2c_device; +extern struct platform_device mxc_keypad_device; -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/3] mx51_3ds: add keypad support on 3ds platform 2010-07-13 13:02 ` [PATCH 2/3] mx51: add imx_keypad device definition for mx51 platforms Jason Wang @ 2010-07-13 13:02 ` Jason Wang 2010-07-13 13:02 ` [PATCH] imx: move gpio init after to irq init Jason Wang 0 siblings, 1 reply; 11+ messages in thread From: Jason Wang @ 2010-07-13 13:02 UTC (permalink / raw) To: linux-arm-kernel Add keymaps and imx_keypad device registration for imx51_3ds board. Signed-off-by: Jason Wang <jason77.wang@gmail.com> --- arch/arm/mach-mx5/board-mx51_3ds.c | 61 ++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c index b51da63..c952f58 100644 --- a/arch/arm/mach-mx5/board-mx51_3ds.c +++ b/arch/arm/mach-mx5/board-mx51_3ds.c @@ -12,6 +12,7 @@ #include <linux/irq.h> #include <linux/platform_device.h> +#include <linux/input/matrix_keypad.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -47,6 +48,18 @@ static struct pad_desc mx51_3ds_pads[] = { /* CPLD PARENT IRQ PIN */ MX51_PAD_GPIO_1_6__GPIO_1_6, + + /* KPP */ + MX51_PAD_KEY_ROW0__KEY_ROW0, + MX51_PAD_KEY_ROW1__KEY_ROW1, + MX51_PAD_KEY_ROW2__KEY_ROW2, + MX51_PAD_KEY_ROW3__KEY_ROW3, + MX51_PAD_KEY_COL0__KEY_COL0, + MX51_PAD_KEY_COL1__KEY_COL1, + MX51_PAD_KEY_COL2__KEY_COL2, + MX51_PAD_KEY_COL3__KEY_COL3, + MX51_PAD_KEY_COL4__KEY_COL4, + MX51_PAD_KEY_COL5__KEY_COL5, }; /* Serial ports */ @@ -67,6 +80,52 @@ static inline void mxc_init_imx_uart(void) } #endif /* SERIAL_IMX */ +#if defined(CONFIG_KEYBOARD_IMX) || defined(CONFIG_KEYBOARD_IMX_MODULE) +static int mx51_3ds_board_keymap[] = { + KEY(0, 0, KEY_1), + KEY(0, 1, KEY_2), + KEY(0, 2, KEY_3), + KEY(0, 3, KEY_F1), + KEY(0, 4, KEY_UP), + KEY(0, 5, KEY_F2), + + KEY(1, 0, KEY_4), + KEY(1, 1, KEY_5), + KEY(1, 2, KEY_6), + KEY(1, 3, KEY_LEFT), + KEY(1, 4, KEY_SELECT), + KEY(1, 5, KEY_RIGHT), + + KEY(2, 0, KEY_7), + KEY(2, 1, KEY_8), + KEY(2, 2, KEY_9), + KEY(2, 3, KEY_F3), + KEY(2, 4, KEY_DOWN), + KEY(2, 5, KEY_F4), + + KEY(3, 0, KEY_0), + KEY(3, 1, KEY_OK), + KEY(3, 2, KEY_ESC), + KEY(3, 3, KEY_ENTER), + KEY(3, 4, KEY_MENU), + KEY(3, 5, KEY_BACK) +}; + +static struct matrix_keymap_data mx51_3ds_map_data = { + .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); +} +#else +static inline void mxc_init_keypad(void) +{ +} +#endif + /* * Board specific initialization. */ @@ -79,6 +138,8 @@ static void __init mxc_board_init(void) if (mxc_expio_init(MX51_CS5_BASE_ADDR, EXPIO_PARENT_INT)) printk(KERN_WARNING "Init of the debugboard failed, all " "devices on the board are unusable.\n"); + + mxc_init_keypad(); } static void __init mx51_3ds_timer_init(void) -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH] imx: move gpio init after to irq init 2010-07-13 13:02 ` [PATCH 3/3] mx51_3ds: add keypad support on 3ds platform Jason Wang @ 2010-07-13 13:02 ` Jason Wang 2010-07-13 14:24 ` Amit Kucheria 2010-07-23 14:02 ` Eric Bénard 0 siblings, 2 replies; 11+ messages in thread From: Jason Wang @ 2010-07-13 13:02 UTC (permalink / raw) To: linux-arm-kernel The commit 9a763bf "get rid of mxc_gpio_init" changed gpio_init and irq_init sequence. Usually we will call set_irq_chained_handler in gpio_init functions, this should be called after the irq_init called, otherwise the chained irq can't get propoer irq_chip and this irq will remain masked even we called set_irq_chained_handler. Signed-off-by: Jason Wang <jason77.wang@gmail.com> --- arch/arm/mach-imx/mm-imx1.c | 2 +- arch/arm/mach-imx/mm-imx21.c | 2 +- arch/arm/mach-imx/mm-imx27.c | 2 +- arch/arm/mach-mx25/mm.c | 2 +- arch/arm/mach-mx3/mm.c | 2 +- arch/arm/mach-mx5/mm.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-imx/mm-imx1.c b/arch/arm/mach-imx/mm-imx1.c index 117ebf6..9be92b9 100644 --- a/arch/arm/mach-imx/mm-imx1.c +++ b/arch/arm/mach-imx/mm-imx1.c @@ -45,6 +45,6 @@ int imx1_register_gpios(void); void __init mx1_init_irq(void) { - imx1_register_gpios(); mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR)); + imx1_register_gpios(); } diff --git a/arch/arm/mach-imx/mm-imx21.c b/arch/arm/mach-imx/mm-imx21.c index 68aa5d2..12faeea 100644 --- a/arch/arm/mach-imx/mm-imx21.c +++ b/arch/arm/mach-imx/mm-imx21.c @@ -81,6 +81,6 @@ int imx21_register_gpios(void); void __init mx21_init_irq(void) { - imx21_register_gpios(); mxc_init_irq(MX21_IO_ADDRESS(MX21_AVIC_BASE_ADDR)); + imx21_register_gpios(); } diff --git a/arch/arm/mach-imx/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c index bcedce9..a246229 100644 --- a/arch/arm/mach-imx/mm-imx27.c +++ b/arch/arm/mach-imx/mm-imx27.c @@ -81,6 +81,6 @@ int imx27_register_gpios(void); void __init mx27_init_irq(void) { - imx27_register_gpios(); mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR)); + imx27_register_gpios(); } diff --git a/arch/arm/mach-mx25/mm.c b/arch/arm/mach-mx25/mm.c index 593e145..bb67711 100644 --- a/arch/arm/mach-mx25/mm.c +++ b/arch/arm/mach-mx25/mm.c @@ -69,7 +69,7 @@ int imx25_register_gpios(void); void __init mx25_init_irq(void) { - imx25_register_gpios(); mxc_init_irq((void __iomem *)MX25_AVIC_BASE_ADDR_VIRT); + imx25_register_gpios(); } diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c index a378fba..20e48c0 100644 --- a/arch/arm/mach-mx3/mm.c +++ b/arch/arm/mach-mx3/mm.c @@ -97,8 +97,8 @@ int imx3x_register_gpios(void); void __init mx31_init_irq(void) { - imx3x_register_gpios(); mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR)); + imx3x_register_gpios(); } void __init mx35_init_irq(void) diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c index 2f79722..bc3f30d 100644 --- a/arch/arm/mach-mx5/mm.c +++ b/arch/arm/mach-mx5/mm.c @@ -81,6 +81,6 @@ void __init mx51_init_irq(void) if (!tzic_virt) panic("unable to map TZIC interrupt controller\n"); - imx51_register_gpios(); tzic_init_irq(tzic_virt); + imx51_register_gpios(); } -- 1.5.6.5 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH] imx: move gpio init after to irq init 2010-07-13 13:02 ` [PATCH] imx: move gpio init after to irq init Jason Wang @ 2010-07-13 14:24 ` Amit Kucheria 2010-07-23 14:02 ` Eric Bénard 1 sibling, 0 replies; 11+ messages in thread From: Amit Kucheria @ 2010-07-13 14:24 UTC (permalink / raw) To: linux-arm-kernel On 10 Jul 13, Jason Wang wrote: > The commit 9a763bf "get rid of mxc_gpio_init" changed gpio_init > and irq_init sequence. Usually we will call set_irq_chained_handler > in gpio_init functions, this should be called after the irq_init > called, otherwise the chained irq can't get propoer irq_chip and this > irq will remain masked even we called set_irq_chained_handler. > > Signed-off-by: Jason Wang <jason77.wang@gmail.com> Acked-by: Amit Kucheria <amit.kucheria@canonical.com> > --- > arch/arm/mach-imx/mm-imx1.c | 2 +- > arch/arm/mach-imx/mm-imx21.c | 2 +- > arch/arm/mach-imx/mm-imx27.c | 2 +- > arch/arm/mach-mx25/mm.c | 2 +- > arch/arm/mach-mx3/mm.c | 2 +- > arch/arm/mach-mx5/mm.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-imx/mm-imx1.c b/arch/arm/mach-imx/mm-imx1.c > index 117ebf6..9be92b9 100644 > --- a/arch/arm/mach-imx/mm-imx1.c > +++ b/arch/arm/mach-imx/mm-imx1.c > @@ -45,6 +45,6 @@ int imx1_register_gpios(void); > > void __init mx1_init_irq(void) > { > - imx1_register_gpios(); > mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR)); > + imx1_register_gpios(); > } > diff --git a/arch/arm/mach-imx/mm-imx21.c b/arch/arm/mach-imx/mm-imx21.c > index 68aa5d2..12faeea 100644 > --- a/arch/arm/mach-imx/mm-imx21.c > +++ b/arch/arm/mach-imx/mm-imx21.c > @@ -81,6 +81,6 @@ int imx21_register_gpios(void); > > void __init mx21_init_irq(void) > { > - imx21_register_gpios(); > mxc_init_irq(MX21_IO_ADDRESS(MX21_AVIC_BASE_ADDR)); > + imx21_register_gpios(); > } > diff --git a/arch/arm/mach-imx/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c > index bcedce9..a246229 100644 > --- a/arch/arm/mach-imx/mm-imx27.c > +++ b/arch/arm/mach-imx/mm-imx27.c > @@ -81,6 +81,6 @@ int imx27_register_gpios(void); > > void __init mx27_init_irq(void) > { > - imx27_register_gpios(); > mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR)); > + imx27_register_gpios(); > } > diff --git a/arch/arm/mach-mx25/mm.c b/arch/arm/mach-mx25/mm.c > index 593e145..bb67711 100644 > --- a/arch/arm/mach-mx25/mm.c > +++ b/arch/arm/mach-mx25/mm.c > @@ -69,7 +69,7 @@ int imx25_register_gpios(void); > > void __init mx25_init_irq(void) > { > - imx25_register_gpios(); > mxc_init_irq((void __iomem *)MX25_AVIC_BASE_ADDR_VIRT); > + imx25_register_gpios(); > } > > diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c > index a378fba..20e48c0 100644 > --- a/arch/arm/mach-mx3/mm.c > +++ b/arch/arm/mach-mx3/mm.c > @@ -97,8 +97,8 @@ int imx3x_register_gpios(void); > > void __init mx31_init_irq(void) > { > - imx3x_register_gpios(); > mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR)); > + imx3x_register_gpios(); > } > > void __init mx35_init_irq(void) > diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c > index 2f79722..bc3f30d 100644 > --- a/arch/arm/mach-mx5/mm.c > +++ b/arch/arm/mach-mx5/mm.c > @@ -81,6 +81,6 @@ void __init mx51_init_irq(void) > if (!tzic_virt) > panic("unable to map TZIC interrupt controller\n"); > > - imx51_register_gpios(); > tzic_init_irq(tzic_virt); > + imx51_register_gpios(); > } > -- > 1.5.6.5 > -- ---------------------------------------------------------------------- Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com ---------------------------------------------------------------------- ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] imx: move gpio init after to irq init 2010-07-13 13:02 ` [PATCH] imx: move gpio init after to irq init Jason Wang 2010-07-13 14:24 ` Amit Kucheria @ 2010-07-23 14:02 ` Eric Bénard 1 sibling, 0 replies; 11+ messages in thread From: Eric Bénard @ 2010-07-23 14:02 UTC (permalink / raw) To: linux-arm-kernel Hi, Le 13/07/2010 15:02, Jason Wang a ?crit : > The commit 9a763bf "get rid of mxc_gpio_init" changed gpio_init > and irq_init sequence. Usually we will call set_irq_chained_handler > in gpio_init functions, this should be called after the irq_init > called, otherwise the chained irq can't get propoer irq_chip and this > irq will remain masked even we called set_irq_chained_handler. > > Signed-off-by: Jason Wang<jason77.wang@gmail.com> > --- > arch/arm/mach-imx/mm-imx1.c | 2 +- > arch/arm/mach-imx/mm-imx21.c | 2 +- > arch/arm/mach-imx/mm-imx27.c | 2 +- > arch/arm/mach-mx25/mm.c | 2 +- > arch/arm/mach-mx3/mm.c | 2 +- > arch/arm/mach-mx5/mm.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-imx/mm-imx1.c b/arch/arm/mach-imx/mm-imx1.c > index 117ebf6..9be92b9 100644 > --- a/arch/arm/mach-imx/mm-imx1.c > +++ b/arch/arm/mach-imx/mm-imx1.c > @@ -45,6 +45,6 @@ int imx1_register_gpios(void); > > void __init mx1_init_irq(void) > { > - imx1_register_gpios(); > mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR)); > + imx1_register_gpios(); > } > diff --git a/arch/arm/mach-imx/mm-imx21.c b/arch/arm/mach-imx/mm-imx21.c > index 68aa5d2..12faeea 100644 > --- a/arch/arm/mach-imx/mm-imx21.c > +++ b/arch/arm/mach-imx/mm-imx21.c > @@ -81,6 +81,6 @@ int imx21_register_gpios(void); > > void __init mx21_init_irq(void) > { > - imx21_register_gpios(); > mxc_init_irq(MX21_IO_ADDRESS(MX21_AVIC_BASE_ADDR)); > + imx21_register_gpios(); > } > diff --git a/arch/arm/mach-imx/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c > index bcedce9..a246229 100644 > --- a/arch/arm/mach-imx/mm-imx27.c > +++ b/arch/arm/mach-imx/mm-imx27.c > @@ -81,6 +81,6 @@ int imx27_register_gpios(void); > > void __init mx27_init_irq(void) > { > - imx27_register_gpios(); > mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR)); > + imx27_register_gpios(); > } > diff --git a/arch/arm/mach-mx25/mm.c b/arch/arm/mach-mx25/mm.c > index 593e145..bb67711 100644 > --- a/arch/arm/mach-mx25/mm.c > +++ b/arch/arm/mach-mx25/mm.c > @@ -69,7 +69,7 @@ int imx25_register_gpios(void); > > void __init mx25_init_irq(void) > { > - imx25_register_gpios(); > mxc_init_irq((void __iomem *)MX25_AVIC_BASE_ADDR_VIRT); > + imx25_register_gpios(); > } > > diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c > index a378fba..20e48c0 100644 > --- a/arch/arm/mach-mx3/mm.c > +++ b/arch/arm/mach-mx3/mm.c > @@ -97,8 +97,8 @@ int imx3x_register_gpios(void); > > void __init mx31_init_irq(void) > { > - imx3x_register_gpios(); > mxc_init_irq(IO_ADDRESS(AVIC_BASE_ADDR)); > + imx3x_register_gpios(); > } > > void __init mx35_init_irq(void) > diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c > index 2f79722..bc3f30d 100644 > --- a/arch/arm/mach-mx5/mm.c > +++ b/arch/arm/mach-mx5/mm.c > @@ -81,6 +81,6 @@ void __init mx51_init_irq(void) > if (!tzic_virt) > panic("unable to map TZIC interrupt controller\n"); > > - imx51_register_gpios(); > tzic_init_irq(tzic_virt); > + imx51_register_gpios(); > } Tested-by: Eric B?nard <eric@eukrea.com> on i.MX51 : this patch seems necessary to get gpio IRQ working. Eric ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board 2010-07-13 13:02 ` [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board Jason Wang 2010-07-13 13:02 ` [PATCH 2/3] mx51: add imx_keypad device definition for mx51 platforms Jason Wang @ 2010-07-14 6:56 ` Sascha Hauer 2010-07-14 13:33 ` Uwe Kleine-König 2 siblings, 0 replies; 11+ messages in thread From: Sascha Hauer @ 2010-07-14 6:56 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jul 13, 2010 at 09:02:39PM +0800, Jason Wang wrote: > 3-stack is a reference board from Freescale for their i.MX51 SoC. > > Add board definition, Kconfig and Makefile to enable Freescale 3-stack > board. > > Boot tested on a i.MX51 3-stack Rev2.0 board > > Signed-off-by: Jason Wang <jason77.wang@gmail.com> > --- > arch/arm/mach-mx5/Kconfig | 6 ++ > arch/arm/mach-mx5/Makefile | 2 +- > arch/arm/mach-mx5/board-mx51_3ds.c | 102 +++++++++++++++++++++++ > arch/arm/plat-mxc/include/mach/board-mx51_3ds.h | 27 ++++++ > 4 files changed, 136 insertions(+), 1 deletions(-) > create mode 100644 arch/arm/mach-mx5/board-mx51_3ds.c > create mode 100644 arch/arm/plat-mxc/include/mach/board-mx51_3ds.h > > diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig > index 1576d51..6ef3428 100644 > --- a/arch/arm/mach-mx5/Kconfig > +++ b/arch/arm/mach-mx5/Kconfig > @@ -15,4 +15,10 @@ config MACH_MX51_BABBAGE > u-boot. This includes specific configurations for the board and its > peripherals. > > +config MACH_MX51_3DS > + bool "Support MX51PDK (3DS)" > + select MXC_DEBUG_BOARD > + help > + Include support for MX51PDK (3DS) platform. This includes specific > + configurations for the board and its peripherals. > endif > diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile > index bf23f86..c757c59 100644 > --- a/arch/arm/mach-mx5/Makefile > +++ b/arch/arm/mach-mx5/Makefile > @@ -6,4 +6,4 @@ > obj-y := cpu.o mm.o clock-mx51.o devices.o > > obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o > - > +obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o > diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c > new file mode 100644 > index 0000000..b51da63 > --- /dev/null > +++ b/arch/arm/mach-mx5/board-mx51_3ds.c > @@ -0,0 +1,102 @@ > +/* > + * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. > + * Copyright (C) 2010 Jason Wang <jason77.wang@gmail.com> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +#include <linux/irq.h> > +#include <linux/platform_device.h> > + > +#include <asm/mach-types.h> > +#include <asm/mach/arch.h> > +#include <asm/mach/time.h> > + > +#include <mach/hardware.h> > +#include <mach/common.h> > +#include <mach/iomux-mx51.h> > +#include <mach/board-mx51_3ds.h> > +#include <mach/imx-uart.h> > +#include <mach/3ds_debugboard.h> > + > +#include "devices.h" > + > +static struct pad_desc mx51_3ds_pads[] = { > + /* UART1 */ > + MX51_PAD_UART1_RXD__UART1_RXD, > + MX51_PAD_UART1_TXD__UART1_TXD, > + MX51_PAD_UART1_RTS__UART1_RTS, > + MX51_PAD_UART1_CTS__UART1_CTS, > + > + /* UART2 */ > + MX51_PAD_UART2_RXD__UART2_RXD, > + MX51_PAD_UART2_TXD__UART2_TXD, > + MX51_PAD_EIM_D25__UART2_CTS, > + MX51_PAD_EIM_D26__UART2_RTS, > + > + /* UART3 */ > + MX51_PAD_UART3_RXD__UART3_RXD, > + MX51_PAD_UART3_TXD__UART3_TXD, > + MX51_PAD_EIM_D24__UART3_CTS, > + MX51_PAD_EIM_D27__UART3_RTS, > + > + /* CPLD PARENT IRQ PIN */ > + MX51_PAD_GPIO_1_6__GPIO_1_6, > +}; > + > +/* Serial ports */ > +#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE) > +static struct imxuart_platform_data uart_pdata = { > + .flags = IMXUART_HAVE_RTSCTS, > +}; > + > +static inline void mxc_init_imx_uart(void) > +{ > + mxc_register_device(&mxc_uart_device0, &uart_pdata); > + mxc_register_device(&mxc_uart_device1, &uart_pdata); > + mxc_register_device(&mxc_uart_device2, &uart_pdata); > +} > +#else /* !SERIAL_IMX */ > +static inline void mxc_init_imx_uart(void) > +{ > +} > +#endif /* SERIAL_IMX */ > + > +/* > + * Board specific initialization. > + */ > +static void __init mxc_board_init(void) > +{ > + mxc_iomux_v3_setup_multiple_pads(mx51_3ds_pads, > + ARRAY_SIZE(mx51_3ds_pads)); > + mxc_init_imx_uart(); > + > + if (mxc_expio_init(MX51_CS5_BASE_ADDR, EXPIO_PARENT_INT)) > + printk(KERN_WARNING "Init of the debugboard failed, all " > + "devices on the board are unusable.\n"); > +} > + > +static void __init mx51_3ds_timer_init(void) > +{ > + mx51_clocks_init(32768, 24000000, 22579200, 0); > +} > + > +static struct sys_timer mxc_timer = { > + .init = mx51_3ds_timer_init, > +}; > + > +MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board") > + /* Maintainer: Freescale Semiconductor, Inc. */ > + .phys_io = MX51_AIPS1_BASE_ADDR, > + .io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, > + .boot_params = PHYS_OFFSET + 0x100, > + .map_io = mx51_map_io, > + .init_irq = mx51_init_irq, > + .init_machine = mxc_board_init, > + .timer = &mxc_timer, > +MACHINE_END > diff --git a/arch/arm/plat-mxc/include/mach/board-mx51_3ds.h b/arch/arm/plat-mxc/include/mach/board-mx51_3ds.h > new file mode 100644 > index 0000000..c2aa016 > --- /dev/null > +++ b/arch/arm/plat-mxc/include/mach/board-mx51_3ds.h > @@ -0,0 +1,27 @@ > +/* > + * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. > + * > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: > + * > + * http://www.opensource.org/licenses/gpl-license.html > + * http://www.gnu.org/copyleft/gpl.html > + */ > + > +#ifndef __ASM_ARCH_MXC_BOARD_MX51_3DS_H__ > +#define __ASM_ARCH_MXC_BOARD_MX51_3DS_H__ > + > +/* > + * plat-mxc/include/mach/board-mx51_3ds.h > + * > + * This file contains all the board level configuration options. > + * > + * It currently hold the options defined for MX51 3Stack Platform. > + * > + */ > + > +#define EXPIO_PARENT_INT (MXC_INTERNAL_IRQS + GPIO_PORTA + 6) Please don't add board header files for things only used in the board file. Sascha > + > +#endif /* __ASM_ARCH_MXC_BOARD_MX51_3DS_H__ */ > -- > 1.5.6.5 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board 2010-07-13 13:02 ` [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board Jason Wang 2010-07-13 13:02 ` [PATCH 2/3] mx51: add imx_keypad device definition for mx51 platforms Jason Wang 2010-07-14 6:56 ` [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board Sascha Hauer @ 2010-07-14 13:33 ` Uwe Kleine-König 2 siblings, 0 replies; 11+ messages in thread From: Uwe Kleine-König @ 2010-07-14 13:33 UTC (permalink / raw) To: linux-arm-kernel Hi Jason, On Tue, Jul 13, 2010 at 09:02:39PM +0800, Jason Wang wrote: > new file mode 100644 > index 0000000..b51da63 > --- /dev/null > +++ b/arch/arm/mach-mx5/board-mx51_3ds.c > @@ -0,0 +1,102 @@ > +/* > + * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. > + * Copyright (C) 2010 Jason Wang <jason77.wang@gmail.com> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License > + * Version 2 or later at the following locations: I think this is the usual FSL boiler plate, but IMHO this is bogus. You/they want to have the "version 2 or later" part in the first senctence, not the second. (Note, this shouldn't be a nack, just a general comment.) Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ | ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/3]Add imx51_3ds platform support 2010-07-13 13:02 [PATCH 0/3]Add imx51_3ds platform support Jason Wang 2010-07-13 13:02 ` [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board Jason Wang @ 2010-07-13 14:39 ` Amit Kucheria 2010-07-14 6:58 ` Sascha Hauer 2 siblings, 0 replies; 11+ messages in thread From: Amit Kucheria @ 2010-07-13 14:39 UTC (permalink / raw) To: linux-arm-kernel On 10 Jul 13, Jason Wang wrote: > part3: > > [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board > [PATCH 2/3] mx51: add imx_keypad device definition for mx51 platforms > [PATCH 3/3] mx51_3ds: add keypad support on 3ds platform > This patchset will add imx51_3ds platform in the linux kernel, > These 3 patches are generated based off imx-for-2.6.36 branch, > and passed build test. I think the 3ds support is clean enough for merging now. Acked-by: Amit Kucheria <amit.kucheria@canonical.com> > But currently in imx-for-2.6.36 branch, there is a recently applied > patch which will affect all imx gpio chained irqs. The lan driver > on imx51_3ds can't raise irq(through gpio) because of this potential > issue. I generate the following patch to fix it. > [PATCH] imx: move gpio init after to irq init Acked separately. -- ---------------------------------------------------------------------- Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com ---------------------------------------------------------------------- ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/3]Add imx51_3ds platform support 2010-07-13 13:02 [PATCH 0/3]Add imx51_3ds platform support Jason Wang 2010-07-13 13:02 ` [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board Jason Wang 2010-07-13 14:39 ` [PATCH 0/3]Add imx51_3ds platform support Amit Kucheria @ 2010-07-14 6:58 ` Sascha Hauer 2 siblings, 0 replies; 11+ messages in thread From: Sascha Hauer @ 2010-07-14 6:58 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jul 13, 2010 at 09:02:38PM +0800, Jason Wang wrote: > part3: > > [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board > [PATCH 2/3] mx51: add imx_keypad device definition for mx51 platforms > [PATCH 3/3] mx51_3ds: add keypad support on 3ds platform > This patchset will add imx51_3ds platform in the linux kernel, > These 3 patches are generated based off imx-for-2.6.36 branch, > and passed build test. > > But currently in imx-for-2.6.36 branch, there is a recently applied > patch which will affect all imx gpio chained irqs. The lan driver > on imx51_3ds can't raise irq(through gpio) because of this potential > issue. I generate the following patch to fix it. > [PATCH] imx: move gpio init after to irq init Ok, except for the one comment I made Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-07-23 14:02 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-07-13 13:02 [PATCH 0/3]Add imx51_3ds platform support Jason Wang 2010-07-13 13:02 ` [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board Jason Wang 2010-07-13 13:02 ` [PATCH 2/3] mx51: add imx_keypad device definition for mx51 platforms Jason Wang 2010-07-13 13:02 ` [PATCH 3/3] mx51_3ds: add keypad support on 3ds platform Jason Wang 2010-07-13 13:02 ` [PATCH] imx: move gpio init after to irq init Jason Wang 2010-07-13 14:24 ` Amit Kucheria 2010-07-23 14:02 ` Eric Bénard 2010-07-14 6:56 ` [PATCH 1/3] mx51_3ds: Add support for the imx51 3-stack board Sascha Hauer 2010-07-14 13:33 ` Uwe Kleine-König 2010-07-13 14:39 ` [PATCH 0/3]Add imx51_3ds platform support Amit Kucheria 2010-07-14 6:58 ` Sascha Hauer
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.