GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

acpi: Add ACPI_ prefix to IRQ enum and struct names

Browse source 
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 <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/18444
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh 2017-02-21 13:16:30 -08:00 committed by Furquan Shaikh
parent eae4926577
commit 5b9b593f2f
14 changed files with 95 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/arch/x86/acpi_device.c
View file

@ -181,7 +181,7 @@ void acpi_device_write_interrupt(const struct acpi_irq *irq)
return; return;
/* This is supported by GpioInt() but not Interrupt() */ /* This is supported by GpioInt() but not Interrupt() */
if (irq->polarity == IRQ_ACTIVE_BOTH) if (irq->polarity == ACPI_IRQ_ACTIVE_BOTH)
return; return;
/* Byte 0: Descriptor Type */ /* Byte 0: Descriptor Type */
@ -200,13 +200,13 @@ void acpi_device_write_interrupt(const struct acpi_irq *irq)
* [0]: Resource (0=PRODUCER 1=CONSUMER) * [0]: Resource (0=PRODUCER 1=CONSUMER)
*/ */
flags = 1 << 0; /* ResourceConsumer */ flags = 1 << 0; /* ResourceConsumer */
if (irq->mode == IRQ_EDGE_TRIGGERED) if (irq->mode == ACPI_IRQ_EDGE_TRIGGERED)
flags |= 1 << 1; flags |= 1 << 1;
if (irq->polarity == IRQ_ACTIVE_LOW) if (irq->polarity == ACPI_IRQ_ACTIVE_LOW)
flags |= 1 << 2; flags |= 1 << 2;
if (irq->shared == IRQ_SHARED) if (irq->shared == ACPI_IRQ_SHARED)
flags |= 1 << 3; flags |= 1 << 3;
if (irq->wake == IRQ_WAKE) if (irq->wake == ACPI_IRQ_WAKE)
flags |= 1 << 4; flags |= 1 << 4;
acpigen_emit_byte(flags); acpigen_emit_byte(flags);
@ -262,21 +262,21 @@ void acpi_device_write_gpio(const struct acpi_gpio *gpio)
* [2:1]: Polarity (0=HIGH 1=LOW 2=BOTH) * [2:1]: Polarity (0=HIGH 1=LOW 2=BOTH)
* [0]: Mode (0=LEVEL 1=EDGE) * [0]: Mode (0=LEVEL 1=EDGE)
*/ */
if (gpio->irq.mode == IRQ_EDGE_TRIGGERED) if (gpio->irq.mode == ACPI_IRQ_EDGE_TRIGGERED)
flags |= 1 << 0; flags |= 1 << 0;
if (gpio->irq.shared == IRQ_SHARED) if (gpio->irq.shared == ACPI_IRQ_SHARED)
flags |= 1 << 3; flags |= 1 << 3;
if (gpio->irq.wake == IRQ_WAKE) if (gpio->irq.wake == ACPI_IRQ_WAKE)
flags |= 1 << 4; flags |= 1 << 4;
switch (gpio->irq.polarity) { switch (gpio->irq.polarity) {
case IRQ_ACTIVE_HIGH: case ACPI_IRQ_ACTIVE_HIGH:
flags |= 0 << 1; flags |= 0 << 1;
break; break;
case IRQ_ACTIVE_LOW: case ACPI_IRQ_ACTIVE_LOW:
flags |= 1 << 1; flags |= 1 << 1;
break; break;
case IRQ_ACTIVE_BOTH: case ACPI_IRQ_ACTIVE_BOTH:
flags |= 2 << 1; flags |= 2 << 1;
break; break;
} }

68
src/arch/x86/include/arch/acpi_device.h
View file

