[Balloon-svn] r1932 - balloon/branches/menuconfig2/package/k…

Author: nick
Date: 2012-07-23 17:58:42 +0100 (Mon, 23 Jul 2012)
New Revision: 1932

Modified:
balloon/branches/menuconfig2/package/kernel/patches/3.5/balloon3config-bubble-sl40
balloon/branches/menuconfig2/package/kernel/patches/3.5/series-balloon3-bubble-sl40
balloon/branches/menuconfig2/package/kernel/patches/3.5/spi_tt.patch
Log:
update sl40b

Modified: balloon/branches/menuconfig2/package/kernel/patches/3.5/balloon3config-bubble-sl40
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/3.5/balloon3config-bubble-sl40    2012-07-23 13:49:28 UTC (rev 1931)
+++ balloon/branches/menuconfig2/package/kernel/patches/3.5/balloon3config-bubble-sl40    2012-07-23 16:58:42 UTC (rev 1932)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.39.4 Kernel Configuration
-# Fri Jun 22 10:24:04 2012
+# Tue Jul 10 15:02:21 2012
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -305,17 +305,18 @@
 CONFIG_BALLOON3_BATT_FAULT_IRQ=y
 # CONFIG_BALLOON3_POWER_FAULT_DEEP_SLEEP is not set
 # CONFIG_BALLOON3_POWER_FAULT_IMPRECISE_ABORT is not set
-# CONFIG_BALLOON3_BATT_FAULT_IRQ_DEEP_SLEEP is not set
+CONFIG_BALLOON3_BATT_FAULT_IRQ_DEEP_SLEEP=y

#
# Balloon LCD panel support
#
-# CONFIG_BALLOON3_TT is not set
+CONFIG_BALLOON3_TT=y
# CONFIG_BALLOON3_SPECS is not set
# CONFIG_BALLOON3_TOPPOLY is not set
# CONFIG_BALLOON3_VGA is not set
# CONFIG_BALLOON3_SVGA is not set
CONFIG_BALLOON3_LCD_NONE=y
+# CONFIG_BALLOON3_LCD_TT is not set
# CONFIG_MACH_CSB726 is not set
# CONFIG_MACH_ARMCORE is not set
# CONFIG_MACH_EM_X270 is not set
@@ -1032,7 +1033,7 @@
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_TT is not set
+CONFIG_KEYBOARD_TT=y
CONFIG_INPUT_MOUSE=y
# CONFIG_MOUSE_PS2 is not set
# CONFIG_MOUSE_SERIAL is not set
@@ -1161,9 +1162,8 @@
CONFIG_SAMOSA=y
# CONFIG_PROC_SAMOSA is not set
# CONFIG_PROC_SAMOSA_HAPTIC is not set
-CONFIG_MINIPUG=m
-CONFIG_MINIPUG_ANIMATE=m
-# CONFIG_SSD1305 is not set
+CONFIG_SSD1305=y
+# CONFIG_SSD1305_ANIMATE is not set
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
@@ -1219,7 +1219,7 @@
# CONFIG_SPI_PXA2XX_PCI is not set
CONFIG_SPI_TT=y
CONFIG_SPI_TT_TIMEOUT_RESET=y
-CONFIG_SPI_SL40=y
+# CONFIG_SPI_SL40 is not set
# CONFIG_SPI_XILINX is not set
# CONFIG_SPI_DESIGNWARE is not set

@@ -1289,7 +1289,8 @@
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_GPIO is not set
-# CONFIG_BATTERY_TT is not set
+CONFIG_BATTERY_TT=y
+CONFIG_BATTERY_TT_LED=y
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
# CONFIG_WATCHDOG is not set
@@ -1330,9 +1331,9 @@
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
CONFIG_FB_SYS_FILLRECT=m
CONFIG_FB_SYS_COPYAREA=m
@@ -1353,7 +1354,13 @@
# CONFIG_FB_S6D04K1 is not set
# CONFIG_FB_UVESA is not set
# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_PXA is not set
+CONFIG_FB_PXA=y
+# CONFIG_FB_PXA_OVERLAY is not set
+# CONFIG_FB_PXA_SMARTPANEL is not set
+CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_PXA_INTERNAL_MEMORY is not set
+# CONFIG_PXA3XX_GCU is not set
+# CONFIG_FB_SSD1305 is not set
# CONFIG_FB_MBX is not set
# CONFIG_FB_W100 is not set
CONFIG_FB_UDL=m
@@ -1361,19 +1368,49 @@
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_BALLOON3=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set

