Aaron Durbin (adurbin@chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11231
-gerrit
commit 2119d47dbb6b5ca5ea25d78a5dfb3dbf8430b493 Author: Naveen Krishna Chatradhi naveenkrishna.ch@intel.com Date: Tue Jul 28 23:30:45 2015 +0530
Kunimitsu: Update Mainboard ASL for Kunimitsu FAB3 with D0 MCP
This patch updates the mainboard.asl file to support Kunimitsu FAB3 board which is based on SKL D0 MCP.
BRANCH=None BUG=chrome-os-partner:43324 CQ-DEPEND=CL:*224327, CL:*224328 TEST=Built for kunimitsu; booted on kunimitsu FAB3 with D0 MCP
Original-Change-Id: I31a315740d49125591591b20c296babe49004166 Original-Signed-off-by: Pravin Angolkar pravin.k.angolkar@intel.com Original-Signed-off-by: Naveen Krishna Chatradhi naveenkrishna.ch@intel.com Original-Reviewed-on: https://chromium-review.googlesource.com/290050 Original-Reviewed-by: Duncan Laurie dlaurie@chromium.org
Change-Id: I81c22e407d1b3d420744eaf1d3f7ff4e8e749bcb Signed-off-by: Pravin Angolkar pravin.k.angolkar@intel.com Signed-off-by: Naveen Krishna Chatradhi naveenkrishna.ch@intel.com --- src/mainboard/intel/kunimitsu/acpi/mainboard.asl | 156 +++++++++++++++-------- 1 file changed, 105 insertions(+), 51 deletions(-)
diff --git a/src/mainboard/intel/kunimitsu/acpi/mainboard.asl b/src/mainboard/intel/kunimitsu/acpi/mainboard.asl index a5e7bcf..aa752f9 100644 --- a/src/mainboard/intel/kunimitsu/acpi/mainboard.asl +++ b/src/mainboard/intel/kunimitsu/acpi/mainboard.asl @@ -18,18 +18,14 @@ * Foundation, Inc. */
-#define KUNIMITSU_TRACKPAD_IRQ 0x33 -#define KUNIMITSU_TOUCH_IRQ 0x1f +#define BOARD_TRACKPAD_IRQ 0x33 +#define BOARD_TOUCHSCREEN_IRQ 0x1f
-#define BOARD_TRACKPAD_NAME "trackpad" -#define BOARD_TRACKPAD_IRQ KUNIMITSU_TRACKPAD_IRQ -#define BOARD_TRACKPAD_I2C_BUS 1 -#define BOARD_TRACKPAD_I2C_ADDR 0x15 - -#define BOARD_TOUCHSCREEN_NAME "touchscreen" -#define BOARD_TOUCHSCREEN_IRQ KUNIMITSU_TOUCH_IRQ -#define BOARD_TOUCHSCREEN_I2C_BUS 0 -#define BOARD_TOUCHSCREEN_I2C_ADDR 0x4b +#define BOARD_TRACKPAD_I2C_ADDR 0x15 +#define BOARD_TOUCHSCREEN_I2C_ADDR 0x10 +#define BOARD_LEFT_SSM4567_I2C_ADDR 0x34 +#define BOARD_RIGHT_SSM4567_I2C_ADDR 0x35 +#define BOARD_AUDIO_CODEC_I2C_ADDR 0x1A
Scope (_SB) { @@ -54,49 +50,25 @@ Scope (_SB.PCI0.LPCB) { #include <drivers/pc80/tpm/acpi/tpm.asl> } + Scope (_SB.PCI0.I2C0) { - Device (ATSB) - { - Name (_HID, "ATML0001") - Name (_DDN, "Atmel Touchscreen Bootloader") - Name (_UID, 4) - Name (_S0W, 4) - Name (ISTP, 0) /* TouchScreen */ - Name (_CRS, ResourceTemplate() - { - I2cSerialBus ( - 0x27, // SlaveAddress - ControllerInitiated, // SlaveMode - 400000, // ConnectionSpeed - AddressingMode7Bit, // AddressingMode - "\_SB.PCI0.I2C0", // ResourceSource - ) - Interrupt (ResourceConsumer, Edge, ActiveLow) { 28 } - }) - Method (_STA) - { - Return (0xF) - } - } - Device (ATSA) + Device (ETSA) { - Name (_HID, "ATML0001") - Name (_DDN, "Atmel Touchscreen") + Name (_HID, "ELAN0001") + Name (_DDN, "ELAN Touchscreen") Name (_UID, 5) - Name (_S0W, 4) Name (ISTP, 0) /* TouchScreen */ Name (_CRS, ResourceTemplate() { I2cSerialBus ( - BOARD_TOUCHSCREEN_I2C_ADDR, // SlaveAddress - ControllerInitiated, // SlaveMode - 400000, // ConnectionSpeed - AddressingMode7Bit, // AddressingMode - "\_SB.PCI0.I2C0", // ResourceSource + BOARD_TOUCHSCREEN_I2C_ADDR, + ControllerInitiated, + 400000, + AddressingMode7Bit, + "\_SB.PCI0.I2C0", ) - Interrupt (ResourceConsumer, Edge, ActiveLow) - { + Interrupt (ResourceConsumer, Edge, ActiveLow) { BOARD_TOUCHSCREEN_IRQ } }) @@ -106,6 +78,7 @@ Scope (_SB.PCI0.I2C0) } } } + Scope (_SB.PCI0.I2C1) { Device (ELAN) @@ -113,20 +86,21 @@ Scope (_SB.PCI0.I2C1) Name (_HID, "ELAN0000") Name (_DDN, "Elan Touchpad") Name (_UID, 3) + /* Allow device to power off in S0 */ Name (_S0W, 4) Name (ISTP, 1) /* TouchPad */ Name (_CRS, ResourceTemplate() { I2cSerialBus ( - BOARD_TRACKPAD_I2C_ADDR, /* SlaveAddress */ - ControllerInitiated, /* SlaveMode */ - 400000, /* ConnectionSpeed */ - AddressingMode7Bit, /* AddressingMode */ - "\_SB.PCI0.I2C1", /* ResourceSource */ + BOARD_TRACKPAD_I2C_ADDR, + ControllerInitiated, + 400000, + AddressingMode7Bit, + "\_SB.PCI0.I2C1", ) Interrupt (ResourceConsumer, Edge, ActiveLow) { - KUNIMITSU_TRACKPAD_IRQ + BOARD_TRACKPAD_IRQ } }) Method (_STA) @@ -135,3 +109,83 @@ Scope (_SB.PCI0.I2C1) } } } + +Scope (_SB.PCI0.I2C4) +{ + // LEFT SSM4567 I2c ADDR 0x34 + Device (LSPK) + { + Name (_HID, "INT343B") + Name (_CID, "INT343B") + Name (_DDN, "Intel(R) Smart Sound Technology Audio Codec") + Name (_UID, 1) + + Name (_CRS, ResourceTemplate() + { + I2cSerialBus ( + BOARD_LEFT_SSM4567_I2C_ADDR, + ControllerInitiated, + 400000, + AddressingMode7Bit, + "\_SB.PCI0.I2C4", + ) + }) + + Method (_STA, 0, NotSerialized) + { + Return (0xF) // I2S Codec ADI LEFT SSM4567 Enabled + } + } // Device (LSPK) + + // RIGHT SSM4567 I2C ADDR 0x35 + Device (RSPK) + { + Name (_HID, "INT343B") + Name (_CID, "INT343B") + Name (_DDN, "Intel(R) Smart Sound Technology Audio Codec") + Name (_UID, 2) + + Name (_CRS, ResourceTemplate() + { + I2cSerialBus ( + BOARD_RIGHT_SSM4567_I2C_ADDR, + ControllerInitiated, + 400000, + AddressingMode7Bit, + "\_SB.PCI0.I2C4", + ) + }) + + Method (_STA, 0, NotSerialized) + { + Return (0xF) // I2S Codec ADI RIGHT SSM4567 Enabled + } + } // Device (RSPK) + + // Nuvoton NAU88L25 (I2SC = 2) + Device (HDAC) + { + Name (_HID, "10508825") + Name (_CID, "10508825") + Name (_DDN, "Intel(R) Smart Sound Technology Audio Codec") + Name (_UID, 1) + + Name (_CRS, ResourceTemplate() + { + I2cSerialBus ( + BOARD_AUDIO_CODEC_I2C_ADDR, + ControllerInitiated, + 400000, + AddressingMode7Bit, + "\_SB.PCI0.I2C4", + ) + }) + + Method (_STA, 0, NotSerialized) + { + Return (0xF) // I2S Codec Enabled + } + } // Device (HDAC) +} + +