@ -47,55 +47,55 @@ const char *acpi_device_path_join(struct device *dev, const char *name);
* ACPI Descriptor for extended Interrupt() * ACPI Descriptor for extended Interrupt()
*/ */
enum irq_mode { enum acpi_irq_mode {
IRQ_EDGE_TRIGGERED, ACPI_IRQ_EDGE_TRIGGERED,
IRQ_LEVEL_TRIGGERED ACPI_IRQ_LEVEL_TRIGGERED
}; };
enum irq_polarity { enum acpi_irq_polarity {
IRQ_ACTIVE_LOW, ACPI_IRQ_ACTIVE_LOW,
IRQ_ACTIVE_HIGH, ACPI_IRQ_ACTIVE_HIGH,
IRQ_ACTIVE_BOTH ACPI_IRQ_ACTIVE_BOTH
}; };
enum irq_shared { enum acpi_irq_shared {
IRQ_EXCLUSIVE, ACPI_IRQ_EXCLUSIVE,
IRQ_SHARED ACPI_IRQ_SHARED
}; };
enum irq_wake { enum acpi_irq_wake {
IRQ_NO_WAKE, ACPI_IRQ_NO_WAKE,
IRQ_WAKE ACPI_IRQ_WAKE
}; };
struct acpi_irq { struct acpi_irq {
unsigned int pin; unsigned int pin;
enum irq_mode mode; enum acpi_irq_mode mode;
enum irq_polarity polarity; enum acpi_irq_polarity polarity;
enum irq_shared shared; enum acpi_irq_shared shared;
enum irq_wake wake; enum acpi_irq_wake wake;
}; };
#define IRQ_EDGE_LOW(x) { \ #define ACPI_IRQ_EDGE_LOW(x) { \
.pin = (x), \ .pin = (x), \
.mode = IRQ_EDGE_TRIGGERED, \ .mode = ACPI_IRQ_EDGE_TRIGGERED, \
.polarity = IRQ_ACTIVE_LOW, \ .polarity = ACPI_IRQ_ACTIVE_LOW, \
.shared = IRQ_EXCLUSIVE, \ .shared = ACPI_IRQ_EXCLUSIVE, \
.wake = IRQ_NO_WAKE } .wake = ACPI_IRQ_NO_WAKE }
#define IRQ_EDGE_HIGH(x) { \ #define ACPI_IRQ_EDGE_HIGH(x) { \
.pin = (x), \ .pin = (x), \
.mode = IRQ_EDGE_TRIGGERED, \ .mode = ACPI_IRQ_EDGE_TRIGGERED, \
.polarity = IRQ_ACTIVE_HIGH, \ .polarity = ACPI_IRQ_ACTIVE_HIGH, \
.shared = IRQ_EXCLUSIVE, \ .shared = ACPI_IRQ_EXCLUSIVE, \
.wake = IRQ_NO_WAKE } .wake = ACPI_IRQ_NO_WAKE }
#define IRQ_LEVEL_LOW(x) { \ #define ACPI_IRQ_LEVEL_LOW(x) { \
.pin = (x), \ .pin = (x), \
.mode = IRQ_LEVEL_TRIGGERED, \ .mode = ACPI_IRQ_LEVEL_TRIGGERED, \
.polarity = IRQ_ACTIVE_LOW, \ .polarity = ACPI_IRQ_ACTIVE_LOW, \
.shared = IRQ_SHARED, \ .shared = ACPI_IRQ_SHARED, \
.wake = IRQ_NO_WAKE } .wake = ACPI_IRQ_NO_WAKE }
/* Write extended Interrupt() descriptor to SSDT AML output */ /* Write extended Interrupt() descriptor to SSDT AML output */
void acpi_device_write_interrupt(const struct acpi_irq *irq); void acpi_device_write_interrupt(const struct acpi_irq *irq);
@ -179,8 +179,8 @@ struct acpi_gpio {
#define ACPI_GPIO_IRQ_EDGE_HIGH(gpio) { \ #define ACPI_GPIO_IRQ_EDGE_HIGH(gpio) { \
.type = ACPI_GPIO_TYPE_INTERRUPT, \ .type = ACPI_GPIO_TYPE_INTERRUPT, \
.pull = ACPI_GPIO_PULL_DEFAULT, \ .pull = ACPI_GPIO_PULL_DEFAULT, \
.irq.mode = IRQ_EDGE_TRIGGERED, \ .irq.mode = ACPI_IRQ_EDGE_TRIGGERED, \
.irq.polarity = IRQ_ACTIVE_HIGH, \ .irq.polarity = ACPI_IRQ_ACTIVE_HIGH, \
.pin_count = 1, \ .pin_count = 1, \
.pins = { (gpio) } } .pins = { (gpio) } }

