summaryrefslogtreecommitdiff
path: root/src/mainboard/google/octopus
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google/octopus')
-rw-r--r--src/mainboard/google/octopus/variants/bloog/overridetree.cb126
-rw-r--r--src/mainboard/google/octopus/variants/lick/overridetree.cb2
-rw-r--r--src/mainboard/google/octopus/variants/phaser/overridetree.cb24
3 files changed, 76 insertions, 76 deletions
diff --git a/src/mainboard/google/octopus/variants/bloog/overridetree.cb b/src/mainboard/google/octopus/variants/bloog/overridetree.cb
index 0212bea46d..6c2aa95747 100644
--- a/src/mainboard/google/octopus/variants/bloog/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/bloog/overridetree.cb
@@ -41,44 +41,44 @@ chip soc/intel/apollolake
# [6:0] Rx Strobe Delay DLL 2(HS400 Mode), each 125ps.
register "emmc_rx_strobe_cntl" = "0x0b0b"
- # Intel Common SoC Config
- #+-------------------+---------------------------+
- #| Field | Value |
- #+-------------------+---------------------------+
- #| GSPI0 | cr50 TPM. Early init is |
- #| | required to set up a BAR |
- #| | for TPM communication |
- #| | before memory is up |
- #| I2C5 | Audio |
- #| I2C6 | Trackpad |
- #| I2C7 | Touchscreen |
- #+-------------------+---------------------------+
+ # Intel Common SoC Config
+ #+-------------------+---------------------------+
+ #| Field | Value |
+ #+-------------------+---------------------------+
+ #| GSPI0 | cr50 TPM. Early init is |
+ #| | required to set up a BAR |
+ #| | for TPM communication |
+ #| | before memory is up |
+ #| I2C5 | Audio |
+ #| I2C6 | Trackpad |
+ #| I2C7 | Touchscreen |
+ #+-------------------+---------------------------+
- register "tcc_offset" = "10"
+ register "tcc_offset" = "10"
- register "common_soc_config" = "{
- .gspi[0] = {
- .speed_mhz = 1,
- .early_init = 1,
- },
- .i2c[5] = {
- .speed = I2C_SPEED_FAST,
- .rise_time_ns = 104,
- .fall_time_ns = 52,
- },
- .i2c[6] = {
- .speed = I2C_SPEED_FAST,
- .rise_time_ns = 66,
- .fall_time_ns = 90,
- .data_hold_time_ns = 350,
- },
- .i2c[7] = {
- .speed = I2C_SPEED_FAST,
- .rise_time_ns = 44,
- .fall_time_ns = 90,
- },
+ register "common_soc_config" = "{
+ .gspi[0] = {
+ .speed_mhz = 1,
+ .early_init = 1,
+ },
+ .i2c[5] = {
+ .speed = I2C_SPEED_FAST,
+ .rise_time_ns = 104,
+ .fall_time_ns = 52,
+ },
+ .i2c[6] = {
+ .speed = I2C_SPEED_FAST,
+ .rise_time_ns = 66,
+ .fall_time_ns = 90,
+ .data_hold_time_ns = 350,
+ },
+ .i2c[7] = {
+ .speed = I2C_SPEED_FAST,
+ .rise_time_ns = 44,
+ .fall_time_ns = 90,
+ },
- }"
+ }"
device domain 0 on
device pci 16.0 off end # - I2C 0
@@ -124,34 +124,34 @@ chip soc/intel/apollolake
register "has_power_resource" = "1"
device i2c 10 on end
end
- chip drivers/i2c/hid
- register "generic.hid" = ""GDIX0000""
- register "generic.desc" = ""Goodix Touchscreen""
- register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPIO_212_IRQ)"
- register "generic.probed" = "1"
- register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_105)"
- register "generic.reset_delay_ms" = "120"
- register "generic.reset_off_delay_ms" = "3"
- register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
- register "generic.has_power_resource" = "1"
- register "generic.enable_delay_ms" = "10"
- register "hid_desc_reg_offset" = "0x01"
- device i2c 5d on end
- end
- chip drivers/i2c/hid
- register "generic.hid" = ""GTCH7503""
- register "generic.desc" = ""G2TOUCH Touchscreen""
- register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPIO_212_IRQ)"
- register "generic.probed" = "1"
- register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_105)"
- register "generic.reset_delay_ms" = "50"
- register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
- register "generic.enable_delay_ms" = "1"
- register "generic.has_power_resource" = "1"
- register "generic.disable_gpio_export_in_crs" = "1"
- register "hid_desc_reg_offset" = "0x01"
- device i2c 40 on end
- end
+ chip drivers/i2c/hid
+ register "generic.hid" = ""GDIX0000""
+ register "generic.desc" = ""Goodix Touchscreen""
+ register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPIO_212_IRQ)"
+ register "generic.probed" = "1"
+ register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_105)"
+ register "generic.reset_delay_ms" = "120"
+ register "generic.reset_off_delay_ms" = "3"
+ register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
+ register "generic.has_power_resource" = "1"
+ register "generic.enable_delay_ms" = "10"
+ register "hid_desc_reg_offset" = "0x01"
+ device i2c 5d on end
+ end
+ chip drivers/i2c/hid
+ register "generic.hid" = ""GTCH7503""
+ register "generic.desc" = ""G2TOUCH Touchscreen""
+ register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPIO_212_IRQ)"
+ register "generic.probed" = "1"
+ register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_105)"
+ register "generic.reset_delay_ms" = "50"
+ register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
+ register "generic.enable_delay_ms" = "1"
+ register "generic.has_power_resource" = "1"
+ register "generic.disable_gpio_export_in_crs" = "1"
+ register "hid_desc_reg_offset" = "0x01"
+ device i2c 40 on end
+ end
end # - I2C 7
end
diff --git a/src/mainboard/google/octopus/variants/lick/overridetree.cb b/src/mainboard/google/octopus/variants/lick/overridetree.cb
index 3ade35402f..af6711a5fc 100644
--- a/src/mainboard/google/octopus/variants/lick/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/lick/overridetree.cb
@@ -52,7 +52,7 @@ chip soc/intel/apollolake
#| I2C5 | Audio |
#| I2C6 | Trackpad |
#+-------------------+---------------------------+
- register "tcc_offset" = "15"
+ register "tcc_offset" = "15"
register "common_soc_config" = "{
.gspi[0] = {
diff --git a/src/mainboard/google/octopus/variants/phaser/overridetree.cb b/src/mainboard/google/octopus/variants/phaser/overridetree.cb
index b80d0317c8..9ce2a0b2cf 100644
--- a/src/mainboard/google/octopus/variants/phaser/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/phaser/overridetree.cb
@@ -159,18 +159,18 @@ chip soc/intel/apollolake
register "hid_desc_reg_offset" = "0x20"
device i2c 20 on end
end
- chip drivers/i2c/generic
- register "hid" = ""RAYD0001""
- register "desc" = ""Raydium Touchscreen""
- register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_212_IRQ)"
- register "probed" = "1"
- register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_105)"
- register "reset_delay_ms" = "1"
- register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
- register "enable_delay_ms" = "50"
- register "has_power_resource" = "1"
- device i2c 39 on end
- end
+ chip drivers/i2c/generic
+ register "hid" = ""RAYD0001""
+ register "desc" = ""Raydium Touchscreen""
+ register "irq" = "ACPI_IRQ_EDGE_LOW(GPIO_212_IRQ)"
+ register "probed" = "1"
+ register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_105)"
+ register "reset_delay_ms" = "1"
+ register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPIO_146)"
+ register "enable_delay_ms" = "50"
+ register "has_power_resource" = "1"
+ device i2c 39 on end
+ end
end # - I2C 7
end