summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch4
-rw-r--r--arm-highbank-l2-reverts.patch2
-rw-r--r--asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch35
-rw-r--r--config-arm-generic2
-rw-r--r--config-armv72
-rw-r--r--config-generic1
-rw-r--r--config-x86-generic2
-rw-r--r--kernel-arm64.patch20
-rw-r--r--kernel.spec12
9 files changed, 65 insertions, 15 deletions
diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
index d07fff577..da8ba00eb 100644
--- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
@@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 7dbe5ec9d9cd..ad59dd188c5b 100644
+index 988160a4ad31..5b6cdde792a4 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -3695,7 +3695,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3701,7 +3701,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
the allocated input device; If set to 0, video driver
will only send out the event without touching backlight
brightness level.
diff --git a/arm-highbank-l2-reverts.patch b/arm-highbank-l2-reverts.patch
index f1e6d45d3..0c4517bf0 100644
--- a/arm-highbank-l2-reverts.patch
+++ b/arm-highbank-l2-reverts.patch
@@ -9,7 +9,7 @@ Will debug upstream separately, but we need F22/21 running there. (#1139762)
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
-index 8c35ae4ff176..38e1dc3b4c6e 100644
+index 07a09570175d..5db6d14fcd67 100644
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -51,13 +51,11 @@ static void __init highbank_scu_map_io(void)
diff --git a/asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch b/asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch
new file mode 100644
index 000000000..1ec42f728
--- /dev/null
+++ b/asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch
@@ -0,0 +1,35 @@
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+Date: Wed, 22 Oct 2014 14:32:52 +0200
+Subject: [PATCH] asus-nb-wmi: Add wapf4 quirk for the X550VB
+
+As reported here: http://bugzilla.redhat.com/show_bug.cgi?id=1089731#c23
+the X550VB needs wapf=4 too.
+
+Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
+---
+ drivers/platform/x86/asus-nb-wmi.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
+index 3a4951f46065..c1a6cd66af42 100644
+--- a/drivers/platform/x86/asus-nb-wmi.c
++++ b/drivers/platform/x86/asus-nb-wmi.c
+@@ -182,6 +182,15 @@ static const struct dmi_system_id asus_quirks[] = {
+ },
+ {
+ .callback = dmi_matched,
++ .ident = "ASUSTeK COMPUTER INC. X550VB",
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
++ DMI_MATCH(DMI_PRODUCT_NAME, "X550VB"),
++ },
++ .driver_data = &quirk_asus_wapf4,
++ },
++ {
++ .callback = dmi_matched,
+ .ident = "ASUSTeK COMPUTER INC. X55A",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+--
+1.9.3
+
diff --git a/config-arm-generic b/config-arm-generic
index 090e83cda..31273b8d8 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -187,6 +187,8 @@ CONFIG_CMA_AREAS=7
# CONFIG_IRQ_DOMAIN_DEBUG is not set
# CONFIG_LOCK_STAT is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+
# CONFIG_DRM_ARMADA is not set
# CONFIG_DRM_TEGRA is not set
# CONFIG_SHMOBILE_IOMMU is not set
diff --git a/config-armv7 b/config-armv7
index 3a03936e7..e1d37fe5f 100644
--- a/config-armv7
+++ b/config-armv7
@@ -354,6 +354,7 @@ CONFIG_DRM_MSM=m
CONFIG_DRM_MSM_FBDEV=y
CONFIG_USB_EHCI_MSM=m
# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
+CONFIG_QCOM_WDT=m
# i.MX
# CONFIG_MXC_DEBUG_BOARD is not set
@@ -619,6 +620,7 @@ CONFIG_XILLYBUS_OF=m
CONFIG_GS_FPGABOOT=m
CONFIG_USB_GADGET_XILINX=m
CONFIG_PCIE_XILINX=y
+CONFIG_CADENCE_WATCHDOG=m
# Multi function devices
CONFIG_MFD_88PM800=m
diff --git a/config-generic b/config-generic
index 4f7848c00..f1b7faad1 100644
--- a/config-generic
+++ b/config-generic
@@ -5197,6 +5197,7 @@ CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m
CONFIG_TCM_FC=m
+# CONFIG_TCM_USER is not set
CONFIG_HWSPINLOCK=m
diff --git a/config-x86-generic b/config-x86-generic
index 44f20161b..732cc4305 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -484,6 +484,8 @@ CONFIG_X86_INTEL_LPSS=y
CONFIG_IOSF_MBI=m
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PINCTRL=y
CONFIG_PINCTRL_BAYTRAIL=y
diff --git a/kernel-arm64.patch b/kernel-arm64.patch
index 0a0941da3..6e2491207 100644
--- a/kernel-arm64.patch
+++ b/kernel-arm64.patch
@@ -6019,19 +6019,19 @@ index 57ff20f..681efd5 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -13,22 +13,20 @@
- #include <linux/kernel.h>
- #include <linux/platform_device.h>
+ #include <linux/err.h>
#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
+ #include <linux/kernel.h>
#include <linux/leds.h>
+ #include <linux/module.h>
-#include <linux/of.h>
--#include <linux/of_platform.h>
-#include <linux/of_gpio.h>
+-#include <linux/of_platform.h>
+ #include <linux/platform_device.h>
++#include <linux/property.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
- #include <linux/module.h>
- #include <linux/err.h>
-+#include <linux/property.h>
struct gpio_led_data {
struct led_classdev cdev;
@@ -6293,7 +6293,7 @@ index 57ff20f..681efd5 100644
}
static const struct of_device_id of_gpio_leds_match[] = {
-@@ -228,13 +230,13 @@ static const struct of_device_id of_gpio_leds_match[] = {
+@@ -228,12 +228,13 @@ static const struct of_device_id of_gpio_leds_match[] = {
};
MODULE_DEVICE_TABLE(of, of_gpio_leds_match);
@@ -6303,10 +6303,10 @@ index 57ff20f..681efd5 100644
- return ERR_PTR(-ENODEV);
-}
-#endif /* CONFIG_OF_GPIO */
-
++
+static const struct acpi_device_id acpi_gpio_leds_match[] = {
-+ { "PRP0001" }, /* Device Tree shoehorned into ACPI */
-+ {},
++ { "PRP0001" }, /* Device Tree shoehorned into ACPI */
++ {},
+};
+
+MODULE_DEVICE_TABLE(acpi, acpi_gpio_leds_match);
diff --git a/kernel.spec b/kernel.spec
index 88fea8cb0..838712d65 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 2
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 1
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -612,6 +612,8 @@ Patch26056: ext4-fix-race-between-write-and-fcntl-F_SETFL.patch
Patch26057: virtio_console-move-early-VQ-enablement.patch
+Patch26058: asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1336,6 +1338,8 @@ ApplyPatch ext4-fix-race-between-write-and-fcntl-F_SETFL.patch
ApplyPatch virtio_console-move-early-VQ-enablement.patch
+ApplyPatch asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2204,6 +2208,10 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Oct 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git2.1
+- Linux v3.18-rc1-221-gc3351dfabf5c
+- Add patch to fix wifi on X550VB machines (rhbz 1089731)
+
* Tue Oct 21 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Drop pinctrl qcom revert now that it's dependencies should be merged
generated by cgit (git 2.34.1) at 2024-11-05 22:26:00 +0000