From e77afe0650ccb29f6e7a5cab5e2b10ceeeb091d6 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 13 Dec 2015 17:52:46 -0700 Subject: [PATCH] core/linux-armv7 to 4.3.2-1 --- ...ags-add-support-for-Marvell-s-u-boot.patch | 4 +- ...trieve-MAC-addresses-from-Marvell-bo.patch | 4 +- .../0003-SMILE-Plug-device-tree-file.patch | 8 +- .../0004-fix-mvsdio-eMMC-timing.patch | 4 +- ...ow-mac-address-to-be-set-as-a-parame.patch | 4 +- ...SoC-Audio-Codec-Fix-errors-reported-.patch | 4 +- ...-set-default-cubietruck-led-triggers.patch | 8 +- .../linux-armv7/0008-USB-armory-support.patch | 195 +++++++++++++++--- core/linux-armv7/PKGBUILD | 29 +-- core/linux-armv7/config | 23 ++- 10 files changed, 212 insertions(+), 71 deletions(-) diff --git a/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch index db4f9565b..68a48f687 100644 --- a/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ b/core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -1,4 +1,4 @@ -From 3f6a51e3dfaa871a8a114753c666adc1442f2496 Mon Sep 17 00:00:00 2001 +From 76442ff123d722a6a7542b35844cb57e17ea88c5 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:59:28 +0100 Subject: [PATCH 1/8] ARM: atags: add support for Marvell's u-boot @@ -47,5 +47,5 @@ index 979ff40..d1d0c19 100644 }; -- -2.4.5 +2.6.2 diff --git a/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index b44834c27..ac62b2c0c 100644 --- a/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,4 +1,4 @@ -From 693aa021add61922682c5cf6f5678f04fe7b94ef Mon Sep 17 00:00:00 2001 +From a758b92c2e4ed56e4bddbffea97e104cf188f3d1 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:56:58 +0100 Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot @@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644 } -- -2.4.5 +2.6.2 diff --git a/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch b/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch index 2d573ca04..486205006 100644 --- a/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch +++ b/core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch @@ -1,4 +1,4 @@ -From c09c0e15623ad939dbc5483d48adce41085bf2aa Mon Sep 17 00:00:00 2001 +From dbea38d0148a1b3861b0e9ef06916838b9d24981 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:41:19 -0600 Subject: [PATCH 3/8] SMILE Plug device tree file @@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 246473a..5586e7a 100644 +index bb8fa02..4a41a60 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -672,6 +672,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ +@@ -699,6 +699,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ armada-370-db.dtb \ armada-370-dlink-dns327l.dtb \ armada-370-mirabox.dtb \ @@ -205,5 +205,5 @@ index 0000000..d01308a + }; +}; -- -2.4.5 +2.6.2 diff --git a/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch b/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch index fa7a719e4..ed03c2ee3 100644 --- a/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch +++ b/core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch @@ -1,4 +1,4 @@ -From d0899762087c6ff5c8a9b522d4f2fe1f9d527b5f Mon Sep 17 00:00:00 2001 +From 92f52469dfbea8294ebbb988542fd2713cd2a306 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:43:56 -0600 Subject: [PATCH 4/8] fix mvsdio eMMC timing @@ -34,5 +34,5 @@ index a448498..14441a6 100644 host->clock = ios->clock; host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); -- -2.4.5 +2.6.2 diff --git a/core/linux-armv7/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-armv7/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index b8d64bfe4..2e3e19237 100644 --- a/core/linux-armv7/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-armv7/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,4 +1,4 @@ -From f51bebf4094d0263c125b38b761a0eb2e3bbdbd8 Mon Sep 17 00:00:00 2001 +From 11f05ff2e937e42eab27b19d2f7c7554daa26c49 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter @@ -91,5 +91,5 @@ index 26423ad..e29a323 100644 if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, dev->net->dev_addr) == 0) { -- -2.4.5 +2.6.2 diff --git a/core/linux-armv7/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/core/linux-armv7/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch index c05d584ea..41c2e5b0b 100644 --- a/core/linux-armv7/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch +++ b/core/linux-armv7/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch @@ -1,4 +1,4 @@ -From be369dba2e0a95d54cc858b5d8ecada13baf328a Mon Sep 17 00:00:00 2001 +From 5d8542ef5cfd5b09350f9eb61d439e25a63fc32e Mon Sep 17 00:00:00 2001 From: dobatog Date: Thu, 26 Feb 2015 12:32:27 +0100 Subject: [PATCH 6/8] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported @@ -45,5 +45,5 @@ index cd8c02b..95e6b11 100644 /* input mux */ {"Capture Source", "Line", "Line Input"}, -- -2.4.5 +2.6.2 diff --git a/core/linux-armv7/0007-set-default-cubietruck-led-triggers.patch b/core/linux-armv7/0007-set-default-cubietruck-led-triggers.patch index bbe7e04d1..c1037f7bc 100644 --- a/core/linux-armv7/0007-set-default-cubietruck-led-triggers.patch +++ b/core/linux-armv7/0007-set-default-cubietruck-led-triggers.patch @@ -1,6 +1,6 @@ -From f141851ab061abfc770b9a0540ee6f6c87e863c0 Mon Sep 17 00:00:00 2001 +From 76a73d29fd0f45aa163d839ede4e21dd183f6ed3 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich -Date: Sun, 14 Jun 2015 13:20:25 -0600 +Date: Sat, 14 Feb 2015 12:32:27 +0100 Subject: [PATCH 7/8] set default cubietruck led triggers Signed-off-by: Kevin Mihelich @@ -9,7 +9,7 @@ Signed-off-by: Kevin Mihelich 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -index 4611e2f..5739f2b 100644 +index e6b0192..fff91d3 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -70,6 +70,7 @@ @@ -29,5 +29,5 @@ index 4611e2f..5739f2b 100644 }; -- -2.4.5 +2.6.2 diff --git a/core/linux-armv7/0008-USB-armory-support.patch b/core/linux-armv7/0008-USB-armory-support.patch index 13b415604..52862eeeb 100644 --- a/core/linux-armv7/0008-USB-armory-support.patch +++ b/core/linux-armv7/0008-USB-armory-support.patch @@ -1,40 +1,46 @@ -From ac49b5026524acf13cbdeef8d5f72257aef3e31d Mon Sep 17 00:00:00 2001 +From 0ae1ec1ae555397c91db254b18c9d95d8fe7854f Mon Sep 17 00:00:00 2001 From: Kevin Mihelich -Date: Sat, 7 Mar 2015 16:51:15 -0700 +Date: Sat, 7 Feb 2015 12:32:27 +0100 Subject: [PATCH 8/8] USB armory support --- - arch/arm/boot/dts/Makefile | 3 + - arch/arm/boot/dts/imx53-usbarmory-common.dtsi | 209 ++++++++++++++++++++++++++ - arch/arm/boot/dts/imx53-usbarmory-gpio.dts | 26 ++++ - arch/arm/boot/dts/imx53-usbarmory-host.dts | 18 +++ - arch/arm/boot/dts/imx53-usbarmory.dts | 18 +++ - 5 files changed, 274 insertions(+) + arch/arm/boot/dts/Makefile | 5 + + arch/arm/boot/dts/imx53-usbarmory-common.dtsi | 241 ++++++++++++++++++++++++++ + arch/arm/boot/dts/imx53-usbarmory-gpio.dts | 26 +++ + arch/arm/boot/dts/imx53-usbarmory-host.dts | 18 ++ + arch/arm/boot/dts/imx53-usbarmory-i2c.dts | 32 ++++ + arch/arm/boot/dts/imx53-usbarmory-spi.dts | 45 +++++ + arch/arm/boot/dts/imx53-usbarmory.dts | 18 ++ + 7 files changed, 385 insertions(+) create mode 100644 arch/arm/boot/dts/imx53-usbarmory-common.dtsi create mode 100644 arch/arm/boot/dts/imx53-usbarmory-gpio.dts create mode 100644 arch/arm/boot/dts/imx53-usbarmory-host.dts + create mode 100644 arch/arm/boot/dts/imx53-usbarmory-i2c.dts + create mode 100644 arch/arm/boot/dts/imx53-usbarmory-spi.dts create mode 100644 arch/arm/boot/dts/imx53-usbarmory.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 5586e7a..d54f5f7 100644 +index 4a41a60..a2df2c2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -264,6 +264,9 @@ dtb-$(CONFIG_SOC_IMX53) += \ +@@ -268,6 +268,11 @@ dtb-$(CONFIG_SOC_IMX53) += \ imx53-smd.dtb \ imx53-tx53-x03x.dtb \ imx53-tx53-x13x.dtb \ + imx53-usbarmory.dtb \ + imx53-usbarmory-gpio.dtb \ + imx53-usbarmory-host.dtb \ ++ imx53-usbarmory-i2c.dtb \ ++ imx53-usbarmory-spi.dtb \ imx53-voipac-bsb.dtb dtb-$(CONFIG_SOC_IMX6Q) += \ imx6dl-apf6dev.dtb \ diff --git a/arch/arm/boot/dts/imx53-usbarmory-common.dtsi b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi new file mode 100644 -index 0000000..c7cbd84 +index 0000000..b73c399 --- /dev/null +++ b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi -@@ -0,0 +1,209 @@ +@@ -0,0 +1,241 @@ +/* + * USB armory MkI device tree include file + * http://inversepath.com/usbarmory @@ -112,16 +118,6 @@ index 0000000..c7cbd84 + pinctrl-names = "default"; + + imx53-usbarmory { -+ pinctrl_pinheader: pinheadergrp { -+ fsl,pins = < -+ MX53_PAD_CSI0_DAT8__GPIO5_26 0xc0 -+ MX53_PAD_CSI0_DAT9__GPIO5_27 0xc0 -+ MX53_PAD_CSI0_DAT10__GPIO5_28 0xc0 -+ MX53_PAD_CSI0_DAT11__GPIO5_29 0xc0 -+ MX53_PAD_CSI0_DAT12__GPIO5_30 0xc0 -+ >; -+ }; -+ + led_pin_gpio4_27: led_gpio4_27@0 { + fsl,pins = < + MX53_PAD_DISP0_DAT6__GPIO4_27 0x80000000 @@ -139,26 +135,67 @@ index 0000000..c7cbd84 + >; + }; + -+ pinctrl_i2c1: i2c1grp { ++ pinctrl_i2c1_pmic: i2c1grp_pmic { + fsl,pins = < -+ MX53_PAD_CSI0_DAT8__I2C1_SDA 0xc0000000 -+ MX53_PAD_CSI0_DAT9__I2C1_SCL 0xc0000000 ++ MX53_PAD_EIM_D21__I2C1_SCL 0xc0000000 ++ MX53_PAD_EIM_D28__I2C1_SDA 0xc0000000 + >; + }; + ++ /* ++ UART mode pin header configration: ++ pin number: 1 2 3 4 5 6 7 ++ function: GND 5V ? ? TX RX ? ++ */ + pinctrl_uart1: uart1grp { + fsl,pins = < + MX53_PAD_CSI0_DAT10__UART1_TXD_MUX 0x1e4 + MX53_PAD_CSI0_DAT11__UART1_RXD_MUX 0x1e4 + >; + }; ++ ++ /* ++ GPIO mode pin header configuration: ++ 1 2 3 4 5 6 7 ++ GND 5V GPIO5[26] GPIO5[27] GPIO5[28] GPIO5[29] GPIO5[30] ++ */ + pinctrl_gpio5: gpio5grp { + fsl,pins = < -+ MX53_PAD_CSI0_DAT8__GPIO5_26 0xc0 -+ MX53_PAD_CSI0_DAT9__GPIO5_27 0xc0 -+ MX53_PAD_CSI0_DAT10__GPIO5_28 0xc0 -+ MX53_PAD_CSI0_DAT11__GPIO5_29 0xc0 -+ MX53_PAD_CSI0_DAT12__GPIO5_30 0xc0 ++ MX53_PAD_CSI0_DAT8__GPIO5_26 0xc0 ++ MX53_PAD_CSI0_DAT9__GPIO5_27 0xc0 ++ MX53_PAD_CSI0_DAT10__GPIO5_28 0xc0 ++ MX53_PAD_CSI0_DAT11__GPIO5_29 0xc0 ++ MX53_PAD_CSI0_DAT12__GPIO5_30 0xc0 ++ >; ++ }; ++ ++ /* ++ SPI mode pin header configuration: ++ 1 2 3 4 5 6 7 ++ GND 5V SCLK MOSI MISO /SS0 /SS1 ++ */ ++ pinctrl_ecspi2: ecspi2grp { ++ fsl,pins = < ++ MX53_PAD_CSI0_DAT8__ECSPI2_SCLK 0x80000000 ++ MX53_PAD_CSI0_DAT9__ECSPI2_MOSI 0x80000000 ++ MX53_PAD_CSI0_DAT10__ECSPI2_MISO 0x80000000 ++ MX53_PAD_CSI0_DAT11__GPIO5_29 0x80000000 ++ MX53_PAD_CSI0_DAT12__GPIO5_30 0x80000000 ++ >; ++ }; ++ ++ /* ++ I2C mode pin header configuration: ++ 1 2 3 4 5 6 7 ++ GND 5V SDA SCL GPIO5[28] GPIO5[29] GPIO5[30] ++ */ ++ pinctrl_i2c1_pinheader: i2c1grp_pinheader { ++ fsl,pins = < ++ MX53_PAD_CSI0_DAT8__I2C1_SDA 0xc0000000 ++ MX53_PAD_CSI0_DAT9__I2C1_SCL 0xc0000000 ++ MX53_PAD_CSI0_DAT10__GPIO5_28 0x80000000 ++ MX53_PAD_CSI0_DAT11__GPIO5_29 0x80000000 ++ MX53_PAD_CSI0_DAT12__GPIO5_30 0x80000000 + >; + }; + }; @@ -175,10 +212,11 @@ index 0000000..c7cbd84 +}; + +&i2c1 { ++ pinctrl-0 = <&pinctrl_i2c1_pmic>; ++ status = "okay"; + ltc3589: pmic@34 { + compatible = "lltc,ltc3589-2"; + reg = <0x34>; -+ + regulators { + sw1_reg: sw1 { + regulator-min-microvolt = <591930>; @@ -246,7 +284,7 @@ index 0000000..c7cbd84 +}; diff --git a/arch/arm/boot/dts/imx53-usbarmory-gpio.dts b/arch/arm/boot/dts/imx53-usbarmory-gpio.dts new file mode 100644 -index 0000000..bf85ffa +index 0000000..a27c759 --- /dev/null +++ b/arch/arm/boot/dts/imx53-usbarmory-gpio.dts @@ -0,0 +1,26 @@ @@ -270,7 +308,7 @@ index 0000000..bf85ffa +}; + +&iomuxc { -+ pinctrl-0 = <&pinctrl_pinheader>; ++ pinctrl-0 = <&pinctrl_gpio5>; +}; + +&uart1 { @@ -300,6 +338,95 @@ index 0000000..ea2ea45 + dr_mode = "host"; + status = "okay"; +}; +diff --git a/arch/arm/boot/dts/imx53-usbarmory-i2c.dts b/arch/arm/boot/dts/imx53-usbarmory-i2c.dts +new file mode 100644 +index 0000000..c66bbb5 +--- /dev/null ++++ b/arch/arm/boot/dts/imx53-usbarmory-i2c.dts +@@ -0,0 +1,32 @@ ++/* ++ * USB armory MkI device mode device tree file ++ * http://inversepath.com/usbarmory ++ * ++ * Copyright (C) 2015, Inverse Path ++ * Andrej Rosano ++ * ++ * Licensed under GPLv2 ++ */ ++ ++/dts-v1/; ++ ++#include "imx53-usbarmory-common.dtsi" ++ ++&usbotg { ++ dr_mode = "peripheral"; ++ status = "okay"; ++}; ++ ++&uart1 { ++ status = "disabled"; ++}; ++ ++&iomuxc { ++ pinctrl-0 = <&pinctrl_i2c1_pinheader>; ++}; ++ ++&i2c1 { ++ ltc3589: pmic@34 { ++ status = "disabled"; ++ }; ++}; +diff --git a/arch/arm/boot/dts/imx53-usbarmory-spi.dts b/arch/arm/boot/dts/imx53-usbarmory-spi.dts +new file mode 100644 +index 0000000..414d641 +--- /dev/null ++++ b/arch/arm/boot/dts/imx53-usbarmory-spi.dts +@@ -0,0 +1,45 @@ ++/* ++ * USB armory MkI device mode device tree file ++ * http://inversepath.com/usbarmory ++ * ++ * Copyright (C) 2015, Inverse Path ++ * Andrej Rosano ++ * ++ * Licensed under GPLv2 ++ */ ++ ++/dts-v1/; ++ ++#include "imx53-usbarmory-common.dtsi" ++ ++&usbotg { ++ dr_mode = "peripheral"; ++ status = "okay"; ++}; ++ ++&uart1 { ++ status = "disabled"; ++}; ++ ++&iomuxc { ++ pinctrl-0 = <&pinctrl_ecspi2>; ++}; ++ ++&ecspi2 { ++ fsl,spi-num-chipselects = <2>; ++ cs-gpios = <&gpio5 29 0>, <&gpio5 30 0>; ++ status = "okay"; ++ ++ flash: m25p40@0 { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ compatible = "st,m25p40", "st,m25p"; ++ spi-max-frequency = <20000000>; ++ reg = <0>; ++ ++ partition@0 { ++ label = "test-partition"; ++ reg = <0x0 0x80000>; ++ }; ++ }; ++}; diff --git a/arch/arm/boot/dts/imx53-usbarmory.dts b/arch/arm/boot/dts/imx53-usbarmory.dts new file mode 100644 index 0000000..902a73b @@ -325,5 +452,5 @@ index 0000000..902a73b + status = "okay"; +}; -- -2.4.5 +2.6.2 diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD index 670762fe1..ee40453f7 100644 --- a/core/linux-armv7/PKGBUILD +++ b/core/linux-armv7/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=linux-armv7 _srcname=linux-4.3 _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform" -pkgver=4.3.0 -pkgrel=2 +pkgver=4.3.2 +pkgrel=1 rcnrel=armv7-x1 arch=('armv7h') url="http://www.kernel.org/" @@ -16,7 +16,7 @@ license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc') options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" - #"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" + "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" "http://rcn-ee.com/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz" '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' @@ -32,16 +32,17 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'kernel.keyblock' 'kernel_data_key.vbprivk') md5sums=('58b35794eee3b6d52ce7be39357801e7' - '8e2d8ce2848df10abcabe1e0c8dac464' - '61f728f854713d17a3d4ef00f8e38f1e' - 'bc39bcc5d752155854f31eb7758db5e8' - 'e871d819421abab551d8219b62cccdf9' - '05e37d0cd7670fe10502b56864b93c41' - 'bef1f3ba7b87f467316de0ae99b40acf' - '3be6a6ddf93b89e90cc127268721845e' - 'fe20decabf6b7d94cf2ecb4d15a07ba7' - '50dca48291316e4c0a7e918f08d5e3f5' - '2abffea9c0215fc478212e86c3109f82' + '3a465c7cf55ec9dbf2d72d9292aa5fde' + 'fc1aa38aa7eb963ecf3ff0fa01218d0d' + '8ea5f9e5dc4cccabb26a8fd0048da4a9' + 'acc9cb3f7c34def13e311bbc7893c0d1' + '68b4a3e938d9ab24d8d82a2a7ddbff2a' + '649ae077135c10480ba52e8bad047780' + '7507fdc224b1000a81f87316befd0f6c' + 'd77167c977871128b862b9aaffde23bc' + 'acb3f83e664bd23fdddf69044b2b0eb4' + '825186972ceb93fe91a9b027731dd95b' + '754a3902b772a6533e7b0b7780f6fda6' '1813b39074d01af6548951764a0f6444' '4b0392e55063eb9f89d91affd1189fc5' '61c5ff73c136ed07a7aadbf58db3d96a' @@ -51,7 +52,7 @@ prepare() { cd "${srcdir}/${_srcname}" # add upstream patch - #git apply --whitespace=nowarn ../patch-${pkgver} + git apply --whitespace=nowarn ../patch-${pkgver} # RCN patch git apply ../patch-${pkgver%.0}-${rcnrel}.diff diff --git a/core/linux-armv7/config b/core/linux-armv7/config index 23e909473..99b95ab77 100644 --- a/core/linux-armv7/config +++ b/core/linux-armv7/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.3.0-2 Kernel Configuration +# Linux/arm 4.3.2-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -789,7 +789,20 @@ CONFIG_QORIQ_CPUFREQ=y # # CPU Idle # -# CONFIG_CPU_IDLE is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_DT_IDLE_STATES=y + +# +# ARM CPU Idle Drivers +# +CONFIG_ARM_CPUIDLE=y +# CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set +# CONFIG_ARM_HIGHBANK_CPUIDLE is not set +# CONFIG_ARM_ZYNQ_CPUIDLE is not set +# CONFIG_ARM_EXYNOS_CPUIDLE is not set +# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y # @@ -3047,7 +3060,7 @@ CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DMA=y +# CONFIG_SERIAL_8250_DMA is not set CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_RUNTIME_UARTS=6 @@ -4587,6 +4600,8 @@ CONFIG_DRM_IMX_TVE=m CONFIG_DRM_IMX_LDB=m CONFIG_DRM_IMX_IPUV3=m CONFIG_DRM_IMX_HDMI=m +CONFIG_DRM_ETNAVIV=m +# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set # # Frame buffer Devices @@ -6028,8 +6043,6 @@ CONFIG_FB_TFT_WATTEROTT=m CONFIG_FB_FLEX=m CONFIG_FB_TFT_FBTFT_DEVICE=m # CONFIG_MOST is not set -CONFIG_DRM_ETNAVIV=m -# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set CONFIG_CHROME_PLATFORMS=y CONFIG_CROS_EC_CHARDEV=y CONFIG_CROS_EC_PROTO=y