summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/dedede/variants/waddledoo/overridetree.cb12
-rw-r--r--src/mainboard/google/hatch/variants/helios/overridetree.cb2
-rw-r--r--src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb2
-rw-r--r--src/mainboard/google/hatch/variants/palkia/overridetree.cb4
-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
-rw-r--r--src/mainboard/google/poppy/variants/nami/devicetree.cb14
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/devicetree.cb4
-rw-r--r--src/mainboard/google/poppy/variants/nocturne/devicetree.cb38
-rw-r--r--src/mainboard/google/sarien/variants/arcada/devicetree.cb2
11 files changed, 115 insertions, 115 deletions
diff --git a/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb b/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb
index a37d2e7b74..3943882812 100644
--- a/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb
+++ b/src/mainboard/google/dedede/variants/waddledoo/overridetree.cb
@@ -147,12 +147,12 @@ chip soc/intel/jasperlake
device i2c 1a on end
end
end #I2C 4
- device pci 1f.3 on
- chip drivers/generic/max98357a
- register "hid" = ""MX98360A""
+ device pci 1f.3 on
+ chip drivers/generic/max98357a
+ register "hid" = ""MX98360A""
register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D17)"
- device generic 0 on end
- end
- end # Intel HDA
+ device generic 0 on end
+ end
+ end # Intel HDA
end
end
diff --git a/src/mainboard/google/hatch/variants/helios/overridetree.cb b/src/mainboard/google/hatch/variants/helios/overridetree.cb
index 34d235856e..4241a46640 100644
--- a/src/mainboard/google/hatch/variants/helios/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/helios/overridetree.cb
@@ -36,7 +36,7 @@ chip soc/intel/cannonlake
.speed = I2C_SPEED_FAST,
.rise_time_ns = 50,
.fall_time_ns = 15,
- .data_hold_time_ns = 330,
+ .data_hold_time_ns = 330,
},
.i2c[1] = {
.speed = I2C_SPEED_FAST,
diff --git a/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb b/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb
index 6accd0cc92..6fbe95058f 100644
--- a/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb
@@ -52,7 +52,7 @@ chip soc/intel/cannonlake
.speed = I2C_SPEED_FAST,
.rise_time_ns = 50,
.fall_time_ns = 15,
- .data_hold_time_ns = 330,
+ .data_hold_time_ns = 330,
},
.i2c[1] = {
.speed = I2C_SPEED_FAST,
diff --git a/src/mainboard/google/hatch/variants/palkia/overridetree.cb b/src/mainboard/google/hatch/variants/palkia/overridetree.cb
index 73cf0f21b9..8cdb2a9fb3 100644
--- a/src/mainboard/google/hatch/variants/palkia/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/palkia/overridetree.cb
@@ -29,7 +29,7 @@ chip soc/intel/cannonlake
#+-------------------+---------------------------+
#| I2C0 | Trackpad |
#| I2C1 | Touchscreen |
- #| I2C2 | 2nd Touchscreen |
+ #| I2C2 | 2nd Touchscreen |
#| I2C4 | Audio |
#+-------------------+---------------------------+
register "common_soc_config" = "{
@@ -37,7 +37,7 @@ chip soc/intel/cannonlake
.speed = I2C_SPEED_FAST,
.rise_time_ns = 50,
.fall_time_ns = 15,
- .data_hold_time_ns = 330,
+ .data_hold_time_ns = 330,
},
.i2c[1] = {
.speed = I2C_SPEED_FAST,
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
diff --git a/src/mainboard/google/poppy/variants/nami/devicetree.cb b/src/mainboard/google/poppy/variants/nami/devicetree.cb
index 8e1f954d8a..bf3b7bd923 100644
--- a/src/mainboard/google/poppy/variants/nami/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nami/devicetree.cb
@@ -366,19 +366,19 @@ chip soc/intel/skylake
end
end # I2C #1
device pci 15.2 on
- chip drivers/i2c/hid
- register "generic.hid" = ""WCOM005C""
- register "generic.desc" = ""WCOM Digitizer""
- register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D1_IRQ)"
+ chip drivers/i2c/hid
+ register "generic.hid" = ""WCOM005C""
+ register "generic.desc" = ""WCOM Digitizer""
+ register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D1_IRQ)"
register "generic.probed" = "1"
register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D3)"
register "generic.reset_delay_ms" = "20"
register "generic.has_power_resource" = "1"
register "generic.disable_gpio_export_in_crs" = "1"
register "generic.wake" = "GPE0_DW2_01"
- register "hid_desc_reg_offset" = "0x1"
- device i2c 0x9 on end
- end
+ register "hid_desc_reg_offset" = "0x1"
+ device i2c 0x9 on end
+ end
chip drivers/generic/gpio_keys
register "name" = ""PENH""
register "gpio" = "ACPI_GPIO_INPUT_ACTIVE_HIGH(GPP_E8)"
diff --git a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
index 0a67d4d7f9..d64bd8a022 100644
--- a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
@@ -144,8 +144,8 @@ chip soc/intel/skylake
register "PcieRpClkReqSupport[0]" = "1"
# RP 1 uses SRCCLKREQ1#
register "PcieRpClkReqNumber[0]" = "1"
- # RP 1 uses uses CLK SRC 1
- register "PcieRpClkSrcNumber[0]" = "1"
+ # RP 1 uses uses CLK SRC 1
+ register "PcieRpClkSrcNumber[0]" = "1"
# RP 1, Enable Advanced Error Reporting
register "PcieRpAdvancedErrorReporting[0]" = "1"
# RP 1, Enable Latency Tolerance Reporting Mechanism
diff --git a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
index 8959a2902e..26207f529e 100644
--- a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
@@ -147,19 +147,19 @@ chip soc/intel/skylake
register "PcieRpAdvancedErrorReporting[0]" = "1"
register "PcieRpLtrEnable[0]" = "1"
- # Root port 9 (x2)
- # PcieRpEnable: Enable root port
- # PcieRpClkReqSupport: Enable CLKREQ#
- # PcieRpClkReqNumber: Uses SRCCLKREQ2#
- # PcieRpClkSrcNumber: Uses 3
- # PcieRpAdvancedErrorReporting: Enable Advanced Error Reporting
- # PcieRpLtrEnable: Enable Latency Tolerance Reporting Mechanism
- register "PcieRpEnable[8]" = "1"
- register "PcieRpClkReqSupport[8]" = "1"
- register "PcieRpClkReqNumber[8]" = "2"
- register "PcieRpClkSrcNumber[8]" = "3"
- register "PcieRpAdvancedErrorReporting[8]" = "1"
- register "PcieRpLtrEnable[8]" = "1"
+ # Root port 9 (x2)
+ # PcieRpEnable: Enable root port
+ # PcieRpClkReqSupport: Enable CLKREQ#
+ # PcieRpClkReqNumber: Uses SRCCLKREQ2#
+ # PcieRpClkSrcNumber: Uses 3
+ # PcieRpAdvancedErrorReporting: Enable Advanced Error Reporting
+ # PcieRpLtrEnable: Enable Latency Tolerance Reporting Mechanism
+ register "PcieRpEnable[8]" = "1"
+ register "PcieRpClkReqSupport[8]" = "1"
+ register "PcieRpClkReqNumber[8]" = "2"
+ register "PcieRpClkSrcNumber[8]" = "3"
+ register "PcieRpAdvancedErrorReporting[8]" = "1"
+ register "PcieRpLtrEnable[8]" = "1"
# USB 2.0
register "usb2_ports[0]" = "USB2_PORT_LONG(OC0)" # Type-C Port 1
@@ -306,12 +306,12 @@ chip soc/intel/skylake
register "generic.desc" = ""WCOM Digitizer""
register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E7_IRQ)"
register "generic.speed" = "I2C_SPEED_FAST_PLUS"
- register "generic.probed" = "1"
- register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_E11)"
- register "generic.reset_delay_ms" = "20"
- register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_C22)"
- register "generic.enable_delay_ms" = "1"
- register "generic.has_power_resource" = "1"
+ register "generic.probed" = "1"
+ register "generic.reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_E11)"
+ register "generic.reset_delay_ms" = "20"
+ register "generic.enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_C22)"
+ 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" = "0x1"
device i2c 0a on end
diff --git a/src/mainboard/google/sarien/variants/arcada/devicetree.cb b/src/mainboard/google/sarien/variants/arcada/devicetree.cb
index 7e4da3fff8..f22c6262fd 100644
--- a/src/mainboard/google/sarien/variants/arcada/devicetree.cb
+++ b/src/mainboard/google/sarien/variants/arcada/devicetree.cb
@@ -340,7 +340,7 @@ chip soc/intel/cannonlake
device i2c 2c on end
end
chip drivers/i2c/hid
- register "generic.hid" = ""PNP0C50""
+ register "generic.hid" = ""PNP0C50""
register "generic.desc" = ""Cirque Touchpad""
register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_B3_IRQ)"
register "generic.probed" = "1"