From 009e6229134cffa05aafb780362b7c5480ec7a16 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 22 Jan 2014 18:23:26 +0100 Subject: colibri_t20/colibri_t30/apalis_t30: remove TEGRA_FB_VGA defines Remove TEGRA_FB_VGA defines and use VGA as default. Since initial mode is now configureable through kernel cmd line parameter, we don't need those compile time helpers. --- arch/arm/mach-tegra/board-apalis_t30-panel.c | 19 ------------------- arch/arm/mach-tegra/board-apalis_t30.h | 3 --- arch/arm/mach-tegra/board-colibri_t20-panel.c | 8 -------- arch/arm/mach-tegra/board-colibri_t20.h | 3 --- arch/arm/mach-tegra/board-colibri_t30-panel.c | 12 ------------ arch/arm/mach-tegra/board-colibri_t30.h | 3 --- 6 files changed, 48 deletions(-) diff --git a/arch/arm/mach-tegra/board-apalis_t30-panel.c b/arch/arm/mach-tegra/board-apalis_t30-panel.c index 289ed2a5a6f6..1be339dce6ef 100644 --- a/arch/arm/mach-tegra/board-apalis_t30-panel.c +++ b/arch/arm/mach-tegra/board-apalis_t30-panel.c @@ -215,22 +215,11 @@ static struct resource apalis_t30_disp2_resources[] = { #ifdef CONFIG_TEGRA_DC static struct tegra_fb_data apalis_t30_fb_data = { .win = 0, -#ifdef TEGRA_FB_VGA - .xres = 640, - .yres = 480, -#else /* TEGRA_FB_VGA */ - .xres = 1920, - .yres = 1080, -#endif /* TEGRA_FB_VGA */ - .bits_per_pixel = 16, .flags = TEGRA_FB_FLIP_ON_PROBE, }; static struct tegra_fb_data apalis_t30_hdmi_fb_data = { .win = 0, - .xres = 640, - .yres = 480, - .bits_per_pixel = 16, .flags = TEGRA_FB_FLIP_ON_PROBE, }; @@ -259,11 +248,7 @@ static struct tegra_dc_out apalis_t30_disp1_out = { .depth = 24, .dither = TEGRA_DC_ORDERED_DITHER, -#ifdef TEGRA_FB_VGA .default_mode = "640x480-16@60", -#else /* TEGRA_FB_VGA */ - .default_mode = "1920x1080-16@60", -#endif /* TEGRA_FB_VGA */ .out_pins = apalis_t30_dc_out_pins, .n_out_pins = ARRAY_SIZE(apalis_t30_dc_out_pins), @@ -282,11 +267,7 @@ static struct tegra_dc_out apalis_t30_disp2_out = { .max_pixclock = KHZ2PICOS(148500), -#ifdef TEGRA_FB_VGA .default_mode = "640x480-16@60", -#else /* TEGRA_FB_VGA */ - .default_mode = "1920x1080-16@60", -#endif /* TEGRA_FB_VGA */ .align = TEGRA_DC_ALIGN_MSB, .order = TEGRA_DC_ORDER_RED_BLUE, diff --git a/arch/arm/mach-tegra/board-apalis_t30.h b/arch/arm/mach-tegra/board-apalis_t30.h index 8c11647b8319..9fde9ef1d89e 100644 --- a/arch/arm/mach-tegra/board-apalis_t30.h +++ b/arch/arm/mach-tegra/board-apalis_t30.h @@ -26,9 +26,6 @@ #include #include -/* Run framebuffer in VGA mode */ -//#define TEGRA_FB_VGA - /* GPIO */ #define APALIS_GPIO1 TEGRA_GPIO_PS2 diff --git a/arch/arm/mach-tegra/board-colibri_t20-panel.c b/arch/arm/mach-tegra/board-colibri_t20-panel.c index 8d8b9e74c58c..c4746590d209 100644 --- a/arch/arm/mach-tegra/board-colibri_t20-panel.c +++ b/arch/arm/mach-tegra/board-colibri_t20-panel.c @@ -246,17 +246,9 @@ static struct tegra_dc_out colibri_t20_disp1_out = { /* Use 32-bit depth for android builds */ #ifdef CONFIG_ANDROID -#ifdef TEGRA_FB_VGA .default_mode = "640x480-32@60", -#else /* TEGRA_FB_VGA */ - .default_mode = "800x480-32@60", -#endif /* TEGRA_FB_VGA */ #else /* CONFIG_ANDROID */ -#ifdef TEGRA_FB_VGA .default_mode = "640x480-16@60", -#else /* TEGRA_FB_VGA */ - .default_mode = "800x480-16@60", -#endif /* TEGRA_FB_VGA */ #endif /* CONFIG_ANDROID */ .out_pins = colibri_t20_dc_out_pins, diff --git a/arch/arm/mach-tegra/board-colibri_t20.h b/arch/arm/mach-tegra/board-colibri_t20.h index c7f2c5dcad33..23e9cdbda749 100644 --- a/arch/arm/mach-tegra/board-colibri_t20.h +++ b/arch/arm/mach-tegra/board-colibri_t20.h @@ -23,9 +23,6 @@ #define COLIBRI_T20_VI #endif -/* Run framebuffer in VGA mode */ -#define TEGRA_FB_VGA - /* Uncomment to activate 32-bit GMI address/databus */ //#define GMI_32BIT diff --git a/arch/arm/mach-tegra/board-colibri_t30-panel.c b/arch/arm/mach-tegra/board-colibri_t30-panel.c index cc61b83a07b2..14c711039f41 100644 --- a/arch/arm/mach-tegra/board-colibri_t30-panel.c +++ b/arch/arm/mach-tegra/board-colibri_t30-panel.c @@ -251,17 +251,9 @@ static struct tegra_dc_out colibri_t30_disp1_out = { /* Use 32-bit depth for android builds */ #ifdef CONFIG_ANDROID -#ifdef TEGRA_FB_VGA .default_mode = "640x480-32@60", -#else /* TEGRA_FB_VGA */ - .default_mode = "800x480-32@60", -#endif /* TEGRA_FB_VGA */ #else /* CONFIG_ANDROID */ -#ifdef TEGRA_FB_VGA .default_mode = "640x480-16@60", -#else /* TEGRA_FB_VGA */ - .default_mode = "800x480-16@60", -#endif /* TEGRA_FB_VGA */ #endif /* CONFIG_ANDROID */ .out_pins = colibri_t30_dc_out_pins, @@ -285,11 +277,7 @@ static struct tegra_dc_out colibri_t30_disp2_out = { #ifdef CONFIG_ANDROID .default_mode = "1920x1080-32@60", #else /* CONFIG_ANDROID */ -#ifdef TEGRA_FB_VGA .default_mode = "640x480-16@60", -#else /* TEGRA_FB_VGA */ - .default_mode = "1920x1080-16@60", -#endif /* TEGRA_FB_VGA */ #endif /* CONFIG_ANDROID */ .align = TEGRA_DC_ALIGN_MSB, diff --git a/arch/arm/mach-tegra/board-colibri_t30.h b/arch/arm/mach-tegra/board-colibri_t30.h index 21de318173ea..85563fe222ba 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.h +++ b/arch/arm/mach-tegra/board-colibri_t30.h @@ -32,9 +32,6 @@ #define COLIBRI_T30_VI #endif -/* Run framebuffer in VGA mode */ -#define TEGRA_FB_VGA - /* GPIO */ #define DDC_SCL TEGRA_GPIO_PV4 /* X2-15 */ -- cgit v1.2.3