Merge back ACPICA material for v4.13.
[muen/linux.git] / drivers / acpi / acpica / utresrc.c
index ff096d9755b925d9f72105f42993ebcc7c0522e1..70f78a4bf13b84d561a6b76e24e33b4372a87f12 100644 (file)
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utresrc")
 
-#if defined(ACPI_DEBUG_OUTPUT) || defined (ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
-/*
- * Strings used to decode resource descriptors.
- * Used by both the disassembler and the debugger resource dump routines
- */
-const char *acpi_gbl_bm_decode[] = {
-       "NotBusMaster",
-       "BusMaster"
-};
-
-const char *acpi_gbl_config_decode[] = {
-       "0 - Good Configuration",
-       "1 - Acceptable Configuration",
-       "2 - Suboptimal Configuration",
-       "3 - ***Invalid Configuration***",
-};
-
-const char *acpi_gbl_consume_decode[] = {
-       "ResourceProducer",
-       "ResourceConsumer"
-};
-
-const char *acpi_gbl_dec_decode[] = {
-       "PosDecode",
-       "SubDecode"
-};
-
-const char *acpi_gbl_he_decode[] = {
-       "Level",
-       "Edge"
-};
-
-const char *acpi_gbl_io_decode[] = {
-       "Decode10",
-       "Decode16"
-};
-
-const char *acpi_gbl_ll_decode[] = {
-       "ActiveHigh",
-       "ActiveLow",
-       "ActiveBoth",
-       "Reserved"
-};
-
-const char *acpi_gbl_max_decode[] = {
-       "MaxNotFixed",
-       "MaxFixed"
-};
-
-const char *acpi_gbl_mem_decode[] = {
-       "NonCacheable",
-       "Cacheable",
-       "WriteCombining",
-       "Prefetchable"
-};
-
-const char *acpi_gbl_min_decode[] = {
-       "MinNotFixed",
-       "MinFixed"
-};
-
-const char *acpi_gbl_mtp_decode[] = {
-       "AddressRangeMemory",
-       "AddressRangeReserved",
-       "AddressRangeACPI",
-       "AddressRangeNVS"
-};
-
-const char *acpi_gbl_rng_decode[] = {
-       "InvalidRanges",
-       "NonISAOnlyRanges",
-       "ISAOnlyRanges",
-       "EntireRange"
-};
-
-const char *acpi_gbl_rw_decode[] = {
-       "ReadOnly",
-       "ReadWrite"
-};
-
-const char *acpi_gbl_shr_decode[] = {
-       "Exclusive",
-       "Shared",
-       "ExclusiveAndWake",     /* ACPI 5.0 */
-       "SharedAndWake"         /* ACPI 5.0 */
-};
-
-const char *acpi_gbl_siz_decode[] = {
-       "Transfer8",
-       "Transfer8_16",
-       "Transfer16",
-       "InvalidSize"
-};
-
-const char *acpi_gbl_trs_decode[] = {
-       "DenseTranslation",
-       "SparseTranslation"
-};
-
-const char *acpi_gbl_ttp_decode[] = {
-       "TypeStatic",
-       "TypeTranslation"
-};
-
-const char *acpi_gbl_typ_decode[] = {
-       "Compatibility",
-       "TypeA",
-       "TypeB",
-       "TypeF"
-};
-
-const char *acpi_gbl_ppc_decode[] = {
-       "PullDefault",
-       "PullUp",
-       "PullDown",
-       "PullNone"
-};
-
-const char *acpi_gbl_ior_decode[] = {
-       "IoRestrictionNone",
-       "IoRestrictionInputOnly",
-       "IoRestrictionOutputOnly",
-       "IoRestrictionNoneAndPreserve"
-};
-
-const char *acpi_gbl_dts_decode[] = {
-       "Width8bit",
-       "Width16bit",
-       "Width32bit",
-       "Width64bit",
-       "Width128bit",
-       "Width256bit",
-};
-
-/* GPIO connection type */
-
-const char *acpi_gbl_ct_decode[] = {
-       "Interrupt",
-       "I/O"
-};
-
-/* Serial bus type */
-
-const char *acpi_gbl_sbt_decode[] = {
-       "/* UNKNOWN serial bus type */",
-       "I2C",
-       "SPI",
-       "UART"
-};
-
-/* I2C serial bus access mode */
-
-const char *acpi_gbl_am_decode[] = {
-       "AddressingMode7Bit",
-       "AddressingMode10Bit"
-};
-
-/* I2C serial bus slave mode */
-
-const char *acpi_gbl_sm_decode[] = {
-       "ControllerInitiated",
-       "DeviceInitiated"
-};
-
-/* SPI serial bus wire mode */
-
-const char *acpi_gbl_wm_decode[] = {
-       "FourWireMode",
-       "ThreeWireMode"
-};
-
-/* SPI serial clock phase */
-
-const char *acpi_gbl_cph_decode[] = {
-       "ClockPhaseFirst",
-       "ClockPhaseSecond"
-};
-
-/* SPI serial bus clock polarity */
-
-const char *acpi_gbl_cpo_decode[] = {
-       "ClockPolarityLow",
-       "ClockPolarityHigh"
-};
-
-/* SPI serial bus device polarity */
-
-const char *acpi_gbl_dp_decode[] = {
-       "PolarityLow",
-       "PolarityHigh"
-};
-
-/* UART serial bus endian */
-
-const char *acpi_gbl_ed_decode[] = {
-       "LittleEndian",
-       "BigEndian"
-};
-
-/* UART serial bus bits per byte */
-
-const char *acpi_gbl_bpb_decode[] = {
-       "DataBitsFive",
-       "DataBitsSix",
-       "DataBitsSeven",
-       "DataBitsEight",
-       "DataBitsNine",
-       "/* UNKNOWN Bits per byte */",
-       "/* UNKNOWN Bits per byte */",
-       "/* UNKNOWN Bits per byte */"
-};
-
-/* UART serial bus stop bits */
-
-const char *acpi_gbl_sb_decode[] = {
-       "StopBitsZero",
-       "StopBitsOne",
-       "StopBitsOnePlusHalf",
-       "StopBitsTwo"
-};
-
-/* UART serial bus flow control */
-
-const char *acpi_gbl_fc_decode[] = {
-       "FlowControlNone",
-       "FlowControlHardware",
-       "FlowControlXON",
-       "/* UNKNOWN flow control keyword */"
-};
-
-/* UART serial bus parity type */
-
-const char *acpi_gbl_pt_decode[] = {
-       "ParityTypeNone",
-       "ParityTypeEven",
-       "ParityTypeOdd",
-       "ParityTypeMark",
-       "ParityTypeSpace",
-       "/* UNKNOWN parity keyword */",
-       "/* UNKNOWN parity keyword */",
-       "/* UNKNOWN parity keyword */"
-};
-
-#endif
-
 /*
  * Base sizes of the raw AML resource descriptors, indexed by resource type.
  * Zero indicates a reserved (and therefore invalid) resource type.
@@ -332,8 +87,12 @@ const u8 acpi_gbl_resource_aml_sizes[] = {
        ACPI_AML_SIZE_LARGE(struct aml_resource_address64),
        ACPI_AML_SIZE_LARGE(struct aml_resource_extended_address64),
        ACPI_AML_SIZE_LARGE(struct aml_resource_gpio),
-       0,
+       ACPI_AML_SIZE_LARGE(struct aml_resource_pin_function),
        ACPI_AML_SIZE_LARGE(struct aml_resource_common_serialbus),
+       ACPI_AML_SIZE_LARGE(struct aml_resource_pin_config),
+       ACPI_AML_SIZE_LARGE(struct aml_resource_pin_group),
+       ACPI_AML_SIZE_LARGE(struct aml_resource_pin_group_function),
+       ACPI_AML_SIZE_LARGE(struct aml_resource_pin_group_config),
 };
 
 const u8 acpi_gbl_resource_aml_serial_bus_sizes[] = {
@@ -384,8 +143,12 @@ static const u8 acpi_gbl_resource_types[] = {
        ACPI_VARIABLE_LENGTH,   /* 0A Qword* address */
        ACPI_FIXED_LENGTH,      /* 0B Extended* address */
        ACPI_VARIABLE_LENGTH,   /* 0C Gpio* */
-       0,
-       ACPI_VARIABLE_LENGTH    /* 0E *serial_bus */
+       ACPI_VARIABLE_LENGTH,   /* 0D pin_function */
+       ACPI_VARIABLE_LENGTH,   /* 0E *serial_bus */
+       ACPI_VARIABLE_LENGTH,   /* 0F pin_config */
+       ACPI_VARIABLE_LENGTH,   /* 10 pin_group */
+       ACPI_VARIABLE_LENGTH,   /* 11 pin_group_function */
+       ACPI_VARIABLE_LENGTH,   /* 12 pin_group_config */
 };
 
 /*******************************************************************************