12
src/drivers/pc80/tpm/tpm.c
View file

@ -936,22 +936,22 @@ static void lpc_tpm_fill_ssdt(struct device *dev)
* PIRQ: Update interrupt vector with configured PIRQ * PIRQ: Update interrupt vector with configured PIRQ
* Active-Low Level-Triggered Shared * Active-Low Level-Triggered Shared
*/ */
struct acpi_irq tpm_irq_a = IRQ_LEVEL_LOW(CONFIG_TPM_PIRQ); struct acpi_irq tpm_irq_a = ACPI_IRQ_LEVEL_LOW(CONFIG_TPM_PIRQ);
acpi_device_write_interrupt(&tpm_irq_a); acpi_device_write_interrupt(&tpm_irq_a);
} else if (tpm_read_int_vector(0) > 0) { } else if (tpm_read_int_vector(0) > 0) {
u8 int_vec = tpm_read_int_vector(0); u8 int_vec = tpm_read_int_vector(0);
u8 int_pol = tpm_read_int_polarity(0); u8 int_pol = tpm_read_int_polarity(0);
struct acpi_irq tpm_irq = IRQ_LEVEL_LOW(int_vec); struct acpi_irq tpm_irq = ACPI_IRQ_LEVEL_LOW(int_vec);
if (int_pol & 1) if (int_pol & 1)
tpm_irq.polarity = IRQ_ACTIVE_LOW; tpm_irq.polarity = ACPI_IRQ_ACTIVE_LOW;
else else
tpm_irq.polarity = IRQ_ACTIVE_HIGH; tpm_irq.polarity = ACPI_IRQ_ACTIVE_HIGH;
if (int_pol & 2) if (int_pol & 2)
tpm_irq.mode = IRQ_EDGE_TRIGGERED; tpm_irq.mode = ACPI_IRQ_EDGE_TRIGGERED;
else else
tpm_irq.mode = IRQ_LEVEL_TRIGGERED; tpm_irq.mode = ACPI_IRQ_LEVEL_TRIGGERED;
acpi_device_write_interrupt(&tpm_irq); acpi_device_write_interrupt(&tpm_irq);
} }

6
src/mainboard/google/chell/devicetree.cb
View file

@ -201,7 +201,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0001"" register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen"" 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 device i2c 10 on end
end end
end # I2C #0 end # I2C #0
@ -209,7 +209,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0000"" register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad"" 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" register "wake" = "GPE0_DW0_05"
device i2c 15 on end device i2c 15 on end
end end
@ -226,7 +226,7 @@ chip soc/intel/skylake
device pci 19.1 off end # I2C #5 device pci 19.1 off end # I2C #5
device pci 19.2 on device pci 19.2 on
chip drivers/i2c/nau8825 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_enable" = "1"
register "jkdet_pull_enable" = "0" # R389 register "jkdet_pull_enable" = "0" # R389
register "jkdet_polarity" = "1" # ActiveLow register "jkdet_polarity" = "1" # ActiveLow

8
src/mainboard/google/eve/devicetree.cb
View file

@ -208,7 +208,7 @@ chip soc/intel/skylake
chip drivers/i2c/hid chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1"" register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer"" 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 "generic.speed" = "I2C_SPEED_FAST_PLUS"
register "hid_desc_reg_offset" = "0x1" register "hid_desc_reg_offset" = "0x1"
device i2c 0a on end device i2c 0a on end
@ -217,7 +217,7 @@ chip soc/intel/skylake
device pci 15.1 on device pci 15.1 on
chip drivers/i2c/tpm chip drivers/i2c/tpm
register "hid" = ""GOOG0005"" 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 device i2c 50 on end
end end
end # I2C #1 end # I2C #1
@ -225,7 +225,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""GOOG5400"" register "hid" = ""GOOG5400""
register "desc" = ""Touchpad"" 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 device i2c 49 on end
end end
end # I2C #2 end # I2C #2
@ -257,7 +257,7 @@ chip soc/intel/skylake
register "hid" = ""10EC5663"" register "hid" = ""10EC5663""
register "name" = ""RT53"" register "name" = ""RT53""
register "desc" = ""Realtek RT5663"" register "desc" = ""Realtek RT5663""
register "irq" = "IRQ_LEVEL_LOW(GPP_D9_IRQ)" register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D9_IRQ)"
register "probed" = "1" register "probed" = "1"
device i2c 13 on end device i2c 13 on end
end end

