Merge branches 'acpi-utils', 'acpi-platform', 'acpi-video' and 'acpi-doc'
* acpi-utils: iommu/amd: Switch to use acpi_dev_hid_uid_match() mmc: sdhci-acpi: Switch to use acpi_dev_hid_uid_match() ACPI / LPSS: Switch to use acpi_dev_hid_uid_match() ACPI / utils: Introduce acpi_dev_hid_uid_match() helper ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI ACPI / utils: Describe function parameters in kernel-doc * acpi-platform: ACPI: platform: Unregister stale platform devices ACPI: Always build evged in * acpi-video: ACPI: video: update doc for acpi_video_bus_DOS() * acpi-doc: ACPI: Documentation: Minor spelling fix in namespace.rstalistair/sunxi64-5.5-dsi
commit
995e2ef082
|
@ -261,7 +261,7 @@ Description Tables contain information used for the creation of the
|
||||||
struct acpi_device objects represented by the given row (xSDT means DSDT
|
struct acpi_device objects represented by the given row (xSDT means DSDT
|
||||||
or SSDT).
|
or SSDT).
|
||||||
|
|
||||||
The forth column of the above table indicates the 'bus_id' generation
|
The fourth column of the above table indicates the 'bus_id' generation
|
||||||
rule of the struct acpi_device object:
|
rule of the struct acpi_device object:
|
||||||
|
|
||||||
_HID:
|
_HID:
|
||||||
|
|
|
@ -48,7 +48,7 @@ acpi-y += acpi_pnp.o
|
||||||
acpi-$(CONFIG_ARM_AMBA) += acpi_amba.o
|
acpi-$(CONFIG_ARM_AMBA) += acpi_amba.o
|
||||||
acpi-y += power.o
|
acpi-y += power.o
|
||||||
acpi-y += event.o
|
acpi-y += event.o
|
||||||
acpi-$(CONFIG_ACPI_REDUCED_HARDWARE_ONLY) += evged.o
|
acpi-y += evged.o
|
||||||
acpi-y += sysfs.o
|
acpi-y += sysfs.o
|
||||||
acpi-y += property.o
|
acpi-y += property.o
|
||||||
acpi-$(CONFIG_X86) += acpi_cmos_rtc.o
|
acpi-$(CONFIG_X86) += acpi_cmos_rtc.o
|
||||||
|
|
|
@ -499,31 +499,16 @@ static const struct lpss_device_links lpss_device_links[] = {
|
||||||
{"80860F41", "7", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},
|
{"80860F41", "7", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},
|
||||||
};
|
};
|
||||||
|
|
||||||
static bool hid_uid_match(struct acpi_device *adev,
|
|
||||||
const char *hid2, const char *uid2)
|
|
||||||
{
|
|
||||||
const char *hid1 = acpi_device_hid(adev);
|
|
||||||
const char *uid1 = acpi_device_uid(adev);
|
|
||||||
|
|
||||||
if (strcmp(hid1, hid2))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (!uid2)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
return uid1 && !strcmp(uid1, uid2);
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool acpi_lpss_is_supplier(struct acpi_device *adev,
|
static bool acpi_lpss_is_supplier(struct acpi_device *adev,
|
||||||
const struct lpss_device_links *link)
|
const struct lpss_device_links *link)
|
||||||
{
|
{
|
||||||
return hid_uid_match(adev, link->supplier_hid, link->supplier_uid);
|
return acpi_dev_hid_uid_match(adev, link->supplier_hid, link->supplier_uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool acpi_lpss_is_consumer(struct acpi_device *adev,
|
static bool acpi_lpss_is_consumer(struct acpi_device *adev,
|
||||||
const struct lpss_device_links *link)
|
const struct lpss_device_links *link)
|
||||||
{
|
{
|
||||||
return hid_uid_match(adev, link->consumer_hid, link->consumer_uid);
|
return acpi_dev_hid_uid_match(adev, link->consumer_hid, link->consumer_uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct hid_uid {
|
struct hid_uid {
|
||||||
|
@ -539,7 +524,7 @@ static int match_hid_uid(struct device *dev, const void *data)
|
||||||
if (!adev)
|
if (!adev)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return hid_uid_match(adev, id->hid, id->uid);
|
return acpi_dev_hid_uid_match(adev, id->hid, id->uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct device *acpi_lpss_find_device(const char *hid, const char *uid)
|
static struct device *acpi_lpss_find_device(const char *hid, const char *uid)
|
||||||
|
|
|
@ -31,6 +31,44 @@ static const struct acpi_device_id forbidden_id_list[] = {
|
||||||
{"", 0},
|
{"", 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static struct platform_device *acpi_platform_device_find_by_companion(struct acpi_device *adev)
|
||||||
|
{
|
||||||
|
struct device *dev;
|
||||||
|
|
||||||
|
dev = bus_find_device_by_acpi_dev(&platform_bus_type, adev);
|
||||||
|
return dev ? to_platform_device(dev) : NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int acpi_platform_device_remove_notify(struct notifier_block *nb,
|
||||||
|
unsigned long value, void *arg)
|
||||||
|
{
|
||||||
|
struct acpi_device *adev = arg;
|
||||||
|
struct platform_device *pdev;
|
||||||
|
|
||||||
|
switch (value) {
|
||||||
|
case ACPI_RECONFIG_DEVICE_ADD:
|
||||||
|
/* Nothing to do here */
|
||||||
|
break;
|
||||||
|
case ACPI_RECONFIG_DEVICE_REMOVE:
|
||||||
|
if (!acpi_device_enumerated(adev))
|
||||||
|
break;
|
||||||
|
|
||||||
|
pdev = acpi_platform_device_find_by_companion(adev);
|
||||||
|
if (!pdev)
|
||||||
|
break;
|
||||||
|
|
||||||
|
platform_device_unregister(pdev);
|
||||||
|
put_device(&pdev->dev);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return NOTIFY_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct notifier_block acpi_platform_notifier = {
|
||||||
|
.notifier_call = acpi_platform_device_remove_notify,
|
||||||
|
};
|
||||||
|
|
||||||
static void acpi_platform_fill_resource(struct acpi_device *adev,
|
static void acpi_platform_fill_resource(struct acpi_device *adev,
|
||||||
const struct resource *src, struct resource *dest)
|
const struct resource *src, struct resource *dest)
|
||||||
{
|
{
|
||||||
|
@ -130,3 +168,8 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,
|
||||||
return pdev;
|
return pdev;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(acpi_create_platform_device);
|
EXPORT_SYMBOL_GPL(acpi_create_platform_device);
|
||||||
|
|
||||||
|
void __init acpi_platform_init(void)
|
||||||
|
{
|
||||||
|
acpi_reconfig_notifier_register(&acpi_platform_notifier);
|
||||||
|
}
|
||||||
|
|
|
@ -699,9 +699,13 @@ acpi_video_device_EDID(struct acpi_video_device *device,
|
||||||
* event notify code.
|
* event notify code.
|
||||||
* lcd_flag :
|
* lcd_flag :
|
||||||
* 0. The system BIOS should automatically control the brightness level
|
* 0. The system BIOS should automatically control the brightness level
|
||||||
* of the LCD when the power changes from AC to DC
|
* of the LCD when:
|
||||||
|
* - the power changes from AC to DC (ACPI appendix B)
|
||||||
|
* - a brightness hotkey gets pressed (implied by Win7/8 backlight docs)
|
||||||
* 1. The system BIOS should NOT automatically control the brightness
|
* 1. The system BIOS should NOT automatically control the brightness
|
||||||
* level of the LCD when the power changes from AC to DC.
|
* level of the LCD when:
|
||||||
|
* - the power changes from AC to DC (ACPI appendix B)
|
||||||
|
* - a brightness hotkey gets pressed (implied by Win7/8 backlight docs)
|
||||||
* Return Value:
|
* Return Value:
|
||||||
* -EINVAL wrong arg.
|
* -EINVAL wrong arg.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -2174,6 +2174,7 @@ int __init acpi_scan_init(void)
|
||||||
acpi_pci_root_init();
|
acpi_pci_root_init();
|
||||||
acpi_pci_link_init();
|
acpi_pci_link_init();
|
||||||
acpi_processor_init();
|
acpi_processor_init();
|
||||||
|
acpi_platform_init();
|
||||||
acpi_lpss_init();
|
acpi_lpss_init();
|
||||||
acpi_apd_init();
|
acpi_apd_init();
|
||||||
acpi_cmos_rtc_init();
|
acpi_cmos_rtc_init();
|
||||||
|
|
|
@ -455,6 +455,7 @@ EXPORT_SYMBOL(acpi_evaluate_ost);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* acpi_handle_path: Return the object path of handle
|
* acpi_handle_path: Return the object path of handle
|
||||||
|
* @handle: ACPI device handle
|
||||||
*
|
*
|
||||||
* Caller must free the returned buffer
|
* Caller must free the returned buffer
|
||||||
*/
|
*/
|
||||||
|
@ -473,6 +474,9 @@ static char *acpi_handle_path(acpi_handle handle)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* acpi_handle_printk: Print message with ACPI prefix and object path
|
* acpi_handle_printk: Print message with ACPI prefix and object path
|
||||||
|
* @level: log level
|
||||||
|
* @handle: ACPI device handle
|
||||||
|
* @fmt: format string
|
||||||
*
|
*
|
||||||
* This function is called through acpi_handle_<level> macros and prints
|
* This function is called through acpi_handle_<level> macros and prints
|
||||||
* a message with ACPI prefix and object path. This function acquires
|
* a message with ACPI prefix and object path. This function acquires
|
||||||
|
@ -501,6 +505,9 @@ EXPORT_SYMBOL(acpi_handle_printk);
|
||||||
#if defined(CONFIG_DYNAMIC_DEBUG)
|
#if defined(CONFIG_DYNAMIC_DEBUG)
|
||||||
/**
|
/**
|
||||||
* __acpi_handle_debug: pr_debug with ACPI prefix and object path
|
* __acpi_handle_debug: pr_debug with ACPI prefix and object path
|
||||||
|
* @descriptor: Dynamic Debug descriptor
|
||||||
|
* @handle: ACPI device handle
|
||||||
|
* @fmt: format string
|
||||||
*
|
*
|
||||||
* This function is called through acpi_handle_debug macro and debug
|
* This function is called through acpi_handle_debug macro and debug
|
||||||
* prints a message with ACPI prefix and object path. This function
|
* prints a message with ACPI prefix and object path. This function
|
||||||
|
@ -694,6 +701,31 @@ bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(acpi_check_dsm);
|
EXPORT_SYMBOL(acpi_check_dsm);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* acpi_dev_hid_uid_match - Match device by supplied HID and UID
|
||||||
|
* @adev: ACPI device to match.
|
||||||
|
* @hid2: Hardware ID of the device.
|
||||||
|
* @uid2: Unique ID of the device, pass NULL to not check _UID.
|
||||||
|
*
|
||||||
|
* Matches HID and UID in @adev with given @hid2 and @uid2.
|
||||||
|
* Returns true if matches.
|
||||||
|
*/
|
||||||
|
bool acpi_dev_hid_uid_match(struct acpi_device *adev,
|
||||||
|
const char *hid2, const char *uid2)
|
||||||
|
{
|
||||||
|
const char *hid1 = acpi_device_hid(adev);
|
||||||
|
const char *uid1 = acpi_device_uid(adev);
|
||||||
|
|
||||||
|
if (strcmp(hid1, hid2))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (!uid2)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return uid1 && !strcmp(uid1, uid2);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(acpi_dev_hid_uid_match);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* acpi_dev_found - Detect presence of a given ACPI device in the namespace.
|
* acpi_dev_found - Detect presence of a given ACPI device in the namespace.
|
||||||
* @hid: Hardware ID of the device.
|
* @hid: Hardware ID of the device.
|
||||||
|
|
|
@ -124,30 +124,6 @@ static struct lock_class_key reserved_rbtree_key;
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
static inline int match_hid_uid(struct device *dev,
|
|
||||||
struct acpihid_map_entry *entry)
|
|
||||||
{
|
|
||||||
struct acpi_device *adev = ACPI_COMPANION(dev);
|
|
||||||
const char *hid, *uid;
|
|
||||||
|
|
||||||
if (!adev)
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
hid = acpi_device_hid(adev);
|
|
||||||
uid = acpi_device_uid(adev);
|
|
||||||
|
|
||||||
if (!hid || !(*hid))
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
if (!uid || !(*uid))
|
|
||||||
return strcmp(hid, entry->hid);
|
|
||||||
|
|
||||||
if (!(*entry->uid))
|
|
||||||
return strcmp(hid, entry->hid);
|
|
||||||
|
|
||||||
return (strcmp(hid, entry->hid) || strcmp(uid, entry->uid));
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline u16 get_pci_device_id(struct device *dev)
|
static inline u16 get_pci_device_id(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pdev = to_pci_dev(dev);
|
struct pci_dev *pdev = to_pci_dev(dev);
|
||||||
|
@ -158,10 +134,14 @@ static inline u16 get_pci_device_id(struct device *dev)
|
||||||
static inline int get_acpihid_device_id(struct device *dev,
|
static inline int get_acpihid_device_id(struct device *dev,
|
||||||
struct acpihid_map_entry **entry)
|
struct acpihid_map_entry **entry)
|
||||||
{
|
{
|
||||||
|
struct acpi_device *adev = ACPI_COMPANION(dev);
|
||||||
struct acpihid_map_entry *p;
|
struct acpihid_map_entry *p;
|
||||||
|
|
||||||
|
if (!adev)
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
list_for_each_entry(p, &acpihid_map, list) {
|
list_for_each_entry(p, &acpihid_map, list) {
|
||||||
if (!match_hid_uid(dev, p)) {
|
if (acpi_dev_hid_uid_match(adev, p->hid, p->uid)) {
|
||||||
if (entry)
|
if (entry)
|
||||||
*entry = p;
|
*entry = p;
|
||||||
return p->devid;
|
return p->devid;
|
||||||
|
|
|
@ -61,7 +61,7 @@ struct sdhci_acpi_slot {
|
||||||
mmc_pm_flag_t pm_caps;
|
mmc_pm_flag_t pm_caps;
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
size_t priv_size;
|
size_t priv_size;
|
||||||
int (*probe_slot)(struct platform_device *, const char *, const char *);
|
int (*probe_slot)(struct platform_device *, struct acpi_device *);
|
||||||
int (*remove_slot)(struct platform_device *);
|
int (*remove_slot)(struct platform_device *);
|
||||||
int (*free_slot)(struct platform_device *pdev);
|
int (*free_slot)(struct platform_device *pdev);
|
||||||
int (*setup_host)(struct platform_device *pdev);
|
int (*setup_host)(struct platform_device *pdev);
|
||||||
|
@ -325,12 +325,10 @@ static bool sdhci_acpi_cht_pci_wifi(unsigned int vendor, unsigned int device,
|
||||||
* wifi card in the expected slot with an ACPI companion node, is used to
|
* wifi card in the expected slot with an ACPI companion node, is used to
|
||||||
* indicate that acpi_device_fix_up_power() should be avoided.
|
* indicate that acpi_device_fix_up_power() should be avoided.
|
||||||
*/
|
*/
|
||||||
static inline bool sdhci_acpi_no_fixup_child_power(const char *hid,
|
static inline bool sdhci_acpi_no_fixup_child_power(struct acpi_device *adev)
|
||||||
const char *uid)
|
|
||||||
{
|
{
|
||||||
return sdhci_acpi_cht() &&
|
return sdhci_acpi_cht() &&
|
||||||
!strcmp(hid, "80860F14") &&
|
acpi_dev_hid_uid_match(adev, "80860F14", "2") &&
|
||||||
!strcmp(uid, "2") &&
|
|
||||||
sdhci_acpi_cht_pci_wifi(0x14e4, 0x43ec, 0, 28);
|
sdhci_acpi_cht_pci_wifi(0x14e4, 0x43ec, 0, 28);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -345,8 +343,7 @@ static inline bool sdhci_acpi_byt_defer(struct device *dev)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool sdhci_acpi_no_fixup_child_power(const char *hid,
|
static inline bool sdhci_acpi_no_fixup_child_power(struct acpi_device *adev)
|
||||||
const char *uid)
|
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -375,19 +372,18 @@ out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int intel_probe_slot(struct platform_device *pdev, const char *hid,
|
static int intel_probe_slot(struct platform_device *pdev, struct acpi_device *adev)
|
||||||
const char *uid)
|
|
||||||
{
|
{
|
||||||
struct sdhci_acpi_host *c = platform_get_drvdata(pdev);
|
struct sdhci_acpi_host *c = platform_get_drvdata(pdev);
|
||||||
struct intel_host *intel_host = sdhci_acpi_priv(c);
|
struct intel_host *intel_host = sdhci_acpi_priv(c);
|
||||||
struct sdhci_host *host = c->host;
|
struct sdhci_host *host = c->host;
|
||||||
|
|
||||||
if (hid && uid && !strcmp(hid, "80860F14") && !strcmp(uid, "1") &&
|
if (acpi_dev_hid_uid_match(adev, "80860F14", "1") &&
|
||||||
sdhci_readl(host, SDHCI_CAPABILITIES) == 0x446cc8b2 &&
|
sdhci_readl(host, SDHCI_CAPABILITIES) == 0x446cc8b2 &&
|
||||||
sdhci_readl(host, SDHCI_CAPABILITIES_1) == 0x00000807)
|
sdhci_readl(host, SDHCI_CAPABILITIES_1) == 0x00000807)
|
||||||
host->timeout_clk = 1000; /* 1000 kHz i.e. 1 MHz */
|
host->timeout_clk = 1000; /* 1000 kHz i.e. 1 MHz */
|
||||||
|
|
||||||
if (hid && !strcmp(hid, "80865ACA"))
|
if (acpi_dev_hid_uid_match(adev, "80865ACA", NULL))
|
||||||
host->mmc_host_ops.get_cd = bxt_get_cd;
|
host->mmc_host_ops.get_cd = bxt_get_cd;
|
||||||
|
|
||||||
intel_dsm_init(intel_host, &pdev->dev, host->mmc);
|
intel_dsm_init(intel_host, &pdev->dev, host->mmc);
|
||||||
|
@ -473,8 +469,7 @@ static irqreturn_t sdhci_acpi_qcom_handler(int irq, void *ptr)
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int qcom_probe_slot(struct platform_device *pdev, const char *hid,
|
static int qcom_probe_slot(struct platform_device *pdev, struct acpi_device *adev)
|
||||||
const char *uid)
|
|
||||||
{
|
{
|
||||||
struct sdhci_acpi_host *c = platform_get_drvdata(pdev);
|
struct sdhci_acpi_host *c = platform_get_drvdata(pdev);
|
||||||
struct sdhci_host *host = c->host;
|
struct sdhci_host *host = c->host;
|
||||||
|
@ -482,7 +477,7 @@ static int qcom_probe_slot(struct platform_device *pdev, const char *hid,
|
||||||
|
|
||||||
*irq = -EINVAL;
|
*irq = -EINVAL;
|
||||||
|
|
||||||
if (strcmp(hid, "QCOM8051"))
|
if (!acpi_dev_hid_uid_match(adev, "QCOM8051", NULL))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
*irq = platform_get_irq(pdev, 1);
|
*irq = platform_get_irq(pdev, 1);
|
||||||
|
@ -501,14 +496,12 @@ static int qcom_free_slot(struct platform_device *pdev)
|
||||||
struct sdhci_host *host = c->host;
|
struct sdhci_host *host = c->host;
|
||||||
struct acpi_device *adev;
|
struct acpi_device *adev;
|
||||||
int *irq = sdhci_acpi_priv(c);
|
int *irq = sdhci_acpi_priv(c);
|
||||||
const char *hid;
|
|
||||||
|
|
||||||
adev = ACPI_COMPANION(dev);
|
adev = ACPI_COMPANION(dev);
|
||||||
if (!adev)
|
if (!adev)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
hid = acpi_device_hid(adev);
|
if (!acpi_dev_hid_uid_match(adev, "QCOM8051", NULL))
|
||||||
if (strcmp(hid, "QCOM8051"))
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (*irq < 0)
|
if (*irq < 0)
|
||||||
|
@ -583,7 +576,7 @@ static const struct sdhci_acpi_chip sdhci_acpi_chip_amd = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static int sdhci_acpi_emmc_amd_probe_slot(struct platform_device *pdev,
|
static int sdhci_acpi_emmc_amd_probe_slot(struct platform_device *pdev,
|
||||||
const char *hid, const char *uid)
|
struct acpi_device *adev)
|
||||||
{
|
{
|
||||||
struct sdhci_acpi_host *c = platform_get_drvdata(pdev);
|
struct sdhci_acpi_host *c = platform_get_drvdata(pdev);
|
||||||
struct sdhci_host *host = c->host;
|
struct sdhci_host *host = c->host;
|
||||||
|
@ -654,17 +647,12 @@ static const struct acpi_device_id sdhci_acpi_ids[] = {
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(acpi, sdhci_acpi_ids);
|
MODULE_DEVICE_TABLE(acpi, sdhci_acpi_ids);
|
||||||
|
|
||||||
static const struct sdhci_acpi_slot *sdhci_acpi_get_slot(const char *hid,
|
static const struct sdhci_acpi_slot *sdhci_acpi_get_slot(struct acpi_device *adev)
|
||||||
const char *uid)
|
|
||||||
{
|
{
|
||||||
const struct sdhci_acpi_uid_slot *u;
|
const struct sdhci_acpi_uid_slot *u;
|
||||||
|
|
||||||
for (u = sdhci_acpi_uids; u->hid; u++) {
|
for (u = sdhci_acpi_uids; u->hid; u++) {
|
||||||
if (strcmp(u->hid, hid))
|
if (acpi_dev_hid_uid_match(adev, u->hid, u->uid))
|
||||||
continue;
|
|
||||||
if (!u->uid)
|
|
||||||
return u->slot;
|
|
||||||
if (uid && !strcmp(u->uid, uid))
|
|
||||||
return u->slot;
|
return u->slot;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -680,22 +668,17 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
|
||||||
struct resource *iomem;
|
struct resource *iomem;
|
||||||
resource_size_t len;
|
resource_size_t len;
|
||||||
size_t priv_size;
|
size_t priv_size;
|
||||||
const char *hid;
|
|
||||||
const char *uid;
|
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
device = ACPI_COMPANION(dev);
|
device = ACPI_COMPANION(dev);
|
||||||
if (!device)
|
if (!device)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
hid = acpi_device_hid(device);
|
slot = sdhci_acpi_get_slot(device);
|
||||||
uid = acpi_device_uid(device);
|
|
||||||
|
|
||||||
slot = sdhci_acpi_get_slot(hid, uid);
|
|
||||||
|
|
||||||
/* Power on the SDHCI controller and its children */
|
/* Power on the SDHCI controller and its children */
|
||||||
acpi_device_fix_up_power(device);
|
acpi_device_fix_up_power(device);
|
||||||
if (!sdhci_acpi_no_fixup_child_power(hid, uid)) {
|
if (!sdhci_acpi_no_fixup_child_power(device)) {
|
||||||
list_for_each_entry(child, &device->children, node)
|
list_for_each_entry(child, &device->children, node)
|
||||||
if (child->status.present && child->status.enabled)
|
if (child->status.present && child->status.enabled)
|
||||||
acpi_device_fix_up_power(child);
|
acpi_device_fix_up_power(child);
|
||||||
|
@ -745,7 +728,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
if (c->slot) {
|
if (c->slot) {
|
||||||
if (c->slot->probe_slot) {
|
if (c->slot->probe_slot) {
|
||||||
err = c->slot->probe_slot(pdev, hid, uid);
|
err = c->slot->probe_slot(pdev, device);
|
||||||
if (err)
|
if (err)
|
||||||
goto err_free;
|
goto err_free;
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,9 +78,6 @@ acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,
|
||||||
bool acpi_dev_found(const char *hid);
|
bool acpi_dev_found(const char *hid);
|
||||||
bool acpi_dev_present(const char *hid, const char *uid, s64 hrv);
|
bool acpi_dev_present(const char *hid, const char *uid, s64 hrv);
|
||||||
|
|
||||||
struct acpi_device *
|
|
||||||
acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv);
|
|
||||||
|
|
||||||
#ifdef CONFIG_ACPI
|
#ifdef CONFIG_ACPI
|
||||||
|
|
||||||
#include <linux/proc_fs.h>
|
#include <linux/proc_fs.h>
|
||||||
|
@ -683,6 +680,11 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev)
|
||||||
adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set);
|
adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2);
|
||||||
|
|
||||||
|
struct acpi_device *
|
||||||
|
acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv);
|
||||||
|
|
||||||
static inline void acpi_dev_put(struct acpi_device *adev)
|
static inline void acpi_dev_put(struct acpi_device *adev)
|
||||||
{
|
{
|
||||||
put_device(&adev->dev);
|
put_device(&adev->dev);
|
||||||
|
|
|
@ -678,6 +678,14 @@ static inline bool acpi_dev_present(const char *hid, const char *uid, s64 hrv)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct acpi_device;
|
||||||
|
|
||||||
|
static inline bool
|
||||||
|
acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static inline struct acpi_device *
|
static inline struct acpi_device *
|
||||||
acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv)
|
acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue