diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2016-11-09 17:04:15 -0600 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2016-11-11 03:11:31 +0100 |
| commit | ed14a4e0df25e55cea2b72a87087aaeb3540c785 (patch) | |
| tree | 5a60bd779391096d6554d9b94f384f158d7c3c00 /src/mainboard/google | |
| parent | ce21151a1c050476079c3ce31b8e8013f8cd3282 (diff) | |
soc/intel/skylake: move i2c voltage config to own variable
In preparation of merging the lpss i2c config structures on
apollolake and skylake move the i2c voltage variable to its
own field. It makes refactoring things easier, and then there's
no reason for a separate SoC specific i2c config structure.
BUG=chrome-os-partner:58889
Change-Id: Ibcc3cba9bac3b5779351b673bc0cc7671d127f24
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/17347
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/chell/devicetree.cb | 2 | ||||
| -rw-r--r-- | src/mainboard/google/eve/devicetree.cb | 10 | ||||
| -rw-r--r-- | src/mainboard/google/glados/devicetree.cb | 2 | ||||
| -rw-r--r-- | src/mainboard/google/lars/devicetree.cb | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/mainboard/google/chell/devicetree.cb b/src/mainboard/google/chell/devicetree.cb index 230a9a6d4d..238a5a5109 100644 --- a/src/mainboard/google/chell/devicetree.cb +++ b/src/mainboard/google/chell/devicetree.cb @@ -163,7 +163,7 @@ chip soc/intel/skylake register "usb3_ports[2]" = "USB3_PORT_DEFAULT" # Type-A Port register "usb3_ports[3]" = "USB3_PORT_DEFAULT" # SD - register "i2c[4].voltage" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V + register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V # Must leave UART0 enabled or SD/eMMC will not work as PCI register "SerialIoDevMode" = "{ diff --git a/src/mainboard/google/eve/devicetree.cb b/src/mainboard/google/eve/devicetree.cb index d825acfa34..37a5ff0712 100644 --- a/src/mainboard/google/eve/devicetree.cb +++ b/src/mainboard/google/eve/devicetree.cb @@ -160,11 +160,11 @@ chip soc/intel/skylake register "usb3_ports[2]" = "USB3_PORT_EMPTY" # Empty register "usb3_ports[3]" = "USB3_PORT_EMPTY" # Empty - register "i2c[0].voltage" = "I2C_VOLTAGE_3V3" # Touchscreen - register "i2c[1].voltage" = "I2C_VOLTAGE_3V3" # TPM - register "i2c[2].voltage" = "I2C_VOLTAGE_1V8" # Touchpad - register "i2c[3].voltage" = "I2C_VOLTAGE_1V8" # Display - register "i2c[4].voltage" = "I2C_VOLTAGE_1V8" # Audio + register "i2c_voltage[0]" = "I2C_VOLTAGE_3V3" # Touchscreen + register "i2c_voltage[1]" = "I2C_VOLTAGE_3V3" # TPM + register "i2c_voltage[2]" = "I2C_VOLTAGE_1V8" # Touchpad + register "i2c_voltage[3]" = "I2C_VOLTAGE_1V8" # Display + register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # Audio # Enable I2C1 bus early for TPM access register "i2c[1].early_init" = "1" diff --git a/src/mainboard/google/glados/devicetree.cb b/src/mainboard/google/glados/devicetree.cb index 9b74212e17..d17ef6cc0c 100644 --- a/src/mainboard/google/glados/devicetree.cb +++ b/src/mainboard/google/glados/devicetree.cb @@ -163,7 +163,7 @@ chip soc/intel/skylake register "usb3_ports[2]" = "USB3_PORT_DEFAULT" # Type-A Port 1 register "usb3_ports[3]" = "USB3_PORT_DEFAULT" # Type-A Port 2 - register "i2c[4].voltage" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V + register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V # Must leave UART0 enabled or SD/eMMC will not work as PCI register "SerialIoDevMode" = "{ diff --git a/src/mainboard/google/lars/devicetree.cb b/src/mainboard/google/lars/devicetree.cb index 25bd19d9d6..dab95de41a 100644 --- a/src/mainboard/google/lars/devicetree.cb +++ b/src/mainboard/google/lars/devicetree.cb @@ -160,7 +160,7 @@ chip soc/intel/skylake register "usb3_ports[2]" = "USB3_PORT_DEFAULT" # Type-A Port (card) register "usb3_ports[3]" = "USB3_PORT_DEFAULT" # Type-A Port (board) - register "i2c[4].voltage" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V + register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" # I2C4 is 1.8V # Must leave UART0 enabled or SD/eMMC will not work as PCI register "SerialIoDevMode" = "{ \ |