6
src/mainboard/google/glados/devicetree.cb
View file

@ -199,7 +199,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0001"" register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen"" 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 device i2c 10 on end
end end
end # I2C #0 end # I2C #0
@ -207,7 +207,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0000"" register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad"" 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" register "wake" = "GPE0_DW0_05"
device i2c 15 on end device i2c 15 on end
end end
@ -224,7 +224,7 @@ chip soc/intel/skylake
device pci 19.1 off end # I2C #5 device pci 19.1 off end # I2C #5
device pci 19.2 on device pci 19.2 on
chip drivers/i2c/nau8825 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_enable" = "1"
register "jkdet_pull_enable" = "0" # R389 register "jkdet_pull_enable" = "0" # R389
register "jkdet_polarity" = "1" # ActiveLow register "jkdet_polarity" = "1" # ActiveLow

6
src/mainboard/google/lars/devicetree.cb
View file

@ -196,7 +196,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0001"" register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen"" 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 device i2c 10 on end
end end
end # I2C #0 end # I2C #0
@ -204,7 +204,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0000"" register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad"" 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" register "wake" = "GPE0_DW0_05"
device i2c 15 on end device i2c 15 on end
end end
@ -221,7 +221,7 @@ chip soc/intel/skylake
device pci 19.1 off end # I2C #5 device pci 19.1 off end # I2C #5
device pci 19.2 on device pci 19.2 on
chip drivers/i2c/nau8825 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_enable" = "1"
register "jkdet_pull_enable" = "1" register "jkdet_pull_enable" = "1"
register "jkdet_pull_up" = "1" register "jkdet_pull_up" = "1"

6
src/mainboard/google/poppy/devicetree.cb
View file

@ -201,7 +201,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ATML0001"" register "hid" = ""ATML0001""
register "desc" = ""Atmel Touchscreen"" register "desc" = ""Atmel Touchscreen""
register "irq" = "IRQ_EDGE_LOW(GPP_E7_IRQ)" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E7_IRQ)"
register "probed" = "1" register "probed" = "1"
device i2c 4b on end device i2c 4b on end
end end
@ -212,7 +212,7 @@ chip soc/intel/skylake
chip drivers/i2c/hid chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1"" register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer"" 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" register "hid_desc_reg_offset" = "0x1"
device i2c 0x9 on end device i2c 0x9 on end
end end
@ -243,7 +243,7 @@ chip soc/intel/skylake
register "hid" = ""10EC5663"" register "hid" = ""10EC5663""
register "name" = ""RT53"" register "name" = ""RT53""
register "desc" = ""Realtek RT5663"" register "desc" = ""Realtek RT5663""
register "irq" = "IRQ_LEVEL_LOW(GPP_D9_IRQ)" register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D9_IRQ)"
register "probed" = "1" register "probed" = "1"
device i2c 13 on end device i2c 13 on end
end end

10
src/mainboard/google/reef/variants/baseboard/devicetree.cb
View file

@ -146,7 +146,7 @@ chip soc/intel/apollolake
device pci 15.1 off end # - XDCI device pci 15.1 off end # - XDCI
device pci 16.0 on # - I2C 0 device pci 16.0 on # - I2C 0
chip drivers/i2c/da7219 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 "btn_cfg" = "50"
register "mic_det_thr" = "500" register "mic_det_thr" = "500"
register "jack_ins_deb" = "20" register "jack_ins_deb" = "20"
@ -167,7 +167,7 @@ chip soc/intel/apollolake
device pci 16.2 on device pci 16.2 on
chip drivers/i2c/tpm chip drivers/i2c/tpm
register "hid" = ""GOOG0005"" 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 device i2c 50 on end
end end
end # - I2C 2 end # - I2C 2
@ -175,7 +175,7 @@ chip soc/intel/apollolake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0001"" register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen"" 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 "probed" = "1"
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)"
register "reset_delay_ms" = "20" register "reset_delay_ms" = "20"
@ -189,7 +189,7 @@ chip soc/intel/apollolake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0000"" register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad"" 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 "wake" = "GPE0_DW1_15"
register "probed" = "1" register "probed" = "1"
device i2c 15 on end device i2c 15 on end
@ -199,7 +199,7 @@ chip soc/intel/apollolake
chip drivers/i2c/hid chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1"" register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer"" 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" register "hid_desc_reg_offset" = "0x1"
device i2c 0x9 on end device i2c 0x9 on end
end end

