diff options
Diffstat (limited to 'src/mainboard/google/volteer')
4 files changed, 51 insertions, 51 deletions
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb index 4775b0fac5..5dfc69c271 100644 --- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb @@ -93,29 +93,6 @@ chip soc/intel/tigerlake register "tcss_ports[0]" = "TCSS_PORT_DEFAULT(OC3)" register "tcss_ports[1]" = "TCSS_PORT_DEFAULT(OC0)" - # NVMe PCIE 9 using clk 0 - register "PcieRpLtrEnable[8]" = "1" - register "PcieClkSrcUsage[0]" = "8" - register "PcieClkSrcClkReq[0]" = "0" - register "PcieRpSlotImplemented[8]" = "1" - - # Optane PCIE 11 using clk 0 - register "PcieRpLtrEnable[10]" = "1" - register "HybridStorageMode" = "0" - register "PcieRpSlotImplemented[10]" = "1" - - # SD Card PCIE 8 using clk 3 - register "PcieRpLtrEnable[7]" = "1" - register "PcieRpHotPlug[7]" = "1" - register "PcieClkSrcUsage[3]" = "7" - register "PcieClkSrcClkReq[3]" = "3" - - # WLAN PCIE 7 using clk 1 - register "PcieRpLtrEnable[6]" = "1" - register "PcieClkSrcUsage[1]" = "6" - register "PcieClkSrcClkReq[1]" = "1" - register "PcieRpSlotImplemented[6]" = "1" - # Mark SRCCLKREQ pins as unused that are routed for a Non-Clkreq functionality register "PcieClkSrcUsage[2]" = "PCIE_CLK_NOTUSED" register "PcieClkSrcUsage[4]" = "PCIE_CLK_NOTUSED" @@ -450,8 +427,20 @@ chip soc/intel/tigerlake register "SataPortsDevSlp[1]" = "1" register "SataPortsEnableDitoConfig[1]" = "1" end - device ref pcie_rp7 on end + device ref pcie_rp7 on + # WLAN PCIE 7 using clk 1 + register "PcieRpLtrEnable[6]" = "1" + register "PcieClkSrcUsage[1]" = "6" + register "PcieClkSrcClkReq[1]" = "1" + register "PcieRpSlotImplemented[6]" = "1" + end device ref pcie_rp8 on + # SD Card PCIE 8 using clk 3 + register "PcieRpLtrEnable[7]" = "1" + register "PcieRpHotPlug[7]" = "1" + register "PcieClkSrcUsage[3]" = "7" + register "PcieClkSrcClkReq[3]" = "3" + probe DB_SD SD_GL9755S probe DB_SD SD_RTS5261 probe DB_SD SD_RTS5227S @@ -477,8 +466,19 @@ chip soc/intel/tigerlake end end end - device ref pcie_rp9 on end - device ref pcie_rp11 on end + device ref pcie_rp9 on + # NVMe PCIE 9 using clk 0 + register "PcieRpLtrEnable[8]" = "1" + register "PcieClkSrcUsage[0]" = "8" + register "PcieClkSrcClkReq[0]" = "0" + register "PcieRpSlotImplemented[8]" = "1" + end + device ref pcie_rp11 on + # Optane PCIE 11 using clk 0 + register "PcieRpLtrEnable[10]" = "1" + register "HybridStorageMode" = "0" + register "PcieRpSlotImplemented[10]" = "1" + end device ref uart0 on end device ref gspi0 on chip drivers/spi/acpi diff --git a/src/mainboard/google/volteer/variants/chronicler/overridetree.cb b/src/mainboard/google/volteer/variants/chronicler/overridetree.cb index fc5d6ab063..09fc980d40 100644 --- a/src/mainboard/google/volteer/variants/chronicler/overridetree.cb +++ b/src/mainboard/google/volteer/variants/chronicler/overridetree.cb @@ -5,12 +5,6 @@ chip soc/intel/tigerlake register "DdiPort2Hpd" = "0" register "typec_aux_bias_pads[0]" = "{.pad_auxp_dc = GPP_E10, .pad_auxn_dc = GPP_E13}" - # EMMC PCIE 5 using clk 5 - register "PcieRpLtrEnable[4]" = "1" - register "PcieRpHotPlug[4]" = "1" - register "PcieClkSrcUsage[5]" = "4" - register "PcieClkSrcClkReq[5]" = "5" - #+-------------------+---------------------------+ #| Field | Value | #+-------------------+---------------------------+ @@ -274,7 +268,13 @@ chip soc/intel/tigerlake device generic 0 on end end end - device ref pcie_rp5 on end + device ref pcie_rp5 on + # EMMC PCIE 5 using clk 5 + register "PcieRpLtrEnable[4]" = "1" + register "PcieRpHotPlug[4]" = "1" + register "PcieClkSrcUsage[5]" = "4" + register "PcieClkSrcClkReq[5]" = "5" + end device ref pmc hidden # The pmc_mux chip driver is a placeholder for the # PMC.MUX device in the ACPI hierarchy. diff --git a/src/mainboard/google/volteer/variants/elemi/overridetree.cb b/src/mainboard/google/volteer/variants/elemi/overridetree.cb index 5eef9ef177..7fa38bf6fd 100644 --- a/src/mainboard/google/volteer/variants/elemi/overridetree.cb +++ b/src/mainboard/google/volteer/variants/elemi/overridetree.cb @@ -5,12 +5,6 @@ chip soc/intel/tigerlake register "DdiPort2Hpd" = "0" register "typec_aux_bias_pads[0]" = "{.pad_auxp_dc = GPP_E10, .pad_auxn_dc = GPP_E13}" - # EMMC PCIE 5 using clk 5 - register "PcieRpLtrEnable[4]" = "1" - register "PcieRpHotPlug[4]" = "1" - register "PcieClkSrcUsage[5]" = "4" - register "PcieClkSrcClkReq[5]" = "5" - #+-------------------+---------------------------+ #| Field | Value | #+-------------------+---------------------------+ @@ -275,7 +269,13 @@ chip soc/intel/tigerlake device generic 0 on end end end - device ref pcie_rp5 on end + device ref pcie_rp5 on + # EMMC PCIE 5 using clk 5 + register "PcieRpLtrEnable[4]" = "1" + register "PcieRpHotPlug[4]" = "1" + register "PcieClkSrcUsage[5]" = "4" + register "PcieClkSrcClkReq[5]" = "5" + end device ref pmc hidden # The pmc_mux chip driver is a placeholder for the # PMC.MUX device in the ACPI hierarchy. diff --git a/src/mainboard/google/volteer/variants/voema/overridetree.cb b/src/mainboard/google/volteer/variants/voema/overridetree.cb index 97160ee269..d895b1a938 100644 --- a/src/mainboard/google/volteer/variants/voema/overridetree.cb +++ b/src/mainboard/google/volteer/variants/voema/overridetree.cb @@ -8,16 +8,6 @@ chip soc/intel/tigerlake register "TcssAuxOri" = "1" register "typec_aux_bias_pads[0]" = "{.pad_auxp_dc = GPP_E10, .pad_auxn_dc = GPP_E13}" - # Disable WLAN PCIE 7 - register "PcieRpLtrEnable[6]" = "0" - register "PcieClkSrcUsage[1]" = "PCIE_CLK_NOTUSED" - register "PcieRpSlotImplemented[6]" = "1" - - # Disable SD Card PCIE 8 - register "PcieRpLtrEnable[7]" = "0" - register "PcieRpHotPlug[7]" = "0" - register "PcieClkSrcUsage[3]" = "PCIE_CLK_NOTUSED" - device domain 0 on device ref ipu on end # IPU device ref i2c0 on @@ -97,8 +87,18 @@ chip soc/intel/tigerlake probe AUDIO MAX98360_ALC5682I_I2S probe AUDIO RT1011_ALC5682I_I2S end - device ref pcie_rp7 off end + + device ref pcie_rp7 off + # Disable WLAN PCIE 7 + register "PcieRpLtrEnable[6]" = "0" + register "PcieClkSrcUsage[1]" = "PCIE_CLK_NOTUSED" + register "PcieRpSlotImplemented[6]" = "1" + end device ref pcie_rp8 off + # Disable SD Card PCIE 8 + register "PcieRpLtrEnable[7]" = "0" + register "PcieRpHotPlug[7]" = "0" + register "PcieClkSrcUsage[3]" = "PCIE_CLK_NOTUSED" # override-devicetree rules say it's only # the same device if it has the same probes: probe DB_SD SD_GL9755S |