From 1da5dd9e91b9843632c0cacf0a04f45dd7d2b2bb Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Sat, 2 Mar 2013 23:44:08 +0100 Subject: apalis/colibri_t30: clean-up defines in header file Re-arrange defines in header file. --- arch/arm/mach-tegra/board-apalis_t30.h | 20 +++++++-------- arch/arm/mach-tegra/board-colibri_t30.h | 43 +++++++++++++++++---------------- 2 files changed, 32 insertions(+), 31 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-tegra/board-apalis_t30.h b/arch/arm/mach-tegra/board-apalis_t30.h index 138e79131839..0e68be4e4de5 100644 --- a/arch/arm/mach-tegra/board-apalis_t30.h +++ b/arch/arm/mach-tegra/board-apalis_t30.h @@ -26,6 +26,9 @@ #include #include +/* Run framebuffer in VGA mode */ +#define TEGRA_FB_VGA + /* GPIO */ #define APALIS_GPIO1 TEGRA_GPIO_PS2 @@ -108,6 +111,12 @@ #define WAKE1_MICO TEGRA_GPIO_PV1 +/* STMPE811 IRQs */ +#define STMPE811_IRQ_BASE TEGRA_NR_IRQS +#define STMPE811_IRQ_END (STMPE811_IRQ_BASE + 22) + +#define TDIODE_OFFSET (10000) /* in millicelsius */ + /* External peripheral act as gpio */ /* TPS6591x GPIOs */ #define TPS6591X_GPIO_BASE TEGRA_NR_GPIOS @@ -125,18 +134,9 @@ /*****************Interrupt tables ******************/ /* External peripheral act as interrupt controller */ /* TPS6591x IRQs */ -#define TPS6591X_IRQ_BASE TEGRA_NR_IRQS +#define TPS6591X_IRQ_BASE STMPE811_IRQ_END #define TPS6591X_IRQ_END (TPS6591X_IRQ_BASE + 18) -/* STMPE811 IRQs */ -#define STMPE811_IRQ_BASE TPS6591X_IRQ_END -#define STMPE811_IRQ_END (STMPE811_IRQ_BASE + 22) - -#define TDIODE_OFFSET (10000) /* in millicelsius */ - -/* Run framebuffer in VGA mode */ -#define TEGRA_FB_VGA - int apalis_t30_regulator_init(void); int apalis_t30_suspend_init(void); int apalis_t30_pinmux_init(void); diff --git a/arch/arm/mach-tegra/board-colibri_t30.h b/arch/arm/mach-tegra/board-colibri_t30.h index 838a00814530..5d944dac4966 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.h +++ b/arch/arm/mach-tegra/board-colibri_t30.h @@ -26,6 +26,27 @@ #include #include +/* Uncomment for camera interface support on Colibri Evaluation carrier + board */ +#ifdef CONFIG_TEGRA_CAMERA +#define COLIBRI_T30_VI +#endif + +/* Run framebuffer in VGA mode */ +#define TEGRA_FB_VGA + +/* Uncomment for Colibri T30 V1.0a prototypes */ +//#define COLIBRI_T30_V10 + +/* Uncomment for SD-card on SDMMC4B rather than SDMMC2 */ +//#define COLIBRI_T30_SDMMC4B + +/* STMPE811 IRQs */ +#define STMPE811_IRQ_BASE TEGRA_NR_IRQS +#define STMPE811_IRQ_END (STMPE811_IRQ_BASE + 22) + +#define TDIODE_OFFSET (10000) /* in millicelsius */ + /* External peripheral act as gpio */ /* TPS6591x GPIOs */ #define TPS6591X_GPIO_BASE TEGRA_NR_GPIOS @@ -43,29 +64,9 @@ /*****************Interrupt tables ******************/ /* External peripheral act as interrupt controller */ /* TPS6591x IRQs */ -#define TPS6591X_IRQ_BASE TEGRA_NR_IRQS +#define TPS6591X_IRQ_BASE STMPE811_IRQ_END #define TPS6591X_IRQ_END (TPS6591X_IRQ_BASE + 18) -/* STMPE811 IRQs */ -#define STMPE811_IRQ_BASE TPS6591X_IRQ_END -#define STMPE811_IRQ_END (STMPE811_IRQ_BASE + 22) - -/* Uncomment for SD-card on SDMMC4B rather than SDMMC2 */ -//#define COLIBRI_T30_SDMMC4B - -/* Uncomment for Colibri T30 V1.0a prototypes */ -//#define COLIBRI_T30_V10 - -/* Uncomment for camera interface support on Colibri Evaluation carrier board */ -#ifdef CONFIG_TEGRA_CAMERA -#define COLIBRI_T30_VI -#endif - -#define TDIODE_OFFSET (10000) /* in millicelsius */ - -/* Run framebuffer in VGA mode */ -#define TEGRA_FB_VGA - int colibri_t30_regulator_init(void); int colibri_t30_suspend_init(void); int colibri_t30_pinmux_init(void); -- cgit v1.2.3