10
src/mainboard/google/reef/variants/pyro/devicetree.cb
View file

@ -155,7 +155,7 @@ chip soc/intel/apollolake
device pci 15.1 off end # - XDCI device pci 15.1 off end # - XDCI
device pci 16.0 on # - I2C 0 device pci 16.0 on # - I2C 0
chip drivers/i2c/da7219 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 "btn_cfg" = "50"
register "mic_det_thr" = "500" register "mic_det_thr" = "500"
register "jack_ins_deb" = "20" register "jack_ins_deb" = "20"
@ -176,7 +176,7 @@ chip soc/intel/apollolake
device pci 16.2 on device pci 16.2 on
chip drivers/i2c/tpm chip drivers/i2c/tpm
register "hid" = ""GOOG0005"" 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 device i2c 50 on end
end end
end # - I2C 2 end # - I2C 2
@ -184,7 +184,7 @@ chip soc/intel/apollolake
chip drivers/i2c/hid chip drivers/i2c/hid
register "generic.hid" = ""WCOMNTN2"" register "generic.hid" = ""WCOMNTN2""
register "generic.desc" = ""WCOM Touchscreen"" 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.probed" = "1"
register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)"
register "generic.reset_delay_ms" = "20" register "generic.reset_delay_ms" = "20"
@ -198,7 +198,7 @@ chip soc/intel/apollolake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0001"" register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen"" 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 "probed" = "1"
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)"
register "reset_delay_ms" = "20" register "reset_delay_ms" = "20"
@ -212,7 +212,7 @@ chip soc/intel/apollolake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0000"" register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad"" 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 "wake" = "GPE0_DW1_15"
register "probed" = "1" register "probed" = "1"
device i2c 15 on end device i2c 15 on end

12
src/mainboard/google/reef/variants/snappy/devicetree.cb
View file

@ -146,7 +146,7 @@ chip soc/intel/apollolake
device pci 15.1 off end # - XDCI device pci 15.1 off end # - XDCI
device pci 16.0 on # - I2C 0 device pci 16.0 on # - I2C 0
chip drivers/i2c/da7219 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 "btn_cfg" = "50"
register "mic_det_thr" = "500" register "mic_det_thr" = "500"
register "jack_ins_deb" = "20" register "jack_ins_deb" = "20"
@ -167,7 +167,7 @@ chip soc/intel/apollolake
device pci 16.2 on device pci 16.2 on
chip drivers/i2c/tpm chip drivers/i2c/tpm
register "hid" = ""GOOG0005"" 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 device i2c 50 on end
end end
end # - I2C 2 end # - I2C 2
@ -175,7 +175,7 @@ chip soc/intel/apollolake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0001"" register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen"" 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 "probed" = "1"
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)"
register "reset_delay_ms" = "20" register "reset_delay_ms" = "20"
@ -187,7 +187,7 @@ chip soc/intel/apollolake
chip drivers/i2c/hid chip drivers/i2c/hid
register "generic.hid" = ""WDHT0001"" register "generic.hid" = ""WDHT0001""
register "generic.desc" = ""WDT Touchscreen"" 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.probed" = "1"
register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)"
register "generic.reset_delay_ms" = "20" register "generic.reset_delay_ms" = "20"
@ -203,7 +203,7 @@ chip soc/intel/apollolake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0000"" register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad"" 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 "wake" = "GPE0_DW1_15"
register "probed" = "1" register "probed" = "1"
device i2c 15 on end device i2c 15 on end
@ -213,7 +213,7 @@ chip soc/intel/apollolake
chip drivers/i2c/hid chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1"" register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer"" 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" register "hid_desc_reg_offset" = "0x1"
device i2c 0x9 on end device i2c 0x9 on end
end end

