diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-31 16:24:44 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-31 16:24:44 +0200 |
commit | 17f0cdebf4c0e829a67bb2480d75f3652d422170 (patch) | |
tree | e3fff7c100ca43d9c79bd27952f5bea08ae52ad5 | |
parent | dc0b2216f9ca56a2185c04a26cd306bab3e51a50 (diff) | |
parent | 62dade39ab42bedd02b240d3bc8a31d804002b5e (diff) | |
download | kernel-17f0cdebf4c0e829a67bb2480d75f3652d422170.tar.gz kernel-17f0cdebf4c0e829a67bb2480d75f3652d422170.tar.xz kernel-17f0cdebf4c0e829a67bb2480d75f3652d422170.zip |
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_COMMON_CLK_MAX77686 | 2 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_PWM_TEGRA | 2 | ||||
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_SND_HDA_POWER_SAVE_DEFAULT | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_MAX77620_WATCHDOG | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 10 | ||||
-rw-r--r-- | kernel-aarch64.config | 10 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 6 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 6 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 6 | ||||
-rw-r--r-- | kernel-armv7hl.config | 6 |
11 files changed, 27 insertions, 25 deletions
diff --git a/configs/fedora/generic/arm/CONFIG_COMMON_CLK_MAX77686 b/configs/fedora/generic/arm/CONFIG_COMMON_CLK_MAX77686 index 71ba0b45c..c794405fd 100644 --- a/configs/fedora/generic/arm/CONFIG_COMMON_CLK_MAX77686 +++ b/configs/fedora/generic/arm/CONFIG_COMMON_CLK_MAX77686 @@ -1 +1 @@ -CONFIG_COMMON_CLK_MAX77686=m +CONFIG_COMMON_CLK_MAX77686=y diff --git a/configs/fedora/generic/arm/CONFIG_PWM_TEGRA b/configs/fedora/generic/arm/CONFIG_PWM_TEGRA index 8751d2ead..bf026d3e8 100644 --- a/configs/fedora/generic/arm/CONFIG_PWM_TEGRA +++ b/configs/fedora/generic/arm/CONFIG_PWM_TEGRA @@ -1 +1 @@ -CONFIG_PWM_TEGRA=m +CONFIG_PWM_TEGRA=y diff --git a/configs/fedora/generic/arm/CONFIG_SND_HDA_POWER_SAVE_DEFAULT b/configs/fedora/generic/arm/CONFIG_SND_HDA_POWER_SAVE_DEFAULT new file mode 100644 index 000000000..ba018972d --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_SND_HDA_POWER_SAVE_DEFAULT @@ -0,0 +1 @@ +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA b/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA new file mode 100644 index 000000000..a0a76e382 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA @@ -0,0 +1 @@ +CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MAX77620_WATCHDOG b/configs/fedora/generic/arm/aarch64/CONFIG_MAX77620_WATCHDOG index f998244fd..dbda48cc9 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_MAX77620_WATCHDOG +++ b/configs/fedora/generic/arm/aarch64/CONFIG_MAX77620_WATCHDOG @@ -1 +1 @@ -CONFIG_MAX77620_WATCHDOG=m +CONFIG_MAX77620_WATCHDOG=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 8411ea2bc..0f39f0cef 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -967,7 +967,7 @@ CONFIG_COMMON_CLK_HI3670=y # CONFIG_COMMON_CLK_HI3798CV200 is not set CONFIG_COMMON_CLK_HI6220=y CONFIG_COMMON_CLK_HI655X=m -CONFIG_COMMON_CLK_MAX77686=m +CONFIG_COMMON_CLK_MAX77686=y # CONFIG_COMMON_CLK_MAX9485 is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y @@ -1477,7 +1477,7 @@ CONFIG_DRM_PANEL_SIMPLE=m CONFIG_DRM_PANEL_SITRONIX_ST7701=m # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set CONFIG_DRM_PANEL_TPO_TPG110=m -# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set +CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m CONFIG_DRM_PANEL=y CONFIG_DRM_PARADE_PS8622=m CONFIG_DRM_PL111=m @@ -3131,7 +3131,7 @@ CONFIG_MAX44009=m # CONFIG_MAX5821 is not set # CONFIG_MAX63XX_WATCHDOG is not set CONFIG_MAX77620_THERMAL=m -CONFIG_MAX77620_WATCHDOG=m +CONFIG_MAX77620_WATCHDOG=y # CONFIG_MAX9611 is not set CONFIG_MAXIM_THERMOCOUPLE=m CONFIG_MAX_RAW_DEVS=8192 @@ -4587,7 +4587,7 @@ CONFIG_PWM_MESON=m CONFIG_PWM_ROCKCHIP=m CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y -CONFIG_PWM_TEGRA=m +CONFIG_PWM_TEGRA=y CONFIG_PWM=y CONFIG_PWRSEQ_EMMC=y CONFIG_PWRSEQ_SD8787=m @@ -5597,7 +5597,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_TEGRA=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 71c9c6673..f2e71a504 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -967,7 +967,7 @@ CONFIG_COMMON_CLK_HI3670=y # CONFIG_COMMON_CLK_HI3798CV200 is not set CONFIG_COMMON_CLK_HI6220=y CONFIG_COMMON_CLK_HI655X=m -CONFIG_COMMON_CLK_MAX77686=m +CONFIG_COMMON_CLK_MAX77686=y # CONFIG_COMMON_CLK_MAX9485 is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y @@ -1469,7 +1469,7 @@ CONFIG_DRM_PANEL_SIMPLE=m CONFIG_DRM_PANEL_SITRONIX_ST7701=m # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set CONFIG_DRM_PANEL_TPO_TPG110=m -# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set +CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m CONFIG_DRM_PANEL=y CONFIG_DRM_PARADE_PS8622=m CONFIG_DRM_PL111=m @@ -3113,7 +3113,7 @@ CONFIG_MAX44009=m # CONFIG_MAX5821 is not set # CONFIG_MAX63XX_WATCHDOG is not set CONFIG_MAX77620_THERMAL=m -CONFIG_MAX77620_WATCHDOG=m +CONFIG_MAX77620_WATCHDOG=y # CONFIG_MAX9611 is not set CONFIG_MAXIM_THERMOCOUPLE=m CONFIG_MAX_RAW_DEVS=8192 @@ -4566,7 +4566,7 @@ CONFIG_PWM_MESON=m CONFIG_PWM_ROCKCHIP=m CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y -CONFIG_PWM_TEGRA=m +CONFIG_PWM_TEGRA=y CONFIG_PWM=y CONFIG_PWRSEQ_EMMC=y CONFIG_PWRSEQ_SD8787=m @@ -5576,7 +5576,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_TEGRA=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index d8df68538..62161d2b9 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -968,7 +968,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set -CONFIG_COMMON_CLK_MAX77686=m +CONFIG_COMMON_CLK_MAX77686=y # CONFIG_COMMON_CLK_MAX9485 is not set CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PWM=m @@ -4739,7 +4739,7 @@ CONFIG_PWM_STI=m # CONFIG_PWM_STMPE is not set CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y -CONFIG_PWM_TEGRA=m +CONFIG_PWM_TEGRA=y CONFIG_PWM_TIECAP=m CONFIG_PWM_TIEHRPWM=m CONFIG_PWM_TIPWMSS=y @@ -5790,7 +5790,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_TEGRA=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index dadb5fa56..56c26c5c0 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -939,7 +939,7 @@ CONFIG_CNIC=m # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set -CONFIG_COMMON_CLK_MAX77686=m +CONFIG_COMMON_CLK_MAX77686=y # CONFIG_COMMON_CLK_MAX9485 is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_RK808=y @@ -4543,7 +4543,7 @@ CONFIG_PWM_SAMSUNG=m # CONFIG_PWM_STM32_LP is not set CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y -CONFIG_PWM_TEGRA=m +CONFIG_PWM_TEGRA=y CONFIG_PWM_TIECAP=m CONFIG_PWM=y CONFIG_PWRSEQ_EMMC=y @@ -5523,7 +5523,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_TEGRA=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 6a64d4fae..d27bacca2 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -939,7 +939,7 @@ CONFIG_CNIC=m # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set -CONFIG_COMMON_CLK_MAX77686=m +CONFIG_COMMON_CLK_MAX77686=y # CONFIG_COMMON_CLK_MAX9485 is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_RK808=y @@ -4523,7 +4523,7 @@ CONFIG_PWM_SAMSUNG=m # CONFIG_PWM_STM32_LP is not set CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y -CONFIG_PWM_TEGRA=m +CONFIG_PWM_TEGRA=y CONFIG_PWM_TIECAP=m CONFIG_PWM=y CONFIG_PWRSEQ_EMMC=y @@ -5503,7 +5503,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_TEGRA=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index bb7598e8e..f3acc627f 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -968,7 +968,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set -CONFIG_COMMON_CLK_MAX77686=m +CONFIG_COMMON_CLK_MAX77686=y # CONFIG_COMMON_CLK_MAX9485 is not set CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PWM=m @@ -4719,7 +4719,7 @@ CONFIG_PWM_STI=m # CONFIG_PWM_STMPE is not set CONFIG_PWM_SUN4I=m CONFIG_PWM_SYSFS=y -CONFIG_PWM_TEGRA=m +CONFIG_PWM_TEGRA=y CONFIG_PWM_TIECAP=m CONFIG_PWM_TIEHRPWM=m CONFIG_PWM_TIPWMSS=y @@ -5770,7 +5770,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_TEGRA=m |