From 30adc11d1cecc5d294f2c0548de080e0984226be Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 10 Aug 2013 07:27:52 +0000 Subject: [PATCH] core/linux-armv5 to 3.11.0-4 --- core/linux-armv5/PKGBUILD | 6 +- core/linux-armv5/config | 122 +++++++++++++++++-------- core/linux-armv5/imx23-olinuxino.patch | 63 +++++++++++-- 3 files changed, 140 insertions(+), 51 deletions(-) diff --git a/core/linux-armv5/PKGBUILD b/core/linux-armv5/PKGBUILD index e0e5ba5a3..8318f0eda 100644 --- a/core/linux-armv5/PKGBUILD +++ b/core/linux-armv5/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-3.11-rc4 _kernelname=${pkgbase#linux} _desc="ARMv5 based platforms" pkgver=3.11.0 -pkgrel=3 +pkgrel=4 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') @@ -18,8 +18,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/testing/${_srcname}.tar.xz" 'config' 'imx23-olinuxino.patch') md5sums=('e1f1ab33167e0bcd48df7d5bceced194' - '8a80e5df40e71d6aab793ef4130596dd' - 'f536078d41d92941951b92489e5d7600') + '590cc6fb5d81af15e81dd50acb16427a' + '82e13220db5032e36e635fb1c29cbf6a') prepare() { cd "${srcdir}/${_srcname}" diff --git a/core/linux-armv5/config b/core/linux-armv5/config index 89ef9fad6..fd7b0c407 100644 --- a/core/linux-armv5/config +++ b/core/linux-armv5/config @@ -158,7 +158,7 @@ CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y -# CONFIG_COMPAT_BRK is not set +CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set @@ -167,7 +167,7 @@ CONFIG_SLUB_CPU_PARTIAL=y CONFIG_TRACEPOINTS=y CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set -# CONFIG_JUMP_LABEL is not set +CONFIG_JUMP_LABEL=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y @@ -182,6 +182,7 @@ CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y @@ -214,9 +215,26 @@ CONFIG_BLK_DEV_INTEGRITY=y # # Partition Types # -# CONFIG_PARTITION_ADVANCED is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_AIX_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set # # IO Schedulers @@ -365,7 +383,8 @@ CONFIG_AEABI=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set CONFIG_HAVE_ARCH_PFN_VALID=y -# CONFIG_HIGHMEM is not set +CONFIG_HIGHMEM=y +# CONFIG_HIGHPTE is not set CONFIG_HW_PERF_EVENTS=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y @@ -377,6 +396,7 @@ CONFIG_COMPACTION=y CONFIG_MIGRATION=y # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 +CONFIG_BOUNCE=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_CROSS_MEMORY_ATTACH=y @@ -387,7 +407,7 @@ CONFIG_NEED_PER_CPU_KM=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set -# CONFIG_SECCOMP is not set +CONFIG_SECCOMP=y # CONFIG_CC_STACKPROTECTOR is not set # @@ -545,6 +565,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -601,7 +622,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m @@ -614,11 +635,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # Xtables matches # CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -# CONFIG_NETFILTER_XT_MATCH_BPF is not set +CONFIG_NETFILTER_XT_MATCH_BPF=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m @@ -945,9 +966,13 @@ CONFIG_MAC80211_LEDS=y CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set -# CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y # CONFIG_RFKILL_REGULATOR is not set +# CONFIG_RFKILL_GPIO is not set # CONFIG_NET_9P is not set # CONFIG_CAIF is not set # CONFIG_CEPH_LIB is not set @@ -1290,7 +1315,11 @@ CONFIG_NET_VENDOR_8390=y # CONFIG_ETHOC is not set # CONFIG_SH_ETH is not set # CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SMSC is not set +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC91X=y +CONFIG_SMC911X=y +CONFIG_SMSC911X=y +# CONFIG_SMSC911X_ARCH_HOOKS is not set # CONFIG_NET_VENDOR_STMICRO is not set CONFIG_NET_VENDOR_VIA=y # CONFIG_VIA_VELOCITY is not set @@ -1343,7 +1372,7 @@ CONFIG_USB_CATC=m CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m -# CONFIG_USB_RTL8152 is not set +CONFIG_USB_RTL8152=m CONFIG_USB_USBNET=y CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_AX88179_178A=y @@ -1370,6 +1399,7 @@ CONFIG_USB_NET_ZAURUS=m CONFIG_USB_NET_CX82310_ETH=m CONFIG_USB_NET_KALMIA=m CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m CONFIG_USB_NET_INT51X1=m CONFIG_USB_IPHETH=m CONFIG_USB_SIERRA_NET=m @@ -1475,10 +1505,17 @@ CONFIG_MWIFIEX_USB=m # CONFIG_CW1200 is not set # -# Enable WiMAX (Networking options) to see the WiMAX drivers +# WiMAX Wireless Broadband devices # +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 # CONFIG_WAN is not set -# CONFIG_IEEE802154_DRIVERS is not set +CONFIG_IEEE802154_DRIVERS=m +# CONFIG_IEEE802154_FAKEHARD is not set +CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +CONFIG_IEEE802154_MRF24J40=m # CONFIG_ISDN is not set # @@ -2136,6 +2173,7 @@ CONFIG_USB_KEENE=m # # Texas Instruments WL128x FM driver (ST based) # +# CONFIG_RADIO_WL128X is not set CONFIG_MEDIA_COMMON_OPTIONS=y # @@ -2606,7 +2644,10 @@ CONFIG_USB_DEFAULT_PERSIST=y # # CONFIG_USB_C67X00_HCD is not set # CONFIG_USB_XHCI_HCD is not set -# CONFIG_USB_EHCI_HCD is not set +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +# CONFIG_USB_EHCI_HCD_PLATFORM is not set # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1760_HCD is not set @@ -2622,7 +2663,7 @@ CONFIG_USB_DEFAULT_PERSIST=y # USB Device Class drivers # CONFIG_USB_ACM=m -# CONFIG_USB_PRINTER is not set +CONFIG_USB_PRINTER=m CONFIG_USB_WDM=m # CONFIG_USB_TMC is not set @@ -2635,34 +2676,34 @@ CONFIG_USB_WDM=m # CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_REALTEK=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_STORAGE_ENE_UB6250=y +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m # # USB Imaging devices # -CONFIG_USB_MDC800=y -CONFIG_USB_MICROTEK=y +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m # CONFIG_USB_DWC3 is not set CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_HOST=y # CONFIG_USB_CHIPIDEA_DEBUG is not set # # USB port drivers # -CONFIG_USB_SERIAL=y -# CONFIG_USB_SERIAL_CONSOLE is not set +CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m @@ -2673,7 +2714,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_FUNSOFT=m CONFIG_USB_SERIAL_VISOR=m CONFIG_USB_SERIAL_IPAQ=m @@ -2706,7 +2747,7 @@ CONFIG_USB_SERIAL_MOS7720=m CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_MOTOROLA=m CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=y +CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_OTI6858=m CONFIG_USB_SERIAL_QCAUX=m CONFIG_USB_SERIAL_QUALCOMM=m @@ -2751,6 +2792,7 @@ CONFIG_USB_CYTHERM=m CONFIG_USB_IDMOUSE=m CONFIG_USB_FTDI_ELAN=m CONFIG_USB_APPLEDISPLAY=m +# CONFIG_USB_SISUSBVGA is not set CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m CONFIG_USB_IOWARRIOR=m @@ -2793,7 +2835,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_MMC_SDHCI_PXAV3 is not set # CONFIG_MMC_SDHCI_PXAV2 is not set CONFIG_MMC_MXS=y -# CONFIG_MMC_SPI is not set # CONFIG_MMC_DW is not set # CONFIG_MMC_VUB300 is not set # CONFIG_MMC_USHC is not set @@ -3562,6 +3603,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_VM is not set CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_HIGHMEM is not set # CONFIG_DEBUG_SHIRQ is not set # @@ -3835,12 +3877,12 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y +# CONFIG_XZ_DEC_X86 is not set +# CONFIG_XZ_DEC_POWERPC is not set +# CONFIG_XZ_DEC_IA64 is not set CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y -CONFIG_XZ_DEC_SPARC=y +# CONFIG_XZ_DEC_SPARC is not set CONFIG_XZ_DEC_BCJ=y # CONFIG_XZ_DEC_TEST is not set CONFIG_TEXTSEARCH=y diff --git a/core/linux-armv5/imx23-olinuxino.patch b/core/linux-armv5/imx23-olinuxino.patch index e09e7ca6c..a2882146c 100644 --- a/core/linux-armv5/imx23-olinuxino.patch +++ b/core/linux-armv5/imx23-olinuxino.patch @@ -1,6 +1,6 @@ diff -urN a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi ---- a/arch/arm/boot/dts/imx23.dtsi 2013-07-14 16:18:27.000000000 -0600 -+++ b/arch/arm/boot/dts/imx23.dtsi 2013-07-19 15:57:45.755900635 -0600 +--- a/arch/arm/boot/dts/imx23.dtsi 2013-08-04 14:46:46.000000000 -0600 ++++ b/arch/arm/boot/dts/imx23.dtsi 2013-08-10 00:29:30.970654697 -0600 @@ -306,6 +306,39 @@ fsl,voltage = <1>; fsl,pull-up = <1>; @@ -58,7 +58,7 @@ diff -urN a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi + i2c0: i2c@80058000 { + #address-cells = <1>; + #size-cells = <0>; -+ compatible = "fsl,imx28-i2c"; ++ compatible = "fsl,imx23-i2c"; reg = <0x80058000 0x2000>; + interrupts = <27 26>; + clock-frequency = <100000>; @@ -67,8 +67,8 @@ diff -urN a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi dma-names = "rx-tx"; status = "disabled"; diff -urN a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts ---- a/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-14 16:18:27.000000000 -0600 -+++ b/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-19 15:57:50.235879808 -0600 +--- a/arch/arm/boot/dts/imx23-olinuxino.dts 2013-08-04 14:46:46.000000000 -0600 ++++ b/arch/arm/boot/dts/imx23-olinuxino.dts 2013-08-10 00:30:11.425471962 -0600 @@ -29,6 +29,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>; @@ -77,22 +77,69 @@ diff -urN a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olin broken-cd; status = "okay"; }; -@@ -69,6 +70,12 @@ +@@ -69,6 +70,29 @@ }; apbx@80040000 { ++ lradc@80050000 { ++ status = "okay"; ++ }; ++ + i2c0: i2c@80058000 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins_a>; + status = "okay"; ++ ++ sgtl5000: codec@0a { ++ compatible = "fsl,sgtl5000"; ++ reg = <0x0a>; ++ VDDA-supply = <®_3p3v>; ++ VDDIO-supply = <®_3p3v>; ++ }; ++ ++ at24@51 { ++ compatible = "at24,24c32"; ++ pagesize = <32>; ++ reg = <0x51>; ++ }; + }; + duart: serial@80070000 { pinctrl-names = "default"; pinctrl-0 = <&duart_pins_a>; +@@ -97,6 +121,14 @@ + regulators { + compatible = "simple-bus"; + ++ reg_3p3v: 3p3v { ++ compatible = "regulator-fixed"; ++ regulator-name = "3P3V"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ }; ++ + reg_usb0_vbus: usb0_vbus { + compatible = "regulator-fixed"; + regulator-name = "usb0_vbus"; +@@ -108,6 +140,14 @@ + }; + }; + ++ sound { ++ compatible = "fsl,imx28-evk-sgtl5000", ++ "fsl,mxs-audio-sgtl5000"; ++ model = "imx28-evk-sgtl5000"; ++ saif-controllers = <&saif0 &saif1>; ++ audio-codec = <&sgtl5000>; ++ }; ++ + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; diff -urN a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c ---- a/drivers/mmc/host/mxs-mmc.c 2013-07-14 16:18:27.000000000 -0600 -+++ b/drivers/mmc/host/mxs-mmc.c 2013-07-19 15:57:40.280926089 -0600 +--- a/drivers/mmc/host/mxs-mmc.c 2013-08-04 14:46:46.000000000 -0600 ++++ b/drivers/mmc/host/mxs-mmc.c 2013-08-05 11:00:07.791212657 -0600 @@ -94,6 +94,9 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)