|
@@ -159,6 +159,8 @@ MODULE_LICENSE("GPL");
|
|
|
#define USB_INTEL_XUSB2PR 0xD0
|
|
|
#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31
|
|
|
|
|
|
+static const char * const ashs_ids[] = { "ATK4001", "ATK4002", NULL };
|
|
|
+
|
|
|
struct bios_args {
|
|
|
u32 arg0;
|
|
|
u32 arg1;
|
|
@@ -2051,6 +2053,16 @@ static int asus_wmi_fan_init(struct asus_wmi *asus)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static bool ashs_present(void)
|
|
|
+{
|
|
|
+ int i = 0;
|
|
|
+ while (ashs_ids[i]) {
|
|
|
+ if (acpi_dev_found(ashs_ids[i++]))
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* WMI Driver
|
|
|
*/
|
|
@@ -2095,6 +2107,13 @@ static int asus_wmi_add(struct platform_device *pdev)
|
|
|
if (err)
|
|
|
goto fail_leds;
|
|
|
|
|
|
+ asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_WLAN, &result);
|
|
|
+ if (result & (ASUS_WMI_DSTS_PRESENCE_BIT | ASUS_WMI_DSTS_USER_BIT))
|
|
|
+ asus->driver->wlan_ctrl_by_user = 1;
|
|
|
+
|
|
|
+ if (asus->driver->wlan_ctrl_by_user && ashs_present())
|
|
|
+ asus->driver->quirks->no_rfkill = 1;
|
|
|
+
|
|
|
if (!asus->driver->quirks->no_rfkill) {
|
|
|
err = asus_wmi_rfkill_init(asus);
|
|
|
if (err)
|
|
@@ -2134,10 +2153,6 @@ static int asus_wmi_add(struct platform_device *pdev)
|
|
|
if (err)
|
|
|
goto fail_debugfs;
|
|
|
|
|
|
- asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_WLAN, &result);
|
|
|
- if (result & (ASUS_WMI_DSTS_PRESENCE_BIT | ASUS_WMI_DSTS_USER_BIT))
|
|
|
- asus->driver->wlan_ctrl_by_user = 1;
|
|
|
-
|
|
|
return 0;
|
|
|
|
|
|
fail_debugfs:
|