Author: nick
Date: 2012-01-30 16:35:54 +0000 (Mon, 30 Jan 2012)
New Revision: 1836
Modified:
balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-displays.patch
Log:
fixup typos
Modified: balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-displays.patch
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-displays.patch 2012-01-30 16:35:35 UTC (rev 1835)
+++ balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-displays.patch 2012-01-30 16:35:54 UTC (rev 1836)
@@ -9,111 +9,20 @@
Index: linux-2.6.39.4/arch/arm/mach-pxa/Kconfig
===================================================================
---- linux-2.6.39.4.orig/arch/arm/mach-pxa/Kconfig 2011-12-29 11:48:47.000000000 +0000
-+++ linux-2.6.39.4/arch/arm/mach-pxa/Kconfig 2011-12-29 11:48:53.000000000 +0000
-@@ -56,6 +56,7 @@
-
+--- linux-2.6.39.4.orig/arch/arm/mach-pxa/Kconfig 2012-01-26 14:02:20.000000000 +0000
++++ linux-2.6.39.4/arch/arm/mach-pxa/Kconfig 2012-01-30 10:35:19.000000000 +0000
+@@ -57,6 +57,7 @@
comment "Third Party Dev Platforms (sorted by vendor name)"
+
+
config ARCH_PXA_IDP
bool "Accelent Xscale IDP"
select PXA25x
-@@ -88,6 +89,90 @@
- Say Y here if you have the reduced feature
- set Bubble Balloon3 variant
-
-+menu "Balloon LCD panel support"
-+ depends on MACH_BALLOON3
-+
-+config BALLOON3_TT
-+ bool "TT LCD panel on Balloon3 Bubble"
-+ depends on MACH_BALLOON3 && MACH_BALLOON3_BUBBLE
-+ select FB
-+ select FB_PXA
-+ select FB_PXA_PARAMETERS
-+ help
-+ Say Y to add support for the TT
-+ QVGA LCD display on a Balloon3 Bubble TT board
-+
-+config BALLOON3_SPECS
-+ bool "SPECS LCD panel on Balloon3"
-+ depends on MACH_BALLOON3
-+ select FB
-+ select FB_PXA
-+ select FB_PXA_PARAMETERS
-+ help
-+ Say Y to add support for the SPECS
-+ QVGA LCD display on a Balloon3 board
-+
-+config BALLOON3_TOPPOLY
-+ bool "Toppoly LCD panel on Balloon3"
-+ depends on MACH_BALLOON3
-+ select FB
-+ select FB_PXA
-+ select FB_PXA_PARAMETERS
-+ help
-+ Say Y to add support for Toppoly 600x800 panel
-+ on a Balloon3 board
-+
-+config BALLOON3_VGA
-+ bool "VGA (640x480 62Hz) monitor output"
-+ depends on MACH_BALLOON3
-+ select FB
-+ select FB_PXA
-+ select FB_PXA_PARAMETERS
-+ help
-+ Say Y to add support for VGA output
-+ on a Balloon3 board
-+
-+config BALLOON3_SVGA
-+ bool "SVGA (800x600 52Hz) monitor output"
-+ depends on MACH_BALLOON3
-+ select FB
-+ select FB_PXA
-+ select FB_PXA_PARAMETERS
-+ help
-+ Say Y to add support for SVGA output
-+ on a Balloon3 board
-+
-+choice
-+ prompt "Default lcd panel"
-+ default BALLOON3_LCD_NONE
-+
-+config BALLOON3_LCD_NONE
-+ bool "No LCD panel"
-+
-+config BALLOON3_LCD_TT
-+ depends on BALLOON3_TT
-+ bool "TT LCD panel"
-+
-+config BALLOON3_LCD_SPECS
-+ depends on BALLOON3_SPECS
-+ bool "SPECS LCD panel"
-+
-+config BALLOON3_LCD_TOPPOLY
-+ depends on BALLOON3_TOPPOLY
-+ bool "TOPPOLY LCD panel"
-+
-+config BALLOON3_LCD_VGA
-+ depends on BALLOON3_VGA
-+ bool "VGA LCD panel"
-+
-+config BALLOON3_LCD_SVGA
-+ depends on BALLOON3_SVGA
-+ bool "SVGA LCD panel"
-+
-+endchoice
-+
-+endmenu
-+
- config MACH_CSB726
- bool "Enable Cogent CSB726 System On a Module"
- select PXA27x
Index: linux-2.6.39.4/drivers/video/pxafb.c
===================================================================
---- linux-2.6.39.4.orig/drivers/video/pxafb.c 2011-12-29 11:48:41.000000000 +0000
-+++ linux-2.6.39.4/drivers/video/pxafb.c 2011-12-29 11:48:53.000000000 +0000
+--- linux-2.6.39.4.orig/drivers/video/pxafb.c 2012-01-26 14:03:56.000000000 +0000
++++ linux-2.6.39.4/drivers/video/pxafb.c 2012-01-30 10:34:06.000000000 +0000
@@ -60,6 +60,7 @@
#include <asm/irq.h>
#include <asm/div64.h>
@@ -173,8 +82,8 @@
#define pxafb_check_options(...) do {} while (0)
Index: linux-2.6.39.4/arch/arm/mach-pxa/include/mach/pxafb.h
===================================================================
---- linux-2.6.39.4.orig/arch/arm/mach-pxa/include/mach/pxafb.h 2011-12-29 11:48:41.000000000 +0000
-+++ linux-2.6.39.4/arch/arm/mach-pxa/include/mach/pxafb.h 2011-12-29 11:48:53.000000000 +0000
+--- linux-2.6.39.4.orig/arch/arm/mach-pxa/include/mach/pxafb.h 2012-01-26 14:03:56.000000000 +0000
++++ linux-2.6.39.4/arch/arm/mach-pxa/include/mach/pxafb.h 2012-01-26 14:04:28.000000000 +0000
@@ -61,6 +61,7 @@
#define LCD_PCLK_EDGE_RISE (0 << 19)
#define LCD_PCLK_EDGE_FALL (1 << 19)
@@ -195,8 +104,8 @@
void (*pxafb_backlight_power)(int);
Index: linux-2.6.39.4/arch/arm/mach-pxa/include/mach/regs-lcd.h
===================================================================
---- linux-2.6.39.4.orig/arch/arm/mach-pxa/include/mach/regs-lcd.h 2011-12-29 11:48:41.000000000 +0000
-+++ linux-2.6.39.4/arch/arm/mach-pxa/include/mach/regs-lcd.h 2011-12-29 11:48:53.000000000 +0000
+--- linux-2.6.39.4.orig/arch/arm/mach-pxa/include/mach/regs-lcd.h 2012-01-26 14:03:56.000000000 +0000
++++ linux-2.6.39.4/arch/arm/mach-pxa/include/mach/regs-lcd.h 2012-01-26 14:04:28.000000000 +0000
@@ -46,6 +46,41 @@
#define LCCR4_PAL_FOR_2 (2 << 15)
#define LCCR4_PAL_FOR_3 (3 << 15)
@@ -241,8 +150,8 @@
#define FDADR1 (0x210) /* DMA Channel 1 Frame Descriptor Address Register */
Index: linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c
===================================================================
---- linux-2.6.39.4.orig/arch/arm/mach-pxa/balloon3.c 2011-12-29 11:48:52.000000000 +0000
-+++ linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c 2011-12-29 11:49:06.000000000 +0000
+--- linux-2.6.39.4.orig/arch/arm/mach-pxa/balloon3.c 2012-01-26 14:04:28.000000000 +0000
++++ linux-2.6.39.4/arch/arm/mach-pxa/balloon3.c 2012-01-30 10:34:04.000000000 +0000
@@ -222,8 +222,24 @@
GPIO99_GPIO | MFP_LPM_DRIVE_LOW,
};
(text/plain)
