New patch to review for coreboot: intel/minnow3: follow up with recent changes in master

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18476

-gerrit

commit cbae65fd8cb207b569c674ae8dfe54e7e5cd3f38
Author: Patrick Georgi 
Date:   Thu Feb 23 18:14:15 2017 +0100

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 
---
 src/mainboard/intel/minnow3/devicetree.cb | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/mainboard/intel/minnow3/devicetree.cb b/src/mainboard/intel/minnow3/devicetree.cb
index 2ccf277..b0c82e2 100644
--- a/src/mainboard/intel/minnow3/devicetree.cb
+++ b/src/mainboard/intel/minnow3/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,20 +189,17 @@ 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
    		end
    	end # - I2C 4
    	device pci 17.1 on
-			chip drivers/i2c/wacom
-				register "generic" = "{
-					 .hid = WCOM50C1_HID,
-					 .cid = PNP0C50_CID,
-					 .desc = WCOM_DT_DESC,
-					 .irq = IRQ_LEVEL_LOW(GPIO_13_IRQ),
-				}"
+			chip drivers/i2c/hid
+				register "generic.hid" = ""WCOM50C1""
+				register "generic.desc" = ""WCOM Digitizer""
+				register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_13_IRQ)"
    			register "hid_desc_reg_offset" = "0x1"
    			device i2c 0x9 on end
    		end