From 5b9b593f2f888c81cc0af8eb2fc2173c83562003 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 21 Feb 2017 13:16:30 -0800 Subject: acpi: Add ACPI_ prefix to IRQ enum and struct names This is done to avoid any conflicts with same IRQ enums defined by other drivers. BUG=None BRANCH=None TEST=Compiles successfully Change-Id: I539831d853286ca45f6c36c3812a6fa9602df24c Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/18444 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/google/chell/devicetree.cb | 6 +++--- src/mainboard/google/eve/devicetree.cb | 8 ++++---- src/mainboard/google/glados/devicetree.cb | 6 +++--- src/mainboard/google/lars/devicetree.cb | 6 +++--- src/mainboard/google/poppy/devicetree.cb | 6 +++--- src/mainboard/google/reef/variants/baseboard/devicetree.cb | 10 +++++----- src/mainboard/google/reef/variants/pyro/devicetree.cb | 10 +++++----- src/mainboard/google/reef/variants/snappy/devicetree.cb | 12 ++++++------ src/mainboard/intel/kunimitsu/devicetree.cb | 6 +++--- src/mainboard/intel/leafhill/devicetree.cb | 10 +++++----- 10 files changed, 40 insertions(+), 40 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/google/chell/devicetree.cb b/src/mainboard/google/chell/devicetree.cb index 2ffaec6946..477a8aa777 100644 --- a/src/mainboard/google/chell/devicetree.cb +++ b/src/mainboard/google/chell/devicetree.cb @@ -201,7 +201,7 @@ chip soc/intel/skylake chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" - register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 10 on end end end # I2C #0 @@ -209,7 +209,7 @@ chip soc/intel/skylake chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" - register "irq" = "IRQ_EDGE_LOW(GPP_B3_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_B3_IRQ)" register "wake" = "GPE0_DW0_05" device i2c 15 on end end @@ -226,7 +226,7 @@ chip soc/intel/skylake device pci 19.1 off end # I2C #5 device pci 19.2 on chip drivers/i2c/nau8825 - register "irq" = "IRQ_LEVEL_LOW(GPP_F10_IRQ)" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" register "jkdet_pull_enable" = "0" # R389 register "jkdet_polarity" = "1" # ActiveLow diff --git a/src/mainboard/google/eve/devicetree.cb b/src/mainboard/google/eve/devicetree.cb index e40f0a3093..e5ac17f738 100644 --- a/src/mainboard/google/eve/devicetree.cb +++ b/src/mainboard/google/eve/devicetree.cb @@ -208,7 +208,7 @@ chip soc/intel/skylake chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" - register "generic.irq" = "IRQ_LEVEL_LOW(GPP_E7_IRQ)" + register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E7_IRQ)" register "generic.speed" = "I2C_SPEED_FAST_PLUS" register "hid_desc_reg_offset" = "0x1" device i2c 0a on end @@ -217,7 +217,7 @@ chip soc/intel/skylake device pci 15.1 on chip drivers/i2c/tpm register "hid" = ""GOOG0005"" - register "irq" = "IRQ_EDGE_LOW(GPP_E0_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E0_IRQ)" device i2c 50 on end end end # I2C #1 @@ -225,7 +225,7 @@ chip soc/intel/skylake chip drivers/i2c/generic register "hid" = ""GOOG5400"" register "desc" = ""Touchpad"" - register "irq" = "IRQ_EDGE_LOW(GPP_B3_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_B3_IRQ)" device i2c 49 on end end end # I2C #2 @@ -257,7 +257,7 @@ chip soc/intel/skylake register "hid" = ""10EC5663"" register "name" = ""RT53"" register "desc" = ""Realtek RT5663"" - register "irq" = "IRQ_LEVEL_LOW(GPP_D9_IRQ)" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D9_IRQ)" register "probed" = "1" device i2c 13 on end end diff --git a/src/mainboard/google/glados/devicetree.cb b/src/mainboard/google/glados/devicetree.cb index d0584ea7c9..f7a2e52a19 100644 --- a/src/mainboard/google/glados/devicetree.cb +++ b/src/mainboard/google/glados/devicetree.cb @@ -199,7 +199,7 @@ chip soc/intel/skylake chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" - register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 10 on end end end # I2C #0 @@ -207,7 +207,7 @@ chip soc/intel/skylake chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" - register "irq" = "IRQ_EDGE_LOW(GPP_B3_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_B3_IRQ)" register "wake" = "GPE0_DW0_05" device i2c 15 on end end @@ -224,7 +224,7 @@ chip soc/intel/skylake device pci 19.1 off end # I2C #5 device pci 19.2 on chip drivers/i2c/nau8825 - register "irq" = "IRQ_LEVEL_LOW(GPP_F10_IRQ)" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" register "jkdet_pull_enable" = "0" # R389 register "jkdet_polarity" = "1" # ActiveLow diff --git a/src/mainboard/google/lars/devicetree.cb b/src/mainboard/google/lars/devicetree.cb index 4291e5f851..b95ecf5d88 100644 --- a/src/mainboard/google/lars/devicetree.cb +++ b/src/mainboard/google/lars/devicetree.cb @@ -196,7 +196,7 @@ chip soc/intel/skylake chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" - register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 10 on end end end # I2C #0 @@ -204,7 +204,7 @@ chip soc/intel/skylake chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" - register "irq" = "IRQ_EDGE_LOW(GPP_B3_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_B3_IRQ)" register "wake" = "GPE0_DW0_05" device i2c 15 on end end @@ -221,7 +221,7 @@ chip soc/intel/skylake device pci 19.1 off end # I2C #5 device pci 19.2 on chip drivers/i2c/nau8825 - register "irq" = "IRQ_LEVEL_LOW(GPP_F10_IRQ)" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" register "jkdet_pull_enable" = "1" register "jkdet_pull_up" = "1" diff --git a/src/mainboard/google/poppy/devicetree.cb b/src/mainboard/google/poppy/devicetree.cb index b3b76235ee..07cacc0500 100644 --- a/src/mainboard/google/poppy/devicetree.cb +++ b/src/mainboard/google/poppy/devicetree.cb @@ -201,7 +201,7 @@ chip soc/intel/skylake chip drivers/i2c/generic register "hid" = ""ATML0001"" register "desc" = ""Atmel Touchscreen"" - register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" register "probed" = "1" device i2c 4b on end end @@ -212,7 +212,7 @@ chip soc/intel/skylake chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" - register "generic.irq" = "IRQ_LEVEL_LOW(GPP_D1_IRQ)" + register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D1_IRQ)" register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end @@ -243,7 +243,7 @@ chip soc/intel/skylake register "hid" = ""10EC5663"" register "name" = ""RT53"" register "desc" = ""Realtek RT5663"" - register "irq" = "IRQ_LEVEL_LOW(GPP_D9_IRQ)" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D9_IRQ)" register "probed" = "1" device i2c 13 on end end diff --git a/src/mainboard/google/reef/variants/baseboard/devicetree.cb b/src/mainboard/google/reef/variants/baseboard/devicetree.cb index 6e51838ecd..b0c82e2be8 100644 --- a/src/mainboard/google/reef/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/reef/variants/baseboard/devicetree.cb @@ -146,7 +146,7 @@ chip soc/intel/apollolake device pci 15.1 off end # - XDCI device pci 16.0 on # - I2C 0 chip drivers/i2c/da7219 - register "irq" = "IRQ_LEVEL_LOW(GPIO_116_IRQ)" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_116_IRQ)" register "btn_cfg" = "50" register "mic_det_thr" = "500" register "jack_ins_deb" = "20" @@ -167,7 +167,7 @@ chip soc/intel/apollolake device pci 16.2 on chip drivers/i2c/tpm register "hid" = ""GOOG0005"" - register "irq" = "IRQ_EDGE_LOW(GPIO_28_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_28_IRQ)" device i2c 50 on end end end # - I2C 2 @@ -175,7 +175,7 @@ chip soc/intel/apollolake chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" - register "irq" = "IRQ_EDGE_LOW(GPIO_21_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_21_IRQ)" register "probed" = "1" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "reset_delay_ms" = "20" @@ -189,7 +189,7 @@ chip soc/intel/apollolake chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" - register "irq" = "IRQ_EDGE_LOW(GPIO_18_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_18_IRQ)" register "wake" = "GPE0_DW1_15" register "probed" = "1" device i2c 15 on end @@ -199,7 +199,7 @@ chip soc/intel/apollolake chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" - register "generic.irq" = "IRQ_LEVEL_LOW(GPIO_13_IRQ)" + register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_13_IRQ)" register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end diff --git a/src/mainboard/google/reef/variants/pyro/devicetree.cb b/src/mainboard/google/reef/variants/pyro/devicetree.cb index a01fa04d35..808ed2c4e7 100644 --- a/src/mainboard/google/reef/variants/pyro/devicetree.cb +++ b/src/mainboard/google/reef/variants/pyro/devicetree.cb @@ -155,7 +155,7 @@ chip soc/intel/apollolake device pci 15.1 off end # - XDCI device pci 16.0 on # - I2C 0 chip drivers/i2c/da7219 - register "irq" = "IRQ_LEVEL_LOW(GPIO_116_IRQ)" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_116_IRQ)" register "btn_cfg" = "50" register "mic_det_thr" = "500" register "jack_ins_deb" = "20" @@ -176,7 +176,7 @@ chip soc/intel/apollolake device pci 16.2 on chip drivers/i2c/tpm register "hid" = ""GOOG0005"" - register "irq" = "IRQ_EDGE_LOW(GPIO_28_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_28_IRQ)" device i2c 50 on end end end # - I2C 2 @@ -184,7 +184,7 @@ chip soc/intel/apollolake chip drivers/i2c/hid register "generic.hid" = ""WCOMNTN2"" register "generic.desc" = ""WCOM Touchscreen"" - register "generic.irq" = "IRQ_LEVEL_LOW(GPIO_21_IRQ)" + register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_21_IRQ)" register "generic.probed" = "1" register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "generic.reset_delay_ms" = "20" @@ -198,7 +198,7 @@ chip soc/intel/apollolake chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" - register "irq" = "IRQ_EDGE_LOW(GPIO_21_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_21_IRQ)" register "probed" = "1" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "reset_delay_ms" = "20" @@ -212,7 +212,7 @@ chip soc/intel/apollolake chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" - register "irq" = "IRQ_EDGE_LOW(GPIO_18_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_18_IRQ)" register "wake" = "GPE0_DW1_15" register "probed" = "1" device i2c 15 on end diff --git a/src/mainboard/google/reef/variants/snappy/devicetree.cb b/src/mainboard/google/reef/variants/snappy/devicetree.cb index 8d9d307228..6d1c9ef145 100644 --- a/src/mainboard/google/reef/variants/snappy/devicetree.cb +++ b/src/mainboard/google/reef/variants/snappy/devicetree.cb @@ -146,7 +146,7 @@ chip soc/intel/apollolake device pci 15.1 off end # - XDCI device pci 16.0 on # - I2C 0 chip drivers/i2c/da7219 - register "irq" = "IRQ_LEVEL_LOW(GPIO_116_IRQ)" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_116_IRQ)" register "btn_cfg" = "50" register "mic_det_thr" = "500" register "jack_ins_deb" = "20" @@ -167,7 +167,7 @@ chip soc/intel/apollolake device pci 16.2 on chip drivers/i2c/tpm register "hid" = ""GOOG0005"" - register "irq" = "IRQ_EDGE_LOW(GPIO_28_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_28_IRQ)" device i2c 50 on end end end # - I2C 2 @@ -175,7 +175,7 @@ chip soc/intel/apollolake chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" - register "irq" = "IRQ_EDGE_LOW(GPIO_21_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_21_IRQ)" register "probed" = "1" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "reset_delay_ms" = "20" @@ -187,7 +187,7 @@ chip soc/intel/apollolake chip drivers/i2c/hid register "generic.hid" = ""WDHT0001"" register "generic.desc" = ""WDT Touchscreen"" - register "generic.irq" = "IRQ_EDGE_LOW(GPIO_21_IRQ)" + register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPIO_21_IRQ)" register "generic.probed" = "1" register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "generic.reset_delay_ms" = "20" @@ -203,7 +203,7 @@ chip soc/intel/apollolake chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" - register "irq" = "IRQ_EDGE_LOW(GPIO_18_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_18_IRQ)" register "wake" = "GPE0_DW1_15" register "probed" = "1" device i2c 15 on end @@ -213,7 +213,7 @@ chip soc/intel/apollolake chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" - register "generic.irq" = "IRQ_LEVEL_LOW(GPIO_13_IRQ)" + register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_13_IRQ)" register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end diff --git a/src/mainboard/intel/kunimitsu/devicetree.cb b/src/mainboard/intel/kunimitsu/devicetree.cb index 6a6c2ce0e4..11cb31a413 100644 --- a/src/mainboard/intel/kunimitsu/devicetree.cb +++ b/src/mainboard/intel/kunimitsu/devicetree.cb @@ -206,7 +206,7 @@ chip soc/intel/skylake chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" - register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)" device i2c 10 on end end end # I2C #0 @@ -214,7 +214,7 @@ chip soc/intel/skylake chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" - register "irq" = "IRQ_EDGE_LOW(GPP_B3_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_B3_IRQ)" register "wake" = "GPE0_DW0_05" device i2c 15 on end end @@ -231,7 +231,7 @@ chip soc/intel/skylake device pci 19.1 off end # I2C #5 device pci 19.2 on chip drivers/i2c/nau8825 - register "irq" = "IRQ_LEVEL_LOW(GPP_F10_IRQ)" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)" register "jkdet_enable" = "1" register "jkdet_pull_enable" = "1" register "jkdet_pull_up" = "1" diff --git a/src/mainboard/intel/leafhill/devicetree.cb b/src/mainboard/intel/leafhill/devicetree.cb index 6e51838ecd..b0c82e2be8 100644 --- a/src/mainboard/intel/leafhill/devicetree.cb +++ b/src/mainboard/intel/leafhill/devicetree.cb @@ -146,7 +146,7 @@ chip soc/intel/apollolake device pci 15.1 off end # - XDCI device pci 16.0 on # - I2C 0 chip drivers/i2c/da7219 - register "irq" = "IRQ_LEVEL_LOW(GPIO_116_IRQ)" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_116_IRQ)" register "btn_cfg" = "50" register "mic_det_thr" = "500" register "jack_ins_deb" = "20" @@ -167,7 +167,7 @@ chip soc/intel/apollolake device pci 16.2 on chip drivers/i2c/tpm register "hid" = ""GOOG0005"" - register "irq" = "IRQ_EDGE_LOW(GPIO_28_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_28_IRQ)" device i2c 50 on end end end # - I2C 2 @@ -175,7 +175,7 @@ chip soc/intel/apollolake chip drivers/i2c/generic register "hid" = ""ELAN0001"" register "desc" = ""ELAN Touchscreen"" - register "irq" = "IRQ_EDGE_LOW(GPIO_21_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_21_IRQ)" register "probed" = "1" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "reset_delay_ms" = "20" @@ -189,7 +189,7 @@ chip soc/intel/apollolake chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" - register "irq" = "IRQ_EDGE_LOW(GPIO_18_IRQ)" + register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_18_IRQ)" register "wake" = "GPE0_DW1_15" register "probed" = "1" device i2c 15 on end @@ -199,7 +199,7 @@ chip soc/intel/apollolake chip drivers/i2c/hid register "generic.hid" = ""WCOM50C1"" register "generic.desc" = ""WCOM Digitizer"" - register "generic.irq" = "IRQ_LEVEL_LOW(GPIO_13_IRQ)" + register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_13_IRQ)" register "hid_desc_reg_offset" = "0x1" device i2c 0x9 on end end -- cgit v1.2.3