From dc1cfc34b2a07c5441d68ca21ae4296822ee4df6 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Sat, 2 Mar 2013 23:45:57 +0100 Subject: colibri_t20/30: move gpio defines Move GPIO defines to header file. While at it get rid of spurious AVDD_DSI_CSI_ENB_GPIO define. --- arch/arm/mach-tegra/board-colibri_t20.c | 33 ---------------- arch/arm/mach-tegra/board-colibri_t20.h | 67 +++++++++++++++++++++++++-------- arch/arm/mach-tegra/board-colibri_t30.c | 37 ------------------ arch/arm/mach-tegra/board-colibri_t30.h | 39 +++++++++++++++++++ 4 files changed, 91 insertions(+), 85 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c index 5d88dbc8bb50..6f2c91852b12 100644 --- a/arch/arm/mach-tegra/board-colibri_t20.c +++ b/arch/arm/mach-tegra/board-colibri_t20.c @@ -121,39 +121,6 @@ static struct tegra_clk_init_table colibri_t20_clk_init_table[] __initdata = { /* GPIO */ -#define FF_DCD TEGRA_GPIO_PC6 /* SODIMM 31 */ -#define FF_DSR TEGRA_GPIO_PC1 /* SODIMM 29 */ - -#define FUSION_PEN_DOWN TEGRA_GPIO_PL1 /* SODIMM 103 */ -#define FUSION_RESET TEGRA_GPIO_PL0 /* SODIMM 101 */ - -#define I2C_SCL TEGRA_GPIO_PC4 /* SODIMM 196 */ -#define I2C_SDA TEGRA_GPIO_PC5 /* SODIMM 194 */ - -#define LAN_EXT_WAKEUP TEGRA GPIO_PV5 -#define LAN_PME TEGRA_GPIO_PV6 -#define LAN_RESET TEGRA_GPIO_PV4 -#define LAN_V_BUS TEGRA_GPIO_PBB1 - -#define MMC_CD TEGRA_GPIO_PC7 /* SODIMM 43 */ - -#define NAND_WP_N TEGRA_GPIO_PS0 - -#define PWR_I2C_SCL TEGRA_GPIO_PZ6 -#define PWR_I2C_SDA TEGRA_GPIO_PZ7 - -#define MECS_USB_HUB_RESET TEGRA_GPIO_PBB3 /* SODIMM 127 */ - -#define THERMD_ALERT TEGRA_GPIO_PV7 - -#define TOUCH_PEN_INT TEGRA_GPIO_PV2 - -#define USB3340_RESETB TEGRA_GPIO_PV1 -//conflicts with MECS Tellurium xPOD2 SSPTXD2 -#define USBC_DET TEGRA_GPIO_PK5 /* SODIMM 137 */ -#define USBH_OC TEGRA_GPIO_PW3 /* SODIMM 131 */ -#define USBH_PEN TEGRA_GPIO_PW2 /* SODIMM 129 */ - static struct gpio colibri_t20_gpios[] = { //conflicts with CAN interrupt on Colibri Evaluation Board and MECS Tellurium //xPOD1 CAN diff --git a/arch/arm/mach-tegra/board-colibri_t20.h b/arch/arm/mach-tegra/board-colibri_t20.h index b6b5e6ae0883..09d5c3175b7f 100644 --- a/arch/arm/mach-tegra/board-colibri_t20.h +++ b/arch/arm/mach-tegra/board-colibri_t20.h @@ -17,32 +17,69 @@ #ifndef _MACH_TEGRA_BOARD_COLIBRI_T20_H #define _MACH_TEGRA_BOARD_COLIBRI_T20_H -/* TPS6586X gpios */ -#define TPS6586X_GPIO_BASE TEGRA_NR_GPIOS -#define AVDD_DSI_CSI_ENB_GPIO (TPS6586X_GPIO_BASE + 1) /* gpio2 */ - -/* Interrupt numbers from external peripherals */ -#define TPS6586X_INT_BASE TEGRA_NR_IRQS -#define TPS6586X_INT_END (TPS6586X_INT_BASE + 32) - -/* Uncomment for camera interface support on Colibri Evaluation carrier board */ +/* Uncomment for camera interface support on Colibri Evaluation carrier + board */ #ifdef CONFIG_TEGRA_CAMERA #define COLIBRI_T20_VI #endif +/* Run framebuffer in VGA mode */ +#ifndef CONFIG_ANDROID +#define TEGRA_FB_VGA +#endif + +/* GPIO */ + +#define FF_DCD TEGRA_GPIO_PC6 /* SODIMM 31 */ +#define FF_DSR TEGRA_GPIO_PC1 /* SODIMM 29 */ + +#define FUSION_PEN_DOWN TEGRA_GPIO_PL1 /* SODIMM 103 */ +#define FUSION_RESET TEGRA_GPIO_PL0 /* SODIMM 101 */ + +#define I2C_SCL TEGRA_GPIO_PC4 /* SODIMM 196 */ +#define I2C_SDA TEGRA_GPIO_PC5 /* SODIMM 194 */ + +#define LAN_EXT_WAKEUP TEGRA GPIO_PV5 +#define LAN_PME TEGRA_GPIO_PV6 +#define LAN_RESET TEGRA_GPIO_PV4 +#define LAN_V_BUS TEGRA_GPIO_PBB1 + +#define MECS_USB_HUB_RESET TEGRA_GPIO_PBB3 /* SODIMM 127 */ + +#define MMC_CD TEGRA_GPIO_PC7 /* SODIMM 43 */ + +#define NAND_WP_N TEGRA_GPIO_PS0 + +#define PWR_I2C_SCL TEGRA_GPIO_PZ6 +#define PWR_I2C_SDA TEGRA_GPIO_PZ7 + +#define THERMD_ALERT TEGRA_GPIO_PV7 + +#define TOUCH_PEN_INT TEGRA_GPIO_PV2 + +#define USB3340_RESETB TEGRA_GPIO_PV1 +//conflicts with MECS Tellurium xPOD2 SSPTXD2 +#define USBC_DET TEGRA_GPIO_PK5 /* SODIMM 137 */ +#define USBH_OC TEGRA_GPIO_PW3 /* SODIMM 131 */ +#define USBH_PEN TEGRA_GPIO_PW2 /* SODIMM 129 */ + /* Use SODIMM pin 73 as DAC power save on Iris carrier board */ #define IRIS -/* Uncomment for back light and USB hub support on MECS Tellurium carrier board */ +/* Uncomment for back light and USB hub support on MECS Tellurium carrier + board */ //#define MECS_TELLURIUM -/* Uncomment for 8-bit SDHCI on HSMMC controller (requires custom carrier board) */ +/* Uncomment for 8-bit SDHCI on HSMMC controller (requires custom carrier + board) */ //#define SDHCI_8BIT -/* Run framebuffer in VGA mode */ -#ifndef CONFIG_ANDROID -#define TEGRA_FB_VGA -#endif +/* TPS6586X gpios */ +#define TPS6586X_GPIO_BASE TEGRA_NR_GPIOS + +/* Interrupt numbers from external peripherals */ +#define TPS6586X_INT_BASE TEGRA_NR_IRQS +#define TPS6586X_INT_END (TPS6586X_INT_BASE + 32) int colibri_t20_emc_init(void); int colibri_t20_panel_init(void); diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index 4c7035bbebf5..f08b38b6cbbe 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -121,43 +121,6 @@ static struct tegra_clk_init_table colibri_t30_clk_init_table[] __initdata = { /* GPIO */ -#define DDC_SCL TEGRA_GPIO_PV4 /* X2-15 */ -#define DDC_SDA TEGRA_GPIO_PV5 /* X2-16 */ - -#ifdef COLIBRI_T30_V10 -#define EMMC_DETECT TEGRA_GPIO_PC7 -#endif - -#define EN_MIC_GND TEGRA_GPIO_PT1 - -#define FUSION_PEN_DOWN TEGRA_GPIO_PY6 /* SODIMM 103 */ -#define FUSION_RESET TEGRA_GPIO_PY7 /* SODIMM 101 */ - -#define I2C_SCL TEGRA_GPIO_PC4 /* SODIMM 196 */ -#define I2C_SDA TEGRA_GPIO_PC5 /* SODIMM 194 */ - -#define LAN_EXT_WAKEUP TEGRA_GPIO_PDD1 -#define LAN_PME TEGRA_GPIO_PDD3 -#define LAN_RESET TEGRA_GPIO_PDD0 -#define LAN_V_BUS TEGRA_GPIO_PDD2 - -#ifdef COLIBRI_T30_V10 -#define MMC_CD TEGRA_GPIO_PU6 /* SODIMM 43 */ -#else -#define MMC_CD TEGRA_GPIO_PC7 /* SODIMM 43 */ -#endif - -#define PWR_I2C_SCL TEGRA_GPIO_PZ6 -#define PWR_I2C_SDA TEGRA_GPIO_PZ7 - -#define TOUCH_PEN_INT TEGRA_GPIO_PV0 - -#define THERMD_ALERT TEGRA_GPIO_PD2 - -#define USBC_DET TEGRA_GPIO_PK5 /* SODIMM 137 */ -#define USBH_OC TEGRA_GPIO_PW3 /* SODIMM 131 */ -#define USBH_PEN TEGRA_GPIO_PW2 /* SODIMM 129 */ - //TODO: sysfs GPIO exports /* I2C */ diff --git a/arch/arm/mach-tegra/board-colibri_t30.h b/arch/arm/mach-tegra/board-colibri_t30.h index 5d944dac4966..4244a007ee72 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.h +++ b/arch/arm/mach-tegra/board-colibri_t30.h @@ -35,6 +35,45 @@ /* Run framebuffer in VGA mode */ #define TEGRA_FB_VGA +/* GPIO */ + +#define DDC_SCL TEGRA_GPIO_PV4 /* X2-15 */ +#define DDC_SDA TEGRA_GPIO_PV5 /* X2-16 */ + +#ifdef COLIBRI_T30_V10 +#define EMMC_DETECT TEGRA_GPIO_PC7 +#endif + +#define EN_MIC_GND TEGRA_GPIO_PT1 + +#define FUSION_PEN_DOWN TEGRA_GPIO_PY6 /* SODIMM 103 */ +#define FUSION_RESET TEGRA_GPIO_PY7 /* SODIMM 101 */ + +#define I2C_SCL TEGRA_GPIO_PC4 /* SODIMM 196 */ +#define I2C_SDA TEGRA_GPIO_PC5 /* SODIMM 194 */ + +#define LAN_EXT_WAKEUP TEGRA_GPIO_PDD1 +#define LAN_PME TEGRA_GPIO_PDD3 +#define LAN_RESET TEGRA_GPIO_PDD0 +#define LAN_V_BUS TEGRA_GPIO_PDD2 + +#ifdef COLIBRI_T30_V10 +#define MMC_CD TEGRA_GPIO_PU6 /* SODIMM 43 */ +#else +#define MMC_CD TEGRA_GPIO_PC7 /* SODIMM 43 */ +#endif + +#define PWR_I2C_SCL TEGRA_GPIO_PZ6 +#define PWR_I2C_SDA TEGRA_GPIO_PZ7 + +#define THERMD_ALERT TEGRA_GPIO_PD2 + +#define TOUCH_PEN_INT TEGRA_GPIO_PV0 + +#define USBC_DET TEGRA_GPIO_PK5 /* SODIMM 137 */ +#define USBH_OC TEGRA_GPIO_PW3 /* SODIMM 131 */ +#define USBH_PEN TEGRA_GPIO_PW2 /* SODIMM 129 */ + /* Uncomment for Colibri T30 V1.0a prototypes */ //#define COLIBRI_T30_V10 -- cgit v1.2.3