Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8c8eb78f673c07b60f31751e1e47ac367c60c6b7

Authored by Thomas Renninger
Committed by Len Brown
1 parent f695baf2df
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ACPI: autoload modules - ACPICA modifications 

Define standardized HIDs - Rename current acpi_device_id to acpica_device_id

Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>

Showing 7 changed files with 25 additions and 19 deletions Side-by-side Diff

drivers/acpi/events/evrgnini.c
Diff comments   View file @ 8c8eb78
... ... @@ -378,7 +378,7 @@
378 378 static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
379 379 {
380 380 acpi_status status;
381   - struct acpi_device_id hid;
  381 + struct acpica_device_id hid;
382 382 struct acpi_compatible_id_list *cid;
383 383 acpi_native_uint i;
384 384  
drivers/acpi/namespace/nsxfeval.c
Diff comments   View file @ 8c8eb78
... ... @@ -440,7 +440,7 @@
440 440 acpi_status status;
441 441 struct acpi_namespace_node *node;
442 442 u32 flags;
443   - struct acpi_device_id hid;
  443 + struct acpica_device_id hid;
444 444 struct acpi_compatible_id_list *cid;
445 445 acpi_native_uint i;
446 446  
drivers/acpi/utilities/uteval.c
Diff comments   View file @ 8c8eb78
... ... @@ -407,7 +407,7 @@
407 407  
408 408 acpi_status
409 409 acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
410   - struct acpi_device_id *hid)
  410 + struct acpica_device_id *hid)
411 411 {
412 412 union acpi_operand_object *obj_desc;
413 413 acpi_status status;
... ... @@ -609,7 +609,7 @@
609 609  
610 610 acpi_status
611 611 acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
612   - struct acpi_device_id *uid)
  612 + struct acpica_device_id *uid)
613 613 {
614 614 union acpi_operand_object *obj_desc;
615 615 acpi_status status;
include/acpi/acpi_bus.h
Diff comments   View file @ 8c8eb78
... ... @@ -131,7 +131,7 @@
131 131 struct acpi_driver {
132 132 char name[80];
133 133 char class[80];
134   - char *ids; /* Supported Hardware IDs */
  134 + const struct acpi_device_id *ids; /* Supported Hardware IDs */
135 135 struct acpi_device_ops ops;
136 136 struct device_driver drv;
137 137 struct module *owner;
... ... @@ -341,7 +341,8 @@
341 341 int acpi_bus_trim(struct acpi_device *start, int rmdevice);
342 342 int acpi_bus_start(struct acpi_device *device);
343 343 acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);
344   -int acpi_match_ids(struct acpi_device *device, char *ids);
  344 +int acpi_match_device_ids(struct acpi_device *device,
  345 + const struct acpi_device_id *ids);
345 346 int acpi_create_dir(struct acpi_device *);
346 347 void acpi_remove_dir(struct acpi_device *);
347 348  
include/acpi/acpi_drivers.h
Diff comments   View file @ 8c8eb78
... ... @@ -34,16 +34,21 @@
34 34 #define ACPI_BUS_COMPONENT 0x00010000
35 35 #define ACPI_SYSTEM_COMPONENT 0x02000000
36 36  
37   -/* _HID definitions */
  37 +/*
  38 + * _HID definitions
  39 + * HIDs must conform to ACPI spec(6.1.4)
  40 + * Linux specific HIDs do not apply to this and begin with LNX:
  41 + */
38 42  
39   -#define ACPI_POWER_HID "power_resource"
  43 +#define ACPI_POWER_HID "LNXPOWER"
40 44 #define ACPI_PROCESSOR_HID "ACPI0007"
41   -#define ACPI_SYSTEM_HID "acpi_system"
42   -#define ACPI_THERMAL_HID "thermal"
43   -#define ACPI_BUTTON_HID_POWERF "button_power"
44   -#define ACPI_BUTTON_HID_SLEEPF "button_sleep"
45   -#define ACPI_VIDEO_HID "video"
46   -#define ACPI_BAY_HID "bay"
  45 +#define ACPI_SYSTEM_HID "LNXSYSTM"
  46 +#define ACPI_THERMAL_HID "LNXTHERM"
  47 +#define ACPI_BUTTON_HID_POWERF "LNXPWRBN"
  48 +#define ACPI_BUTTON_HID_SLEEPF "LNXSLPBN"
  49 +#define ACPI_VIDEO_HID "LNXVIDEO"
  50 +#define ACPI_BAY_HID "LNXIOBAY"
  51 +
47 52 /* --------------------------------------------------------------------------
48 53 PCI
49 54 -------------------------------------------------------------------------- */
include/acpi/actypes.h
Diff comments   View file @ 8c8eb78
... ... @@ -809,7 +809,7 @@
809 809  
810 810 /* Common string version of device HIDs and UIDs */
811 811  
812   -struct acpi_device_id {
  812 +struct acpica_device_id {
813 813 char value[ACPI_DEVICE_ID_LENGTH];
814 814 };
815 815  
... ... @@ -859,8 +859,8 @@
859 859 u32 valid; /* Indicates which fields below are valid */
860 860 u32 current_status; /* _STA value */
861 861 acpi_integer address; /* _ADR value if any */
862   - struct acpi_device_id hardware_id; /* _HID value if any */
863   - struct acpi_device_id unique_id; /* _UID value if any */
  862 + struct acpica_device_id hardware_id; /* _HID value if any */
  863 + struct acpica_device_id unique_id; /* _UID value if any */
864 864 u8 highest_dstates[4]; /* _sx_d values: 0xFF indicates not valid */
865 865 struct acpi_compatible_id_list compatibility_id; /* List of _CIDs if any */
866 866 };
include/acpi/acutils.h
Diff comments   View file @ 8c8eb78
... ... @@ -354,7 +354,7 @@
354 354  
355 355 acpi_status
356 356 acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
357   - struct acpi_device_id *hid);
  357 + struct acpica_device_id *hid);
358 358  
359 359 acpi_status
360 360 acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
... ... @@ -366,7 +366,7 @@
366 366  
367 367 acpi_status
368 368 acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
369   - struct acpi_device_id *uid);
  369 + struct acpica_device_id *uid);
370 370  
371 371 acpi_status
372 372 acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest);