From ebea7db3db359d4b1d31427aab307fdbdfb67b46 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 20 Jan 2015 15:26:08 +0800 Subject: [PATCH] 3.10-stable patches added patches: hp_accel-add-support-for-hp-zbook-15.patch rtlwifi-rtl8192ce-set-fw_ready-flag.patch --- ...hp_accel-add-support-for-hp-zbook-15.patch | 31 ++++++++++++++++ .../rtlwifi-rtl8192ce-set-fw_ready-flag.patch | 37 +++++++++++++++++++ queue-3.10/series | 2 + 3 files changed, 70 insertions(+) create mode 100644 queue-3.10/hp_accel-add-support-for-hp-zbook-15.patch create mode 100644 queue-3.10/rtlwifi-rtl8192ce-set-fw_ready-flag.patch diff --git a/queue-3.10/hp_accel-add-support-for-hp-zbook-15.patch b/queue-3.10/hp_accel-add-support-for-hp-zbook-15.patch new file mode 100644 index 00000000000..ef25a46f32e --- /dev/null +++ b/queue-3.10/hp_accel-add-support-for-hp-zbook-15.patch @@ -0,0 +1,31 @@ +From 6583659e0f92e38079a8dd081e0a1181a0f37747 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Thu, 13 Nov 2014 20:57:37 +0100 +Subject: hp_accel: Add support for HP ZBook 15 + +From: Dominique Leuenberger + +commit 6583659e0f92e38079a8dd081e0a1181a0f37747 upstream. + +HP ZBook 15 laptop needs a non-standard mapping (x_inverted). + +BugLink: http://bugzilla.opensuse.org/show_bug.cgi?id=905329 +Signed-off-by: Dominique Leuenberger +Signed-off-by: Takashi Iwai +Signed-off-by: Darren Hart +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/hp_accel.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/platform/x86/hp_accel.c ++++ b/drivers/platform/x86/hp_accel.c +@@ -237,6 +237,7 @@ static struct dmi_system_id lis3lv02d_dm + AXIS_DMI_MATCH("HPB64xx", "HP ProBook 64", xy_swap), + AXIS_DMI_MATCH("HPB64xx", "HP EliteBook 84", xy_swap), + AXIS_DMI_MATCH("HPB65xx", "HP ProBook 65", x_inverted), ++ AXIS_DMI_MATCH("HPZBook15", "HP ZBook 15", x_inverted), + { NULL, } + /* Laptop models without axis info (yet): + * "NC6910" "HP Compaq 6910" diff --git a/queue-3.10/rtlwifi-rtl8192ce-set-fw_ready-flag.patch b/queue-3.10/rtlwifi-rtl8192ce-set-fw_ready-flag.patch new file mode 100644 index 00000000000..3f127245733 --- /dev/null +++ b/queue-3.10/rtlwifi-rtl8192ce-set-fw_ready-flag.patch @@ -0,0 +1,37 @@ +From 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee Mon Sep 17 00:00:00 2001 +From: Larry Finger +Date: Wed, 10 Dec 2014 14:38:29 -0600 +Subject: rtlwifi: rtl8192ce: Set fw_ready flag + +From: Larry Finger + +commit 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee upstream. + +The setting of this flag was missed in previous modifications. + +Signed-off-by: Larry Finger +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c ++++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +@@ -951,6 +951,7 @@ int rtl92ce_hw_init(struct ieee80211_hw + local_save_flags(flags); + local_irq_enable(); + ++ rtlhal->fw_ready = false; + rtlpriv->intf_ops->disable_aspm(hw); + rtstatus = _rtl92ce_init_mac(hw); + if (!rtstatus) { +@@ -967,6 +968,7 @@ int rtl92ce_hw_init(struct ieee80211_hw + goto exit; + } + ++ rtlhal->fw_ready = true; + rtlhal->last_hmeboxnum = 0; + rtl92c_phy_mac_config(hw); + /* because last function modify RCR, so we update diff --git a/queue-3.10/series b/queue-3.10/series index 92b1e4fa6cd..f338b542b8a 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -11,3 +11,5 @@ drm-i915-invalidate-media-caches-on-gen7.patch drm-i915-force-the-cs-stall-for-invalidate-flushes.patch arc-move-peripherals-to-match-model-to-fpga.patch cfg80211-fix-160-mhz-channels-with-80-80-and-160-mhz-drivers.patch +rtlwifi-rtl8192ce-set-fw_ready-flag.patch +hp_accel-add-support-for-hp-zbook-15.patch -- 2.47.3