* [PATCH v2 1/3] ARM: pxa168: added support for Teton BGA platform
2010-09-13 3:51 [PATCH v2 0/3] ARM: pxa168: Added Teton BGA Board Support Mark F. Brown
@ 2010-09-13 3:51 ` Mark F. Brown
2010-09-14 7:08 ` Eric Miao
2010-09-13 3:51 ` [PATCH v2 2/3] ARM: pxa168/teton bga: added keypad support Mark F. Brown
2010-09-13 3:51 ` [PATCH v2 3/3] ARM: pxa168/teton bga: add board support for i2c and rtc-ds1337 Mark F. Brown
2 siblings, 1 reply; 9+ messages in thread
From: Mark F. Brown @ 2010-09-13 3:51 UTC (permalink / raw)
To: linux-arm-kernel
Added board defintion, header, and debug UART support.
Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
---
MAINTAINERS | 5 +++
arch/arm/mach-mmp/Kconfig | 7 ++++
arch/arm/mach-mmp/Makefile | 1 +
arch/arm/mach-mmp/include/mach/teton_bga.h | 27 +++++++++++++++
arch/arm/mach-mmp/teton_bga.c | 50 ++++++++++++++++++++++++++++
5 files changed, 90 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-mmp/include/mach/teton_bga.h
create mode 100644 arch/arm/mach-mmp/teton_bga.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 433f353..d7a4481 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -967,6 +967,11 @@ M: Lennert Buytenhek <kernel@wantstofly.org>
L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
S: Maintained
+ARM/TETON BGA MACHINE SUPPORT
+M: Mark F. Brown <mark.brown314@gmail.com>
+L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
+S: Maintained
+
ARM/THECUS N2100 MACHINE SUPPORT
M: Lennert Buytenhek <kernel@wantstofly.org>
L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
index 6ab843e..0711d3b 100644
--- a/arch/arm/mach-mmp/Kconfig
+++ b/arch/arm/mach-mmp/Kconfig
@@ -57,6 +57,13 @@ config MACH_MARVELL_JASPER
PXA910-based development board. Since MMP2 is compatible to
ARMv6 architecture.
+config MACH_TETON_BGA
+ bool "Marvell's PXA168 Teton BGA Development Board"
+ select CPU_PXA168
+ help
+ Say 'Y' here if you want to support the Marvell PXA168-based
+ Teton BGA Development Board.
+
endmenu
config CPU_PXA168
diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile
index 8b66d06..751cdbf 100644
--- a/arch/arm/mach-mmp/Makefile
+++ b/arch/arm/mach-mmp/Makefile
@@ -17,3 +17,4 @@ obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o
obj-$(CONFIG_MACH_TTC_DKB) += ttc_dkb.o
obj-$(CONFIG_MACH_FLINT) += flint.o
obj-$(CONFIG_MACH_MARVELL_JASPER) += jasper.o
+obj-$(CONFIG_MACH_TETON_BGA) += teton_bga.o
diff --git a/arch/arm/mach-mmp/include/mach/teton_bga.h b/arch/arm/mach-mmp/include/mach/teton_bga.h
new file mode 100644
index 0000000..61a539b
--- /dev/null
+++ b/arch/arm/mach-mmp/include/mach/teton_bga.h
@@ -0,0 +1,27 @@
+/*
+ * linux/arch/arm/mach-mmp/include/mach/teton_bga.h
+ *
+ * Support for the Marvell PXA168 Teton BGA Development Platform.
+ *
+ * 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
+ * publishhed by the Free Software Foundation.
+ */
+#ifndef __ASM_MACH_TETON_BGA_H
+#define __ASM_MACH_TETON_BGA_H
+
+/* GPIOs */
+#define MMC_PWENA_GPIO 27
+#define USBHPENB_GPIO 55
+#define RTC_INT_GPIO 78
+#define LCD_VBLK_EN_GPIO 79
+#define LCD_DVDD_EN_GPIO 80
+#define RST_WIFI_GPIO 81
+#define CF_PWEN_GPIO 82
+#define USB_OC_GPIO 83
+#define PWM_GPIO 84
+#define USBHPENA_GPIO 85
+#define TS_INT_GPIO 86
+#define CIR_GPIO 108
+
+#endif /* __ASM_MACH_TETON_BGA_H */
diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c
new file mode 100644
index 0000000..49b746b
--- /dev/null
+++ b/arch/arm/mach-mmp/teton_bga.c
@@ -0,0 +1,50 @@
+/*
+ * linux/arch/arm/mach-mmp/teton_bga.c
+ *
+ * Support for the Marvell PXA168 Teton BGA Development Platform.
+ *
+ * Author: Mark F. Brown <mark.brown314@gmail.com>
+ *
+ * This code is based on aspenite.c
+ *
+ * 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
+ * publishhed by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/addr-map.h>
+#include <mach/mfp-pxa168.h>
+#include <mach/pxa168.h>
+#include <mach/teton_bga.h>
+
+#include "common.h"
+
+static unsigned long teton_bga_pin_config[] __initdata = {
+ /* UART1 */
+ GPIO107_UART1_TXD,
+ GPIO108_UART1_RXD,
+};
+
+static void __init teton_bga_init(void)
+{
+ mfp_config(ARRAY_AND_SIZE(teton_bga_pin_config));
+
+ /* on-chip devices */
+ pxa168_add_uart(1);
+}
+
+MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
+ .phys_io = APB_PHYS_BASE,
+ .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc,
+ .map_io = mmp_map_io,
+ .init_irq = pxa168_init_irq,
+ .timer = &pxa168_timer,
+ .init_machine = teton_bga_init,
+MACHINE_END
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 1/3] ARM: pxa168: added support for Teton BGA platform
2010-09-13 3:51 ` [PATCH v2 1/3] ARM: pxa168: added support for Teton BGA platform Mark F. Brown
@ 2010-09-14 7:08 ` Eric Miao
0 siblings, 0 replies; 9+ messages in thread
From: Eric Miao @ 2010-09-14 7:08 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 13, 2010 at 11:51 AM, Mark F. Brown <mark.brown314@gmail.com> wrote:
> Added board defintion, header, and debug UART support.
>
> Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
> ---
> ?MAINTAINERS ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?5 +++
> ?arch/arm/mach-mmp/Kconfig ? ? ? ? ? ? ? ? ?| ? ?7 ++++
> ?arch/arm/mach-mmp/Makefile ? ? ? ? ? ? ? ? | ? ?1 +
> ?arch/arm/mach-mmp/include/mach/teton_bga.h | ? 27 +++++++++++++++
> ?arch/arm/mach-mmp/teton_bga.c ? ? ? ? ? ? ?| ? 50 ++++++++++++++++++++++++++++
> ?5 files changed, 90 insertions(+), 0 deletions(-)
> ?create mode 100644 arch/arm/mach-mmp/include/mach/teton_bga.h
> ?create mode 100644 arch/arm/mach-mmp/teton_bga.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 433f353..d7a4481 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -967,6 +967,11 @@ M: Lennert Buytenhek <kernel@wantstofly.org>
> ?L: ? ? linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> ?S: ? ? Maintained
>
> +ARM/TETON BGA MACHINE SUPPORT
> +M: ? ? Mark F. Brown <mark.brown314@gmail.com>
> +L: ? ? linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> +S: ? ? Maintained
> +
> ?ARM/THECUS N2100 MACHINE SUPPORT
> ?M: ? ? Lennert Buytenhek <kernel@wantstofly.org>
> ?L: ? ? linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
> index 6ab843e..0711d3b 100644
> --- a/arch/arm/mach-mmp/Kconfig
> +++ b/arch/arm/mach-mmp/Kconfig
> @@ -57,6 +57,13 @@ config MACH_MARVELL_JASPER
> ? ? ? ? ?PXA910-based development board. Since MMP2 is compatible to
> ? ? ? ? ?ARMv6 architecture.
>
> +config MACH_TETON_BGA
> + ? ? ? bool "Marvell's PXA168 Teton BGA Development Board"
> + ? ? ? select CPU_PXA168
> + ? ? ? help
> + ? ? ? ? Say 'Y' here if you want to support the Marvell PXA168-based
> + ? ? ? ? Teton BGA Development Board.
> +
> ?endmenu
>
> ?config CPU_PXA168
> diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile
> index 8b66d06..751cdbf 100644
> --- a/arch/arm/mach-mmp/Makefile
> +++ b/arch/arm/mach-mmp/Makefile
> @@ -17,3 +17,4 @@ obj-$(CONFIG_MACH_TAVOREVB) ? += tavorevb.o
> ?obj-$(CONFIG_MACH_TTC_DKB) ? ? += ttc_dkb.o
> ?obj-$(CONFIG_MACH_FLINT) ? ? ? += flint.o
> ?obj-$(CONFIG_MACH_MARVELL_JASPER) += jasper.o
> +obj-$(CONFIG_MACH_TETON_BGA) ? += teton_bga.o
> diff --git a/arch/arm/mach-mmp/include/mach/teton_bga.h b/arch/arm/mach-mmp/include/mach/teton_bga.h
> new file mode 100644
> index 0000000..61a539b
> --- /dev/null
> +++ b/arch/arm/mach-mmp/include/mach/teton_bga.h
> @@ -0,0 +1,27 @@
> +/*
> + * ?linux/arch/arm/mach-mmp/include/mach/teton_bga.h
> + *
> + * ?Support for the Marvell PXA168 Teton BGA Development Platform.
> + *
> + * ?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
> + * ?publishhed by the Free Software Foundation.
> + */
> +#ifndef __ASM_MACH_TETON_BGA_H
> +#define __ASM_MACH_TETON_BGA_H
> +
> +/* GPIOs */
> +#define MMC_PWENA_GPIO ? ? ? ? 27
> +#define USBHPENB_GPIO ? ? ? ? ?55
> +#define RTC_INT_GPIO ? ? ? ? ? 78
> +#define LCD_VBLK_EN_GPIO ? ? ? 79
> +#define LCD_DVDD_EN_GPIO ? ? ? 80
> +#define RST_WIFI_GPIO ? ? ? ? ?81
> +#define CF_PWEN_GPIO ? ? ? ? ? 82
> +#define USB_OC_GPIO ? ? ? ? ? ?83
> +#define PWM_GPIO ? ? ? ? ? ? ? 84
> +#define USBHPENA_GPIO ? ? ? ? ?85
> +#define TS_INT_GPIO ? ? ? ? ? ?86
> +#define CIR_GPIO ? ? ? ? ? ? ? 108
> +
> +#endif /* __ASM_MACH_TETON_BGA_H */
> diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c
> new file mode 100644
> index 0000000..49b746b
> --- /dev/null
> +++ b/arch/arm/mach-mmp/teton_bga.c
> @@ -0,0 +1,50 @@
> +/*
> + * ?linux/arch/arm/mach-mmp/teton_bga.c
> + *
> + * ?Support for the Marvell PXA168 Teton BGA Development Platform.
> + *
> + * ?Author: Mark F. Brown <mark.brown314@gmail.com>
> + *
> + * ?This code is based on aspenite.c
> + *
> + * ?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
> + * ?publishhed by the Free Software Foundation.
> + */
> +
> +#include <linux/init.h>
> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +#include <linux/gpio.h>
> +
> +#include <asm/mach-types.h>
> +#include <asm/mach/arch.h>
> +#include <mach/addr-map.h>
> +#include <mach/mfp-pxa168.h>
> +#include <mach/pxa168.h>
> +#include <mach/teton_bga.h>
> +
> +#include "common.h"
> +
> +static unsigned long teton_bga_pin_config[] __initdata = {
> + ? ? ? /* UART1 */
> + ? ? ? GPIO107_UART1_TXD,
> + ? ? ? GPIO108_UART1_RXD,
> +};
> +
> +static void __init teton_bga_init(void)
> +{
> + ? ? ? mfp_config(ARRAY_AND_SIZE(teton_bga_pin_config));
> +
> + ? ? ? /* on-chip devices */
> + ? ? ? pxa168_add_uart(1);
> +}
> +
> +MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
> + ? ? ? .phys_io ? ? ? ?= APB_PHYS_BASE,
> + ? ? ? .io_pg_offst ? ?= (APB_VIRT_BASE >> 18) & 0xfffc,
> + ? ? ? .map_io ? ? ? ? = mmp_map_io,
Added .nr_irqs = IRQ_BOARD_START here, since I've merged Haojian's
patch for enabling SPARSE_IRQ on MMP.
Otherwise all good to me, applied to 'devel'.
> + ? ? ? .init_irq ? ? ? = pxa168_init_irq,
> + ? ? ? .timer ? ? ? ? ?= &pxa168_timer,
> + ? ? ? .init_machine ? = teton_bga_init,
> +MACHINE_END
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 2/3] ARM: pxa168/teton bga: added keypad support
2010-09-13 3:51 [PATCH v2 0/3] ARM: pxa168: Added Teton BGA Board Support Mark F. Brown
2010-09-13 3:51 ` [PATCH v2 1/3] ARM: pxa168: added support for Teton BGA platform Mark F. Brown
@ 2010-09-13 3:51 ` Mark F. Brown
2010-09-14 7:08 ` Eric Miao
2010-09-13 3:51 ` [PATCH v2 3/3] ARM: pxa168/teton bga: add board support for i2c and rtc-ds1337 Mark F. Brown
2 siblings, 1 reply; 9+ messages in thread
From: Mark F. Brown @ 2010-09-13 3:51 UTC (permalink / raw)
To: linux-arm-kernel
Support for Matrix keypad ESC, ENTER, LEFT, and RIGHT
Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
---
arch/arm/mach-mmp/teton_bga.c | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c
index 49b746b..2966117 100644
--- a/arch/arm/mach-mmp/teton_bga.c
+++ b/arch/arm/mach-mmp/teton_bga.c
@@ -16,6 +16,8 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
+#include <linux/input.h>
+#include <plat/pxa27x_keypad.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -30,6 +32,27 @@ static unsigned long teton_bga_pin_config[] __initdata = {
/* UART1 */
GPIO107_UART1_TXD,
GPIO108_UART1_RXD,
+
+ /* Keypad */
+ GPIO109_KP_MKIN1,
+ GPIO110_KP_MKIN0,
+ GPIO111_KP_MKOUT7,
+ GPIO112_KP_MKOUT6,
+};
+
+static unsigned int teton_bga_matrix_key_map[] = {
+ KEY(0, 6, KEY_ESC),
+ KEY(0, 7, KEY_ENTER),
+ KEY(1, 6, KEY_LEFT),
+ KEY(1, 7, KEY_RIGHT),
+};
+
+static struct pxa27x_keypad_platform_data teton_bga_keypad_info __initdata = {
+ .matrix_key_rows = 2,
+ .matrix_key_cols = 8,
+ .matrix_key_map = teton_bga_matrix_key_map,
+ .matrix_key_map_size = ARRAY_SIZE(teton_bga_matrix_key_map),
+ .debounce_interval = 30,
};
static void __init teton_bga_init(void)
@@ -38,6 +61,7 @@ static void __init teton_bga_init(void)
/* on-chip devices */
pxa168_add_uart(1);
+ pxa168_add_keypad(&teton_bga_keypad_info);
}
MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 2/3] ARM: pxa168/teton bga: added keypad support
2010-09-13 3:51 ` [PATCH v2 2/3] ARM: pxa168/teton bga: added keypad support Mark F. Brown
@ 2010-09-14 7:08 ` Eric Miao
0 siblings, 0 replies; 9+ messages in thread
From: Eric Miao @ 2010-09-14 7:08 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 13, 2010 at 11:51 AM, Mark F. Brown <mark.brown314@gmail.com> wrote:
> Support for Matrix keypad ESC, ENTER, LEFT, and RIGHT
>
> Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
Applied.
> ---
> ?arch/arm/mach-mmp/teton_bga.c | ? 24 ++++++++++++++++++++++++
> ?1 files changed, 24 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c
> index 49b746b..2966117 100644
> --- a/arch/arm/mach-mmp/teton_bga.c
> +++ b/arch/arm/mach-mmp/teton_bga.c
> @@ -16,6 +16,8 @@
> ?#include <linux/kernel.h>
> ?#include <linux/platform_device.h>
> ?#include <linux/gpio.h>
> +#include <linux/input.h>
> +#include <plat/pxa27x_keypad.h>
>
> ?#include <asm/mach-types.h>
> ?#include <asm/mach/arch.h>
> @@ -30,6 +32,27 @@ static unsigned long teton_bga_pin_config[] __initdata = {
> ? ? ? ?/* UART1 */
> ? ? ? ?GPIO107_UART1_TXD,
> ? ? ? ?GPIO108_UART1_RXD,
> +
> + ? ? ? /* Keypad */
> + ? ? ? GPIO109_KP_MKIN1,
> + ? ? ? GPIO110_KP_MKIN0,
> + ? ? ? GPIO111_KP_MKOUT7,
> + ? ? ? GPIO112_KP_MKOUT6,
> +};
> +
> +static unsigned int teton_bga_matrix_key_map[] = {
> + ? ? ? KEY(0, 6, KEY_ESC),
> + ? ? ? KEY(0, 7, KEY_ENTER),
> + ? ? ? KEY(1, 6, KEY_LEFT),
> + ? ? ? KEY(1, 7, KEY_RIGHT),
> +};
> +
> +static struct pxa27x_keypad_platform_data teton_bga_keypad_info __initdata = {
> + ? ? ? .matrix_key_rows ? ? ? ?= 2,
> + ? ? ? .matrix_key_cols ? ? ? ?= 8,
> + ? ? ? .matrix_key_map ? ? ? ? = teton_bga_matrix_key_map,
> + ? ? ? .matrix_key_map_size ? ?= ARRAY_SIZE(teton_bga_matrix_key_map),
> + ? ? ? .debounce_interval ? ? ?= 30,
> ?};
>
> ?static void __init teton_bga_init(void)
> @@ -38,6 +61,7 @@ static void __init teton_bga_init(void)
>
> ? ? ? ?/* on-chip devices */
> ? ? ? ?pxa168_add_uart(1);
> + ? ? ? pxa168_add_keypad(&teton_bga_keypad_info);
> ?}
>
> ?MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 3/3] ARM: pxa168/teton bga: add board support for i2c and rtc-ds1337
2010-09-13 3:51 [PATCH v2 0/3] ARM: pxa168: Added Teton BGA Board Support Mark F. Brown
2010-09-13 3:51 ` [PATCH v2 1/3] ARM: pxa168: added support for Teton BGA platform Mark F. Brown
2010-09-13 3:51 ` [PATCH v2 2/3] ARM: pxa168/teton bga: added keypad support Mark F. Brown
@ 2010-09-13 3:51 ` Mark F. Brown
2010-09-13 5:34 ` Haojian Zhuang
2010-09-14 7:08 ` Eric Miao
2 siblings, 2 replies; 9+ messages in thread
From: Mark F. Brown @ 2010-09-13 3:51 UTC (permalink / raw)
To: linux-arm-kernel
Defined I2C/ALARM pin definitions
DS1337 RTC alarm support is tied to RTC_INT_GPIO
Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
---
arch/arm/mach-mmp/teton_bga.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c
index 2966117..d631bbc 100644
--- a/arch/arm/mach-mmp/teton_bga.c
+++ b/arch/arm/mach-mmp/teton_bga.c
@@ -18,6 +18,7 @@
#include <linux/gpio.h>
#include <linux/input.h>
#include <plat/pxa27x_keypad.h>
+#include <linux/i2c.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -38,6 +39,13 @@ static unsigned long teton_bga_pin_config[] __initdata = {
GPIO110_KP_MKIN0,
GPIO111_KP_MKOUT7,
GPIO112_KP_MKOUT6,
+
+ /* I2C Bus */
+ GPIO105_CI2C_SDA,
+ GPIO106_CI2C_SCL,
+
+ /* RTC */
+ GPIO78_GPIO,
};
static unsigned int teton_bga_matrix_key_map[] = {
@@ -55,6 +63,13 @@ static struct pxa27x_keypad_platform_data teton_bga_keypad_info __initdata = {
.debounce_interval = 30,
};
+static struct i2c_board_info teton_bga_i2c_info[] __initdata = {
+ {
+ I2C_BOARD_INFO("ds1337", 0x68),
+ .irq = gpio_to_irq(RTC_INT_GPIO)
+ },
+};
+
static void __init teton_bga_init(void)
{
mfp_config(ARRAY_AND_SIZE(teton_bga_pin_config));
@@ -62,6 +77,7 @@ static void __init teton_bga_init(void)
/* on-chip devices */
pxa168_add_uart(1);
pxa168_add_keypad(&teton_bga_keypad_info);
+ pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(teton_bga_i2c_info));
}
MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
--
1.7.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/3] ARM: pxa168/teton bga: add board support for i2c and rtc-ds1337
2010-09-13 3:51 ` [PATCH v2 3/3] ARM: pxa168/teton bga: add board support for i2c and rtc-ds1337 Mark F. Brown
@ 2010-09-13 5:34 ` Haojian Zhuang
2010-09-13 7:44 ` Marek Vasut
2010-09-14 7:08 ` Eric Miao
1 sibling, 1 reply; 9+ messages in thread
From: Haojian Zhuang @ 2010-09-13 5:34 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 13, 2010 at 11:51 AM, Mark F. Brown <mark.brown314@gmail.com> wrote:
> Defined I2C/ALARM pin definitions
> DS1337 RTC alarm support is tied to RTC_INT_GPIO
>
> Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
> ---
> ?arch/arm/mach-mmp/teton_bga.c | ? 16 ++++++++++++++++
> ?1 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c
> index 2966117..d631bbc 100644
> --- a/arch/arm/mach-mmp/teton_bga.c
> +++ b/arch/arm/mach-mmp/teton_bga.c
> @@ -18,6 +18,7 @@
> ?#include <linux/gpio.h>
> ?#include <linux/input.h>
> ?#include <plat/pxa27x_keypad.h>
> +#include <linux/i2c.h>
>
> ?#include <asm/mach-types.h>
> ?#include <asm/mach/arch.h>
> @@ -38,6 +39,13 @@ static unsigned long teton_bga_pin_config[] __initdata = {
> ? ? ? ?GPIO110_KP_MKIN0,
> ? ? ? ?GPIO111_KP_MKOUT7,
> ? ? ? ?GPIO112_KP_MKOUT6,
> +
> + ? ? ? /* I2C Bus */
> + ? ? ? GPIO105_CI2C_SDA,
> + ? ? ? GPIO106_CI2C_SCL,
> +
> + ? ? ? /* RTC */
> + ? ? ? GPIO78_GPIO,
> ?};
>
> ?static unsigned int teton_bga_matrix_key_map[] = {
> @@ -55,6 +63,13 @@ static struct pxa27x_keypad_platform_data teton_bga_keypad_info __initdata = {
> ? ? ? ?.debounce_interval ? ? ?= 30,
> ?};
>
> +static struct i2c_board_info teton_bga_i2c_info[] __initdata = {
> + ? ? ? {
> + ? ? ? ? ? ? ? I2C_BOARD_INFO("ds1337", 0x68),
> + ? ? ? ? ? ? ? .irq = gpio_to_irq(RTC_INT_GPIO)
> + ? ? ? },
> +};
> +
> ?static void __init teton_bga_init(void)
> ?{
> ? ? ? ?mfp_config(ARRAY_AND_SIZE(teton_bga_pin_config));
> @@ -62,6 +77,7 @@ static void __init teton_bga_init(void)
> ? ? ? ?/* on-chip devices */
> ? ? ? ?pxa168_add_uart(1);
> ? ? ? ?pxa168_add_keypad(&teton_bga_keypad_info);
> + ? ? ? pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(teton_bga_i2c_info));
> ?}
>
> ?MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at ?http://www.tux.org/lkml/
>
Acked
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2 3/3] ARM: pxa168/teton bga: add board support for i2c and rtc-ds1337
2010-09-13 5:34 ` Haojian Zhuang
@ 2010-09-13 7:44 ` Marek Vasut
0 siblings, 0 replies; 9+ messages in thread
From: Marek Vasut @ 2010-09-13 7:44 UTC (permalink / raw)
To: linux-arm-kernel
Dne Po 13. z??? 2010 07:34:36 Haojian Zhuang napsal(a):
> On Mon, Sep 13, 2010 at 11:51 AM, Mark F. Brown <mark.brown314@gmail.com>
wrote:
> > Defined I2C/ALARM pin definitions
> > DS1337 RTC alarm support is tied to RTC_INT_GPIO
> >
> > Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
> > ---
> > arch/arm/mach-mmp/teton_bga.c | 16 ++++++++++++++++
> > 1 files changed, 16 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/arm/mach-mmp/teton_bga.c
> > b/arch/arm/mach-mmp/teton_bga.c index 2966117..d631bbc 100644
> > --- a/arch/arm/mach-mmp/teton_bga.c
> > +++ b/arch/arm/mach-mmp/teton_bga.c
> > @@ -18,6 +18,7 @@
> > #include <linux/gpio.h>
> > #include <linux/input.h>
> > #include <plat/pxa27x_keypad.h>
> > +#include <linux/i2c.h>
> >
> > #include <asm/mach-types.h>
> > #include <asm/mach/arch.h>
> > @@ -38,6 +39,13 @@ static unsigned long teton_bga_pin_config[] __initdata
> > = { GPIO110_KP_MKIN0,
> > GPIO111_KP_MKOUT7,
> > GPIO112_KP_MKOUT6,
> > +
> > + /* I2C Bus */
> > + GPIO105_CI2C_SDA,
> > + GPIO106_CI2C_SCL,
> > +
> > + /* RTC */
> > + GPIO78_GPIO,
> > };
> >
> > static unsigned int teton_bga_matrix_key_map[] = {
> > @@ -55,6 +63,13 @@ static struct pxa27x_keypad_platform_data
> > teton_bga_keypad_info __initdata = { .debounce_interval = 30,
> > };
> >
> > +static struct i2c_board_info teton_bga_i2c_info[] __initdata = {
> > + {
> > + I2C_BOARD_INFO("ds1337", 0x68),
> > + .irq = gpio_to_irq(RTC_INT_GPIO)
> > + },
> > +};
> > +
> > static void __init teton_bga_init(void)
> > {
> > mfp_config(ARRAY_AND_SIZE(teton_bga_pin_config));
> > @@ -62,6 +77,7 @@ static void __init teton_bga_init(void)
> > /* on-chip devices */
> > pxa168_add_uart(1);
> > pxa168_add_keypad(&teton_bga_keypad_info);
> > + pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(teton_bga_i2c_info));
> > }
> >
> > MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
> > --
> > 1.7.0.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel"
> > in the body of a message to majordomo at vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at http://www.tux.org/lkml/
>
> Acked
Yes, they look good:
Acked-by: Marek Vasut <marek.vasut@gmail.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 3/3] ARM: pxa168/teton bga: add board support for i2c and rtc-ds1337
2010-09-13 3:51 ` [PATCH v2 3/3] ARM: pxa168/teton bga: add board support for i2c and rtc-ds1337 Mark F. Brown
2010-09-13 5:34 ` Haojian Zhuang
@ 2010-09-14 7:08 ` Eric Miao
1 sibling, 0 replies; 9+ messages in thread
From: Eric Miao @ 2010-09-14 7:08 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 13, 2010 at 11:51 AM, Mark F. Brown <mark.brown314@gmail.com> wrote:
> Defined I2C/ALARM pin definitions
> DS1337 RTC alarm support is tied to RTC_INT_GPIO
>
> Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
Applied with Acks.
> ---
> ?arch/arm/mach-mmp/teton_bga.c | ? 16 ++++++++++++++++
> ?1 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c
> index 2966117..d631bbc 100644
> --- a/arch/arm/mach-mmp/teton_bga.c
> +++ b/arch/arm/mach-mmp/teton_bga.c
> @@ -18,6 +18,7 @@
> ?#include <linux/gpio.h>
> ?#include <linux/input.h>
> ?#include <plat/pxa27x_keypad.h>
> +#include <linux/i2c.h>
>
> ?#include <asm/mach-types.h>
> ?#include <asm/mach/arch.h>
> @@ -38,6 +39,13 @@ static unsigned long teton_bga_pin_config[] __initdata = {
> ? ? ? ?GPIO110_KP_MKIN0,
> ? ? ? ?GPIO111_KP_MKOUT7,
> ? ? ? ?GPIO112_KP_MKOUT6,
> +
> + ? ? ? /* I2C Bus */
> + ? ? ? GPIO105_CI2C_SDA,
> + ? ? ? GPIO106_CI2C_SCL,
> +
> + ? ? ? /* RTC */
> + ? ? ? GPIO78_GPIO,
> ?};
>
> ?static unsigned int teton_bga_matrix_key_map[] = {
> @@ -55,6 +63,13 @@ static struct pxa27x_keypad_platform_data teton_bga_keypad_info __initdata = {
> ? ? ? ?.debounce_interval ? ? ?= 30,
> ?};
>
> +static struct i2c_board_info teton_bga_i2c_info[] __initdata = {
> + ? ? ? {
> + ? ? ? ? ? ? ? I2C_BOARD_INFO("ds1337", 0x68),
> + ? ? ? ? ? ? ? .irq = gpio_to_irq(RTC_INT_GPIO)
> + ? ? ? },
> +};
> +
> ?static void __init teton_bga_init(void)
> ?{
> ? ? ? ?mfp_config(ARRAY_AND_SIZE(teton_bga_pin_config));
> @@ -62,6 +77,7 @@ static void __init teton_bga_init(void)
> ? ? ? ?/* on-chip devices */
> ? ? ? ?pxa168_add_uart(1);
> ? ? ? ?pxa168_add_keypad(&teton_bga_keypad_info);
> + ? ? ? pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(teton_bga_i2c_info));
> ?}
>
> ?MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread