diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2017-05-01 08:18:25 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2017-05-01 08:18:25 -0700 |
| commit | 1277b8fb183a9dcfc8309d92724c24d2e2b82db4 (patch) | |
| tree | a5bdd09b27a48bb44fc0ac984d3bd11c9f5556b1 | |
| parent | 45b26b00cf51049d132d4e0f5bd9e589fb983548 (diff) | |
| parent | a0fec333d0b5623db0d5b55710348163450a31cf (diff) | |
| download | kernel-1277b8fb183a9dcfc8309d92724c24d2e2b82db4.tar.gz kernel-1277b8fb183a9dcfc8309d92724c24d2e2b82db4.tar.xz kernel-1277b8fb183a9dcfc8309d92724c24d2e2b82db4.zip | |
Merge remote-tracking branch 'origin/master' into f26_may1
91 files changed, 957 insertions, 404 deletions
diff --git a/CVE-2017-7477.patch b/CVE-2017-7477.patch new file mode 100644 index 000000000..6405614cc --- /dev/null +++ b/CVE-2017-7477.patch @@ -0,0 +1,73 @@ +From 4d6fa57b4dab0d77f4d8e9d9c73d1e63f6fe8fee Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" <Jason@zx2c4.com> +Date: Fri, 21 Apr 2017 23:14:48 +0200 +Subject: macsec: avoid heap overflow in skb_to_sgvec + +While this may appear as a humdrum one line change, it's actually quite +important. An sk_buff stores data in three places: + +1. A linear chunk of allocated memory in skb->data. This is the easiest + one to work with, but it precludes using scatterdata since the memory + must be linear. +2. The array skb_shinfo(skb)->frags, which is of maximum length + MAX_SKB_FRAGS. This is nice for scattergather, since these fragments + can point to different pages. +3. skb_shinfo(skb)->frag_list, which is a pointer to another sk_buff, + which in turn can have data in either (1) or (2). + +The first two are rather easy to deal with, since they're of a fixed +maximum length, while the third one is not, since there can be +potentially limitless chains of fragments. Fortunately dealing with +frag_list is opt-in for drivers, so drivers don't actually have to deal +with this mess. For whatever reason, macsec decided it wanted pain, and +so it explicitly specified NETIF_F_FRAGLIST. + +Because dealing with (1), (2), and (3) is insane, most users of sk_buff +doing any sort of crypto or paging operation calls a convenient function +called skb_to_sgvec (which happens to be recursive if (3) is in use!). +This takes a sk_buff as input, and writes into its output pointer an +array of scattergather list items. Sometimes people like to declare a +fixed size scattergather list on the stack; othertimes people like to +allocate a fixed size scattergather list on the heap. However, if you're +doing it in a fixed-size fashion, you really shouldn't be using +NETIF_F_FRAGLIST too (unless you're also ensuring the sk_buff and its +frag_list children arent't shared and then you check the number of +fragments in total required.) + +Macsec specifically does this: + + size += sizeof(struct scatterlist) * (MAX_SKB_FRAGS + 1); + tmp = kmalloc(size, GFP_ATOMIC); + *sg = (struct scatterlist *)(tmp + sg_offset); + ... + sg_init_table(sg, MAX_SKB_FRAGS + 1); + skb_to_sgvec(skb, sg, 0, skb->len); + +Specifying MAX_SKB_FRAGS + 1 is the right answer usually, but not if you're +using NETIF_F_FRAGLIST, in which case the call to skb_to_sgvec will +overflow the heap, and disaster ensues. + +Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> +Cc: stable@vger.kernel.org +Cc: security@kernel.org +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/macsec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c +index ff0a5ed..dbab05a 100644 +--- a/drivers/net/macsec.c ++++ b/drivers/net/macsec.c +@@ -2716,7 +2716,7 @@ static netdev_tx_t macsec_start_xmit(struct sk_buff *skb, + } + + #define MACSEC_FEATURES \ +- (NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST) ++ (NETIF_F_SG | NETIF_F_HIGHDMA) + static struct lock_class_key macsec_netdev_addr_lock_key; + + static int macsec_dev_init(struct net_device *dev) +-- +cgit v1.1 + diff --git a/arm-rk3288-tinker.patch b/arm-rk3288-tinker.patch new file mode 100644 index 000000000..d7a4897b3 --- /dev/null +++ b/arm-rk3288-tinker.patch @@ -0,0 +1,573 @@ +From 223599514133293bb9afe7b82937140c3b275877 Mon Sep 17 00:00:00 2001 +From: Eddie Cai <eddie.cai.linux@gmail.com> +Date: Tue, 14 Feb 2017 18:07:31 +0800 +Subject: ARM: dts: rockchip: add dts for RK3288-Tinker board + +This patch add basic support for RK3288-Tinker board. We can boot in to rootfs +with this patch. + +Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com> +Signed-off-by: Heiko Stuebner <heiko@sntech.de> +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/rk3288-tinker.dts | 536 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 537 insertions(+) + create mode 100644 arch/arm/boot/dts/rk3288-tinker.dts + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index 0118084..fb46849 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -695,6 +695,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ + rk3288-popmetal.dtb \ + rk3288-r89.dtb \ + rk3288-rock2-square.dtb \ ++ rk3288-tinker.dtb \ + rk3288-veyron-brain.dtb \ + rk3288-veyron-jaq.dtb \ + rk3288-veyron-jerry.dtb \ +diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts +new file mode 100644 +index 0000000..f601c78 +--- /dev/null ++++ b/arch/arm/boot/dts/rk3288-tinker.dts +@@ -0,0 +1,536 @@ ++/* ++ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively, ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/dts-v1/; ++ ++#include "rk3288.dtsi" ++#include <dt-bindings/input/input.h> ++ ++/ { ++ model = "Rockchip RK3288 Tinker Board"; ++ compatible = "asus,rk3288-tinker", "rockchip,rk3288"; ++ ++ memory { ++ reg = <0x0 0x80000000>; ++ device_type = "memory"; ++ }; ++ ++ ext_gmac: external-gmac-clock { ++ compatible = "fixed-clock"; ++ #clock-cells = <0>; ++ clock-frequency = <125000000>; ++ clock-output-names = "ext_gmac"; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ autorepeat; ++ ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pwrbtn>; ++ ++ button@0 { ++ gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; ++ linux,code = <KEY_POWER>; ++ label = "GPIO Key Power"; ++ linux,input-type = <1>; ++ wakeup-source; ++ debounce-interval = <100>; ++ }; ++ }; ++ ++ gpio-leds { ++ compatible = "gpio-leds"; ++ ++ act-led { ++ gpios=<&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger="mmc0"; ++ }; ++ ++ heartbeat-led { ++ gpios=<&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger="heartbeat"; ++ }; ++ ++ pwr-led { ++ gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "default-on"; ++ }; ++ }; ++ ++ sound { ++ compatible = "simple-audio-card"; ++ simple-audio-card,format = "i2s"; ++ simple-audio-card,name = "rockchip,tinker-codec"; ++ simple-audio-card,mclk-fs = <512>; ++ ++ simple-audio-card,codec { ++ sound-dai = <&hdmi>; ++ }; ++ ++ simple-audio-card,cpu { ++ sound-dai = <&i2s>; ++ }; ++ }; ++ ++ vcc_sys: vsys-regulator { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc_sys"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vcc_sd: sdmmc-regulator { ++ compatible = "regulator-fixed"; ++ gpio = <&gpio7 11 GPIO_ACTIVE_LOW>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdmmc_pwr>; ++ regulator-name = "vcc_sd"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ startup-delay-us = <100000>; ++ vin-supply = <&vcc_io>; ++ }; ++}; ++ ++&cpu0 { ++ cpu0-supply = <&vdd_cpu>; ++}; ++ ++&gmac { ++ assigned-clocks = <&cru SCLK_MAC>; ++ assigned-clock-parents = <&ext_gmac>; ++ clock_in_out = "input"; ++ phy-mode = "rgmii"; ++ phy-supply = <&vcc33_lan>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&rgmii_pins>; ++ snps,reset-gpio = <&gpio4 7 0>; ++ snps,reset-active-low; ++ snps,reset-delays-us = <0 10000 1000000>; ++ tx_delay = <0x30>; ++ rx_delay = <0x10>; ++ status = "ok"; ++}; ++ ++&hdmi { ++ ddc-i2c-bus = <&i2c5>; ++ status = "okay"; ++}; ++ ++&i2c0 { ++ clock-frequency = <400000>; ++ status = "okay"; ++ ++ rk808: pmic@1b { ++ compatible = "rockchip,rk808"; ++ reg = <0x1b>; ++ interrupt-parent = <&gpio0>; ++ interrupts = <4 IRQ_TYPE_LEVEL_LOW>; ++ #clock-cells = <1>; ++ clock-output-names = "xin32k", "rk808-clkout2"; ++ dvs-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>, ++ <&gpio0 12 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pmic_int &global_pwroff &dvs_1 &dvs_2>; ++ rockchip,system-power-controller; ++ wakeup-source; ++ ++ vcc1-supply = <&vcc_sys>; ++ vcc2-supply = <&vcc_sys>; ++ vcc3-supply = <&vcc_sys>; ++ vcc4-supply = <&vcc_sys>; ++ vcc6-supply = <&vcc_sys>; ++ vcc7-supply = <&vcc_sys>; ++ vcc8-supply = <&vcc_io>; ++ vcc9-supply = <&vcc_io>; ++ vcc10-supply = <&vcc_io>; ++ vcc11-supply = <&vcc_sys>; ++ vcc12-supply = <&vcc_io>; ++ vddio-supply = <&vcc_io>; ++ ++ regulators { ++ vdd_cpu: DCDC_REG1 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <750000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-name = "vdd_arm"; ++ regulator-ramp-delay = <6000>; ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vdd_gpu: DCDC_REG2 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <850000>; ++ regulator-max-microvolt = <1250000>; ++ regulator-name = "vdd_gpu"; ++ regulator-ramp-delay = <6000>; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1000000>; ++ }; ++ }; ++ ++ vcc_ddr: DCDC_REG3 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-name = "vcc_ddr"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ }; ++ }; ++ ++ vcc_io: DCDC_REG4 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc_io"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <3300000>; ++ }; ++ }; ++ ++ vcc18_ldo1: LDO_REG1 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "vcc18_ldo1"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1800000>; ++ }; ++ }; ++ ++ vcc33_mipi: LDO_REG2 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vcc33_mipi"; ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vdd_10: LDO_REG3 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1000000>; ++ regulator-max-microvolt = <1000000>; ++ regulator-name = "vdd_10"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1000000>; ++ }; ++ }; ++ ++ vcc18_codec: LDO_REG4 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "vcc18_codec"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1800000>; ++ }; ++ }; ++ ++ vccio_sd: LDO_REG5 { ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-name = "vccio_sd"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <3300000>; ++ }; ++ }; ++ ++ vdd10_lcd: LDO_REG6 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1000000>; ++ regulator-max-microvolt = <1000000>; ++ regulator-name = "vdd10_lcd"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1000000>; ++ }; ++ }; ++ ++ vcc_18: LDO_REG7 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "vcc_18"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1800000>; ++ }; ++ }; ++ ++ vcc18_lcd: LDO_REG8 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-name = "vcc18_lcd"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1800000>; ++ }; ++ }; ++ ++ vcc33_sd: SWITCH_REG1 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-name = "vcc33_sd"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ }; ++ }; ++ ++ vcc33_lan: SWITCH_REG2 { ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-name = "vcc33_lan"; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ }; ++ }; ++ }; ++ }; ++}; ++ ++&i2c2 { ++ status = "okay"; ++}; ++ ++&i2c5 { ++ status = "okay"; ++}; ++ ++&i2s { ++ #sound-dai-cells = <0>; ++ status = "okay"; ++}; ++ ++&io_domains { ++ status = "okay"; ++ ++ sdcard-supply = <&vccio_sd>; ++}; ++ ++&pinctrl { ++ pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma { ++ drive-strength = <8>; ++ }; ++ ++ pcfg_pull_up_drv_8ma: pcfg-pull-up-drv-8ma { ++ bias-pull-up; ++ drive-strength = <8>; ++ }; ++ ++ backlight { ++ bl_en: bl-en { ++ rockchip,pins = <7 2 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ ++ buttons { ++ pwrbtn: pwrbtn { ++ rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ }; ++ ++ eth_phy { ++ eth_phy_pwr: eth-phy-pwr { ++ rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ ++ pmic { ++ pmic_int: pmic-int { ++ rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO \ ++ &pcfg_pull_up>; ++ }; ++ ++ dvs_1: dvs-1 { ++ rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO \ ++ &pcfg_pull_down>; ++ }; ++ ++ dvs_2: dvs-2 { ++ rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO \ ++ &pcfg_pull_down>; ++ }; ++ }; ++ ++ sdmmc { ++ sdmmc_bus4: sdmmc-bus4 { ++ rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, ++ <6 17 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, ++ <6 18 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, ++ <6 19 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; ++ }; ++ ++ sdmmc_clk: sdmmc-clk { ++ rockchip,pins = <6 20 RK_FUNC_1 \ ++ &pcfg_pull_none_drv_8ma>; ++ }; ++ ++ sdmmc_cmd: sdmmc-cmd { ++ rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; ++ }; ++ ++ sdmmc_pwr: sdmmc-pwr { ++ rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ ++ usb { ++ host_vbus_drv: host-vbus-drv { ++ rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ pwr_3g: pwr-3g { ++ rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++}; ++ ++&pwm0 { ++ status = "okay"; ++}; ++ ++&saradc { ++ vref-supply = <&vcc18_ldo1>; ++ status ="okay"; ++}; ++ ++&sdmmc { ++ bus-width = <4>; ++ cap-mmc-highspeed; ++ cap-sd-highspeed; ++ card-detect-delay = <200>; ++ disable-wp; /* wp not hooked up */ ++ num-slots = <1>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; ++ status = "okay"; ++ vmmc-supply = <&vcc33_sd>; ++ vqmmc-supply = <&vccio_sd>; ++}; ++ ++&tsadc { ++ rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */ ++ rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */ ++ status = "okay"; ++}; ++ ++&uart0 { ++ status = "okay"; ++}; ++ ++&uart1 { ++ status = "okay"; ++}; ++ ++&uart2 { ++ status = "okay"; ++}; ++ ++&uart3 { ++ status = "okay"; ++}; ++ ++&uart4 { ++ status = "okay"; ++}; ++ ++&usbphy { ++ status = "okay"; ++}; ++ ++&usb_host0_ehci { ++ status = "okay"; ++}; ++ ++&usb_host1 { ++ status = "okay"; ++}; ++ ++&usb_otg { ++ status= "okay"; ++}; ++ ++&vopb { ++ status = "okay"; ++}; ++ ++&vopb_mmu { ++ status = "okay"; ++}; ++ ++&vopl { ++ status = "okay"; ++}; ++ ++&vopl_mmu { ++ status = "okay"; ++}; ++ ++&wdt { ++ status = "okay"; ++}; +-- +cgit v1.1 + diff --git a/arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch b/arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch new file mode 100644 index 000000000..6417bc29a --- /dev/null +++ b/arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch @@ -0,0 +1,29 @@ +From 487ff7b0e537506057960a0c2d9482d19f2acf4a Mon Sep 17 00:00:00 2001 +From: Peter Robinson <pbrobinson@gmail.com> +Date: Wed, 26 Apr 2017 11:12:54 +0100 +Subject: [PATCH] Add option of 13 for FORCE_MAX_ZONEORDER + +This is a hack, but it's what the other distros currently use +for aarch64 with 4K pages so we'll do the same while upstream +decides what the best outcome is (which isn't this). + +Signed-off-by: Peter Robinson <pbrobinson@gmail.com> +--- + arch/arm64/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig +index 3741859765cf..deec9511f1d3 100644 +--- a/arch/arm64/Kconfig ++++ b/arch/arm64/Kconfig +@@ -751,6 +751,7 @@ config XEN + config FORCE_MAX_ZONEORDER + int + default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE) ++ default "13" if (ARCH_THUNDER && !ARM64_64K_PAGES) + default "12" if (ARM64_16K_PAGES && TRANSPARENT_HUGEPAGE) + default "11" + help +-- +2.12.2 + diff --git a/baseconfig/CONFIG_CM3605 b/baseconfig/CONFIG_CM3605 index be5dca2ea..138742e11 100644 --- a/baseconfig/CONFIG_CM3605 +++ b/baseconfig/CONFIG_CM3605 @@ -1 +1 @@ -# CONFIG_CM3605 is not set +CONFIG_CM3605=m diff --git a/baseconfig/CONFIG_COMMON_CLK_HI3519 b/baseconfig/CONFIG_COMMON_CLK_HI3519 deleted file mode 100644 index 492b656b1..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_HI3519 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_HI3519 is not set diff --git a/baseconfig/CONFIG_COMMON_CLK_MT2701 b/baseconfig/CONFIG_COMMON_CLK_MT2701 deleted file mode 100644 index 1f4db7eb4..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_MT2701 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_MT2701 is not set diff --git a/baseconfig/CONFIG_COMMON_CLK_MT2701_BDPSYS b/baseconfig/CONFIG_COMMON_CLK_MT2701_BDPSYS deleted file mode 100644 index 8836cfeb2..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_MT2701_BDPSYS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set diff --git a/baseconfig/CONFIG_COMMON_CLK_MT2701_ETHSYS b/baseconfig/CONFIG_COMMON_CLK_MT2701_ETHSYS deleted file mode 100644 index ce71bcaf3..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_MT2701_ETHSYS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set diff --git a/baseconfig/CONFIG_COMMON_CLK_MT2701_HIFSYS b/baseconfig/CONFIG_COMMON_CLK_MT2701_HIFSYS deleted file mode 100644 index 687287f1a..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_MT2701_HIFSYS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set diff --git a/baseconfig/CONFIG_COMMON_CLK_MT2701_IMGSYS b/baseconfig/CONFIG_COMMON_CLK_MT2701_IMGSYS deleted file mode 100644 index f50109f52..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_MT2701_IMGSYS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set diff --git a/baseconfig/CONFIG_COMMON_CLK_MT2701_MMSYS b/baseconfig/CONFIG_COMMON_CLK_MT2701_MMSYS deleted file mode 100644 index a28dde4dd..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_MT2701_MMSYS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set diff --git a/baseconfig/CONFIG_COMMON_CLK_MT2701_VDECSYS b/baseconfig/CONFIG_COMMON_CLK_MT2701_VDECSYS deleted file mode 100644 index 2fffe9756..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_MT2701_VDECSYS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set diff --git a/baseconfig/CONFIG_COMMON_CLK_MT8135 b/baseconfig/CONFIG_COMMON_CLK_MT8135 deleted file mode 100644 index 0e5e55f2d..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_MT8135 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_MT8135 is not set diff --git a/baseconfig/CONFIG_COMMON_CLK_MT8173 b/baseconfig/CONFIG_COMMON_CLK_MT8173 deleted file mode 100644 index ef1d176f5..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_MT8173 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_MT8173 is not set diff --git a/baseconfig/CONFIG_COMMON_CLK_OXNAS b/baseconfig/CONFIG_COMMON_CLK_OXNAS deleted file mode 100644 index 123f7bbbf..000000000 --- a/baseconfig/CONFIG_COMMON_CLK_OXNAS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_COMMON_CLK_OXNAS is not set diff --git a/baseconfig/CONFIG_SND_SIMPLE_SCU_CARD b/baseconfig/CONFIG_SND_SIMPLE_SCU_CARD index 38757da9f..e50c18374 100644 --- a/baseconfig/CONFIG_SND_SIMPLE_SCU_CARD +++ b/baseconfig/CONFIG_SND_SIMPLE_SCU_CARD @@ -1 +1 @@ -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_NAU8540 b/baseconfig/CONFIG_SND_SOC_NAU8540 index 43355fa74..43355fa74 100644 --- a/baseconfig/arm/armv7/CONFIG_SND_SOC_NAU8540 +++ b/baseconfig/CONFIG_SND_SOC_NAU8540 diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TAS571X b/baseconfig/CONFIG_SND_SOC_TAS571X index 5a0960c0f..5a0960c0f 100644 --- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TAS571X +++ b/baseconfig/CONFIG_SND_SOC_TAS571X diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_MAX77686 b/baseconfig/arm/CONFIG_COMMON_CLK_MAX77686 index 71ba0b45c..71ba0b45c 100644 --- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_MAX77686 +++ b/baseconfig/arm/CONFIG_COMMON_CLK_MAX77686 diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO b/baseconfig/arm/CONFIG_LEDS_GPIO index 65a807afb..65a807afb 100644 --- a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO +++ b/baseconfig/arm/CONFIG_LEDS_GPIO diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO_REGISTER b/baseconfig/arm/CONFIG_LEDS_GPIO_REGISTER index 101e4404f..101e4404f 100644 --- a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO_REGISTER +++ b/baseconfig/arm/CONFIG_LEDS_GPIO_REGISTER diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_PWM b/baseconfig/arm/CONFIG_LEDS_PWM index fc4cfe6f7..fc4cfe6f7 100644 --- a/baseconfig/arm/armv7/CONFIG_LEDS_PWM +++ b/baseconfig/arm/CONFIG_LEDS_PWM diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_SYSCON b/baseconfig/arm/CONFIG_LEDS_SYSCON index c458741b6..c458741b6 100644 --- a/baseconfig/arm/armv7/CONFIG_LEDS_SYSCON +++ b/baseconfig/arm/CONFIG_LEDS_SYSCON diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_TRIGGER_CPU b/baseconfig/arm/CONFIG_LEDS_TRIGGER_CPU index b017fb086..b017fb086 100644 --- a/baseconfig/arm/armv7/CONFIG_LEDS_TRIGGER_CPU +++ b/baseconfig/arm/CONFIG_LEDS_TRIGGER_CPU diff --git a/baseconfig/arm/armv7/CONFIG_MFD_MAX77686 b/baseconfig/arm/CONFIG_MFD_MAX77686 index e6791bf7e..e6791bf7e 100644 --- a/baseconfig/arm/armv7/CONFIG_MFD_MAX77686 +++ b/baseconfig/arm/CONFIG_MFD_MAX77686 diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX77686 b/baseconfig/arm/CONFIG_REGULATOR_MAX77686 index 69bd2bdd7..69bd2bdd7 100644 --- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX77686 +++ b/baseconfig/arm/CONFIG_REGULATOR_MAX77686 diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX77802 b/baseconfig/arm/CONFIG_REGULATOR_MAX77802 index 3f55c214c..3f55c214c 100644 --- a/baseconfig/arm/armv7/CONFIG_REGULATOR_MAX77802 +++ b/baseconfig/arm/CONFIG_REGULATOR_MAX77802 diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_CODEC b/baseconfig/arm/CONFIG_SND_SOC_AC97_CODEC index f2388a7c0..f2388a7c0 100644 --- a/baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_CODEC +++ b/baseconfig/arm/CONFIG_SND_SOC_AC97_CODEC diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328 b/baseconfig/arm/CONFIG_SND_SOC_ES8328 index 806f698e1..806f698e1 100644 --- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328 +++ b/baseconfig/arm/CONFIG_SND_SOC_ES8328 diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_I2C b/baseconfig/arm/CONFIG_SND_SOC_ES8328_I2C index 9f90cb7e0..9f90cb7e0 100644 --- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_I2C +++ b/baseconfig/arm/CONFIG_SND_SOC_ES8328_I2C diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_SPI b/baseconfig/arm/CONFIG_SND_SOC_ES8328_SPI index 0eb8f755c..0eb8f755c 100644 --- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_SPI +++ b/baseconfig/arm/CONFIG_SND_SOC_ES8328_SPI diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_ALC5632 b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_ALC5632 index 63a5d40d0..63a5d40d0 100644 --- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_ALC5632 +++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_ALC5632 diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_TRIMSLICE b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_TRIMSLICE index 23a6b3005..23a6b3005 100644 --- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_TRIMSLICE +++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_TRIMSLICE diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8903 b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM8903 index ff10de901..ff10de901 100644 --- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8903 +++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM8903 diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM9712 b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM9712 index 3ced427a6..3ced427a6 100644 --- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM9712 +++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM9712 diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TS3A227E b/baseconfig/arm/CONFIG_SND_SOC_TS3A227E index 1d3522517..1d3522517 100644 --- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TS3A227E +++ b/baseconfig/arm/CONFIG_SND_SOC_TS3A227E diff --git a/baseconfig/arm/CONFIG_SYSCON_REBOOT_MODE b/baseconfig/arm/CONFIG_SYSCON_REBOOT_MODE new file mode 100644 index 000000000..b391f88cb --- /dev/null +++ b/baseconfig/arm/CONFIG_SYSCON_REBOOT_MODE @@ -0,0 +1 @@ +CONFIG_SYSCON_REBOOT_MODE=y diff --git a/baseconfig/CONFIG_COMMON_CLK_HI3516CV300 b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3516CV300 index 2c50858a5..2c50858a5 100644 --- a/baseconfig/CONFIG_COMMON_CLK_HI3516CV300 +++ b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3516CV300 diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3519 b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3519 new file mode 100644 index 000000000..5484a59ba --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3519 @@ -0,0 +1 @@ +CONFIG_COMMON_CLK_HI3519=m diff --git a/baseconfig/CONFIG_COMMON_CLK_HI3798CV200 b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3798CV200 index 8d91e10e1..8d91e10e1 100644 --- a/baseconfig/CONFIG_COMMON_CLK_HI3798CV200 +++ b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_HI3798CV200 diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_PWM b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_PWM new file mode 100644 index 000000000..08193dd2c --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_PWM @@ -0,0 +1 @@ +CONFIG_COMMON_CLK_PWM=m diff --git a/baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER b/baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER new file mode 100644 index 000000000..6d42a47fc --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER @@ -0,0 +1 @@ +CONFIG_FORCE_MAX_ZONEORDER=13 diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I index 7c9597c70..54410db09 100644 --- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I +++ b/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I @@ -1 +1 @@ -# CONFIG_RTC_DRV_SUN6I is not set +CONFIG_RTC_DRV_SUN6I=y diff --git a/baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC b/baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC new file mode 100644 index 000000000..05e82f2e9 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC @@ -0,0 +1 @@ +# CONFIG_SND_KIRKWOOD_SOC is not set diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC b/baseconfig/arm/arm64/CONFIG_SND_SOC deleted file mode 100644 index a161b8e18..000000000 --- a/baseconfig/arm/arm64/CONFIG_SND_SOC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SND_SOC is not set diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC b/baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC new file mode 100644 index 000000000..dfe53b84d --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC @@ -0,0 +1 @@ +CONFIG_SND_SOC_APQ8016_SBC=m diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM b/baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM new file mode 100644 index 000000000..719eb4e3d --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM @@ -0,0 +1 @@ +CONFIG_SND_SOC_QCOM=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_SGTL5000 b/baseconfig/arm/arm64/CONFIG_SND_SOC_SGTL5000 index ea71dece1..ea71dece1 100644 --- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_SGTL5000 +++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_SGTL5000 diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_STORM b/baseconfig/arm/arm64/CONFIG_SND_SOC_STORM new file mode 100644 index 000000000..adab3ae82 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_STORM @@ -0,0 +1 @@ +# CONFIG_SND_SOC_STORM is not set diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA new file mode 100644 index 000000000..b32a04ff3 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA @@ -0,0 +1 @@ +CONFIG_SND_SOC_TEGRA=m diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090 b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090 new file mode 100644 index 000000000..55f327a38 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090 @@ -0,0 +1 @@ +CONFIG_SND_SOC_TEGRA_MAX98090=m diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640 b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640 new file mode 100644 index 000000000..3370b8ec2 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640 @@ -0,0 +1 @@ +CONFIG_SND_SOC_TEGRA_RT5640=m diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677 b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677 new file mode 100644 index 000000000..24298d93b --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677 @@ -0,0 +1 @@ +CONFIG_SND_SOC_TEGRA_RT5677=m diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000 b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000 new file mode 100644 index 000000000..4706a31c1 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000 @@ -0,0 +1 @@ +CONFIG_SND_SOC_TEGRA_SGTL5000=m diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753 b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753 new file mode 100644 index 000000000..9039b1695 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753 @@ -0,0 +1 @@ +# CONFIG_SND_SOC_TEGRA_WM8753 is not set diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S b/baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S new file mode 100644 index 000000000..d9270e25b --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S @@ -0,0 +1 @@ +CONFIG_SND_SUN4I_I2S=m diff --git a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77686 b/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77686 deleted file mode 100644 index 71ba0b45c..000000000 --- a/baseconfig/arm/armv7/CONFIG_COMMON_CLK_MAX77686 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_COMMON_CLK_MAX77686=m diff --git a/baseconfig/arm/CONFIG_FORCE_MAX_ZONEORDER b/baseconfig/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER index bdbd3377f..bdbd3377f 100644 --- a/baseconfig/arm/CONFIG_FORCE_MAX_ZONEORDER +++ b/baseconfig/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I index 7c9597c70..54410db09 100644 --- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I +++ b/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I @@ -1 +1 @@ -# CONFIG_RTC_DRV_SUN6I is not set +CONFIG_RTC_DRV_SUN6I=y diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_I2C b/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_I2C deleted file mode 100644 index 4250a8ff6..000000000 --- a/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_I2C +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SND_SOC_ES8328_I2C is not set diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_SPI b/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_SPI deleted file mode 100644 index 4a841e5a3..000000000 --- a/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_SPI +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SND_SOC_ES8328_SPI is not set diff --git a/baseconfig/powerpc/CONFIG_LEDS_TRIGGER_GPIO b/baseconfig/powerpc/CONFIG_LEDS_TRIGGER_GPIO deleted file mode 100644 index c45d222a9..000000000 --- a/baseconfig/powerpc/CONFIG_LEDS_TRIGGER_GPIO +++ /dev/null @@ -1 +0,0 @@ -CONFIG_LEDS_TRIGGER_GPIO=m diff --git a/baseconfig/x86/CONFIG_SND_SOC_TAS571X b/baseconfig/x86/CONFIG_SND_SOC_TAS571X deleted file mode 100644 index 5a0960c0f..000000000 --- a/baseconfig/x86/CONFIG_SND_SOC_TAS571X +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SND_SOC_TAS571X is not set diff --git a/baseconfig/x86/i686/CONFIG_SND_SOC_TS3A227E b/baseconfig/x86/CONFIG_SND_SOC_TS3A227E index 1d3522517..1d3522517 100644 --- a/baseconfig/x86/i686/CONFIG_SND_SOC_TS3A227E +++ b/baseconfig/x86/CONFIG_SND_SOC_TS3A227E diff --git a/baseconfig/x86/i686PAE/CONFIG_SND_SOC_TS3A227E b/baseconfig/x86/i686PAE/CONFIG_SND_SOC_TS3A227E deleted file mode 100644 index 1d3522517..000000000 --- a/baseconfig/x86/i686PAE/CONFIG_SND_SOC_TS3A227E +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SOC_TS3A227E=m diff --git a/baseconfig/x86/x86_64/CONFIG_SND_SOC_TS3A227E b/baseconfig/x86/x86_64/CONFIG_SND_SOC_TS3A227E deleted file mode 100644 index 1d3522517..000000000 --- a/baseconfig/x86/x86_64/CONFIG_SND_SOC_TS3A227E +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SOC_TS3A227E=m diff --git a/bcm2837-initial-support.patch b/bcm2837-initial-support.patch index d18446d2c..021ae1069 100644 --- a/bcm2837-initial-support.patch +++ b/bcm2837-initial-support.patch @@ -1,19 +1,19 @@ -From patchwork Wed Feb 8 22:40:24 2017 +From patchwork Tue Apr 25 16:45:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit -Subject: ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v3) +Subject: ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v6) From: Eric Anholt <eric@anholt.net> -X-Patchwork-Id: 9563699 -Message-Id: <20170208224024.30415-1-eric@anholt.net> -To: Florian Fainelli <f.fainelli@gmail.com>, Rob Herring <robh+dt@kernel.org>, +X-Patchwork-Id: 9698781 +Message-Id: <20170425164508.32242-1-eric@anholt.net> +To: Lee Jones <lee@kernel.org>, Florian Fainelli <f.fainelli@gmail.com>, + Olof Johansson <olof@lixom.net>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, devicetree@vger.kernel.org -Cc: Stephen Warren <swarren@wwwdotorg.org>, Lee Jones <lee@kernel.org>, - linux-kernel@vger.kernel.org, Eric Anholt <eric@anholt.net>, - bcm-kernel-feedback-list@broadcom.com, - linux-rpi-kernel@lists.infradead.org, - linux-arm-kernel@lists.infradead.org, Gerd Hoffmann <kraxel@redhat.com> -Date: Wed, 8 Feb 2017 14:40:24 -0800 +Cc: Stefan Wahren <stefan.wahren@i2se.com>, linux-kernel@vger.kernel.org, + Eric Anholt <eric@anholt.net>, bcm-kernel-feedback-list@broadcom.com, + Gerd Hoffmann <kraxel@redhat.com>, linux-arm-kernel@lists.infradead.org, + linux-rpi-kernel@lists.infradead.org +Date: Tue, 25 Apr 2017 09:45:08 -0700 Raspbian and Fedora have decided to support the Pi3 in 32-bit mode for now, so it's useful to be able to test that mode on an upstream @@ -22,25 +22,16 @@ and 64-bit development. Signed-off-by: Eric Anholt <eric@anholt.net> --- - -v1: Gerd's patch that put the ../../../arm64/... link in the Makefile -v2: Michael's patch that #included from ../../../arm64/... in a new - bcm2837-rpi-3-b.dts. -v3: Mine, using symlinks to make sure that we don't break the split DT - tree. - arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 + - arch/arm/boot/dts/bcm2837.dtsi | 1 + - 3 files changed, 3 insertions(+) - create mode 120000 arch/arm/boot/dts/bcm2837-rpi-3-b.dts - create mode 120000 arch/arm/boot/dts/bcm2837.dtsi + 2 files changed, 2 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 6576e3f000c9..416fdcedf5a1 100644 +index 011808490fed..eded842d9978 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -70,6 +70,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ +@@ -72,6 +72,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ bcm2835-rpi-b-plus.dtb \ bcm2835-rpi-a-plus.dtb \ bcm2836-rpi-2-b.dtb \ @@ -49,18 +40,9 @@ index 6576e3f000c9..416fdcedf5a1 100644 dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-asus-rt-ac56u.dtb \ diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -new file mode 120000 -index 000000000000..ceebc0e163fb +new file mode 100644 +index 000000000000..c72a27d908b6 --- /dev/null +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -0,0 +1 @@ -+../../../arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts -\ No newline at end of file -diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi -new file mode 120000 -index 000000000000..53f1cd2bba47 ---- /dev/null -+++ b/arch/arm/boot/dts/bcm2837.dtsi -@@ -0,0 +1 @@ -+../../../arm64/boot/dts/broadcom/bcm2837.dtsi -\ No newline at end of file ++#include "../../../arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts" @@ -1 +1 @@ -057a650bdcb05ec5947558b6baa5305a3cb15f17 +8b5d11e4b095450e2f259d5f60ea18c13d2fe0a2 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index a5039bd61..b0c8f40a6 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -827,7 +827,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 @@ -849,21 +849,11 @@ CONFIG_CNIC=m # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set +CONFIG_COMMON_CLK_HI3519=m CONFIG_COMMON_CLK_HI3660=y # CONFIG_COMMON_CLK_HI3798CV200 is not set CONFIG_COMMON_CLK_HI6220=y CONFIG_COMMON_CLK_MAX77686=m -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=m CONFIG_COMMON_CLK_RK808=m @@ -1583,7 +1573,7 @@ CONFIG_FMC_TRIVIAL=m CONFIG_FMC_WRITE_EEPROM=m # CONFIG_FONTS is not set CONFIG_FORCEDETH=m -CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_FORCE_MAX_ZONEORDER=13 # CONFIG_FPGA is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y @@ -2597,7 +2587,8 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLEVO_MAIL=m # CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_DELL_NETBOOKS=m -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_GPIO_REGISTER=y # CONFIG_LEDS_IS31FL319X is not set # CONFIG_LEDS_IS31FL32XX is not set # CONFIG_LEDS_KTD2692 is not set @@ -2621,15 +2612,15 @@ CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set -# CONFIG_LEDS_PWM is not set +CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m # CONFIG_LEDS_S3C24XX is not set -# CONFIG_LEDS_SYSCON is not set +CONFIG_LEDS_SYSCON=y # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TLC591XX is not set CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_CAMERA=m -# CONFIG_LEDS_TRIGGER_CPU is not set +CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_DISK=y CONFIG_LEDS_TRIGGER_GPIO=m @@ -2879,7 +2870,7 @@ CONFIG_MFD_HI655X_PMIC=m # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_MAX14577 is not set CONFIG_MFD_MAX77620=y -# CONFIG_MFD_MAX77686 is not set +CONFIG_MFD_MAX77686=y # CONFIG_MFD_MAX77693 is not set # CONFIG_MFD_MAX77843 is not set # CONFIG_MFD_MAX8907 is not set @@ -4199,6 +4190,8 @@ CONFIG_REGULATOR_HI655X=m # CONFIG_REGULATOR_LTC3676 is not set # CONFIG_REGULATOR_MAX1586 is not set CONFIG_REGULATOR_MAX77620=m +CONFIG_REGULATOR_MAX77686=m +CONFIG_REGULATOR_MAX77802=m # CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set # CONFIG_REGULATOR_MAX8952 is not set @@ -4375,7 +4368,7 @@ CONFIG_RTC_DRV_S35390A=m # CONFIG_RTC_DRV_SA1100 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m -# CONFIG_RTC_DRV_SUN6I is not set +CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_TEGRA=m # CONFIG_RTC_DRV_TEST is not set CONFIG_RTC_DRV_V3020=m @@ -4963,6 +4956,7 @@ CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_ISIGHT=m CONFIG_SND_JACK=y +# CONFIG_SND_KIRKWOOD_SOC is not set CONFIG_SND_KORG1212=m CONFIG_SND_LAYLA20=m CONFIG_SND_LAYLA24=m @@ -5001,8 +4995,9 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m +CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set # CONFIG_SND_SOC_AK4104 is not set @@ -5013,6 +5008,7 @@ CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_ALL_CODECS=m CONFIG_SND_SOC_AMD_ACP=m +CONFIG_SND_SOC_APQ8016_SBC=m # CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set @@ -5032,7 +5028,9 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set CONFIG_SND_SOC_DMIC=m -# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_ASOC_CARD is not set # CONFIG_SND_SOC_FSL_ASRC is not set # CONFIG_SND_SOC_FSL_ESAI is not set @@ -5047,11 +5045,12 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -5062,6 +5061,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_PCM512x_I2C=m CONFIG_SND_SOC_PCM512x=m CONFIG_SND_SOC_PCM512x_SPI=m +CONFIG_SND_SOC_QCOM=m CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m CONFIG_SND_SOC_RK3399_GRU_SOUND=m CONFIG_SND_SOC_ROCKCHIP_I2S=m @@ -5071,7 +5071,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set -# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SGTL5000=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2602_I2C is not set @@ -5080,16 +5080,28 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STA32X is not set # CONFIG_SND_SOC_STA350 is not set # CONFIG_SND_SOC_STI_SAS is not set +# CONFIG_SND_SOC_STORM is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set +# CONFIG_SND_SOC_TEGRA_ALC5632 is not set +CONFIG_SND_SOC_TEGRA=m +CONFIG_SND_SOC_TEGRA_MAX98090=m +CONFIG_SND_SOC_TEGRA_RT5640=m +CONFIG_SND_SOC_TEGRA_RT5677=m +CONFIG_SND_SOC_TEGRA_SGTL5000=m +# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set +# CONFIG_SND_SOC_TEGRA_WM8753 is not set +# CONFIG_SND_SOC_TEGRA_WM8903 is not set +# CONFIG_SND_SOC_TEGRA_WM9712 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set # CONFIG_SND_SOC_TLV320AIC23_SPI is not set # CONFIG_SND_SOC_TLV320AIC31XX is not set # CONFIG_SND_SOC_TLV320AIC3X is not set CONFIG_SND_SOC_TPA6130A2=m -# CONFIG_SND_SOC_TS3A227E is not set +CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set # CONFIG_SND_SOC_WM8580 is not set @@ -5115,6 +5127,7 @@ CONFIG_SND_SOC_WM8804_SPI=m CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set CONFIG_SND_SUN4I_CODEC=m +CONFIG_SND_SUN4I_I2S=m CONFIG_SND_SUN4I_SPDIF=m CONFIG_SND_SUN8I_CODEC_ANALOG=m CONFIG_SND_SUN8I_CODEC=m @@ -5276,7 +5289,7 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYN_COOKIES=y # CONFIG_SYNOPSYS_DWC_ETH_QOS is not set -# CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index bff2422bf..37bd5d69c 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -827,7 +827,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 @@ -849,21 +849,11 @@ CONFIG_CNIC=m # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set +CONFIG_COMMON_CLK_HI3519=m CONFIG_COMMON_CLK_HI3660=y # CONFIG_COMMON_CLK_HI3798CV200 is not set CONFIG_COMMON_CLK_HI6220=y CONFIG_COMMON_CLK_MAX77686=m -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=m CONFIG_COMMON_CLK_RK808=m @@ -1566,7 +1556,7 @@ CONFIG_FMC_TRIVIAL=m CONFIG_FMC_WRITE_EEPROM=m # CONFIG_FONTS is not set CONFIG_FORCEDETH=m -CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_FORCE_MAX_ZONEORDER=13 # CONFIG_FPGA is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y @@ -2578,7 +2568,8 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLEVO_MAIL=m # CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_DELL_NETBOOKS=m -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_GPIO_REGISTER=y # CONFIG_LEDS_IS31FL319X is not set # CONFIG_LEDS_IS31FL32XX is not set # CONFIG_LEDS_KTD2692 is not set @@ -2602,15 +2593,15 @@ CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set -# CONFIG_LEDS_PWM is not set +CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m # CONFIG_LEDS_S3C24XX is not set -# CONFIG_LEDS_SYSCON is not set +CONFIG_LEDS_SYSCON=y # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TLC591XX is not set CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_CAMERA=m -# CONFIG_LEDS_TRIGGER_CPU is not set +CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_DISK=y CONFIG_LEDS_TRIGGER_GPIO=m @@ -2859,7 +2850,7 @@ CONFIG_MFD_HI655X_PMIC=m # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_MAX14577 is not set CONFIG_MFD_MAX77620=y -# CONFIG_MFD_MAX77686 is not set +CONFIG_MFD_MAX77686=y # CONFIG_MFD_MAX77693 is not set # CONFIG_MFD_MAX77843 is not set # CONFIG_MFD_MAX8907 is not set @@ -4177,6 +4168,8 @@ CONFIG_REGULATOR_HI655X=m # CONFIG_REGULATOR_LTC3676 is not set # CONFIG_REGULATOR_MAX1586 is not set CONFIG_REGULATOR_MAX77620=m +CONFIG_REGULATOR_MAX77686=m +CONFIG_REGULATOR_MAX77802=m # CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set # CONFIG_REGULATOR_MAX8952 is not set @@ -4353,7 +4346,7 @@ CONFIG_RTC_DRV_S35390A=m # CONFIG_RTC_DRV_SA1100 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m -# CONFIG_RTC_DRV_SUN6I is not set +CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_TEGRA=m # CONFIG_RTC_DRV_TEST is not set CONFIG_RTC_DRV_V3020=m @@ -4941,6 +4934,7 @@ CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_ISIGHT=m CONFIG_SND_JACK=y +# CONFIG_SND_KIRKWOOD_SOC is not set CONFIG_SND_KORG1212=m CONFIG_SND_LAYLA20=m CONFIG_SND_LAYLA24=m @@ -4978,8 +4972,9 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m +CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set # CONFIG_SND_SOC_AK4104 is not set @@ -4990,6 +4985,7 @@ CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_ALL_CODECS=m CONFIG_SND_SOC_AMD_ACP=m +CONFIG_SND_SOC_APQ8016_SBC=m # CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set @@ -5009,7 +5005,9 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set CONFIG_SND_SOC_DMIC=m -# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_ASOC_CARD is not set # CONFIG_SND_SOC_FSL_ASRC is not set # CONFIG_SND_SOC_FSL_ESAI is not set @@ -5024,11 +5022,12 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -5039,6 +5038,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_PCM512x_I2C=m CONFIG_SND_SOC_PCM512x=m CONFIG_SND_SOC_PCM512x_SPI=m +CONFIG_SND_SOC_QCOM=m CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m CONFIG_SND_SOC_RK3399_GRU_SOUND=m CONFIG_SND_SOC_ROCKCHIP_I2S=m @@ -5048,7 +5048,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set -# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SGTL5000=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2602_I2C is not set @@ -5057,16 +5057,28 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STA32X is not set # CONFIG_SND_SOC_STA350 is not set # CONFIG_SND_SOC_STI_SAS is not set +# CONFIG_SND_SOC_STORM is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set +# CONFIG_SND_SOC_TEGRA_ALC5632 is not set +CONFIG_SND_SOC_TEGRA=m +CONFIG_SND_SOC_TEGRA_MAX98090=m +CONFIG_SND_SOC_TEGRA_RT5640=m +CONFIG_SND_SOC_TEGRA_RT5677=m +CONFIG_SND_SOC_TEGRA_SGTL5000=m +# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set +# CONFIG_SND_SOC_TEGRA_WM8753 is not set +# CONFIG_SND_SOC_TEGRA_WM8903 is not set +# CONFIG_SND_SOC_TEGRA_WM9712 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set # CONFIG_SND_SOC_TLV320AIC23_SPI is not set # CONFIG_SND_SOC_TLV320AIC31XX is not set # CONFIG_SND_SOC_TLV320AIC3X is not set CONFIG_SND_SOC_TPA6130A2=m -# CONFIG_SND_SOC_TS3A227E is not set +CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set # CONFIG_SND_SOC_WM8580 is not set @@ -5092,6 +5104,7 @@ CONFIG_SND_SOC_WM8804_SPI=m CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set CONFIG_SND_SUN4I_CODEC=m +CONFIG_SND_SUN4I_I2S=m CONFIG_SND_SUN4I_SPDIF=m CONFIG_SND_SUN8I_CODEC_ANALOG=m CONFIG_SND_SUN8I_CODEC=m @@ -5253,7 +5266,7 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYN_COOKIES=y # CONFIG_SYNOPSYS_DWC_ETH_QOS is not set -# CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 037f7f34e..0b75171a7 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -877,7 +877,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m CONFIG_CM36651=m CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 @@ -899,21 +899,8 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set CONFIG_COMMON_CLK_MAX77686=m CONFIG_COMMON_CLK_MAX77802=m -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=m @@ -4755,7 +4742,7 @@ CONFIG_RTC_DRV_S5M=m CONFIG_RTC_DRV_SNVS=m CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_ST_LPC=m -# CONFIG_RTC_DRV_SUN6I is not set +CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_SUNXI=m CONFIG_RTC_DRV_TEGRA=m # CONFIG_RTC_DRV_TEST is not set @@ -5435,7 +5422,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AC97_CODEC=m @@ -5809,7 +5796,7 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYN_COOKIES=y # CONFIG_SYNOPSYS_DWC_ETH_QOS is not set -# CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 6feb2bd3a..7bc14358d 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -852,7 +852,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 @@ -873,21 +873,8 @@ CONFIG_CNIC=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set CONFIG_COMMON_CLK_MAX77686=m CONFIG_COMMON_CLK_MAX77802=m -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_S2MPS11=m @@ -4475,7 +4462,7 @@ CONFIG_RTC_DRV_S5M=m # CONFIG_RTC_DRV_SA1100 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m -# CONFIG_RTC_DRV_SUN6I is not set +CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_SUNXI=m CONFIG_RTC_DRV_TEGRA=m # CONFIG_RTC_DRV_TEST is not set @@ -5117,7 +5104,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AC97_CODEC=m @@ -5151,9 +5138,9 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set CONFIG_SND_SOC_DMIC=m -# CONFIG_SND_SOC_ES8328_I2C is not set -# CONFIG_SND_SOC_ES8328 is not set -# CONFIG_SND_SOC_ES8328_SPI is not set +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_ASOC_CARD is not set # CONFIG_SND_SOC_FSL_ASRC is not set # CONFIG_SND_SOC_FSL_ESAI is not set @@ -5433,7 +5420,7 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYN_COOKIES=y # CONFIG_SYNOPSYS_DWC_ETH_QOS is not set -# CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 8a817af3f..e5d1605ba 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -851,7 +851,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 @@ -872,21 +872,8 @@ CONFIG_CNIC=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set CONFIG_COMMON_CLK_MAX77686=m CONFIG_COMMON_CLK_MAX77802=m -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_S2MPS11=m @@ -4453,7 +4440,7 @@ CONFIG_RTC_DRV_S5M=m # CONFIG_RTC_DRV_SA1100 is not set # CONFIG_RTC_DRV_SNVS is not set CONFIG_RTC_DRV_STK17TA8=m -# CONFIG_RTC_DRV_SUN6I is not set +CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_SUNXI=m CONFIG_RTC_DRV_TEGRA=m # CONFIG_RTC_DRV_TEST is not set @@ -5094,7 +5081,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AC97_CODEC=m @@ -5128,9 +5115,9 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set CONFIG_SND_SOC_DMIC=m -# CONFIG_SND_SOC_ES8328_I2C is not set -# CONFIG_SND_SOC_ES8328 is not set -# CONFIG_SND_SOC_ES8328_SPI is not set +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_ASOC_CARD is not set # CONFIG_SND_SOC_FSL_ASRC is not set # CONFIG_SND_SOC_FSL_ESAI is not set @@ -5410,7 +5397,7 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYN_COOKIES=y # CONFIG_SYNOPSYS_DWC_ETH_QOS is not set -# CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 866ccbbca..66bd982ac 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -876,7 +876,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m CONFIG_CM36651=m CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 @@ -898,21 +898,8 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set CONFIG_COMMON_CLK_MAX77686=m CONFIG_COMMON_CLK_MAX77802=m -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=m @@ -4733,7 +4720,7 @@ CONFIG_RTC_DRV_S5M=m CONFIG_RTC_DRV_SNVS=m CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_ST_LPC=m -# CONFIG_RTC_DRV_SUN6I is not set +CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_SUNXI=m CONFIG_RTC_DRV_TEGRA=m # CONFIG_RTC_DRV_TEST is not set @@ -5412,7 +5399,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AC97_CODEC=m @@ -5786,7 +5773,7 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYN_COOKIES=y # CONFIG_SYNOPSYS_DWC_ETH_QOS is not set -# CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_SYSCON_REBOOT_MODE=y CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 519626758..4a24bc6a4 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -735,7 +735,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_BOOL is not set @@ -746,19 +746,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4766,7 +4753,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 684031302..03e610d3f 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -736,7 +736,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_BOOL is not set @@ -747,19 +747,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4788,7 +4775,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 15a2e1f9a..2d2ddcf4d 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -736,7 +736,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_BOOL is not set @@ -747,19 +747,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4788,7 +4775,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set diff --git a/kernel-i686.config b/kernel-i686.config index 2fff27e6c..2b640d3e3 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -735,7 +735,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_BOOL is not set @@ -746,19 +746,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4766,7 +4753,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index f6510bedf..c59901132 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -720,7 +720,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -736,19 +736,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4614,7 +4601,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set @@ -4665,6 +4652,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4687,6 +4675,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 7c7198a22..af2f8af93 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -719,7 +719,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -735,19 +735,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4590,7 +4577,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set @@ -4641,6 +4628,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4663,6 +4651,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 15c3ee9e4..47fadbda3 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -677,7 +677,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -693,19 +693,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4543,7 +4530,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set @@ -4594,6 +4581,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4616,6 +4604,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 367030874..ebfead87c 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -676,7 +676,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -692,19 +692,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4519,7 +4506,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set @@ -4570,6 +4557,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4592,6 +4580,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 07124bb11..896b8132b 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -677,7 +677,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -693,19 +693,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4542,7 +4529,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set @@ -4593,6 +4580,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4615,6 +4603,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 36a00507f..a3cb93cdc 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -676,7 +676,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -692,19 +692,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4518,7 +4505,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set @@ -4569,6 +4556,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4591,6 +4579,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 8524c0556..49c17079c 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -677,7 +677,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_PARTITION is not set @@ -689,19 +689,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4436,7 +4423,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set @@ -4487,6 +4474,7 @@ CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4509,6 +4497,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index bf55a2a2f..afaecb425 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -676,7 +676,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_PARTITION is not set @@ -688,19 +688,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4412,7 +4399,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set @@ -4463,6 +4450,7 @@ CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4485,6 +4473,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 383ac66a1..905bb6af4 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -740,7 +740,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -754,19 +754,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4818,7 +4805,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 3cf494a1b..4c24a5330 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -739,7 +739,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -753,19 +753,6 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_HI3516CV300 is not set -# CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_COMMON_CLK_HI3798CV200 is not set -# CONFIG_COMMON_CLK_MT2701_BDPSYS is not set -# CONFIG_COMMON_CLK_MT2701_ETHSYS is not set -# CONFIG_COMMON_CLK_MT2701_HIFSYS is not set -# CONFIG_COMMON_CLK_MT2701_IMGSYS is not set -# CONFIG_COMMON_CLK_MT2701 is not set -# CONFIG_COMMON_CLK_MT2701_MMSYS is not set -# CONFIG_COMMON_CLK_MT2701_VDECSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4796,7 +4783,7 @@ CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SND_SIMPLE_SCU_CARD is not set +CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set diff --git a/kernel.spec b/kernel.spec index 98a4d5efa..ca8986516 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 0 +%global released_kernel 1 # Sign modules on x86. Make sure the config files match this setting if more # architectures are added. @@ -48,7 +48,7 @@ Summary: The Linux kernel # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base, # which yields a base_sublevel of 0. -%define base_sublevel 10 +%define base_sublevel 11 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -67,7 +67,7 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 8 +%global rcrev 0 # The git snapshot level %define gitrev 0 # Set rpm version accordingly @@ -219,7 +219,7 @@ Summary: The Linux kernel %if %{with_vdso_install} # These arches install vdso/ directories. -%define vdso_arches %{all_x86} x86_64 %{power64} s390 s390x aarch64 +%define vdso_arches %{all_x86} x86_64 %{power64} s390x aarch64 %endif # Overrides for generic default options @@ -329,7 +329,7 @@ Summary: The Linux kernel # Which is a BadThing(tm). # We only build kernel-headers on the following... -%define nobuildarches i386 s390 +%define nobuildarches i386 %ifarch %nobuildarches %define with_up 0 @@ -364,7 +364,7 @@ Version: %{rpmversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD -ExclusiveArch: %{all_x86} x86_64 ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le +ExclusiveArch: %{all_x86} x86_64 ppc64 ppc64p7 s390x %{arm} aarch64 ppc64le ExclusiveOS: Linux %ifnarch %{nobuildarches} Requires: kernel-core-uname-r = %{KVERREL}%{?variant} @@ -385,7 +385,7 @@ BuildRequires: sparse %if %{with_perf} BuildRequires: zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex xz-devel BuildRequires: audit-libs-devel -%ifnarch s390 s390x %{arm} +%ifnarch s390x %{arm} BuildRequires: numactl-devel %endif %endif @@ -537,6 +537,8 @@ Patch429: arm64-hikey-fixes.patch # http://www.spinics.net/lists/devicetree/msg163238.html Patch430: bcm2837-initial-support.patch +Patch431: arm-rk3288-tinker.patch + # http://www.spinics.net/lists/dri-devel/msg132235.html Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch @@ -554,6 +556,11 @@ Patch437: bcm283x-hdmi-audio.patch # https://www.spinics.net/lists/arm-kernel/msg554183.html Patch438: arm-imx6-hummingboard2.patch +# https://lkml.org/lkml/2017/4/4/316 +Patch339: media-cec-Fix-runtime-BUG-when-CONFIG_RC_CORE-CEC_CAP_RC.patch + +Patch440: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch + Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch Patch466: input-kill-stupid-messages.patch @@ -614,6 +621,9 @@ Patch666: powerpc-prom-Increase-RMA-size-to-512MB.patch # CVE-2017-7645 rhbz 1443615 1443617 Patch667: CVE-2017-7645.patch +# CVE-2017-7477 rhbz 1445207 1445208 +Patch668: CVE-2017-7477.patch + # END OF PATCH DEFINITIONS %endif @@ -2178,6 +2188,44 @@ fi # # %changelog +* Mon May 01 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-1 +- Linux v4.11 + +* Mon May 01 2017 Laura Abbott <labbott@fedoraproject.org> +- Disable debugging options. + +* Sun Apr 30 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Add initial ASUS Tinker board support + +* Fri Apr 28 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc8.git4.1 +- Linux v4.11-rc8-87-g8b5d11e + +* Fri Apr 28 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Upstream CEC patch to fix STi issues + +* Thu Apr 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc8.git3.1 +- Linux v4.11-rc8-75-gf832460 + +* Wed Apr 26 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc8.git2.1 +- Linux v4.11-rc8-17-gea839b4 + +* Wed Apr 26 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Enable sound SoC on aarch64 +- Update some ARM patches to latest upstream +- ARM config updates + +* Tue Apr 25 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc8.git1.1 +- Linux v4.11-rc8-14-g8f9cedc + +* Tue Apr 25 2017 Laura Abbott <labbott@fedoraproject.org> +- Reenable debugging options. + +* Tue Apr 25 2017 Justin M. Forbes <jforbes@fedoraproject.org> +- Fix CVE-2017-7477 (rhbz 1445207 1445208) + +* Tue Apr 25 2017 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM config cleanups + * Mon Apr 24 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc8.git0.1 - Linux v4.11-rc8 diff --git a/media-cec-Fix-runtime-BUG-when-CONFIG_RC_CORE-CEC_CAP_RC.patch b/media-cec-Fix-runtime-BUG-when-CONFIG_RC_CORE-CEC_CAP_RC.patch new file mode 100644 index 000000000..7a29d72bf --- /dev/null +++ b/media-cec-Fix-runtime-BUG-when-CONFIG_RC_CORE-CEC_CAP_RC.patch @@ -0,0 +1,45 @@ +From patchwork Tue Apr 4 12:32:19 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [2/2, media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC) +From: Lee Jones <lee.jones@linaro.org> +X-Patchwork-Id: 9661691 +Message-Id: <20170404123219.22040-2-lee.jones@linaro.org> +To: hans.verkuil@cisco.com, + mchehab@kernel.org +Cc: benjamin.gaignard@st.com, patrice.chotard@st.com, + linux-kernel@vger.kernel.org, kernel@stlinux.com, + Lee Jones <lee.jones@linaro.org>, linux-arm-kernel@lists.infradead.org, + linux-media@vger.kernel.org +Date: Tue, 4 Apr 2017 13:32:19 +0100 + +Currently when the RC Core is enabled (reachable) core code located +in cec_register_adapter() attempts to populate the RC structure with +a pointer to the 'parent' passed in by the caller. + +Unfortunately if the caller did not specify RC capibility when calling +cec_allocate_adapter(), then there will be no RC structure to populate. + +This causes a "NULL pointer dereference" error. + +Fixes: f51e80804f0 ("[media] cec: pass parent device in register(), not allocate()") +Signed-off-by: Lee Jones <lee.jones@linaro.org> +--- + drivers/media/cec/cec-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c +index 06a312c..d64937b 100644 +--- a/drivers/media/cec/cec-core.c ++++ b/drivers/media/cec/cec-core.c +@@ -286,8 +286,8 @@ int cec_register_adapter(struct cec_adapter *adap, + adap->devnode.dev.parent = parent; + + #if IS_REACHABLE(CONFIG_RC_CORE) +- adap->rc->dev.parent = parent; + if (adap->capabilities & CEC_CAP_RC) { ++ adap->rc->dev.parent = parent; + res = rc_register_device(adap->rc); + + if (res) { @@ -1,3 +1,2 @@ -SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 -SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 -SHA512 (patch-4.11-rc8.xz) = 07a3b08ad1ef9323df14f19995bdc261c303a150d58159791697389701f01ade2fdb55937c3c08f362772dd3e1337e466d653de81a9d49ff1015f4482d77c375 +SHA512 (perf-man-4.11.tar.gz) = 0b070d2f10a743329de2f532e2d7e19ef385a3e6ef3c700b591ae2697604dbe542b36e31121b3e37517ee8071ab800386fa8663c24a5b36520a18e096c6eefc8 +SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 |