Merge pull request #753 from mikkeloscar/linux-sun4i

Update linux-sun4i to working copy of 3.4.79
2024-11-08 22:45:43 +00:00 · 2014-03-11 07:21:55 -06:00 · 2014-03-11 07:21:55 -06:00 · 810a81d065
commit 810a81d065
parent 14d917d953 a14cb28a0d
3 changed files with 100 additions and 19 deletions
--- a/core/linux-sun4i/PKGBUILD
+++ b/core/linux-sun4i/PKGBUILD
@ -4,11 +4,11 @@
 buildarch=4

 pkgbase=linux-sun4i
-_commit=9cfbbed3b2b098774b04553843d2f4092b8f7fe8
+_commit=8ea347bcb4b4a5e50ec0343afac579e933ce8402
 _srcname=linux-sunxi-${_commit}
 _kernelname=${pkgname#linux}
 _desc="AllWinner A10"
-pkgver=3.4.75
+pkgver=3.4.79
 pkgrel=1
 arch=('armv7h')
 url="http://www.kernel.org/"
@ -17,8 +17,8 @@ makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'bc' 'kmod' 'inetutils')
 options=('!strip')
 source=("https://github.com/linux-sunxi/linux-sunxi/archive/${_commit}.tar.gz"
        'config')
-md5sums=('a40190d501993b35b0022889e2f64902'
-         'bc1a3b1b13628c4a8d5785890796cf09')
+md5sums=('a6f18158a7f8dcb552547ea958c24c6b'
+         'b249073f997f84f8dd793a400b209ef0')

 prepare() {
  cd "${srcdir}/${_srcname}"
@ -70,7 +70,6 @@ _package() {
  optdepends=('crda: to set the correct wireless channels of your country')
  provides=("kernel26" "linux=${pkgver}")
  conflicts=('kernel26' 'linux')
-  backup=("etc/mkinitcpio.d/${pkgname}.preset")
  install=${pkgname}.install

  cd "${srcdir}/${_srcname}"
--- a/core/linux-sun4i/config
+++ b/core/linux-sun4i/config
@ -1,9 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.75-1 Kernel Configuration
+# Linux/arm 3.4.79 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_KTIME_SCALAR=y
@ -19,6 +20,7 @@ CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
@ -155,6 +157,8 @@ CONFIG_HAVE_OPROFILE=y
 # CONFIG_JUMP_LABEL is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@ -308,6 +312,8 @@ CONFIG_ARCH_SUN4I=y
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_VT8500 is not set
 # CONFIG_ARCH_ZYNQ is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set

 #
 # System MMU
@ -317,7 +323,6 @@ CONFIG_ARCH_SUN4I=y
 # Allwinner's sunxi options
 #
 CONFIG_SUNXI_MULTIPLATFORM=y
-CONFIG_SUNXI_MALI_RESERVED_MEM=y
 CONFIG_SUNXI_SCALING_MIN=60
 CONFIG_PLAT_SUNXI=y

@ -409,7 +414,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_KSM=y
@ -880,6 +885,7 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
 # CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
@ -917,6 +923,7 @@ CONFIG_RFKILL_PM=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 # CONFIG_RFKILL_REGULATOR is not set
+CONFIG_RFKILL_GPIO=m
 CONFIG_SUNXI_RFKILL=y
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
@ -945,6 +952,7 @@ CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_SYNC is not set
+# CONFIG_CMA is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
@ -1029,6 +1037,7 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y
 # CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_SM_COMMON is not set
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
@ -1059,6 +1068,7 @@ CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_DEVICE=y
+CONFIG_OF_GPIO=y
 CONFIG_OF_I2C=y
 CONFIG_OF_NET=y
 CONFIG_OF_SPI=y
@ -1079,6 +1089,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BLK_DEV_XIP is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MG_DISK is not set
 # CONFIG_BLK_DEV_RBD is not set
 CONFIG_SUNXI_NAND=y
 CONFIG_SUNXI_NAND_COMPAT_DEV=y
@ -1089,7 +1100,6 @@ CONFIG_SUNXI_NAND_COMPAT_DEV=y
 #
 # CONFIG_SENSORS_LIS3LV02D is not set
 # CONFIG_AD525X_DPOT is not set
-CONFIG_SUN4I_GPIO_UGLY=m
 CONFIG_SUNXI_DBGREG=m
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_SUNXI_PWM is not set
@ -1126,6 +1136,7 @@ CONFIG_EEPROM_93CX6=m
 #
 # Texas Instruments shared transport line discipline
 #
+CONFIG_TI_ST=m
 # CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set

@ -1286,7 +1297,7 @@ CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_SMSC911X is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_STMMAC_ETH is not set
-CONFIG_SUNXI_EMAC=m
+CONFIG_SUNXI_EMAC=y
 CONFIG_PHYLIB=y

 #
@ -1471,8 +1482,10 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 # CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_KEYBOARD_TCA6416 is not set
 # CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_MCS is not set
@ -1502,6 +1515,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_BCM5974 is not set
 # CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
 CONFIG_INPUT_JOYSTICK=y
@ -1533,7 +1547,9 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
@ -1574,6 +1590,8 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
 # CONFIG_INPUT_ATI_REMOTE2 is not set
 # CONFIG_INPUT_KEYCHORD is not set
 # CONFIG_INPUT_KEYSPAN_REMOTE is not set
@ -1584,6 +1602,7 @@ CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
 # CONFIG_INPUT_GPIO is not set
 # CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_CMA3000 is not set

@ -1647,6 +1666,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
@ -1673,6 +1693,7 @@ CONFIG_I2C_ALGOBIT=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PXA_PCI is not set
@ -1703,7 +1724,9 @@ CONFIG_SPI_MASTER=y
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_GPIO=m
+# CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_SUN4I=m
@ -1735,7 +1758,45 @@ CONFIG_SPI_SUN4I=m
 # Enable Device Drivers -> PPS to see the PTP clock options.
 #
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_GPIOLIB is not set
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=y
+
+#
+# Memory mapped GPIO drivers:
+#
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_PL061 is not set
+CONFIG_GPIO_SUNXI=y
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_ADP5588 is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
+
+#
+# AC97 GPIO expanders:
+#
+
+#
+# MODULbus GPIO expanders:
+#
 # CONFIG_W1 is not set
 CONFIG_POWER_SUPPLY=y
 CONFIG_AW_AXP=y
@ -1757,6 +1818,7 @@ CONFIG_AXP_CHGCHANGE=y
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_SMB347 is not set
 CONFIG_HWMON=y
@ -1791,6 +1853,7 @@ CONFIG_SENSORS_MMA7660=m
 # CONFIG_SENSORS_G760A is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
@ -1826,6 +1889,7 @@ CONFIG_SENSORS_MMA7660=m
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
+# CONFIG_SENSORS_SHT15 is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SMM665 is not set
 # CONFIG_SENSORS_DME1737 is not set
@ -1893,10 +1957,18 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_CORE is not set
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
 # CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_TWL6040_CORE is not set
 # CONFIG_MFD_STMPE is not set
@ -1904,6 +1976,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_DA9052_I2C is not set
@ -1923,6 +1996,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_EZX_PCAP is not set
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_RC5T583 is not set
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
@ -1930,6 +2004,7 @@ CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_MAX1586 is not set
@ -2182,6 +2257,7 @@ CONFIG_USB_DSBR=m
 #
 # Texas Instruments WL128x FM driver (ST based)
 #
+CONFIG_RADIO_WL128X=m
 CONFIG_AUDIO_ENGINE=y
 CONFIG_ACE_CONFIG=y
 CONFIG_PA_CONTROL=y
@ -2687,6 +2763,7 @@ CONFIG_USB_FILE_STORAGE_TEST=y
 # OTG and related infrastructure
 #
 # CONFIG_USB_OTG_WAKELOCK is not set
+# CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_SW_SUNXI_USB is not set
@ -2736,6 +2813,7 @@ CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_SUNXI=m
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
@ -2744,6 +2822,8 @@ CONFIG_LEDS_SUNXI=m
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_REGULATOR is not set
 # CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_OT200 is not set
 CONFIG_LEDS_TRIGGERS=y
@ -2751,11 +2831,12 @@ CONFIG_LEDS_TRIGGERS=y
 #
 # LED Triggers
 #
-# CONFIG_LEDS_TRIGGER_TIMER is not set
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-# CONFIG_LEDS_TRIGGER_CPU is not set
-# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

 #
 # iptables trigger is under Netfilter config (LED target)
@ -2874,6 +2955,7 @@ CONFIG_R8712U=m
 # Speakup console speech
 #
 # CONFIG_SPEAKUP is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
 # CONFIG_STAGING_MEDIA is not set

--- a/core/linux-sun4i/linux-sun4i.install
+++ b/core/linux-sun4i/linux-sun4i.install
@ -1,8 +1,8 @@
 # arg 1:  the new package version
 # arg 2:  the old package version

-KERNEL_NAME=-sun4i
-KERNEL_VERSION=3.0.57-1-ARCH
+KERNEL_NAME=
+KERNEL_VERSION=3.4.79-1-ARCH

 post_install () {
  # updating module dependencies