#
# Display device support
#
-# CONFIG_DISPLAY_SUPPORT is not set
+CONFIG_DISPLAY_SUPPORT=y

#
+# Display hardware drivers
+#
+CONFIG_S6D04K1_DISPLAY=y
+
+#
# Console display driver support
#
CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
-# CONFIG_LOGO is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+CONFIG_FB_LOGO_ANIMATE=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+CONFIG_LOGO_TT_CLUT224=y
+CONFIG_LOGO_TT_ANIMATE=y
+# CONFIG_LOGO_TCL_CLUT224 is not set
CONFIG_SOUND=m
# CONFIG_SOUND_OSS_CORE is not set
CONFIG_SND=m
@@ -1725,7 +1762,7 @@
# CONFIG_LEDS_LM3530 is not set
# CONFIG_LEDS_PCA9532 is not set
CONFIG_LEDS_GPIO=y
-# CONFIG_LEDS_SAMOSA is not set
+CONFIG_LEDS_SAMOSA=y
CONFIG_LEDS_GPIO_PLATFORM=y
# CONFIG_LEDS_LP3944 is not set
# CONFIG_LEDS_LP5521 is not set
@@ -1792,7 +1829,7 @@
#
# CONFIG_RTC_DRV_M41T94 is not set
# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
+CONFIG_RTC_DRV_DS1390=y
# CONFIG_RTC_DRV_MAX6902 is not set
# CONFIG_RTC_DRV_R9701 is not set
# CONFIG_RTC_DRV_RS5C348 is not set

Modified: balloon/branches/menuconfig2/package/kernel/patches/3.5/series-balloon3-bubble-sl40
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/3.5/series-balloon3-bubble-sl40    2012-07-23 13:49:28 UTC (rev 1931)
+++ balloon/branches/menuconfig2/package/kernel/patches/3.5/series-balloon3-bubble-sl40    2012-07-23 16:58:42 UTC (rev 1932)
@@ -15,12 +15,12 @@
 balloon3-backlight-tt.patch
 logo_tt.patch
 keyboard-tt.patch
-ssd1305.patch
-s6d04k1.patch
-ssd1305fb.patch
+#ssd1305.patch
+#s6d04k1.patch
+#ssd1305fb.patch
 vt.patch
 battery-tt.patch
-pxafb_internal_ram.patch
+#pxafb_internal_ram.patch
 spi_tt.patch
 usb_gadget_vbus.patch
 wm8960.patch

Modified: balloon/branches/menuconfig2/package/kernel/patches/3.5/spi_tt.patch
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/3.5/spi_tt.patch    2012-07-23 13:49:28 UTC (rev 1931)
+++ balloon/branches/menuconfig2/package/kernel/patches/3.5/spi_tt.patch    2012-07-23 16:58:42 UTC (rev 1932)
@@ -1,7 +1,7 @@
-Index: linux-3.5-rc6/drivers/spi/Kconfig
+Index: linux-3.5/drivers/spi/Kconfig
 ===================================================================
---- linux-3.5-rc6.orig/drivers/spi/Kconfig    2012-07-07 18:23:56.000000000 -0600
-+++ linux-3.5-rc6/drivers/spi/Kconfig    2012-07-14 16:34:00.000000000 -0600
+--- linux-3.5.orig/drivers/spi/Kconfig    2012-07-21 21:58:29.000000000 +0100
++++ linux-3.5/drivers/spi/Kconfig    2012-07-23 15:03:32.000000000 +0100
 @@ -378,6 +378,26 @@
        This driver also supports the ML7213/ML7223/ML7831, a companion chip
        for the Atom E6xx series and compatible with the Intel EG20T PCH.
