Changeset 29730
- Timestamp:
- 2012-01-13T15:55:07+01:00 (6 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 1 edited
- 124 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/kernel-version.mk
r29726 r29730 36 36 LINUX_KERNEL_MD5SUM:=4e387a49cde20805955c905bc8c311e0 37 37 endif 38 ifeq ($(LINUX_VERSION),3.2.1) 39 LINUX_KERNEL_MD5SUM:=090eb3dae0f520f7770f85193e931ad3 40 endif 38 41 39 42 # disable the md5sum check for unknown kernel versions -
trunk/target/linux/generic/config-3.2
r29729 r29730 179 179 # CONFIG_BDI_SWITCH is not set 180 180 # CONFIG_BE2ISCSI is not set 181 # CONFIG_BE2NET is not set 181 182 # CONFIG_BEFS_FS is not set 182 183 # CONFIG_BFS_FS is not set … … 265 266 # CONFIG_BNA is not set 266 267 # CONFIG_BNX2 is not set 268 # CONFIG_BNX2X is not set 267 269 # CONFIG_BONDING is not set 268 270 # CONFIG_BOOT_PRINTK_DELAY is not set … … 475 477 # CONFIG_CRYPTO_TWOFISH_586 is not set 476 478 # CONFIG_CRYPTO_TWOFISH_COMMON is not set 479 # CONFIG_CRYPTO_USER is not set 477 480 # CONFIG_CRYPTO_USER_API_HASH is not set 478 481 # CONFIG_CRYPTO_USER_API_SKCIPHER is not set … … 515 518 # CONFIG_DEBUG_PAGEALLOC is not set 516 519 # CONFIG_DEBUG_PER_CPU_MAPS is not set 517 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set 520 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set 518 521 # CONFIG_DEBUG_PREEMPT is not set 519 522 # CONFIG_DEBUG_RODATA is not set … … 564 567 # CONFIG_DM_RAID is not set 565 568 # CONFIG_DM_FLAKEY is not set 569 # CONFIG_DM_THIN_PROVISIONING is not set 566 570 # CONFIG_DNET is not set 567 571 # CONFIG_DNOTIFY is not set … … 595 599 # CONFIG_ENC28J60 is not set 596 600 # CONFIG_ENCLOSURE_SERVICES is not set 601 # CONFIG_ENIC is not set 597 602 # CONFIG_EPIC100 is not set 598 603 CONFIG_EPOLL=y 599 604 # CONFIG_EQUALIZER is not set 600 605 # CONFIG_ET131X is not set 606 CONFIG_ETHERNET=y 601 607 # CONFIG_ETHOC is not set 602 608 CONFIG_EVENTFD=y … … 701 707 CONFIG_FRAME_WARN=1024 702 708 # CONFIG_FREEZER is not set 709 # CONFIG_FRONTSWAP is not set 703 710 # CONFIG_FSCACHE is not set 704 711 CONFIG_FSNOTIFY=y … … 805 812 # CONFIG_HID_PICOLCD is not set 806 813 # CONFIG_HID_PID is not set 814 # CONFIG_HID_PRIMAX is not set 807 815 # CONFIG_HID_PRODIKEYS is not set 808 816 # CONFIG_HID_QUANTA is not set … … 883 891 # CONFIG_I2C_DEBUG_CORE is not set 884 892 # CONFIG_I2C_DESIGNWARE is not set 893 # CONFIG_I2C_DESIGNWARE_PCI is not set 885 894 # CONFIG_I2C_DIOLAN_U2C is not set 886 895 # CONFIG_I2C_EG20T is not set … … 1004 1013 # CONFIG_INPUT_ATI_REMOTE2 is not set 1005 1014 # CONFIG_INPUT_ATLAS_BTNS is not set 1015 # CONFIG_INPUT_BMA150 is not set 1006 1016 # CONFIG_INPUT_CMA3000 is not set 1007 1017 # CONFIG_INPUT_CM109 is not set … … 1156 1166 # CONFIG_IWMC3200TOP is not set 1157 1167 # CONFIG_IXGB is not set 1168 # CONFIG_IXGBE is not set 1158 1169 # CONFIG_JBD is not set 1159 1170 # CONFIG_JBD2_DEBUG is not set … … 1211 1222 # CONFIG_KEYBOARD_SUNKBD is not set 1212 1223 # CONFIG_KEYBOARD_TCA6416 is not set 1224 # CONFIG_KEYBOARD_TCA8418 is not set 1213 1225 # CONFIG_KEYBOARD_XTKBD is not set 1214 1226 # CONFIG_KEYS is not set … … 1377 1389 # CONFIG_MISDN_W6692 is not set 1378 1390 # CONFIG_MKISS is not set 1391 # CONFIG_MLX4_EN is not set 1379 1392 # CONFIG_MMC is not set 1380 1393 # CONFIG_MMC_ARMMMCI is not set … … 1443 1456 # CONFIG_MTD_DOC2001 is not set 1444 1457 # CONFIG_MTD_DOC2001PLUS is not set 1458 # CONFIG_MTD_DOCG3 is not set 1445 1459 CONFIG_MTD_GEN_PROBE=y 1446 1460 # CONFIG_MTD_GPIO_ADDR is not set … … 1608 1622 # CONFIG_NET_CLS_TCINDEX is not set 1609 1623 # CONFIG_NET_CLS_U32 is not set 1624 CONFIG_NET_CORE=y 1610 1625 # CONFIG_NET_DROP_MONITOR is not set 1611 1626 # CONFIG_NET_DSA is not set … … 1632 1647 # CONFIG_NET_KEY is not set 1633 1648 # CONFIG_NET_KEY_MIGRATE is not set 1649 # CONFIG_NET_PACKET_ENGINE is not set 1634 1650 CONFIG_NET_PCI=y 1635 1651 # CONFIG_NET_PCMCIA is not set … … 1662 1678 # CONFIG_NET_SCH_TEQL is not set 1663 1679 # CONFIG_NET_TULIP is not set 1664 # CONFIG_NET_VENDOR_3COM is not set 1680 CONFIG_NET_VENDOR_3COM=y 1681 CONFIG_NET_VENDOR_8390=y 1682 CONFIG_NET_VENDOR_ADAPTEC=y 1683 CONFIG_NET_VENDOR_ALTEON=y 1684 CONFIG_NET_VENDOR_AMD=y 1685 CONFIG_NET_VENDOR_ATHEROS=y 1686 CONFIG_NET_VENDOR_BROADCOM=y 1687 CONFIG_NET_VENDOR_BROCADE=y 1688 CONFIG_NET_VENDOR_CHELSIO=y 1689 CONFIG_NET_VENDOR_CISCO=y 1690 CONFIG_NET_VENDOR_DEC=y 1691 CONFIG_NET_VENDOR_DLINK=y 1692 CONFIG_NET_VENDOR_EMULEX=y 1693 CONFIG_NET_VENDOR_EXAR=y 1694 CONFIG_NET_VENDOR_FUJITSU=y 1695 CONFIG_NET_VENDOR_HP=y 1696 CONFIG_NET_VENDOR_INTEL=y 1697 CONFIG_NET_VENDOR_I825XX=y 1698 CONFIG_NET_VENDOR_MARVELL=y 1699 CONFIG_NET_VENDOR_MELLANOX=y 1700 CONFIG_NET_VENDOR_MICREL=y 1701 CONFIG_NET_VENDOR_MICROCHIP=y 1702 CONFIG_NET_VENDOR_MYRI=y 1703 CONFIG_NET_VENDOR_NATSEMI=y 1704 CONFIG_NET_VENDOR_NVIDIA=y 1705 CONFIG_NET_VENDOR_OKI=y 1706 CONFIG_NET_VENDOR_QLOGIC=y 1707 CONFIG_NET_VENDOR_REALTEK=y 1708 CONFIG_NET_VENDOR_RDC=y 1709 CONFIG_NET_VENDOR_SEEQ=y 1710 CONFIG_NET_VENDOR_SILAN=y 1711 CONFIG_NET_VENDOR_SIS=y 1712 CONFIG_NET_VENDOR_SMSC=y 1713 CONFIG_NET_VENDOR_STMICRO=y 1714 CONFIG_NET_VENDOR_SUN=y 1715 CONFIG_NET_VENDOR_TEHUTI=y 1716 CONFIG_NET_VENDOR_TI=y 1717 CONFIG_NET_VENDOR_VIA=y 1718 CONFIG_NET_VENDOR_XIRCOM=y 1665 1719 CONFIG_NEW_LEDS=y 1666 1720 # CONFIG_NFC_DEVICES is not set … … 1718 1772 # CONFIG_NF_NAT_TFTP is not set 1719 1773 # CONFIG_NILFS2_FS is not set 1774 # CONFIG_NIU is not set 1720 1775 CONFIG_NLATTR=y 1721 1776 # CONFIG_NLM_XLR_BOARD is not set … … 1876 1931 # CONFIG_PCI_IOV is not set 1877 1932 # CONFIG_PCI_MSI is not set 1933 # CONFIG_PCI_PASID is not set 1934 # CONFIG_PCI_PRI is not set 1878 1935 CONFIG_PCI_QUIRKS=y 1879 1936 # CONFIG_PCI_STUB is not set 1880 1937 CONFIG_PCI_SYSCALL=y 1881 1938 # CONFIG_PCMCIA is not set 1939 # CONFIG_PCMCIA_3C574 is not set 1940 # CONFIG_PCMCIA_3C589 is not set 1882 1941 # CONFIG_PCMCIA_AHA152X is not set 1883 1942 # CONFIG_PCMCIA_ATMEL is not set 1943 # CONFIG_PCMCIA_AXNET is not set 1884 1944 # CONFIG_PCMCIA_DEBUG is not set 1885 1945 # CONFIG_PCMCIA_FDOMAIN is not set 1946 # CONFIG_PCMCIA_FMVJ18X is not set 1886 1947 # CONFIG_PCMCIA_HERMES is not set 1887 1948 # CONFIG_PCMCIA_LOAD_CIS is not set 1888 1949 # CONFIG_PCMCIA_NINJA_SCSI is not set 1950 # CONFIG_PCMCIA_NMCLAN is not set 1951 # CONFIG_PCMCIA_PCNET is not set 1889 1952 # CONFIG_PCMCIA_QLOGIC is not set 1890 1953 # CONFIG_PCMCIA_RAYCS is not set 1954 # CONFIG_PCMCIA_SMC91C92 is not set 1891 1955 # CONFIG_PCMCIA_SPECTRUM is not set 1892 1956 # CONFIG_PCMCIA_SYM53C500 is not set 1893 1957 # CONFIG_PCMCIA_WL3501 is not set 1958 # CONFIG_PCMCIA_XIRC2PS is not set 1894 1959 # CONFIG_PCMCIA_XIRCOM is not set 1895 1960 # CONFIG_PCNET32 is not set … … 1905 1970 # CONFIG_PHYS_ADDR_T_64BIT is not set 1906 1971 # CONFIG_PID_NS is not set 1972 # CONFIG_PINCTRL is not set 1907 1973 # CONFIG_PLAT_SPEAR is not set 1908 1974 # CONFIG_PLIP is not set 1909 1975 # CONFIG_PLX_HERMES is not set 1910 1976 # CONFIG_PM is not set 1977 # CONFIG_PM_DEVFREQ is not set 1911 1978 # CONFIG_PM_RUNTIME is not set 1912 1979 # CONFIG_PMBUS is not set … … 1960 2027 # CONFIG_QLA3XXX is not set 1961 2028 # CONFIG_QLCNIC is not set 2029 # CONFIG_QLGE is not set 1962 2030 # CONFIG_QNX4FS_FS is not set 1963 2031 # CONFIG_QSEMI_PHY is not set … … 1969 2037 # CONFIG_R8187SE is not set 1970 2038 # CONFIG_R8712U is not set 2039 # CONFIG_RTS5139 is not set 1971 2040 # CONFIG_RTS_PSTOR is not set 1972 2041 # CONFIG_RADIO_ADAPTERS is not set … … 2082 2151 # CONFIG_RTL8192U is not set 2083 2152 # CONFIG_RTL8306_PHY is not set 2084 # CONFIG_RTL8367_PHY is not set2085 2153 # CONFIG_RTL8366RB_PHY is not set 2086 2154 # CONFIG_RTL8366S_PHY is not set 2087 2155 # CONFIG_RTL8366S_PHY_DEBUG_FS is not set 2088 2156 # CONFIG_RTL8366_SMI is not set 2157 # CONFIG_RTL8367_PHY is not set 2089 2158 # CONFIG_RTS_PSTOR is not set 2090 2159 CONFIG_RT_MUTEXES=y … … 2171 2240 # CONFIG_SCSI_MVSAS is not set 2172 2241 # CONFIG_SCSI_MVSAS_DEBUG is not set 2242 # CONFIG_SCSI_MVUMI is not set 2173 2243 # CONFIG_SCSI_NCR53C406A is not set 2174 2244 # CONFIG_SCSI_NETLINK is not set … … 2201 2271 # CONFIG_SECURITYFS is not set 2202 2272 # CONFIG_SECURITY_DMESG_RESTRICT is not set 2273 # CONFIG_SEEQ8005 is not set 2203 2274 CONFIG_SELECT_MEMORY_MODEL=y 2204 2275 # CONFIG_SENSORS_ABITUGURU is not set 2205 2276 # CONFIG_SENSORS_ABITUGURU3 is not set 2206 2277 # CONFIG_SENSORS_ACPI_POWER is not set 2278 # CONFIG_SENSORS_AD7314 is not set 2207 2279 # CONFIG_SENSORS_AD7414 is not set 2208 2280 # CONFIG_SENSORS_AD7418 is not set … … 2337 2409 # CONFIG_SERIO_ALTERA_PS2 is not set 2338 2410 # CONFIG_SERIO_PS2MULT is not set 2411 # CONFIG_SFC is not set 2339 2412 # CONFIG_SFI is not set 2340 2413 # CONFIG_SGI_IOC4 is not set … … 2553 2626 CONFIG_SPLIT_PTLOCK_CPUS=4 2554 2627 CONFIG_SQUASHFS=y 2628 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set 2555 2629 # CONFIG_SQUASHFS_EMBEDDED is not set 2556 2630 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 … … 2569 2643 # CONFIG_STACK_TRACER is not set 2570 2644 CONFIG_STAGING=y 2645 # CONFIG_STAGING_MEDIA is not set 2571 2646 CONFIG_STANDALONE=y 2572 2647 CONFIG_STDBINUTILS=y … … 2618 2693 # CONFIG_TCP_CONG_YEAH is not set 2619 2694 # CONFIG_TCP_MD5SIG is not set 2695 # CONFIG_TEHUTI is not set 2620 2696 # CONFIG_TEST_KSTRTOX is not set 2621 2697 # CONFIG_TEST_LIST_SORT is not set … … 2686 2762 # CONFIG_TUN is not set 2687 2763 # CONFIG_TWL4030_CORE is not set 2764 # CONFIG_TYPHOON is not set 2688 2765 # CONFIG_UACCESS_WITH_MEMCPY is not set 2689 2766 # CONFIG_UCB1400_CORE is not set … … 2722 2799 # CONFIG_USB_DEVICE_CLASS is not set 2723 2800 # CONFIG_USB_DSBR is not set 2801 # CONFIG_USB_DWC3 is not set 2724 2802 # CONFIG_USB_DYNAMIC_MINORS is not set 2725 2803 # CONFIG_USB_EHCI_HCD_PPC_OF is not set … … 2774 2852 # CONFIG_USB_GSPCA_SUNPLUS is not set 2775 2853 # CONFIG_USB_GSPCA_T613 is not set 2854 # CONFIG_USB_GSPCA_TOPRO is not set 2776 2855 # CONFIG_USB_GSPCA_TV8532 is not set 2777 2856 # CONFIG_USB_GSPCA_VC032X is not set … … 3050 3129 # CONFIG_VIRQ_DEBUG is not set 3051 3130 # CONFIG_VIRTIO_BALLOON is not set 3131 # CONFIG_VIRTIO_MMIO is not set 3052 3132 # CONFIG_VIRTIO_PCI is not set 3053 3133 # CONFIG_VIRT_DRIVERS is not set … … 3065 3145 # CONFIG_VMXNET3 is not set 3066 3146 # CONFIG_VM_EVENT_COUNTERS is not set 3147 # CONFIG_VORTEX is not set 3067 3148 # CONFIG_VT is not set 3068 3149 # CONFIG_VT6655 is not set 3069 3150 # CONFIG_VT6656 is not set 3070 3151 # CONFIG_VXFS_FS is not set 3152 # CONFIG_VXGE is not set 3071 3153 # CONFIG_W1 is not set 3072 3154 # CONFIG_W1_CON is not set -
trunk/target/linux/generic/patches-3.2/006-arm_kernel_xz_support.patch
r29729 r29730 28 28 --- a/arch/arm/boot/compressed/Makefile 29 29 +++ b/arch/arm/boot/compressed/Makefile 30 @@ - 88,13 +88,14@@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/30 @@ -92,6 +92,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/ 31 31 suffix_$(CONFIG_KERNEL_GZIP) = gzip 32 32 suffix_$(CONFIG_KERNEL_LZO) = lzo … … 34 34 +suffix_$(CONFIG_KERNEL_XZ) = xzkern 35 35 36 targets := vmlinux vmlinux.lds \ 37 piggy.$(suffix_y) piggy.$(suffix_y).o \ 38 font.o font.c head.o misc.o $(OBJS) 36 # Borrowed libfdt files for the ATAG compatibility mode 37 38 @@ -115,7 +116,7 @@ targets := vmlinux vmlinux.lds \ 39 lib1funcs.o lib1funcs.S font.o font.c head.o misc.o $(OBJS) 39 40 40 41 # Make sure files are removed during clean 41 -extra-y += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S 42 +extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern lib1funcs.S ashldi3.S 42 -extra-y += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S $(libfdt) $(libfdt_hdrs) 43 +extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern lib1funcs.S ashldi3.S $(libfdt) $(libfdt_hdrs) 43 44 44 45 ifeq ($(CONFIG_FUNCTION_TRACER),y) 45 46 ORIG_CFLAGS := $(KBUILD_CFLAGS) 46 @@ -1 39,8 +140,14 @@ bad_syms=$$($(CROSS_COMPILE)nm $@ | sed47 ( echo "following symbols must have non local/private scope:" >&2; \48 echo "$$bad_syms" >&2; rm -f $@; false )47 @@ -170,8 +171,14 @@ if [ $(words $(ZRELADDR)) -gt 1 -a "$(CO 48 false; \ 49 fi 49 50 50 51 +# For __aeabi_llsl … … 57 58 - $(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE 58 59 + $(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) FORCE 60 @$(check_for_multiple_zreladdr) 59 61 $(call if_changed,ld) 60 62 @$(check_for_bad_syms) 61 62 63 --- a/arch/arm/boot/compressed/decompress.c 63 64 +++ b/arch/arm/boot/compressed/decompress.c -
trunk/target/linux/generic/patches-3.2/020-ssb_update.patch
r29729 r29730 1 --- a/drivers/ssb/b43_pci_bridge.c2 +++ b/drivers/ssb/b43_pci_bridge.c3 @@ -11,6 +11,7 @@4 */5 6 #include <linux/pci.h>7 +#include <linux/module.h>8 #include <linux/ssb/ssb.h>9 10 #include "ssb_private.h"11 --- a/drivers/ssb/main.c12 +++ b/drivers/ssb/main.c13 @@ -12,6 +12,7 @@14 15 #include <linux/delay.h>16 #include <linux/io.h>17 +#include <linux/module.h>18 #include <linux/ssb/ssb.h>19 #include <linux/ssb/ssb_regs.h>20 #include <linux/ssb/ssb_driver_gige.h>21 @@ -1260,16 +1261,34 @@ void ssb_device_disable(struct ssb_devic22 }23 EXPORT_SYMBOL(ssb_device_disable);24 25 +/* Some chipsets need routing known for PCIe and 64-bit DMA */26 +static bool ssb_dma_translation_special_bit(struct ssb_device *dev)27 +{28 + u16 chip_id = dev->bus->chip_id;29 +30 + if (dev->id.coreid == SSB_DEV_80211) {31 + return (chip_id == 0x4322 || chip_id == 43221 ||32 + chip_id == 43231 || chip_id == 43222);33 + }34 +35 + return 0;36 +}37 +38 u32 ssb_dma_translation(struct ssb_device *dev)39 {40 switch (dev->bus->bustype) {41 case SSB_BUSTYPE_SSB:42 return 0;43 case SSB_BUSTYPE_PCI:44 - if (ssb_read32(dev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64)45 + if (pci_is_pcie(dev->bus->host_pci) &&46 + ssb_read32(dev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64) {47 return SSB_PCIE_DMA_H32;48 - else49 - return SSB_PCI_DMA;50 + } else {51 + if (ssb_dma_translation_special_bit(dev))52 + return SSB_PCIE_DMA_H32;53 + else54 + return SSB_PCI_DMA;55 + }56 default:57 __ssb_dma_not_implemented(dev);58 }59 1 --- a/drivers/ssb/pci.c 60 2 +++ b/drivers/ssb/pci.c … … 91 33 --- a/include/linux/ssb/ssb.h 92 34 +++ b/include/linux/ssb/ssb.h 93 @@ -25,7 +25,7 @@ struct ssb_sprom {94 u8 et1phyaddr; /* MII address for enet1 */95 u8 et0mdcport; /* MDIO for enet0 */96 u8 et1mdcport; /* MDIO for enet1 */97 - u8 board_rev; /* Board revision number from SPROM. */98 + u16 board_rev; /* Board revision number from SPROM. */99 u8 country_code; /* Country Code */100 u16 leddc_on_time; /* LED Powersave Duty Cycle On Count */101 u16 leddc_off_time; /* LED Powersave Duty Cycle Off Count */102 35 @@ -94,6 +94,15 @@ struct ssb_sprom { 103 36 } ghz5; /* 5GHz band */ … … 115 48 /* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */ 116 49 }; 117 118 @@ -231,10 +240,9 @@ struct ssb_driver {119 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)120 121 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);122 -static inline int ssb_driver_register(struct ssb_driver *drv)123 -{124 - return __ssb_driver_register(drv, THIS_MODULE);125 -}126 +#define ssb_driver_register(drv) \127 + __ssb_driver_register(drv, THIS_MODULE)128 +129 extern void ssb_driver_unregister(struct ssb_driver *drv);130 131 50 132 51 --- a/include/linux/ssb/ssb_regs.h … … 156 75 #define SSB_SPROM8_MAXP_BG_MASK 0x00FF /* Mask for Max Power 2GHz */ 157 76 #define SSB_SPROM8_ITSSI_BG 0xFF00 /* Mask for path 1 itssi_bg */ 158 @@ -462,6 +479,46 @@ 159 #define SSB_SPROM8_OFDM5GLPO 0x014A /* 5.2GHz OFDM power offset */ 160 #define SSB_SPROM8_OFDM5GHPO 0x014E /* 5.8GHz OFDM power offset */ 77 @@ -464,6 +481,46 @@ 161 78 162 +/* Values for boardflags_lo read from SPROM */163 +#define SSB_BFL_BTCOEXIST 0x0001 /* implements Bluetooth coexistance */79 /* Values for boardflags_lo read from SPROM */ 80 #define SSB_BFL_BTCOEXIST 0x0001 /* implements Bluetooth coexistance */ 164 81 +#define SSB_BFL_PACTRL 0x0002 /* GPIO 9 controlling the PA */ 165 82 +#define SSB_BFL_AIRLINEMODE 0x0004 /* implements GPIO 13 radio disable indication */ … … 200 117 +#define SSB_BFL2_GPLL_WAR 0x0400 /* altenative G-band PLL settings implemented */ 201 118 + 202 /* Values for SSB_SPROM1_BINF_CCODE */ 203 enum { 204 SSB_SPROM1CCODE_WORLD = 0, 119 +/* Values for boardflags_lo read from SPROM */ 120 +#define SSB_BFL_BTCOEXIST 0x0001 /* implements Bluetooth coexistance */ 121 #define SSB_BFL_PACTRL 0x0002 /* GPIO 9 controlling the PA */ 122 #define SSB_BFL_AIRLINEMODE 0x0004 /* implements GPIO 13 radio disable indication */ 123 #define SSB_BFL_RSSI 0x0008 /* software calculates nrssi slope. */ -
trunk/target/linux/generic/patches-3.2/100-overlayfs_v11.patch
r29729 r29730 203 203 --- a/MAINTAINERS 204 204 +++ b/MAINTAINERS 205 @@ -4 792,6 +4792,13 @@ F: drivers/scsi/osd/205 @@ -4901,6 +4901,13 @@ F: drivers/scsi/osd/ 206 206 F: include/scsi/osd_* 207 207 F: fs/exofs/ … … 320 320 file_sb_list_add(f, inode->i_sb); 321 321 322 @@ -72 3,7 +722,7 @@ cleanup_all:322 @@ -727,7 +726,7 @@ cleanup_all: 323 323 * here, so just reset the state. 324 324 */ … … 329 329 } 330 330 file_sb_list_del(f); 331 @@ -73 1,8 +730,7 @@ cleanup_all:331 @@ -735,8 +734,7 @@ cleanup_all: 332 332 f->f_path.mnt = NULL; 333 333 cleanup_file: … … 339 339 } 340 340 341 @@ -7 58,14 +756,14 @@ cleanup_file:341 @@ -762,14 +760,14 @@ cleanup_file: 342 342 struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, 343 343 int (*open)(struct inode *, struct file *)) … … 356 356 out: 357 357 return nd->intent.open.file; 358 @@ -79 4,10 +792,17 @@ struct file *nameidata_to_filp(struct na358 @@ -798,10 +796,17 @@ struct file *nameidata_to_filp(struct na 359 359 360 360 /* Has the filesystem initialised the file for us? */ … … 377 377 } 378 378 379 @@ -8 08,26 +813,45 @@ struct file *nameidata_to_filp(struct na379 @@ -812,26 +817,45 @@ struct file *nameidata_to_filp(struct na 380 380 struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags, 381 381 const struct cred *cred) … … 3122 3122 --- a/include/linux/fs.h 3123 3123 +++ b/include/linux/fs.h 3124 @@ -48 1,6 +481,12 @@ struct iattr {3124 @@ -482,6 +482,12 @@ struct iattr { 3125 3125 */ 3126 3126 #include <linux/quota.h> … … 3135 3135 * enum positive_aop_returns - aop return codes with specific semantics 3136 3136 * 3137 @@ -14 61,6 +1467,11 @@ struct super_block {3137 @@ -1481,6 +1487,11 @@ struct super_block { 3138 3138 int cleancache_poolid; 3139 3139 … … 3147 3147 3148 3148 /* superblock cache pruning functions */ 3149 @@ -16 18,6 +1629,7 @@ struct inode_operations {3149 @@ -1638,6 +1649,7 @@ struct inode_operations { 3150 3150 void (*truncate_range)(struct inode *, loff_t, loff_t); 3151 3151 int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, … … 3155 3155 3156 3156 struct seq_file; 3157 @@ -20 23,6 +2035,7 @@ extern long do_sys_open(int dfd, const c3157 @@ -2058,6 +2070,7 @@ extern long do_sys_open(int dfd, const c 3158 3158 extern struct file *filp_open(const char *, int, int); 3159 3159 extern struct file *file_open_root(struct dentry *, struct vfsmount *, -
trunk/target/linux/generic/patches-3.2/102-ehci_hcd_ignore_oc.patch
r29729 r29730 12 12 --- a/drivers/usb/host/ehci-hub.c 13 13 +++ b/drivers/usb/host/ehci-hub.c 14 @@ -5 80,7 +580,7 @@ ehci_hub_status_data (struct usb_hcd *hc14 @@ -578,7 +578,7 @@ ehci_hub_status_data (struct usb_hcd *hc 15 15 * always set, seem to clear PORT_OCC and PORT_CSC when writing to 16 16 * PORT_POWER; that's surprising, but maybe within-spec. … … 21 21 else 22 22 mask = PORT_CSC | PORT_PEC; 23 @@ -80 5,7 +805,7 @@ static int ehci_hub_control (23 @@ -803,7 +803,7 @@ static int ehci_hub_control ( 24 24 if (temp & PORT_PEC) 25 25 status |= USB_PORT_STAT_C_ENABLE << 16; … … 32 32 --- a/drivers/usb/host/ehci.h 33 33 +++ b/drivers/usb/host/ehci.h 34 @@ -14 0,6 +140,7 @@ struct ehci_hcd { /* one per controlle34 @@ -147,6 +147,7 @@ struct ehci_hcd { /* one per controlle 35 35 unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/ 36 36 unsigned has_synopsys_hc_bug:1; /* Synopsys HC */ -
trunk/target/linux/generic/patches-3.2/210-darwin_scripts_include.patch
r29729 r29730 39 39 --- a/scripts/kconfig/Makefile 40 40 +++ b/scripts/kconfig/Makefile 41 @@ -1 48,6 +148,9 @@ check-lxdialog := $(srctree)/$(src)/lxd41 @@ -123,6 +123,9 @@ check-lxdialog := $(srctree)/$(src)/lxd 42 42 # we really need to do so. (Do not call gcc as part of make mrproper) 43 43 HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \ -
trunk/target/linux/generic/patches-3.2/220-module_exports.patch
r29729 r29730 29 29 #define VMLINUX_SYMBOL(sym) sym 30 30 #else 31 @@ -27 6,14 +297,14 @@31 @@ -275,14 +296,14 @@ 32 32 /* Kernel symbol table: Normal symbols */ \ 33 33 __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ … … 46 46 } \ 47 47 \ 48 @@ -34 5,7 +366,7 @@48 @@ -344,7 +365,7 @@ 49 49 \ 50 50 /* Kernel symbol table: strings */ \ … … 55 55 \ 56 56 /* __*init sections */ \ 57 @@ -67 7,6 +698,9 @@57 @@ -676,6 +697,9 @@ 58 58 EXIT_TEXT \ 59 59 EXIT_DATA \ … … 65 65 *(.discard.*) \ 66 66 } 67 --- a/include/linux/ module.h68 +++ b/include/linux/ module.h69 @@ - 232,12 +232,19 @@ struct module_use {67 --- a/include/linux/export.h 68 +++ b/include/linux/export.h 69 @@ -45,12 +45,19 @@ extern struct module __this_module; 70 70 #define __CRC_SYMBOL(sym, sec) 71 71 #endif … … 85 85 + __attribute__((section("__ksymtab_strings" \ 86 86 + __EXPORT_SUFFIX(sym)), aligned(1))) \ 87 = MODULE_SYMBOL_PREFIX #sym; 87 = MODULE_SYMBOL_PREFIX #sym; \ 88 88 static const struct kernel_symbol __ksymtab_##sym \ 89 89 __used \ -
trunk/target/linux/generic/patches-3.2/230-openwrt_lzma_options.patch
r29729 r29730 1 1 --- a/scripts/Makefile.lib 2 2 +++ b/scripts/Makefile.lib 3 @@ -2 54,7 +254,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)3 @@ -296,7 +296,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 4 4 5 5 quiet_cmd_lzma = LZMA $@ -
trunk/target/linux/generic/patches-3.2/250-netfilter_depends.patch
r29729 r29730 9 9 help 10 10 H.323 is a VoIP signalling protocol from ITU-T. As one of the most 11 @@ -6 11,7 +610,6 @@ config NETFILTER_XT_TARGET_SECMARK11 @@ -609,7 +608,6 @@ config NETFILTER_XT_TARGET_SECMARK 12 12 13 13 config NETFILTER_XT_TARGET_TCPMSS -
trunk/target/linux/generic/patches-3.2/300-mips_expose_boot_raw.patch
r29729 r29730 9 9 --- a/arch/mips/Kconfig 10 10 +++ b/arch/mips/Kconfig 11 @@ -8 56,9 +856,6 @@ config ARC11 @@ -849,9 +849,6 @@ config ARC 12 12 config ARCH_MAY_HAVE_PC_FDC 13 13 bool … … 19 19 bool 20 20 21 @@ -2 309,6 +2306,18 @@ config USE_OF21 @@ -2292,6 +2289,18 @@ config USE_OF 22 22 help 23 23 Include support for flattened device tree machine descriptions. -
trunk/target/linux/generic/patches-3.2/301-mips_image_cmdline_hack.patch
r29729 r29730 1 1 --- a/arch/mips/Kconfig 2 2 +++ b/arch/mips/Kconfig 3 @@ - 886,6 +886,10 @@ config SYNC_R4K3 @@ -948,6 +948,10 @@ config SYNC_R4K 4 4 config MIPS_MACHINE 5 5 def_bool n -
trunk/target/linux/generic/patches-3.2/304-mips_disable_fpu.patch
r29729 r29730 9 9 --- a/arch/mips/Kconfig 10 10 +++ b/arch/mips/Kconfig 11 @@ -9 40,6 +940,17 @@ config I825911 @@ -933,6 +933,17 @@ config I8259 12 12 config MIPS_BONITO64 13 13 bool -
trunk/target/linux/generic/patches-3.2/305-mips_module_reloc.patch
r29729 r29730 28 28 --- a/arch/mips/kernel/module.c 29 29 +++ b/arch/mips/kernel/module.c 30 @@ -4 5,14 +45,219 @@ static struct mips_hi16 *mips_hi16_list;30 @@ -44,14 +44,219 @@ static struct mips_hi16 *mips_hi16_list; 31 31 static LIST_HEAD(dbe_list); 32 32 static DEFINE_SPINLOCK(dbe_lock); … … 249 249 static int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v) 250 250 { 251 @@ -7 3,28 +278,36 @@ static int apply_r_mips_32_rela(struct m251 @@ -72,28 +277,36 @@ static int apply_r_mips_32_rela(struct m 252 252 return 0; 253 253 } … … 302 302 if (v % 4) { 303 303 pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n", 304 @@ -10 3,17 +316,31 @@ static int apply_r_mips_26_rela(struct m304 @@ -102,17 +315,31 @@ static int apply_r_mips_26_rela(struct m 305 305 } 306 306 … … 337 337 { 338 338 struct mips_hi16 *n; 339 @@ -38 1,11 +608,32 @@ int module_finalize(const Elf_Ehdr *hdr,339 @@ -380,11 +607,32 @@ int module_finalize(const Elf_Ehdr *hdr, 340 340 list_add(&me->arch.dbe_list, &dbe_list); 341 341 spin_unlock_irq(&dbe_lock); -
trunk/target/linux/generic/patches-3.2/330-mips-add-crash-and-kdump-support.patch
r29729 r29730 48 48 --- a/arch/mips/kernel/Makefile 49 49 +++ b/arch/mips/kernel/Makefile 50 @@ -9 3,7 +93,8 @@ obj-$(CONFIG_I8253) += i8253.o50 @@ -95,7 +95,8 @@ obj-$(CONFIG_I8253) += i8253.o 51 51 52 52 obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o -
trunk/target/linux/generic/patches-3.2/400-rootfs_split.patch
r29729 r29730 1 1 --- a/drivers/mtd/Kconfig 2 2 +++ b/drivers/mtd/Kconfig 3 @@ - 33,6 +33,14 @@ config MTD_TESTS4 should normally be compiled as kernel modules. The modules perform5 various checks and verifications when loaded.3 @@ -23,6 +23,14 @@ config MTD_TESTS 4 WARNING: some of the tests will ERASE entire MTD device which they 5 test. Do not use these tests unless you really know what you do. 6 6 7 7 +config MTD_ROOTFS_ROOT_DEV … … 36 36 /* 37 37 * MTD methods which simply translate the effective address and pass through 38 @@ -6 37,6 +639,155 @@ int mtd_del_partition(struct mtd_info *m38 @@ -650,6 +652,155 @@ int mtd_del_partition(struct mtd_info *m 39 39 } 40 40 EXPORT_SYMBOL_GPL(mtd_del_partition); … … 192 192 * This function, given a master MTD object and a partition table, creates 193 193 * and registers slave MTD objects which are bound to the master according to 194 @@ -6 53,6 +804,9 @@ int add_mtd_partitions(struct mtd_info *194 @@ -666,6 +817,9 @@ int add_mtd_partitions(struct mtd_info * 195 195 struct mtd_part *slave; 196 196 uint64_t cur_offset = 0; … … 202 202 printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name); 203 203 204 @@ -6 67,12 +821,53 @@ int add_mtd_partitions(struct mtd_info *204 @@ -680,12 +834,53 @@ int add_mtd_partitions(struct mtd_info * 205 205 206 206 add_mtd_device(&slave->mtd); … … 258 258 --- a/drivers/mtd/mtdchar.c 259 259 +++ b/drivers/mtd/mtdchar.c 260 @@ - 949,6 +949,12 @@ static int mtd_ioctl(struct file *file,260 @@ -1026,6 +1026,12 @@ static int mtd_ioctl(struct file *file, 261 261 break; 262 262 } … … 273 273 --- a/include/linux/mtd/mtd.h 274 274 +++ b/include/linux/mtd/mtd.h 275 @@ -1 25,6 +125,7 @@ struct nand_ecclayout {276 struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES_LARGE];277 };275 @@ -114,6 +114,7 @@ struct nand_ecclayout { 276 277 struct module; /* only needed for owner field in mtd_info */ 278 278 279 279 +struct mtd_info; … … 281 281 u_char type; 282 282 uint32_t flags; 283 @@ -2 77,6 +278,9 @@ struct mtd_info {283 @@ -266,6 +267,9 @@ struct mtd_info { 284 284 struct device dev; 285 285 int usecount; … … 291 291 * its own reference counting. The below functions are only for driver. 292 292 * The driver may register its callbacks. These callbacks are not 293 @@ -32 7,6 +331,7 @@ struct mtd_partition;294 extern int mtd_device_register(struct mtd_info *master,295 const struct mtd_partition *parts,296 int nr_parts);293 @@ -321,6 +325,7 @@ extern int mtd_device_parse_register(str 294 int defnr_parts); 295 #define mtd_device_register(master, parts, nr_parts) \ 296 mtd_device_parse_register(master, NULL, NULL, parts, nr_parts) 297 297 +extern int mtd_device_refresh(struct mtd_info *master); 298 298 extern int mtd_device_unregister(struct mtd_info *master); … … 301 301 --- a/include/linux/mtd/partitions.h 302 302 +++ b/include/linux/mtd/partitions.h 303 @@ -3 4,12 +34,14 @@303 @@ -36,12 +36,14 @@ 304 304 * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK). 305 305 */ … … 315 315 }; 316 316 317 #define MTDPART_OFS_ NXTBLK (-2)317 #define MTDPART_OFS_RETAIN (-3) 318 318 --- a/include/mtd/mtd-abi.h 319 319 +++ b/include/mtd/mtd-abi.h 320 @@ - 127,6 +127,7 @@ struct otp_info {321 #define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)322 #define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)323 #define MEM ISLOCKED _IOR('M', 23, struct erase_info_user)320 @@ -201,6 +201,7 @@ struct otp_info { 321 * modes (see "struct mtd_write_req") 322 */ 323 #define MEMWRITE _IOWR('M', 24, struct mtd_write_req) 324 324 +#define MTDREFRESH _IO('M', 50) 325 325 -
trunk/target/linux/generic/patches-3.2/401-partial_eraseblock_write.patch
r29729 r29730 97 97 instr->fail_addr -= part->offset; 98 98 instr->addr -= part->offset; 99 @@ -5 30,18 +597,24 @@ static struct mtd_part *allocate_partiti99 @@ -543,18 +610,24 @@ static struct mtd_part *allocate_partiti 100 100 if ((slave->mtd.flags & MTD_WRITEABLE) && 101 101 mtd_mod_by_eb(slave->offset, &slave->mtd)) { … … 133 133 --- a/include/linux/mtd/mtd.h 134 134 +++ b/include/linux/mtd/mtd.h 135 @@ -5 7,6 +57,10 @@ struct erase_info {135 @@ -58,6 +58,10 @@ struct erase_info { 136 136 u_long priv; 137 137 u_char state; -
trunk/target/linux/generic/patches-3.2/410-mtd_info_move_forward_decl.patch
r29729 r29730 1 1 --- a/include/linux/mtd/partitions.h 2 2 +++ b/include/linux/mtd/partitions.h 3 @@ -3 3,6 +33,7 @@3 @@ -35,6 +35,7 @@ 4 4 * Note: writeable partitions require their size and offset be 5 5 * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK). … … 9 9 struct mtd_partition; 10 10 struct mtd_partition { 11 @@ - 49,7 +50,6 @@ struct mtd_partition {11 @@ -52,7 +53,6 @@ struct mtd_partition { 12 12 #define MTDPART_SIZ_FULL (0) 13 13 14 14 15 15 -struct mtd_info; 16 struct device_node; 16 17 17 /* 18 * Functions dealing with the various ways of partitioning the space 18 /** -
trunk/target/linux/generic/patches-3.2/421-redboot_boardconfig.patch
r29729 r29730 1 1 --- a/drivers/mtd/redboot.c 2 2 +++ b/drivers/mtd/redboot.c 3 @@ -29,6 +29,8 @@ 4 #include <linux/mtd/mtd.h> 3 @@ -30,6 +30,8 @@ 5 4 #include <linux/mtd/partitions.h> 5 #include <linux/module.h> 6 6 7 7 +#define BOARD_CONFIG_PART "boardconfig" … … 10 10 unsigned char name[16]; // Null terminated name 11 11 uint32_t flash_base; // Address within FLASH of image 12 @@ - 59,6 +61,7 @@ static int parse_redboot_partitions(stru13 14 unsigned long fis_origin)12 @@ -60,6 +62,7 @@ static int parse_redboot_partitions(stru 13 struct mtd_partition **pparts, 14 struct mtd_part_parser_data *data) 15 15 { 16 16 + unsigned long max_offset = 0; -
trunk/target/linux/generic/patches-3.2/430-mtd_myloader_partition_parser.patch
r29729 r29730 1 1 --- a/drivers/mtd/Kconfig 2 2 +++ b/drivers/mtd/Kconfig 3 @@ -1 57,6 +157,22 @@ config MTD_AR7_PARTS3 @@ -148,6 +148,22 @@ config MTD_AR7_PARTS 4 4 ---help--- 5 5 TI AR7 partitioning support -
trunk/target/linux/generic/patches-3.2/450-mtd_plat_nand_chip_fixup.patch
r29729 r29730 6 6 --- a/include/linux/mtd/nand.h 7 7 +++ b/include/linux/mtd/nand.h 8 @@ -625,6 +625,7 @@ struct platform_nand_chip { 9 int chip_delay; 8 @@ -621,6 +621,7 @@ struct platform_nand_chip { 10 9 unsigned int options; 10 unsigned int bbt_options; 11 11 const char **part_probe_types; 12 12 + int (*chip_fixup)(struct mtd_info *mtd); 13 void (*set_parts)(uint64_t size, struct platform_nand_chip *chip);14 void *priv;15 13 }; 14 15 /* Keep gcc happy */ 16 16 --- a/drivers/mtd/nand/plat_nand.c 17 17 +++ b/drivers/mtd/nand/plat_nand.c 18 @@ -9 6,7 +96,18 @@ static int __devinit plat_nand_probe(str18 @@ -93,7 +93,18 @@ static int __devinit plat_nand_probe(str 19 19 } 20 20 -
trunk/target/linux/generic/patches-3.2/451-mtd_fix_nand_correct_data_return_code.patch
r29729 r29730 3 3 @@ -507,8 +507,7 @@ int __nand_correct_data(unsigned char *b 4 4 if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1) 5 return 1; /* error in eccdata; no action needed */5 return 1; /* error in ECC data; no action needed */ 6 6 7 7 - printk(KERN_ERR "uncorrectable error : "); -
trunk/target/linux/generic/patches-3.2/460-cfi_cmdset_0002_no_erase_suspend.patch
r29729 r29730 1 1 --- a/drivers/mtd/chips/cfi_cmdset_0002.c 2 2 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c 3 @@ -68 5,7 +685,7 @@ static int get_chip(struct map_info *map3 @@ -682,7 +682,7 @@ static int get_chip(struct map_info *map 4 4 return 0; 5 5 -
trunk/target/linux/generic/patches-3.2/470-mtd_m25p80_add_pm25lv_flash_support.patch
r29729 r29730 1 1 --- a/drivers/mtd/devices/m25p80.c 2 2 +++ b/drivers/mtd/devices/m25p80.c 3 @@ -4 3,6 +43,7 @@3 @@ -45,6 +45,7 @@ 4 4 #define OPCODE_BE_4K 0x20 /* Erase 4KiB block */ 5 5 #define OPCODE_BE_32K 0x52 /* Erase 32KiB block */ … … 9 9 #define OPCODE_RDID 0x9f /* Read JEDEC ID */ 10 10 11 @@ -6 17,6 +618,7 @@ struct flash_info {11 @@ -625,6 +626,7 @@ struct flash_info { 12 12 u16 flags; 13 13 #define SECT_4K 0x01 /* OPCODE_BE_4K works uniformly */ … … 17 17 18 18 #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags) \ 19 @@ -6 75,6 +677,10 @@ static const struct spi_device_id m25p_i19 @@ -686,6 +688,10 @@ static const struct spi_device_id m25p_i 20 20 { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) }, 21 21 { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, … … 28 28 * for the chips listed here (without boot sectors). 29 29 */ 30 @@ - 897,6 +903,9 @@ static int __devinit m25p_probe(struct s30 @@ -921,6 +927,9 @@ static int __devinit m25p_probe(struct s 31 31 if (info->flags & SECT_4K) { 32 32 flash->erase_opcode = OPCODE_BE_4K; -
trunk/target/linux/generic/patches-3.2/473-mtd_m25p80_add_w25q128.patch
r29729 r29730 1 1 --- a/drivers/mtd/devices/m25p80.c 2 2 +++ b/drivers/mtd/devices/m25p80.c 3 @@ -76 8,6 +768,7 @@ static const struct spi_device_id m25p_i3 @@ -765,6 +765,7 @@ static const struct spi_device_id m25p_i 4 4 { "w25q32", INFO(0xef4016, 0, 64 * 1024, 64, SECT_4K) }, 5 5 { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) }, -
trunk/target/linux/generic/patches-3.2/475-mtd_cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
r29729 r29730 9 9 --- a/drivers/mtd/chips/cfi_cmdset_0002.c 10 10 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c 11 @@ -14 12,6 +1412,7 @@ static int __xipram do_write_buffer(stru11 @@ -1409,6 +1409,7 @@ static int __xipram do_write_buffer(stru 12 12 13 13 /* Write Buffer Load */ -
trunk/target/linux/generic/patches-3.2/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
r29729 r29730 18 18 --- a/drivers/mtd/devices/m25p80.c 19 19 +++ b/drivers/mtd/devices/m25p80.c 20 @@ -8 3,6 +83,12 @@20 @@ -84,6 +84,12 @@ 21 21 22 22 #define JEDEC_MFR(_jedec_id) ((_jedec_id) >> 16) … … 31 31 32 32 struct m25p { 33 @@ -92 4,7 +930,7 @@ static int __devinit m25p_probe(struct s33 @@ -925,7 +931,7 @@ static int __devinit m25p_probe(struct s 34 34 flash->mtd.write = m25p80_write; 35 35 -
trunk/target/linux/generic/patches-3.2/500-yaffs_support.patch
r29729 r29730 12 12 +++ b/fs/Makefile 13 13 @@ -124,3 +124,5 @@ obj-$(CONFIG_GFS2_FS) += gfs2/ 14 obj- $(CONFIG_EXOFS_FS) += exofs/14 obj-y += exofs/ # Multiple modules 15 15 obj-$(CONFIG_CEPH_FS) += ceph/ 16 16 obj-$(CONFIG_PSTORE) += pstore/ -
trunk/target/linux/generic/patches-3.2/502-yaffs_git_2010_10_20.patch
r29729 r29730 23 23 +++ b/fs/Makefile 24 24 @@ -124,5 +124,6 @@ obj-$(CONFIG_GFS2_FS) += gfs2/ 25 obj- $(CONFIG_EXOFS_FS) += exofs/25 obj-y += exofs/ # Multiple modules 26 26 obj-$(CONFIG_CEPH_FS) += ceph/ 27 27 obj-$(CONFIG_PSTORE) += pstore/ -
trunk/target/linux/generic/patches-3.2/510-jffs2_make_lzma_available.patch
r29729 r29730 29 29 --- a/fs/jffs2/compr.c 30 30 +++ b/fs/jffs2/compr.c 31 @@ -3 20,6 +320,9 @@ int __init jffs2_compressors_init(void)31 @@ -374,6 +374,9 @@ int __init jffs2_compressors_init(void) 32 32 #ifdef CONFIG_JFFS2_LZO 33 33 jffs2_lzo_init(); … … 39 39 #ifdef CONFIG_JFFS2_CMODE_NONE 40 40 jffs2_compression_mode = JFFS2_COMPR_MODE_NONE; 41 @@ -3 43,6 +346,9 @@ int __init jffs2_compressors_init(void)41 @@ -397,6 +400,9 @@ int __init jffs2_compressors_init(void) 42 42 int jffs2_compressors_exit(void) 43 43 { … … 64 64 #define JFFS2_RUBINMIPS_DISABLED /* RUBINs will be used only */ 65 65 #define JFFS2_DYNRUBIN_DISABLED /* for decompression */ 66 @@ - 99,5 +99,9 @@ void jffs2_zlib_exit(void);66 @@ -101,5 +101,9 @@ void jffs2_zlib_exit(void); 67 67 int jffs2_lzo_init(void); 68 68 void jffs2_lzo_exit(void); … … 207 207 --- a/fs/jffs2/super.c 208 208 +++ b/fs/jffs2/super.c 209 @@ - 255,14 +255,41 @@ static int __init init_jffs2_fs(void)209 @@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void) 210 210 BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); 211 211 BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); -
trunk/target/linux/generic/patches-3.2/512-jffs2_eofdetect.patch
r29729 r29730 44 44 if (ret < 0) 45 45 goto out; 46 @@ -40 5,7 +408,7 @@ static int jffs2_scan_xref_node(struct j46 @@ -403,7 +406,7 @@ static int jffs2_scan_xref_node(struct j 47 47 if (!ref) 48 48 return -ENOMEM; … … 53 53 * ref->xid is used to store 32bit xid, xd is not used 54 54 * ref->ino is used to store 32bit inode-number, ic is not used 55 @@ -47 8,7 +481,7 @@ static int jffs2_scan_eraseblock (struct55 @@ -476,7 +479,7 @@ static int jffs2_scan_eraseblock (struct 56 56 struct jffs2_sum_marker *sm; 57 57 void *sumptr = NULL; … … 62 62 /* XIP case. Just look, point at the summary if it's there */ 63 63 sm = (void *)buf + c->sector_size - sizeof(*sm); 64 @@ -49 4,9 +497,9 @@ static int jffs2_scan_eraseblock (struct64 @@ -492,9 +495,9 @@ static int jffs2_scan_eraseblock (struct 65 65 buf_len = sizeof(*sm); 66 66 … … 74 74 return err; 75 75 76 @@ -51 5,9 +518,9 @@ static int jffs2_scan_eraseblock (struct76 @@ -513,9 +516,9 @@ static int jffs2_scan_eraseblock (struct 77 77 } 78 78 if (buf_len < sumlen) { … … 86 86 return err; 87 87 } 88 @@ -5 30,7 +533,7 @@ static int jffs2_scan_eraseblock (struct88 @@ -528,7 +531,7 @@ static int jffs2_scan_eraseblock (struct 89 89 90 90 if (buf_size && sumlen > buf_size) … … 95 95 (i.e. BLK_STATE_xxx) so return that too. 96 96 If it returns zero, fall through to full scan. */ 97 @@ -5 51,6 +554,17 @@ static int jffs2_scan_eraseblock (struct97 @@ -549,6 +552,17 @@ static int jffs2_scan_eraseblock (struct 98 98 return err; 99 99 } … … 113 113 ofs = 0; 114 114 max_ofs = EMPTY_SCAN_SIZE(c->sector_size); 115 @@ -67 6,7 +690,7 @@ scan_more:115 @@ -674,7 +688,7 @@ scan_more: 116 116 scan_end = buf_len; 117 117 goto more_empty; … … 122 122 buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs); 123 123 if (!buf_len) { 124 @@ -91 2,7 +926,7 @@ scan_more:124 @@ -910,7 +924,7 @@ scan_more: 125 125 126 126 D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n", -
trunk/target/linux/generic/patches-3.2/600-netfilter_layer7_2.22.patch
r29729 r29730 1 1 --- a/net/netfilter/Kconfig 2 2 +++ b/net/netfilter/Kconfig 3 @@ -101 8,6 +1018,27 @@ config NETFILTER_XT_MATCH_STATE3 @@ -1016,6 +1016,27 @@ config NETFILTER_XT_MATCH_STATE 4 4 5 5 To compile it as a module, choose M here. If unsure, say N. -
trunk/target/linux/generic/patches-3.2/603-netfilter_layer7_2.6.36_fix.patch
r29729 r29730 1 1 --- a/net/netfilter/Kconfig 2 2 +++ b/net/netfilter/Kconfig 3 @@ - 760,6 +760,27 @@ config NETFILTER_XT_MATCH_IPVS3 @@ -830,6 +830,27 @@ config NETFILTER_XT_MATCH_IPVS 4 4 5 5 If unsure, say N. … … 29 29 tristate '"length" match support' 30 30 depends on NETFILTER_ADVANCED 31 @@ - 946,26 +967,11 @@ config NETFILTER_XT_MATCH_STATE31 @@ -1016,26 +1037,11 @@ config NETFILTER_XT_MATCH_STATE 32 32 33 33 To compile it as a module, choose M here. If unsure, say N. -
trunk/target/linux/generic/patches-3.2/630-packet_socket_type.patch
r29729 r29730 27 27 --- a/net/packet/af_packet.c 28 28 +++ b/net/packet/af_packet.c 29 @@ -2 12,6 +212,7 @@ struct packet_sock {29 @@ -296,6 +296,7 @@ struct packet_sock { 30 30 unsigned int tp_loss:1; 31 31 unsigned int tp_tstamp; … … 35 35 36 36 #define PACKET_FANOUT_MAX 256 37 @@ - 661,6 +662,7 @@ static int packet_rcv_spkt(struct sk_buf37 @@ -1383,6 +1384,7 @@ static int packet_rcv_spkt(struct sk_buf 38 38 { 39 39 struct sock *sk; … … 43 43 /* 44 44 * When we registered the protocol we saved the socket in the data 45 @@ - 668,6 +670,7 @@ static int packet_rcv_spkt(struct sk_buf45 @@ -1390,6 +1392,7 @@ static int packet_rcv_spkt(struct sk_buf 46 46 */ 47 47 … … 51 51 /* 52 52 * Yank back the headers [hope the device set this 53 @@ - 680,7 +683,7 @@ static int packet_rcv_spkt(struct sk_buf53 @@ -1402,7 +1405,7 @@ static int packet_rcv_spkt(struct sk_buf 54 54 * so that this procedure is noop. 55 55 */ … … 60 60 61 61 if (!net_eq(dev_net(dev), sock_net(sk))) 62 @@ - 873,12 +876,12 @@ static int packet_rcv(struct sk_buff *sk62 @@ -1595,12 +1598,12 @@ static int packet_rcv(struct sk_buff *sk 63 63 int skb_len = skb->len; 64 64 unsigned int snaplen, res; … … 76 76 goto drop; 77 77 78 @@ - 997,12 +1000,12 @@ static int tpacket_rcv(struct sk_buff *s78 @@ -1719,12 +1722,12 @@ static int tpacket_rcv(struct sk_buff *s 79 79 struct timespec ts; 80 80 struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb); … … 92 92 goto drop; 93 93 94 @@ - 1829,6 +1832,7 @@ static int packet_create(struct net *net94 @@ -2590,6 +2593,7 @@ static int packet_create(struct net *net 95 95 spin_lock_init(&po->bind_lock); 96 96 mutex_init(&po->pg_vec_lock); … … 100 100 if (sock->type == SOCK_PACKET) 101 101 po->prot_hook.func = packet_rcv_spkt; 102 @@ - 2413,6 +2417,16 @@ packet_setsockopt(struct socket *sock, i102 @@ -3187,6 +3191,16 @@ packet_setsockopt(struct socket *sock, i 103 103 104 104 return fanout_add(sk, val & 0xffff, val >> 16); … … 117 117 return -ENOPROTOOPT; 118 118 } 119 @@ - 2470,6 +2484,13 @@ static int packet_getsockopt(struct sock119 @@ -3257,6 +3271,13 @@ static int packet_getsockopt(struct sock 120 120 121 121 data = &val; -
trunk/target/linux/generic/patches-3.2/640-bridge_no_eap_forward.patch
r29729 r29730 1 1 --- a/net/bridge/br_input.c 2 2 +++ b/net/bridge/br_input.c 3 @@ -7 7,7 +77,11 @@ int br_handle_frame_finish(struct sk_buf3 @@ -78,7 +78,11 @@ int br_handle_frame_finish(struct sk_buf 4 4 5 5 dst = NULL; -
trunk/target/linux/generic/patches-3.2/641-bridge_always_accept_eap.patch
r29729 r29730 1 1 --- a/net/bridge/br_input.c 2 2 +++ b/net/bridge/br_input.c 3 @@ -6 4,7 +64,7 @@ int br_handle_frame_finish(struct sk_buf3 @@ -65,7 +65,7 @@ int br_handle_frame_finish(struct sk_buf 4 4 br_multicast_rcv(br, p, skb)) 5 5 goto drop; -
trunk/target/linux/generic/patches-3.2/642-bridge_port_isolate.patch
r29729 r29730 1 1 --- a/net/bridge/br_private.h 2 2 +++ b/net/bridge/br_private.h 3 @@ -13 4,6 +134,7 @@ struct net_bridge_port3 @@ -139,6 +139,7 @@ struct net_bridge_port 4 4 5 5 unsigned long flags; … … 44 44 --- a/net/bridge/br_input.c 45 45 +++ b/net/bridge/br_input.c 46 @@ -9 7,7 +97,8 @@ int br_handle_frame_finish(struct sk_buf46 @@ -98,7 +98,8 @@ int br_handle_frame_finish(struct sk_buf 47 47 skb2 = skb; 48 48 -
trunk/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch
r29729 r29730 33 33 --- a/net/ipv6/addrconf.c 34 34 +++ b/net/ipv6/addrconf.c 35 @@ -110 6,7 +1106,7 @@ out:35 @@ -1107,7 +1107,7 @@ out: 36 36 return ret; 37 37 } … … 42 42 struct in6_addr *saddr) 43 43 { 44 @@ -123 1,7 +1231,6 @@ try_nextdev:44 @@ -1232,7 +1232,6 @@ try_nextdev: 45 45 in6_ifa_put(hiscore->ifa); 46 46 return 0; … … 50 50 int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, 51 51 unsigned char banned_flags) 52 @@ -4 705,6 +4704,9 @@ int __init addrconf_init(void)52 @@ -4814,6 +4813,9 @@ int __init addrconf_init(void) 53 53 54 54 ipv6_addr_label_rtnl_register(); … … 60 60 errout: 61 61 rtnl_af_unregister(&inet6_ops); 62 @@ -4 723,6 +4725,9 @@ void addrconf_cleanup(void)62 @@ -4832,6 +4834,9 @@ void addrconf_cleanup(void) 63 63 struct net_device *dev; 64 64 int i; … … 72 72 --- /dev/null 73 73 +++ b/net/ipv6/inet6_stubs.c 74 @@ -0,0 +1, 27@@74 @@ -0,0 +1,33 @@ 75 75 +/* 76 76 + * This program is free software; you can redistribute it and/or … … 79 79 + * 2 of the License, or (at your option) any later version. 80 80 + */ 81 +#include <linux/export.h> 81 82 +#include <net/ipv6.h> 82 83 + … … 91 92 + struct in6_addr *saddr) 92 93 +{ 93 + typeof(ipv6_dev_get_saddr_hook) dev_get_saddr = rcu_dereference(ipv6_dev_get_saddr_hook); 94 + int ret = -EADDRNOTAVAIL; 95 + typeof(ipv6_dev_get_saddr_hook) dev_get_saddr; 96 + 97 + rcu_read_lock(); 98 + dev_get_saddr = rcu_dereference(ipv6_dev_get_saddr_hook); 94 99 + 95 100 + if (dev_get_saddr) 96 + ret urndev_get_saddr(net, dst_dev, daddr, prefs, saddr);101 + ret = dev_get_saddr(net, dst_dev, daddr, prefs, saddr); 97 102 + 98 + return -EADDRNOTAVAIL; 103 + rcu_read_unlock(); 104 + return ret; 99 105 +} 100 106 +EXPORT_SYMBOL(ipv6_dev_get_saddr); -
trunk/target/linux/generic/patches-3.2/650-pppoe_header_pad.patch
r29729 r29730 1 --- a/drivers/net/ppp oe.c2 +++ b/drivers/net/ppp oe.c1 --- a/drivers/net/ppp/pppoe.c 2 +++ b/drivers/net/ppp/pppoe.c 3 3 @@ -856,7 +856,7 @@ static int pppoe_sendmsg(struct kiocb *i 4 4 goto end; -
trunk/target/linux/generic/patches-3.2/721-phy_packets.patch
r29729 r29730 54 54 --- a/include/linux/netdevice.h 55 55 +++ b/include/linux/netdevice.h 56 @@ -115 3,6 +1153,7 @@ struct net_device {56 @@ -1158,6 +1158,7 @@ struct net_device { 57 57 void *ax25_ptr; /* AX.25 specific data */ 58 58 struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, -
trunk/target/linux/generic/patches-3.2/750-hostap_txpower.patch
r29729 r29730 1 1 --- a/drivers/net/wireless/hostap/hostap_ap.c 2 2 +++ b/drivers/net/wireless/hostap/hostap_ap.c 3 @@ -23 35,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t3 @@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t 4 4 addr[count].sa_family = ARPHRD_ETHER; 5 5 memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); … … 21 21 22 22 sta->last_rx_updated = IW_QUAL_DBM; 23 @@ -24 07,13 +2407,13 @@ int prism2_ap_translate_scan(struct net_23 @@ -2412,13 +2412,13 @@ int prism2_ap_translate_scan(struct net_ 24 24 memset(&iwe, 0, sizeof(iwe)); 25 25 iwe.cmd = IWEVQUAL; … … 75 75 --- a/drivers/net/wireless/hostap/hostap_info.c 76 76 +++ b/drivers/net/wireless/hostap/hostap_info.c 77 @@ -43 3,6 +433,11 @@ static void handle_info_queue_linkstatus77 @@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus 78 78 } 79 79 … … 89 89 --- a/drivers/net/wireless/hostap/hostap_ioctl.c 90 90 +++ b/drivers/net/wireless/hostap/hostap_ioctl.c 91 @@ -147 7,23 +1477,20 @@ static int prism2_txpower_hfa386x_to_dBm91 @@ -1478,23 +1478,20 @@ static int prism2_txpower_hfa386x_to_dBm 92 92 val = 255; 93 93 … … 117 117 return (unsigned char) tmp; 118 118 } 119 @@ -405 6,3 +4053,35 @@ int hostap_ioctl(struct net_device *dev,119 @@ -4057,3 +4054,35 @@ int hostap_ioctl(struct net_device *dev, 120 120 121 121 return ret; -
trunk/target/linux/generic/patches-3.2/810-pci_disable_common_quirks.patch
r29729 r29730 1 1 --- a/drivers/pci/Kconfig 2 2 +++ b/drivers/pci/Kconfig 3 @@ - 61,6 +61,12 @@ config XEN_PCIDEV_FE_DEBUG4 5 When in doubt, say N.3 @@ -51,6 +51,12 @@ config XEN_PCIDEV_FRONTEND 4 The PCI device frontend driver allows the kernel to import arbitrary 5 PCI devices from a PCI backend to support PCI driver domains. 6 6 7 7 +config PCI_DISABLE_COMMON_QUIRKS … … 16 16 --- a/drivers/pci/quirks.c 17 17 +++ b/drivers/pci/quirks.c 18 @@ -10 4,6 +104,7 @@ static void __devinit quirk_mmio_always_18 @@ -105,6 +105,7 @@ static void __devinit quirk_mmio_always_ 19 19 } 20 20 DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on); … … 24 24 * Mark this device with a broken_parity_status, to allow 25 25 * PCI scanning code to "skip" this now blacklisted device. 26 @@ -19 89,7 +1990,9 @@ static void __devinit fixup_rev1_53c810(26 @@ -1990,7 +1991,9 @@ static void __devinit fixup_rev1_53c810( 27 27 } 28 28 } … … 34 34 static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) 35 35 { 36 @@ -266 2,6 +2665,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT36 @@ -2666,6 +2669,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT 37 37 quirk_msi_intx_disable_bug); 38 38 -
trunk/target/linux/generic/patches-3.2/811-pci_disable_usb_common_quirks.patch
r29729 r29730 2 2 --- a/drivers/usb/host/pci-quirks.c 3 3 +++ b/drivers/usb/host/pci-quirks.c 4 @@ -4 23,6 +423,8 @@ reset_needed:4 @@ -431,6 +431,8 @@ reset_needed: 5 5 } 6 6 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); … … 11 11 { 12 12 u16 cmd; 13 @@ - 767,3 +769,5 @@ static void __devinit quirk_usb_early_ha13 @@ -877,3 +879,5 @@ static void __devinit quirk_usb_early_ha 14 14 quirk_usb_handoff_xhci(pdev); 15 15 } -
trunk/target/linux/generic/patches-3.2/820-usb_add_usb_find_device_by_name.patch
r29729 r29730 1 1 --- a/drivers/usb/core/usb.c 2 2 +++ b/drivers/usb/core/usb.c 3 @@ -6 45,6 +645,71 @@ int __usb_get_extra_descriptor(char *buf3 @@ -652,6 +652,71 @@ int __usb_get_extra_descriptor(char *buf 4 4 } 5 5 EXPORT_SYMBOL_GPL(__usb_get_extra_descriptor); … … 75 75 --- a/include/linux/usb.h 76 76 +++ b/include/linux/usb.h 77 @@ -5 16,6 +516,7 @@ extern int usb_lock_device_for_reset(str77 @@ -531,6 +531,7 @@ extern int usb_lock_device_for_reset(str 78 78 extern int usb_reset_device(struct usb_device *dev); 79 79 extern void usb_queue_reset_device(struct usb_interface *dev); -
trunk/target/linux/generic/patches-3.2/830-ledtrig_morse.patch
r29729 r29730 1 1 --- a/drivers/leds/Kconfig 2 2 +++ b/drivers/leds/Kconfig 3 @@ -45 3,4 +453,8 @@ config LEDS_TRIGGER_DEFAULT_ON3 @@ -457,4 +457,8 @@ config LEDS_TRIGGER_DEFAULT_ON 4 4 comment "iptables trigger is under Netfilter config (LED target)" 5 5 depends on LEDS_TRIGGERS -
trunk/target/linux/generic/patches-3.2/831-ledtrig_netdev.patch
r29729 r29730 1 1 --- a/drivers/leds/Kconfig 2 2 +++ b/drivers/leds/Kconfig 3 @@ -4 73,4 +473,11 @@ config LEDS_TRIGGER_MORSE3 @@ -461,4 +461,11 @@ config LEDS_TRIGGER_MORSE 4 4 tristate "LED Morse Trigger" 5 5 depends on LEDS_TRIGGERS -
trunk/target/linux/generic/patches-3.2/832-ledtrig_usbdev.patch
r29729 r29730 1 1 --- a/drivers/leds/Kconfig 2 2 +++ b/drivers/leds/Kconfig 3 @@ -46 4,4 +464,11 @@ config LEDS_TRIGGER_NETDEV3 @@ -468,4 +468,11 @@ config LEDS_TRIGGER_NETDEV 4 4 This allows LEDs to be controlled by network device activity. 5 5 If unsure, say Y. -
trunk/target/linux/generic/patches-3.2/833-gpio_buttons.patch
r29729 r29730 1 1 --- a/drivers/input/misc/Kconfig 2 2 +++ b/drivers/input/misc/Kconfig 3 @@ -5 27,4 +527,20 @@ config INPUT_XEN_KBDDEV_FRONTEND3 @@ -544,4 +544,20 @@ config INPUT_XEN_KBDDEV_FRONTEND 4 4 To compile this driver as a module, choose M here: the 5 5 module will be called xen-kbdfront. … … 24 24 --- a/drivers/input/misc/Makefile 25 25 +++ b/drivers/input/misc/Makefile 26 @@ - 49,3 +49,4 @@ obj-$(CONFIG_INPUT_WISTRON_BTNS) += wist26 @@ -51,3 +51,4 @@ obj-$(CONFIG_INPUT_WISTRON_BTNS) += wist 27 27 obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o 28 28 obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o -
trunk/target/linux/generic/patches-3.2/861-04_spi_gpio_implement_spi_delay.patch
r29729 r29730 7 7 --- a/drivers/spi/spi-gpio.c 8 8 +++ b/drivers/spi/spi-gpio.c 9 @@ -2 1,6 +21,7 @@9 @@ -22,6 +22,7 @@ 10 10 #include <linux/init.h> 11 11 #include <linux/platform_device.h> … … 15 15 #include <linux/spi/spi.h> 16 16 #include <linux/spi/spi_bitbang.h> 17 @@ - 69,6 +70,7 @@ struct spi_gpio {17 @@ -70,6 +71,7 @@ struct spi_gpio { 18 18 * #define SPI_MOSI_GPIO 120 19 19 * #define SPI_SCK_GPIO 121 … … 23 23 */ 24 24 25 @@ -7 6,6 +78,7 @@ struct spi_gpio {25 @@ -77,6 +79,7 @@ struct spi_gpio { 26 26 #define DRIVER_NAME "spi_gpio" 27 27 … … 31 31 /* all functions referencing these symbols must define pdata */ 32 32 #define SPI_MISO_GPIO ((pdata)->miso) 33 @@ -12 0,12 +123,20 @@ static inline int getmiso(const struct s33 @@ -121,12 +124,20 @@ static inline int getmiso(const struct s 34 34 #undef pdata 35 35 -
trunk/target/linux/generic/patches-3.2/863-gpiommc.patch
r29729 r29730 830 830 --- a/MAINTAINERS 831 831 +++ b/MAINTAINERS 832 @@ - 2930,6 +2930,11 @@ L: linuxppc-dev@lists.ozlabs.org832 @@ -3008,6 +3008,11 @@ L: linuxppc-dev@lists.ozlabs.org 833 833 S: Odd Fixes 834 834 F: drivers/tty/hvc/ -
trunk/target/linux/generic/patches-3.2/911-kobject_add_broadcast_uevent.patch
r29729 r29730 21 21 static inline int kobject_uevent(struct kobject *kobj, 22 22 enum kobject_action action) 23 @@ -231,6 +237,16 @@ static inline int add_uevent_var(struct23 @@ -231,6 +237,16 @@ int add_uevent_var(struct kobj_uevent_en 24 24 static inline int kobject_action_type(const char *buf, size_t count, 25 25 enum kobject_action *type) -
trunk/target/linux/generic/patches-3.2/920-unable_to_open_console.patch
r29729 r29730 1 1 --- a/init/main.c 2 2 +++ b/init/main.c 3 @@ -8 90,7 +890,7 @@ static int __init kernel_init(void * unu3 @@ -821,7 +821,7 @@ static int __init kernel_init(void * unu 4 4 5 5 /* Open the /dev/console on the rootfs, this should never fail */ -
trunk/target/linux/generic/patches-3.2/921-use_preinit_as_init.patch
r29729 r29730 1 1 --- a/init/main.c 2 2 +++ b/init/main.c 3 @@ - 844,10 +844,7 @@ static noinline int init_post(void)3 @@ -783,10 +783,7 @@ static noinline int init_post(void) 4 4 printk(KERN_WARNING "Failed to execute %s. Attempting " 5 5 "defaults...\n", execute_command); -
trunk/target/linux/generic/patches-3.2/930-crashlog.patch
r29729 r29730 16 16 --- a/init/Kconfig 17 17 +++ b/init/Kconfig 18 @@ -8 79,6 +879,10 @@ config RELAY18 @@ -891,6 +891,10 @@ config RELAY 19 19 20 20 If unsure, say N. … … 29 29 --- a/kernel/Makefile 30 30 +++ b/kernel/Makefile 31 @@ -10 8,6 +108,7 @@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += us31 @@ -109,6 +109,7 @@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += us 32 32 obj-$(CONFIG_PADATA) += padata.o 33 33 obj-$(CONFIG_CRASH_DUMP) += crash_dump.o … … 214 214 +++ b/mm/bootmem.c 215 215 @@ -15,6 +15,7 @@ 216 #include <linux/ module.h>216 #include <linux/export.h> 217 217 #include <linux/kmemleak.h> 218 218 #include <linux/range.h> -
trunk/target/linux/generic/patches-3.2/940-ocf_kbuild_integration.patch
r29729 r29730 1 1 --- a/crypto/Kconfig 2 2 +++ b/crypto/Kconfig 3 @@ - 860,3 +860,6 @@ config CRYPTO_USER_API_SKCIPHER3 @@ -923,3 +923,6 @@ config CRYPTO_USER_API_SKCIPHER 4 4 source "drivers/crypto/Kconfig" 5 5 … … 10 10 --- a/crypto/Makefile 11 11 +++ b/crypto/Makefile 12 @@ - 89,6 +89,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg.12 @@ -91,6 +91,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg. 13 13 obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o 14 14 obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o -
trunk/target/linux/generic/patches-3.2/941-ocf_20110720.patch
r29729 r29730 1 1 --- a/kernel/pid.c 2 2 +++ b/kernel/pid.c 3 @@ -42 6,6 +426,7 @@ struct task_struct *find_task_by_vpid(pi3 @@ -428,6 +428,7 @@ struct task_struct *find_task_by_vpid(pi 4 4 { 5 5 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns); … … 111 111 --- a/include/linux/miscdevice.h 112 112 +++ b/include/linux/miscdevice.h 113 @@ -1 8,6 +18,7 @@113 @@ -19,6 +19,7 @@ 114 114 #define APOLLO_MOUSE_MINOR 7 115 115 #define PC110PAD_MINOR 9 -
trunk/target/linux/generic/patches-3.2/950-vm_exports.patch
r29729 r29730 1 1 --- a/mm/shmem.c 2 2 +++ b/mm/shmem.c 3 @@ -24 56,6 +2456,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);3 @@ -2462,6 +2462,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); 4 4 5 5 /* common code */ … … 18 18 * shmem_file_setup - get an unlinked file living in tmpfs 19 19 * @name: name for dentry (to be seen in /proc/<pid>/maps 20 @@ -253 3,11 +2543,8 @@ int shmem_zero_setup(struct vm_area_stru20 @@ -2539,11 +2549,8 @@ int shmem_zero_setup(struct vm_area_stru 21 21 if (IS_ERR(file)) 22 22 return PTR_ERR(file); … … 62 62 --- a/kernel/sched.c 63 63 +++ b/kernel/sched.c 64 @@ - 4953,6 +4953,7 @@ int can_nice(const struct task_struct *p64 @@ -5101,6 +5101,7 @@ int can_nice(const struct task_struct *p 65 65 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || 66 66 capable(CAP_SYS_NICE)); … … 108 108 --- a/include/linux/mm.h 109 109 +++ b/include/linux/mm.h 110 @@ -87 1,6 +871,7 @@ extern bool skip_free_areas_node(unsigne110 @@ -872,6 +872,7 @@ extern bool skip_free_areas_node(unsigne 111 111 112 112 int shmem_lock(struct file *file, int lock, struct user_struct *user); -
trunk/target/linux/generic/patches-3.2/980-update_arm_machtypes.patch
r29729 r29730 1 1 --- a/arch/arm/tools/mach-types 2 2 +++ b/arch/arm/tools/mach-types 3 @@ -12,4 74 +12,2803 @@3 @@ -12,484 +12,2803 @@ 4 4 # 5 5 # http://www.arm.linux.org.uk/developer/machines/?action=new 6 6 # 7 -# XXX: This is a cut-down version of the file; it contains only machines that 8 -# XXX: are in mainline or have been submitted to the machine database within 9 -# XXX: the last 12 months. If your entry is missing please email rmk at 10 -# XXX: <linux@arm.linux.org.uk> 7 -# This is a cut-down version of the file; it contains only machines that 8 -# are merged into mainline or have been edited in the machine database 9 -# within the last 12 months. References to machine_is_NAME() do not count! 11 10 -# 12 11 -# Last update: Sat May 7 08:48:24 2011 … … 203 202 +nova SA1100_NOVA NOVA 188 204 203 +hmk ARCH_HMK HMK 189 205 +karo ARCH_KARO KARO 190204 karo ARCH_KARO KARO 190 206 205 +fester SA1100_FESTER FESTER 191 207 206 +gpi ARCH_GPI GPI 192 … … 912 911 palmz72 MACH_PALMZ72 PALMZ72 904 913 912 nxdb500 MACH_NXDB500 NXDB500 905 914 +apf9328 MACH_APF9328 APF9328 906913 apf9328 MACH_APF9328 APF9328 906 915 914 +omap_wipoq MACH_OMAP_WIPOQ OMAP_WIPOQ 907 916 915 +omap_twip MACH_OMAP_TWIP OMAP_TWIP 908 … … 1570 1569 +rcc MACH_RCC RCC 1576 1571 1570 +dmp MACH_ARM9 ARM9 1577 1572 +vision_ep9307 MACH_VISION_EP9307 VISION_EP9307 15781571 vision_ep9307 MACH_VISION_EP9307 VISION_EP9307 1578 1573 1572 +scly1000 MACH_SCLY1000 SCLY1000 1579 1574 1573 +fontel_ep MACH_FONTEL_EP FONTEL_EP 1580 … … 1600 1599 +u3 MACH_U3 U3 1607 1601 1600 +smdk2450 MACH_SMDK2450 SMDK2450 1608 1602 +rsi_ews MACH_RSI_EWS RSI_EWS 16091601 rsi_ews MACH_RSI_EWS RSI_EWS 1609 1603 1602 +tnb MACH_TNB TNB 1610 1604 1603 +toepath MACH_TOEPATH TOEPATH 1611 … … 1827 1826 +logi9260 MACH_LOGI9260 LOGI9260 1839 1828 1827 +mx31_exm32 MACH_MX31_EXM32 MX31_EXM32 1840 1829 +usb_a9g20 MACH_USB_A9G20 USB_A9G20 18411828 usb_a9g20 MACH_USB_A9G20 USB_A9G20 1841 1830 1829 +picproje2008 MACH_PICPROJE2008 PICPROJE2008 1842 1831 1830 +cs_e9315 MACH_CS_E9315 CS_E9315 1843 … … 1960 1959 cpuat9260 MACH_CPUAT9260 CPUAT9260 1973 1961 1960 +cpupxa255 MACH_CPUPXA255 CPUPXA255 1974 1962 eukrea_cpuimx27 MACH_ CPUIMX27CPUIMX27 19751961 eukrea_cpuimx27 MACH_EUKREA_CPUIMX27 EUKREA_CPUIMX27 1975 1963 1962 +cheflux MACH_CHEFLUX CHEFLUX 1976 1964 1963 +eb_cpux9k2 MACH_EB_CPUX9K2 EB_CPUX9K2 1977 … … 2112 2111 mx51_babbage MACH_MX51_BABBAGE MX51_BABBAGE 2125 2113 2112 +s3c2440turkiye MACH_S3C2440TURKIYE S3C2440TURKIYE 2126 2114 +tx37 MACH_TX37 TX37 21272113 tx37 MACH_TX37 TX37 2127 2115 2114 +sbc2800_9g20 MACH_SBC2800_9G20 SBC2800_9G20 2128 2116 2115 +benzglb MACH_BENZGLB BENZGLB 2129 … … 2162 2161 +quatro45xx MACH_QUATRO45XX QUATRO45XX 2175 2163 2162 +openpad MACH_OPENPAD OPENPAD 2176 2164 +tx25 MACH_TX25 TX25 21772163 tx25 MACH_TX25 TX25 2177 2165 2164 omap3_torpedo MACH_OMAP3_TORPEDO OMAP3_TORPEDO 2178 2166 2165 +htcraphael_k MACH_HTCRAPHAEL_K HTCRAPHAEL_K 2179 … … 2407 2406 +net5big MACH_NET5BIG NET5BIG 2426 2408 2407 +seabed9263 MACH_SEABED9263 SEABED9263 2427 2409 +mx51_m2id MACH_MX51_M2ID MX51_M2ID 24282408 mx51_m2id MACH_MX51_M2ID MX51_M2ID 2428 2410 2409 +octvocplus_eb MACH_OCTVOCPLUS_EB OCTVOCPLUS_EB 2429 2411 2410 +klk_firefox MACH_KLK_FIREFOX KLK_FIREFOX 2430 … … 2506 2505 +vpnext MACH_VPNEXT VPNEXT 2527 2507 2506 +swarco_itc3 MACH_SWARCO_ITC3 SWARCO_ITC3 2528 2508 +tx51 MACH_TX51 TX51 25292507 tx51 MACH_TX51 TX51 2529 2509 2508 +dolby_cat1021 MACH_DOLBY_CAT1021 DOLBY_CAT1021 2530 2510 2509 mx28evk MACH_MX28EVK MX28EVK 2531 … … 2572 2571 +phrazer_bulldog MACH_PHRAZER_BULLDOG PHRAZER_BULLDOG 2593 2573 2572 +omap3_bulldog MACH_OMAP3_BULLDOG OMAP3_BULLDOG 2594 2574 +pca101 MACH_PCA101 PCA101 25952573 pca101 MACH_PCA101 PCA101 2595 2575 2574 +buzzc MACH_BUZZC BUZZC 2596 2576 2575 +sasie2 MACH_SASIE2 SASIE2 2597 … … 2600 2599 +mini2440v2 MACH_MINI2440V2 MINI2440V2 2623 2601 2600 icontrol MACH_ICONTROL ICONTROL 2624 2601 -gplugd MACH_GPLUGD GPLUGD 2625 2602 2602 +gplugd MACH_SHEEVAD SHEEVAD 2625 2603 2603 +qsd8x50a_st1_1 MACH_QSD8X50A_ST1_1 QSD8X50A_ST1_1 2626 … … 2791 2791 +tam3517 MACH_TAM3517 TAM3517 2818 2792 2792 +pdc100 MACH_PDC100 PDC100 2819 2793 eukrea_cpuimx25sd MACH_EUKREA_CPUIMX25 EUKREA_CPUIMX2528202794 eukrea_cpuimx35sd MACH_EUKREA_CPUIMX35 EUKREA_CPUIMX3528212793 eukrea_cpuimx25sd MACH_EUKREA_CPUIMX25SD EUKREA_CPUIMX25SD 2820 2794 eukrea_cpuimx35sd MACH_EUKREA_CPUIMX35SD EUKREA_CPUIMX35SD 2821 2795 2795 eukrea_cpuimx51sd MACH_EUKREA_CPUIMX51SD EUKREA_CPUIMX51SD 2822 2796 2796 eukrea_cpuimx51 MACH_EUKREA_CPUIMX51 EUKREA_CPUIMX51 2823 … … 2811 2811 omap3_braillo MACH_OMAP3_BRAILLO OMAP3_BRAILLO 2839 2812 2812 spyplug MACH_SPYPLUG SPYPLUG 2840 2813 @@ - 692,6 +3021,7 @@ s5pc110_crespo MACH_S5PC110_CRESPO S5PC2813 @@ -702,6 +3021,7 @@ s5pc110_crespo MACH_S5PC110_CRESPO S5PC 2814 2814 controltek9g20 MACH_CONTROLTEK9G20 CONTROLTEK9G20 3053 2815 2815 tin307 MACH_TIN307 TIN307 3054 … … 2819 2819 tem3x30 MACH_TEM3X30 TEM3X30 3058 2820 2820 harvest_desoto MACH_HARVEST_DESOTO HARVEST_DESOTO 3059 2821 @@ -910,7 +3240,7 @@ omapl138_case_a3 MACH_OMAPL138_CASE_A3 O 2822 uemd MACH_UEMD UEMD 3281 2823 ccwmx51mut MACH_CCWMX51MUT CCWMX51MUT 3282 2824 rockhopper MACH_ROCKHOPPER ROCKHOPPER 3283 2825 -nookcolor MACH_NOOKCOLOR NOOKCOLOR 3284 2826 +encore MACH_ENCORE ENCORE 3284 2827 hkdkc100 MACH_HKDKC100 HKDKC100 3285 2828 ts42xx MACH_TS42XX TS42XX 3286 2829 aebl MACH_AEBL AEBL 3287 2830 @@ -921,7 +3251,9 @@ isc3 MACH_ISC3 ISC3 3291 2821 @@ -931,7 +3251,9 @@ isc3 MACH_ISC3 ISC3 3291 2831 2822 rascal MACH_RASCAL RASCAL 3292 2832 2823 hrefv60 MACH_HREFV60 HREFV60 3293 … … 2838 2829 htc_hd_mini MACH_HTC_HD_MINI HTC_HD_MINI 3299 2839 2830 athene MACH_ATHENE ATHENE 3300 2840 @@ -9 32,6 +3264,7 @@ rfl109145_ssrv MACH_RFL109145_SSRV RFL12831 @@ -942,6 +3264,7 @@ rfl109145_ssrv MACH_RFL109145_SSRV RFL1 2841 2832 nmh MACH_NMH NMH 3305 2842 2833 wn802t MACH_WN802T WN802T 3306 … … 2846 2837 bcmhana_sv MACH_BCMHANA_SV BCMHANA_SV 3310 2847 2838 bcmhana_tablet MACH_BCMHANA_TABLET BCMHANA_TABLET 3311 2848 @@ -10 11,13 +3344,15 @@ viprinet MACH_VIPRINET VIPRINET 33852839 @@ -1021,13 +3344,15 @@ viprinet MACH_VIPRINET VIPRINET 3385 2849 2840 bockw MACH_BOCKW BOCKW 3386 2850 2841 eva2000 MACH_EVA2000 EVA2000 3387 … … 2863 2854 msm8960_apq MACH_MSM8960_APQ MSM8960_APQ 3399 2864 2855 helios_v2 MACH_HELIOS_V2 HELIOS_V2 3400 2865 @@ -10 49,6 +3384,7 @@ gt_i5700 MACH_GT_I5700 GT_I5700 34252856 @@ -1059,6 +3384,7 @@ gt_i5700 MACH_GT_I5700 GT_I5700 3425 2866 2857 ctera_plug_c2 MACH_CTERA_PLUG_C2 CTERA_PLUG_C2 3426 2867 2858 marvelct MACH_MARVELCT MARVELCT 3427 … … 2871 2862 matrix505 MACH_MATRIX505 MATRIX505 3431 2872 2863 oce_nigma MACH_OCE_NIGMA OCE_NIGMA 3432 2873 @@ -10 88,6 +3424,7 @@ h1600 MACH_H1600 H1600 34652864 @@ -1098,6 +3424,7 @@ h1600 MACH_H1600 H1600 3465 2874 2865 mini210 MACH_MINI210 MINI210 3466 2875 2866 mini8168 MACH_MINI8168 MINI8168 3467 … … 2879 2870 mx51erebus MACH_MX51EREBUS MX51EREBUS 3471 2880 2871 wm8650refboard MACH_WM8650REFBOARD WM8650REFBOARD 3472 2881 @@ -11 13,3 +3450,110@@ blissc MACH_BLISSC BLISSC 34912872 @@ -1123,6 +3450,113 @@ blissc MACH_BLISSC BLISSC 3491 2882 2873 thales_adc MACH_THALES_ADC THALES_ADC 3492 2883 2874 ubisys_p9d_evp MACH_UBISYS_P9D_EVP UBISYS_P9D_EVP 3493 … … 2990 2981 +tagh MACH_TAGH TAGH 3600 2991 2982 +filbert MACH_FILBERT FILBERT 3601 2983 m28evk MACH_M28EVK M28EVK 3613 2984 smdk4212 MACH_SMDK4212 SMDK4212 3638 2985 smdk4412 MACH_SMDK4412 SMDK4412 3765 -
trunk/target/linux/generic/patches-3.2/992-mpcore_wdt_fix_watchdog_counter_loading.patch
r29729 r29730 32 32 @@ -24,5 +24,6 @@ extern void __iomem *twd_base; 33 33 34 int twd_timer_ack(void);35 34 void twd_timer_setup(struct clock_event_device *); 35 void twd_timer_stop(struct clock_event_device *); 36 36 +unsigned long twd_timer_get_rate(void); 37 37 … … 39 39 --- a/arch/arm/kernel/smp_twd.c 40 40 +++ b/arch/arm/kernel/smp_twd.c 41 @@ -1 42,3 +142,10 @@ void __cpuinit twd_timer_setup(struct cl41 @@ -185,3 +185,10 @@ void __cpuinit twd_timer_setup(struct cl 42 42 43 clockevents_register_device(clk);43 enable_percpu_irq(clk->irq, 0); 44 44 } 45 45 +
Note: See TracChangeset
for help on using the changeset viewer.