intel/minnow3: follow up with recent changes in master

minnow3 doesn't build right now due to API divergence on master branch.
Follow up with recent changes.

Change-Id: Iee84750292f22aa040127bcbfe523a0b9eaa8176
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/18476
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-by: Martin Roth <martinroth@google.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Patrick Georgi 2017-02-23 18:14:15 +01:00 committed by Patrick Georgi
parent 57debca234
commit a5c029f235
1 changed files with 8 additions and 11 deletions

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,20 +189,17 @@ 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
end end
end # - I2C 4 end # - I2C 4
device pci 17.1 on device pci 17.1 on
chip drivers/i2c/wacom chip drivers/i2c/hid
register "generic" = "{ register "generic.hid" = ""WCOM50C1""
.hid = WCOM50C1_HID, register "generic.desc" = ""WCOM Digitizer""
.cid = PNP0C50_CID, register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_13_IRQ)"
.desc = WCOM_DT_DESC,
.irq = 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