@@ -29,10 +29,10 @@
  config SPI_TXX9
      tristate "Toshiba TXx9 SPI controller"
      depends on GENERIC_GPIO && CPU_TX49XX
-Index: linux-3.5-rc6/drivers/spi/Makefile
+Index: linux-3.5/drivers/spi/Makefile
 ===================================================================
---- linux-3.5-rc6.orig/drivers/spi/Makefile    2012-07-07 18:23:56.000000000 -0600
-+++ linux-3.5-rc6/drivers/spi/Makefile    2012-07-14 16:34:00.000000000 -0600
+--- linux-3.5.orig/drivers/spi/Makefile    2012-07-21 21:58:29.000000000 +0100
++++ linux-3.5/drivers/spi/Makefile    2012-07-23 15:03:32.000000000 +0100
 @@ -36,6 +36,7 @@
  obj-$(CONFIG_SPI_MPC52xx_PSC)        += spi-mpc52xx-psc.o
  obj-$(CONFIG_SPI_MPC52xx)        += spi-mpc52xx.o
@@ -41,10 +41,10 @@
  obj-$(CONFIG_SPI_OC_TINY)        += spi-oc-tiny.o
  obj-$(CONFIG_SPI_OMAP_UWIRE)        += spi-omap-uwire.o
  obj-$(CONFIG_SPI_OMAP_100K)        += spi-omap-100k.o
-Index: linux-3.5-rc6/drivers/spi/spi_tt.c
+Index: linux-3.5/drivers/spi/spi_tt.c
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.5-rc6/drivers/spi/spi_tt.c    2012-07-14 16:34:00.000000000 -0600
++++ linux-3.5/drivers/spi/spi_tt.c    2012-07-23 15:03:32.000000000 +0100
 @@ -0,0 +1,294 @@
 +/*
 + * Copyright 20011 Toby Churchill Ltd
@@ -340,17 +340,18 @@
 +MODULE_DESCRIPTION("SPI Master Controller driver for Toby Churchill TT");
 +MODULE_AUTHOR("Nick Bane");
 +MODULE_LICENSE("GPL");
-Index: linux-3.5-rc6/include/linux/spi/spi_tt.h
+Index: linux-3.5/include/linux/spi/spi_tt.h
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.5-rc6/include/linux/spi/spi_tt.h    2012-07-14 16:34:00.000000000 -0600
-@@ -0,0 +1,92 @@
++++ linux-3.5/include/linux/spi/spi_tt.h    2012-07-23 15:47:41.000000000 +0100
+@@ -0,0 +1,93 @@
 +#ifndef SPI_TT_H
 +#define SPI_TT_H
 +
 +#include "mach/balloon3.h"
 +
-+#ifdef CONFIG_SPI_SL40
++//#ifdef CONFIG_SPI_SL40
++#if 0
 +
 +#define SAMOSA_ADDR_SPI_DATA 0x046
 +#define SAMOSA_ADDR_SPI_STATUS 0x047
@@ -437,10 +438,10 @@
 +
 +
 +#endif
-Index: linux-3.5-rc6/arch/arm/mach-pxa/balloon3.c
+Index: linux-3.5/arch/arm/mach-pxa/balloon3.c
 ===================================================================
---- linux-3.5-rc6.orig/arch/arm/mach-pxa/balloon3.c    2012-07-14 16:33:59.000000000 -0600
-+++ linux-3.5-rc6/arch/arm/mach-pxa/balloon3.c    2012-07-14 16:35:12.000000000 -0600
+--- linux-3.5.orig/arch/arm/mach-pxa/balloon3.c    2012-07-23 15:03:32.000000000 +0100
++++ linux-3.5/arch/arm/mach-pxa/balloon3.c    2012-07-23 15:03:32.000000000 +0100
 @@ -55,6 +55,12 @@
  #include <mach/irda.h>
  #include <mach/ohci.h>