From mboxrd@z Thu Jan 1 00:00:00 1970 From: eric.y.miao@gmail.com (Eric Miao) Date: Wed, 25 Aug 2010 21:17:19 +0800 Subject: [PATCH 1/3] pxa: append tavorevb3 support In-Reply-To: <201008251501.03060.marek.vasut@gmail.com> References: <201008251501.03060.marek.vasut@gmail.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Aug 25, 2010 at 9:01 PM, Marek Vasut wrote: > Dne St 25. srpna 2010 12:43:39 Haojian Zhuang napsal(a): >> From bb6db47adae8d0ce1a12c353c7d898bd3c197d86 Mon Sep 17 00:00:00 2001 >> From: Haojian Zhuang >> Date: Thu, 13 May 2010 18:09:27 +0800 >> Subject: [PATCH 1/3] pxa: append tavorevb3 support >> >> Bringup tavorevb3 development platform. UART and PMIC are enabled. >> >> Signed-off-by: Haojian Zhuang >> --- >> ?arch/arm/mach-pxa/Kconfig ? ? ? ? ? ? ? ? ? | ? ?4 + >> ?arch/arm/mach-pxa/Makefile ? ? ? ? ? ? ? ? ?| ? ?1 + >> ?arch/arm/mach-pxa/include/mach/mfp-pxa930.h | ? ?7 ++ >> ?arch/arm/mach-pxa/pxa930.c ? ? ? ? ? ? ? ? ?| ? ?2 +- >> ?arch/arm/mach-pxa/tavorevb3.c ? ? ? ? ? ? ? | ?136 >> +++++++++++++++++++++++++++ 5 files changed, 149 insertions(+), 1 >> deletions(-) >> ?create mode 100644 arch/arm/mach-pxa/tavorevb3.c >> >> diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig >> index 2bfcd10..4b83b9b 100644 >> --- a/arch/arm/mach-pxa/Kconfig >> +++ b/arch/arm/mach-pxa/Kconfig >> @@ -41,6 +41,10 @@ config MACH_TAVOREVB >> ? ? ? select PXA3xx >> ? ? ? select CPU_PXA930 >> >> +config MACH_TAVOREVB3 >> + ? ? bool "PXA95x Development Platform (aka TavorEVB III)" >> + ? ? select CPU_PXA950 >> + >> ?config MACH_SAAR >> ? ? ? bool "PXA930 Handheld Platform (aka SAAR)" >> ? ? ? select PXA3xx >> diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile >> index 85c7fb3..28eef69 100644 >> --- a/arch/arm/mach-pxa/Makefile >> +++ b/arch/arm/mach-pxa/Makefile >> @@ -32,6 +32,7 @@ obj-$(CONFIG_MACH_ZYLONITE300) ? ? ?+= zylonite.o >> zylonite_pxa300.o obj-$(CONFIG_MACH_ZYLONITE320) ? ? ?+= zylonite.o >> zylonite_pxa320.o >> ?obj-$(CONFIG_MACH_LITTLETON) += littleton.o >> ?obj-$(CONFIG_MACH_TAVOREVB) ?+= tavorevb.o >> +obj-$(CONFIG_MACH_TAVOREVB3) += tavorevb3.o >> ?obj-$(CONFIG_MACH_SAAR) ? ? ? ? ? ? ?+= saar.o >> >> ?# 3rd Party Dev Platforms >> diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa930.h >> b/arch/arm/mach-pxa/include/mach/mfp-pxa930.h >> index 0d119d3..04f7c97 100644 >> --- a/arch/arm/mach-pxa/include/mach/mfp-pxa930.h >> +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa930.h >> @@ -69,6 +69,7 @@ >> ?#define nBE0_GPIO_60 ? ? ? ? MFP_CFG(nBE0, AF0) >> ?#define nBE1_GPIO_61 ? ? ? ? MFP_CFG(nBE1, AF0) >> ?#define RDY_GPIO_62 ? ? ? ? ?MFP_CFG(RDY, AF0) >> +#define PMIC_INT_GPIO83 ? ? ? ? ? ? ?MFP_CFG_LPM(PMIC_INT, AF0, PULL_HIGH) >> >> ?/* Chip Select */ >> ?#define DF_nCS0_nCS2 ? ? ? ? MFP_CFG_LPM(DF_nCS0, AF3, PULL_HIGH) >> @@ -92,6 +93,9 @@ >> ?#define GPIO63_CI2C_SCL ? ? ? ? ? ? ?MFP_CFG_LPM(GPIO63, AF4, PULL_HIGH) >> ?#define GPIO64_CI2C_SDA ? ? ? ? ? ? ?MFP_CFG_LPM(GPIO64, AF4, PULL_HIGH) >> >> +#define GPIO73_CI2C_SCL ? ? ? ? ? ? ?MFP_CFG_LPM(GPIO73, AF1, PULL_HIGH) >> +#define GPIO74_CI2C_SDA ? ? ? ? ? ? ?MFP_CFG_LPM(GPIO74, AF1, PULL_HIGH) >> + >> ?#define GPIO77_CI2C_SCL ? ? ? ? ? ? ?MFP_CFG_LPM(GPIO77, AF2, PULL_HIGH) >> ?#define GPIO78_CI2C_SDA ? ? ? ? ? ? ?MFP_CFG_LPM(GPIO78, AF2, PULL_HIGH) >> >> @@ -345,6 +349,9 @@ >> ?#define GPIO69_UART1_CTS ? ? MFP_CFG(GPIO69, AF2) >> ?#define GPIO70_UART1_RTS ? ? MFP_CFG(GPIO70, AF2) >> >> +#define GPIO53_UART1_TXD ? ? MFP_CFG(GPIO53, AF2) >> +#define GPIO54_UART1_RXD ? ? MFP_CFG(GPIO54, AF2) >> + >> ?/* UART2 - BTUART */ >> ?#define GPIO91_UART2_RXD ? ? MFP_CFG(GPIO91, AF1) >> ?#define GPIO92_UART2_TXD ? ? MFP_CFG(GPIO92, AF1) >> diff --git a/arch/arm/mach-pxa/pxa930.c b/arch/arm/mach-pxa/pxa930.c >> index 0642920..7d29dd3 100644 >> --- a/arch/arm/mach-pxa/pxa930.c >> +++ b/arch/arm/mach-pxa/pxa930.c >> @@ -192,7 +192,7 @@ static struct mfp_addr_map pxa935_mfp_addr_map[] >> __initdata = { >> >> ?static int __init pxa930_init(void) >> ?{ >> - ? ? if (cpu_is_pxa930() || cpu_is_pxa935()) { >> + ? ? if (cpu_is_pxa930() || cpu_is_pxa935() || cpu_is_pxa950()) { >> ? ? ? ? ? ? ? mfp_init_base(io_p2v(MFPR_BASE)); >> ? ? ? ? ? ? ? mfp_init_addr(pxa930_mfp_addr_map); >> ? ? ? } >> diff --git a/arch/arm/mach-pxa/tavorevb3.c b/arch/arm/mach-pxa/tavorevb3.c >> new file mode 100644 >> index 0000000..5eeba64 >> --- /dev/null >> +++ b/arch/arm/mach-pxa/tavorevb3.c >> @@ -0,0 +1,136 @@ >> +/* >> + * ?linux/arch/arm/mach-pxa/tavorevb3.c >> + * >> + * ?Support for the Marvell EVB3 Development Platform. >> + * >> + * ?Copyright: ?(C) Copyright 2008-2010 Marvell International Ltd. > > So, who should I contact for support if this doesn't work/ need fixing ? > Indeed. Haojian, would be good if you are willing to maintain this and put your name as Maintainer below the MACHINE_START() or here in the comment? > The rest is good, this is just a nitpick > > Cheers >> + * >> + * ?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 >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include >> +#include >> + >> +#include >> + >> +#include >> + >> +#include "devices.h" >> +#include "generic.h" >> + >> +#define TAVOREVB3_NR_IRQS ? ?(IRQ_BOARD_START + 24) >> + >> +static mfp_cfg_t evb3_mfp_cfg[] __initdata = { >> + ? ? /* UART */ >> + ? ? GPIO53_UART1_TXD, >> + ? ? GPIO54_UART1_RXD, >> + >> + ? ? /* PMIC */ >> + ? ? PMIC_INT_GPIO83, >> +}; >> + >> +#if defined(CONFIG_I2C_PXA) || defined(CONFIG_I2C_PXA_MODULE) >> +static struct pm860x_touch_pdata evb3_touch = { >> + ? ? .gpadc_prebias ?= 1, >> + ? ? .slot_cycle ? ? = 1, >> + ? ? .tsi_prebias ? ?= 6, >> + ? ? .pen_prebias ? ?= 16, >> + ? ? .pen_prechg ? ? = 2, >> + ? ? .res_x ? ? ? ? ?= 300, >> +}; >> + >> +static struct pm860x_backlight_pdata evb3_backlight[] = { >> + ? ? { >> + ? ? ? ? ? ? .id ? ? = PM8606_ID_BACKLIGHT, >> + ? ? ? ? ? ? .iset ? = PM8606_WLED_CURRENT(24), >> + ? ? ? ? ? ? .flags ?= PM8606_BACKLIGHT1, >> + ? ? }, >> + ? ? {}, >> +}; >> + >> +static struct pm860x_led_pdata evb3_led[] = { >> + ? ? { >> + ? ? ? ? ? ? .id ? ? = PM8606_ID_LED, >> + ? ? ? ? ? ? .iset ? = PM8606_LED_CURRENT(12), >> + ? ? ? ? ? ? .flags ?= PM8606_LED1_RED, >> + ? ? }, { >> + ? ? ? ? ? ? .id ? ? = PM8606_ID_LED, >> + ? ? ? ? ? ? .iset ? = PM8606_LED_CURRENT(12), >> + ? ? ? ? ? ? .flags ?= PM8606_LED1_GREEN, >> + ? ? }, { >> + ? ? ? ? ? ? .id ? ? = PM8606_ID_LED, >> + ? ? ? ? ? ? .iset ? = PM8606_LED_CURRENT(12), >> + ? ? ? ? ? ? .flags ?= PM8606_LED1_BLUE, >> + ? ? }, { >> + ? ? ? ? ? ? .id ? ? = PM8606_ID_LED, >> + ? ? ? ? ? ? .iset ? = PM8606_LED_CURRENT(12), >> + ? ? ? ? ? ? .flags ?= PM8606_LED2_RED, >> + ? ? }, { >> + ? ? ? ? ? ? .id ? ? = PM8606_ID_LED, >> + ? ? ? ? ? ? .iset ? = PM8606_LED_CURRENT(12), >> + ? ? ? ? ? ? .flags ?= PM8606_LED2_GREEN, >> + ? ? }, { >> + ? ? ? ? ? ? .id ? ? = PM8606_ID_LED, >> + ? ? ? ? ? ? .iset ? = PM8606_LED_CURRENT(12), >> + ? ? ? ? ? ? .flags ?= PM8606_LED2_BLUE, >> + ? ? }, >> +}; >> + >> +static struct pm860x_platform_data evb3_pm8607_info = { >> + ? ? .touch ? ? ? ? ? ? ? ? ? ? ? ? ?= &evb3_touch, >> + ? ? .backlight ? ? ? ? ? ? ? ? ? ? ?= &evb3_backlight[0], >> + ? ? .led ? ? ? ? ? ? ? ? ? ? ? ? ? ?= &evb3_led[0], >> + ? ? .companion_addr ? ? ? ? ? ? ? ? = 0x10, >> + ? ? .irq_mode ? ? ? ? ? ? ? ? ? ? ? = 0, >> + ? ? .irq_base ? ? ? ? ? ? ? ? ? ? ? = IRQ_BOARD_START, >> + >> + ? ? .i2c_port ? ? ? ? ? ? ? ? ? ? ? = GI2C_PORT, >> +}; >> + >> +static struct i2c_board_info evb3_i2c_info[] = { >> + ? ? { >> + ? ? ? ? ? ? .type ? ? ? ? ? = "88PM860x", >> + ? ? ? ? ? ? .addr ? ? ? ? ? = 0x34, >> + ? ? ? ? ? ? .platform_data ?= &evb3_pm8607_info, >> + ? ? ? ? ? ? .irq ? ? ? ? ? ?= gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO83)), >> + ? ? }, >> +}; >> + >> +static void __init evb3_init_i2c(void) >> +{ >> + ? ? pxa_set_i2c_info(NULL); >> + ? ? i2c_register_board_info(0, ARRAY_AND_SIZE(evb3_i2c_info)); >> +} >> +#else >> +static inline void evb3_init_i2c(void) {} >> +#endif >> + >> +static void __init evb3_init(void) >> +{ >> + ? ? /* initialize MFP configurations */ >> + ? ? pxa3xx_mfp_config(ARRAY_AND_SIZE(evb3_mfp_cfg)); >> + >> + ? ? pxa_set_ffuart_info(NULL); >> + >> + ? ? evb3_init_i2c(); >> +} >> + >> +MACHINE_START(TAVOREVB3, "PXA950 Evaluation Board (aka TavorEVB3)") >> + ? ? .phys_io ? ? ? ?= 0x40000000, >> + ? ? .boot_params ? ?= 0xa0000100, >> + ? ? .map_io ? ? ? ? = pxa_map_io, >> + ? ? .nr_irqs ? ? ? ?= TAVOREVB3_NR_IRQS, >> + ? ? .init_irq ? ? ? = pxa3xx_init_irq, >> + ? ? .timer ? ? ? ? ?= &pxa_timer, >> + ? ? .init_machine ? = evb3_init, >> +MACHINE_END >