Changeset 26224


Ignore:
Timestamp:
2011-03-18T14:04:02+01:00 (6 years ago)
Author:
kaloz
Message:

[pxa]: upgrade to 2.6.37

Location:
trunk/target/linux/pxa
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/pxa/Makefile

    r26124 r26224  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1313MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1414 
    15 LINUX_VERSION:=2.6.32.32 
     15LINUX_VERSION:=2.6.37.3 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/pxa/config-default

    r25928 r26224  
    7979# CONFIG_LEDS_GPIO is not set 
    8080CONFIG_MAC80211_DEFAULT_PS_VALUE=0 
     81# CONFIG_MACH_ARCOM_ZEUS is not set 
    8182# CONFIG_MACH_ARMCORE is not set 
    8283# CONFIG_MACH_BALLOON3 is not set 
     84# CONFIG_MACH_CAPC7117 is not set 
    8385# CONFIG_MACH_CM_X300 is not set 
    8486# CONFIG_MACH_COLIBRI300 is not set 
     
    9395# CONFIG_MACH_H5000 is not set 
    9496# CONFIG_MACH_HIMALAYA is not set 
     97# CONFIG_MACH_ICONTROL is not set 
    9598# CONFIG_MACH_INTELMOTE2 is not set 
    9699# CONFIG_MACH_LITTLETON is not set 
     
    101104# CONFIG_MACH_MP900C is not set 
    102105# CONFIG_MACH_PCM027 is not set 
     106# CONFIG_MACH_RAUMFELD_CONNECTOR is not set 
     107# CONFIG_MACH_RAUMFELD_RC is not set 
     108# CONFIG_MACH_RAUMFELD_SPEAKER is not set 
    103109# CONFIG_MACH_SAAR is not set 
    104110# CONFIG_MACH_STARGATE2 is not set 
    105111# CONFIG_MACH_TAVOREVB is not set 
     112# CONFIG_MACH_TAVOREVB3 is not set 
     113# CONFIG_MACH_VPAC270 is not set 
    106114# CONFIG_MACH_XCEP is not set 
     115# CONFIG_MACH_ZIPIT2 is not set 
    107116# CONFIG_MACH_ZYLONITE is not set 
     117# CONFIG_MACH_ZYLONITE300 is not set 
     118# CONFIG_MACH_ZYLONITE320 is not set 
    108119# CONFIG_MFD_T7L66XB is not set 
    109120CONFIG_MII=m 
    110121CONFIG_MMC_BLOCK=y 
    111122CONFIG_MMC_PXA=y 
     123# CONFIG_MMC_SDHCI_PXA is not set 
    112124CONFIG_MMC=y 
    113125CONFIG_MTD_CFI_ADV_OPTIONS=y 
  • trunk/target/linux/pxa/patches/001-gumstix_verdex_pro_arch_support.patch

    r19562 r26224  
    1818--- a/arch/arm/mach-pxa/Kconfig 
    1919+++ b/arch/arm/mach-pxa/Kconfig 
    20 @@ -32,23 +32,34 @@ endmenu 
    21  endif 
     20@@ -116,23 +116,34 @@ config MACH_CAPC7117 
     21        select PXA3xx 
    2222  
    2323 config ARCH_GUMSTIX 
     
    6464--- a/arch/arm/mach-pxa/Makefile 
    6565+++ b/arch/arm/mach-pxa/Makefile 
    66 @@ -25,7 +25,8 @@ obj-$(CONFIG_CPU_PXA320)      += pxa320.o 
    67  obj-$(CONFIG_CPU_PXA930)       += pxa930.o 
    68   
    69  # Specific board support 
     66@@ -49,7 +49,8 @@ endif 
     67 obj-$(CONFIG_MACH_EM_X270)     += em-x270.o 
     68 obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o 
     69 obj-$(CONFIG_MACH_CAPC7117)     += capc7117.o mxm8x10.o 
    7070-obj-$(CONFIG_ARCH_GUMSTIX)     += gumstix.o 
    7171+obj-$(CONFIG_MACH_GUMSTIX_F)   += gumstix.o 
     
    7373 obj-$(CONFIG_GUMSTIX_AM200EPD) += am200epd.o 
    7474 obj-$(CONFIG_GUMSTIX_AM300EPD) += am300epd.o 
    75  obj-$(CONFIG_ARCH_LUBBOCK)     += lubbock.o 
     75 obj-$(CONFIG_MACH_INTELMOTE2)  += stargate2.o 
    7676--- /dev/null 
    7777+++ b/arch/arm/mach-pxa/gumstix-verdex.c 
    78 @@ -0,0 +1,749 @@ 
     78@@ -0,0 +1,747 @@ 
    7979+/* 
    8080+ *  linux/arch/arm/mach-pxa/gumstix-verdex.c 
     
    817817+ 
    818818+MACHINE_START(GUMSTIX, "Gumstix verdex") 
    819 +    .phys_io        = 0x40000000, 
    820819+    .boot_params    = 0xa0000100, /* match u-boot bi_boot_params */ 
    821 +    .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc, 
    822820+    .map_io         = pxa_map_io, 
    823821+    .init_irq       = pxa27x_init_irq, 
  • trunk/target/linux/pxa/patches/002-verdex_lcd_support.patch

    r19562 r26224  
    1313--- a/drivers/video/Kconfig 
    1414+++ b/drivers/video/Kconfig 
    15 @@ -1772,6 +1772,37 @@ config FB_PXA 
     15@@ -1822,6 +1822,37 @@ config FB_PXA 
    1616          say M here and read <file:Documentation/kbuild/modules.txt>. 
    1717  
  • trunk/target/linux/pxa/patches/003-gumstix_h_verdex_pro_support.patch

    r19562 r26224  
    2424 /* BTRESET - Reset line to Bluetooth module, active low signal. */ 
    2525 #define GPIO_GUMSTIX_BTRESET          7 
    26 @@ -28,9 +31,18 @@ has detected a cable insertion; driven l 
    27   
    28  #else 
     26@@ -20,9 +23,18 @@ this moves to GPIO17 and GPIO37. */ 
     27 /* GPIOx - Connects to USB D+ and used as a pull-up after GPIOn 
     28 has detected a cable insertion; driven low otherwise. */ 
    2929  
    3030+#ifndef CONFIG_MACH_GUMSTIX_VERDEX 
     
    3535+#else 
    3636+ 
    37 +#define GPIO_GUMSTIX_USB_GPIOn         100 
    38 +#define GPIO_GUMSTIX_USB_GPIOx         27 
    39 + 
    40 +#endif 
    41 + 
    42  #endif 
    43   
     37+#define GPIO_GUMSTIX_USB_GPIOn         100 
     38+#define GPIO_GUMSTIX_USB_GPIOx         27 
     39+ 
     40+#endif 
     41+ 
    4442 /* usb state change */ 
    45 @@ -52,48 +64,136 @@ has detected a cable insertion; driven l 
     43 #define GUMSTIX_USB_INTR_IRQ           IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn) 
     44  
     45@@ -42,48 +54,136 @@ has detected a cable insertion; driven l 
    4646  * ETH_RST provides a hardware reset line to the ethernet chip 
    4747  * ETH is the IRQ line in from the ethernet chip to the PXA 
  • trunk/target/linux/pxa/patches/004-smsc911x_verdex_pro_support.patch

    r19562 r26224  
    1616--- a/drivers/net/smsc911x.c 
    1717+++ b/drivers/net/smsc911x.c 
    18 @@ -1181,7 +1181,7 @@ static int smsc911x_open(struct net_devi 
     18@@ -1189,7 +1189,7 @@ static int smsc911x_open(struct net_devi 
    1919                SMSC_WARNING(IFUP, 
    2020                        "Timed out waiting for EEPROM busy bit to clear"); 
     
    2525        /* The soft reset above cleared the device's MAC address, 
    2626         * restore it from local copy (set in probe) */ 
    27 @@ -1193,8 +1193,8 @@ static int smsc911x_open(struct net_devi 
     27@@ -1201,8 +1201,8 @@ static int smsc911x_open(struct net_devi 
    2828        smsc911x_reg_write(pdata, INT_EN, 0); 
    2929        smsc911x_reg_write(pdata, INT_STS, 0xFFFFFFFF); 
     
    3636        if (pdata->config.irq_polarity) { 
    3737                SMSC_TRACE(IFUP, "irq polarity: active high"); 
    38 @@ -1220,7 +1220,7 @@ static int smsc911x_open(struct net_devi 
     38@@ -1228,7 +1228,7 @@ static int smsc911x_open(struct net_devi 
    3939        temp |= INT_EN_SW_INT_EN_; 
    4040        smsc911x_reg_write(pdata, INT_EN, temp); 
     
    4545                if (pdata->software_irq_signal) 
    4646                        break; 
    47 @@ -1948,6 +1948,38 @@ static int __devexit smsc911x_drv_remove 
     47@@ -1946,6 +1946,38 @@ static int __devexit smsc911x_drv_remove 
    4848        return 0; 
    4949 } 
     
    8484 { 
    8585        struct net_device *dev; 
    86 @@ -2081,11 +2113,11 @@ static int __devinit smsc911x_drv_probe( 
     86@@ -2082,11 +2114,11 @@ static int __devinit smsc911x_drv_probe( 
    8787                        SMSC_TRACE(PROBE, 
    8888                                "Mac Address is read from LAN911x EEPROM"); 
  • trunk/target/linux/pxa/patches/005-verdex_pcmcia_support.patch

    r19562 r26224  
    1616--- a/drivers/pcmcia/Kconfig 
    1717+++ b/drivers/pcmcia/Kconfig 
    18 @@ -221,7 +221,8 @@ config PCMCIA_PXA2XX 
    19         depends on ARM && ARCH_PXA && PCMCIA 
     18@@ -215,7 +215,7 @@ config PCMCIA_PXA2XX 
    2019        depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ 
    2120                    || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \ 
    22 -                   || ARCH_VIPER || ARCH_PXA_ESERIES || MACH_STARGATE2) 
    23 +                   || ARCH_VIPER || ARCH_PXA_ESERIES || MACH_STARGATE2 \ 
    24 +                   || ARCH_GUMSTIX) 
     21                    || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \ 
     22-                   || MACH_VPAC270 || MACH_BALLOON3) 
     23+                   || MACH_VPAC270 || MACH_BALLOON3 || ARCH_GUMSTIX) 
     24        select PCMCIA_SOC_COMMON 
    2525        help 
    2626          Say Y here to include support for the PXA2xx PCMCIA controller 
    27   
    2827--- a/drivers/pcmcia/Makefile 
    2928+++ b/drivers/pcmcia/Makefile 
    30 @@ -77,4 +77,7 @@ pxa2xx-obj-$(CONFIG_MACH_PALMLD)              += pxa 
    31  pxa2xx-obj-$(CONFIG_MACH_E740)                 += pxa2xx_e740.o 
    32  pxa2xx-obj-$(CONFIG_MACH_STARGATE2)            += pxa2xx_stargate2.o 
     29@@ -71,6 +71,9 @@ pxa2xx-obj-$(CONFIG_MACH_STARGATE2)           += 
     30 pxa2xx-obj-$(CONFIG_MACH_VPAC270)              += pxa2xx_vpac270.o 
     31 pxa2xx-obj-$(CONFIG_MACH_BALLOON3)             += pxa2xx_balloon3.o 
    3332  
    3433+pxa2xx-obj-$(CONFIG_MACH_GUMSTIX_VERDEX)       += pxa2xx_cs.o 
    3534+pxa2xx_cs-objs                                 := pxa2xx_gumstix.o 
    3635+ 
    37  obj-$(CONFIG_PCMCIA_PXA2XX)                    += pxa2xx_core.o $(pxa2xx-obj-y) 
     36 obj-$(CONFIG_PCMCIA_PXA2XX)                    += pxa2xx_base.o $(pxa2xx-obj-y) 
     37  
     38 obj-$(CONFIG_PCMCIA_XXS1500)                   += xxs1500_ss.o 
    3839--- /dev/null 
    3940+++ b/drivers/pcmcia/pxa2xx_gumstix.c 
Note: See TracChangeset for help on using the changeset viewer.