6
src/mainboard/intel/kunimitsu/devicetree.cb
View file

@ -206,7 +206,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0001"" register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen"" 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 device i2c 10 on end
end end
end # I2C #0 end # I2C #0
@ -214,7 +214,7 @@ chip soc/intel/skylake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0000"" register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad"" 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" register "wake" = "GPE0_DW0_05"
device i2c 15 on end device i2c 15 on end
end end
@ -231,7 +231,7 @@ chip soc/intel/skylake
device pci 19.1 off end # I2C #5 device pci 19.1 off end # I2C #5
device pci 19.2 on device pci 19.2 on
chip drivers/i2c/nau8825 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_enable" = "1"
register "jkdet_pull_enable" = "1" register "jkdet_pull_enable" = "1"
register "jkdet_pull_up" = "1" register "jkdet_pull_up" = "1"

10
src/mainboard/intel/leafhill/devicetree.cb
View file

@ -146,7 +146,7 @@ chip soc/intel/apollolake
device pci 15.1 off end # - XDCI device pci 15.1 off end # - XDCI
device pci 16.0 on # - I2C 0 device pci 16.0 on # - I2C 0
chip drivers/i2c/da7219 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 "btn_cfg" = "50"
register "mic_det_thr" = "500" register "mic_det_thr" = "500"
register "jack_ins_deb" = "20" register "jack_ins_deb" = "20"
@ -167,7 +167,7 @@ chip soc/intel/apollolake
device pci 16.2 on device pci 16.2 on
chip drivers/i2c/tpm chip drivers/i2c/tpm
register "hid" = ""GOOG0005"" 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 device i2c 50 on end
end end
end # - I2C 2 end # - I2C 2
@ -175,7 +175,7 @@ chip soc/intel/apollolake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0001"" register "hid" = ""ELAN0001""
register "desc" = ""ELAN Touchscreen"" 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 "probed" = "1"
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_36)"
register "reset_delay_ms" = "20" register "reset_delay_ms" = "20"
@ -189,7 +189,7 @@ chip soc/intel/apollolake
chip drivers/i2c/generic chip drivers/i2c/generic
register "hid" = ""ELAN0000"" register "hid" = ""ELAN0000""
register "desc" = ""ELAN Touchpad"" 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 "wake" = "GPE0_DW1_15"
register "probed" = "1" register "probed" = "1"
device i2c 15 on end device i2c 15 on end
@ -199,7 +199,7 @@ chip soc/intel/apollolake
chip drivers/i2c/hid chip drivers/i2c/hid
register "generic.hid" = ""WCOM50C1"" register "generic.hid" = ""WCOM50C1""
register "generic.desc" = ""WCOM Digitizer"" 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" register "hid_desc_reg_offset" = "0x1"
device i2c 0x9 on end device i2c 0x9 on end
end end

8
src/soc/intel/skylake/sd.c
View file

@ -30,10 +30,10 @@ static void sd_fill_ssdt(struct device *dev)
struct acpi_gpio default_gpio = { struct acpi_gpio default_gpio = {
.type = ACPI_GPIO_TYPE_INTERRUPT, .type = ACPI_GPIO_TYPE_INTERRUPT,
.pull = ACPI_GPIO_PULL_NONE, .pull = ACPI_GPIO_PULL_NONE,
.irq.mode = IRQ_EDGE_TRIGGERED, .irq.mode = ACPI_IRQ_EDGE_TRIGGERED,
.irq.polarity = IRQ_ACTIVE_BOTH, .irq.polarity = ACPI_IRQ_ACTIVE_BOTH,
.irq.shared = IRQ_SHARED, .irq.shared = ACPI_IRQ_SHARED,
.irq.wake = IRQ_WAKE, .irq.wake = ACPI_IRQ_WAKE,
.interrupt_debounce_timeout = 10000, /* 100ms */ .interrupt_debounce_timeout = 10000, /* 100ms */
.pin_count = 1, .pin_count = 1,
.pins = { config->sdcard_cd_gpio_default } .pins = { config->sdcard_cd_gpio_default }