Change in coreboot[master]: mb/google/poppy/var/nautilus: Relocate devicetree FSP settings
Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43879 )
Change subject: mb/google/poppy/var/nautilus: Relocate devicetree FSP settings ......................................................................
mb/google/poppy/var/nautilus: Relocate devicetree FSP settings
Also drop some redundant comments about these settings.
Tested with BUILD_TIMELESS=1, its coreboot.rom does not change.
Change-Id: Ic1a0c3d3013718d832f6afafc59fe1cae210403c Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/google/poppy/variants/nautilus/devicetree.cb 1 file changed, 106 insertions(+), 110 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/43879/1
diff --git a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb index 7812646..1a8cdb0 100644 --- a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb +++ b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb @@ -32,26 +32,12 @@
# FSP Configuration register "ProbelessTrace" = "0" - register "EnableLan" = "0" - register "EnableSata" = "0" - register "SataSalpSupport" = "0" - register "SataMode" = "0" - register "SataPortsEnable[0]" = "0" - register "EnableAzalia" = "1" register "DspEnable" = "1" register "IoBufferOwnership" = "3" - register "EnableTraceHub" = "0" register "SsicPortEnable" = "0" - register "SmbusEnable" = "1" register "Cio2Enable" = "1" - register "SaImguEnable" = "1" - register "ScsEmmcEnabled" = "1" - register "ScsEmmcHs400Enabled" = "1" - register "ScsSdCardEnabled" = "2" register "PttSwitch" = "0" register "SkipExtGfxScan" = "1" - register "Device4Enable" = "1" - register "HeciEnabled" = "0" register "SaGv" = "3" register "PmConfigSlpS3MinAssert" = "2" # 50ms register "PmConfigSlpS4MinAssert" = "1" # 1s @@ -144,19 +130,6 @@ .dc_loadline = 420, }"
- # Enable Root port 1. - register "PcieRpEnable[0]" = "1" - # Enable CLKREQ# - 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, Enable Advanced Error Reporting - register "PcieRpAdvancedErrorReporting[0]" = "1" - # RP 1, Enable Latency Tolerance Reporting Mechanism - register "PcieRpLtrEnable[0]" = "1" - register "usb2_ports[0]" = "USB2_PORT_LONG(OC1)" # Type-C Port 1 register "usb2_ports[1]" = "USB2_PORT_SHORT(OC2)" # Type-A Port register "usb2_ports[2]" = "USB2_PORT_SHORT(OC_SKIP)" # Bluetooth @@ -187,82 +160,9 @@ #+-------------------+---------------------------+ register "common_soc_config" = "{ .chipset_lockdown = CHIPSET_LOCKDOWN_COREBOOT, - .i2c[0] = { - .speed = I2C_SPEED_FAST, - .speed_config[0] = { - .speed = I2C_SPEED_FAST, - .scl_lcnt = 180, - .scl_hcnt = 90, - .sda_hold = 36, - }, - }, - .i2c[1] = { - .early_init = 1, - .speed = I2C_SPEED_FAST, - .speed_config[0] = { - .speed = I2C_SPEED_FAST, - .scl_lcnt = 185, - .scl_hcnt = 90, - .sda_hold = 36, - }, - }, - .i2c[2] = { - .speed = I2C_SPEED_FAST, - .speed_config[0] = { - .speed = I2C_SPEED_FAST, - .scl_lcnt = 190, - .scl_hcnt = 100, - .sda_hold = 36, - }, - }, - .i2c[3] = { - .speed = I2C_SPEED_FAST, - .speed_config[0] = { - .speed = I2C_SPEED_FAST, - .scl_lcnt = 185, - .scl_hcnt = 90, - .sda_hold = 36, - }, - }, - .i2c[4] = { - .speed = I2C_SPEED_FAST, - .speed_config[0] = { - .speed = I2C_SPEED_FAST, - .scl_lcnt = 190, - .scl_hcnt = 100, - .sda_hold = 36, - }, - }, - .i2c[5] = { - .speed = I2C_SPEED_FAST, - .speed_config[0] = { - .speed = I2C_SPEED_FAST, - .scl_lcnt = 190, - .scl_hcnt = 100, - .sda_hold = 36, - }, - }, .pch_thermal_trip = 75, }"
- # Touch Screen - register "i2c_voltage[0]" = "I2C_VOLTAGE_3V3" - - # H1 - register "i2c_voltage[1]" = "I2C_VOLTAGE_3V3" - - # Trackpad - register "i2c_voltage[2]" = "I2C_VOLTAGE_1V8" - - # Pen - register "i2c_voltage[3]" = "I2C_VOLTAGE_1V8" - - # Camera - register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" - - # Audio - register "i2c_voltage[5]" = "I2C_VOLTAGE_1V8" - # Must leave UART0 enabled or SD/eMMC will not work as PCI register "SerialIoDevMode" = "{ [PchSerialIoIndexI2C0] = PchSerialIoPci, @@ -286,19 +186,33 @@ }" register "tcc_offset" = "10" # TCC of 90C
- # Use default SD card detect GPIO configuration - register "sdcard_cd_gpio_default" = "GPP_E15" - device cpu_cluster 0 on device lapic 0 on end end device domain 0 on device pci 00.0 on end # Host Bridge device pci 02.0 on end # Integrated Graphics Device + + # FIXME: corresponding device entry is missing + register "Device4Enable" = "1" + + # FIXME: corresponding device entry is missing + register "SaImguEnable" = "1" + device pci 14.0 on end # USB xHCI device pci 14.1 on end # USB xDCI (OTG) device pci 14.2 on end # Thermal Subsystem device pci 15.0 on + register "i2c_voltage[0]" = "I2C_VOLTAGE_3V3" + register "common_soc_config.i2c[0]" = "{ + .speed = I2C_SPEED_FAST, + .speed_config[0] = { + .speed = I2C_SPEED_FAST, + .scl_lcnt = 180, + .scl_hcnt = 90, + .sda_hold = 36, + }, + }" chip drivers/i2c/hid register "generic.hid" = ""SYTS7813"" register "generic.desc" = ""Synaptics Touchscreen"" @@ -313,6 +227,17 @@ end end # I2C #0 device pci 15.1 on + register "i2c_voltage[1]" = "I2C_VOLTAGE_3V3" + register "common_soc_config.i2c[1]" = "{ + .early_init = 1, + .speed = I2C_SPEED_FAST, + .speed_config[0] = { + .speed = I2C_SPEED_FAST, + .scl_lcnt = 185, + .scl_hcnt = 90, + .sda_hold = 36, + }, + }" chip drivers/i2c/tpm register "hid" = ""GOOG0005"" register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_E0_IRQ)" @@ -320,6 +245,16 @@ end end # I2C #1 device pci 15.2 on + register "i2c_voltage[2]" = "I2C_VOLTAGE_1V8" + register "common_soc_config.i2c[2]" = "{ + .speed = I2C_SPEED_FAST, + .speed_config[0] = { + .speed = I2C_SPEED_FAST, + .scl_lcnt = 190, + .scl_hcnt = 100, + .sda_hold = 36, + }, + }" chip drivers/i2c/generic register "hid" = ""STH9321"" register "name" = ""SEMTECH SX9321"" @@ -330,6 +265,16 @@ end end # I2C #2 device pci 15.3 on + register "i2c_voltage[3]" = "I2C_VOLTAGE_1V8" + register "common_soc_config.i2c[3]" = "{ + .speed = I2C_SPEED_FAST, + .speed_config[0] = { + .speed = I2C_SPEED_FAST, + .scl_lcnt = 185, + .scl_hcnt = 90, + .sda_hold = 36, + }, + }" chip drivers/i2c/hid register "generic.hid" = ""ACPI0C50"" register "generic.cid" = ""PNP0C50"" @@ -353,14 +298,33 @@ device generic 0 on end end end # I2C #3 - device pci 16.0 on end # Management Engine Interface 1 + device pci 16.0 on # Management Engine Interface 1 + + # FIXME: does not match devicetree! + register "HeciEnabled" = "0" + end device pci 16.1 off end # Management Engine Interface 2 device pci 16.2 off end # Management Engine IDE-R device pci 16.3 off end # Management Engine KT Redirection device pci 16.4 off end # Management Engine Interface 3 - device pci 17.0 off end # SATA + device pci 17.0 off # SATA + register "EnableSata" = "0" + register "SataSalpSupport" = "0" + register "SataMode" = "0" + register "SataPortsEnable[0]" = "0" + end device pci 19.0 on end # UART #2 device pci 19.1 on + register "i2c_voltage[5]" = "I2C_VOLTAGE_1V8" + register "common_soc_config.i2c[5]" = "{ + .speed = I2C_SPEED_FAST, + .speed_config[0] = { + .speed = I2C_SPEED_FAST, + .scl_lcnt = 190, + .scl_hcnt = 100, + .sda_hold = 36, + }, + }" chip drivers/generic/max98357a register "hid" = ""MX98357A"" register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A23)" @@ -386,6 +350,16 @@ end end # I2C #5 device pci 19.2 on + register "i2c_voltage[4]" = "I2C_VOLTAGE_1V8" + register "common_soc_config.i2c[4]" = "{ + .speed = I2C_SPEED_FAST, + .speed_config[0] = { + .speed = I2C_SPEED_FAST, + .scl_lcnt = 190, + .scl_hcnt = 100, + .sda_hold = 36, + }, + }" chip drivers/i2c/generic register "hid" = ""ELAN0000"" register "desc" = ""ELAN Touchpad"" @@ -395,6 +369,12 @@ end end # I2C #4 device pci 1c.0 on + register "PcieRpEnable[0]" = "1" + register "PcieRpClkReqSupport[0]" = "1" + register "PcieRpClkReqNumber[0]" = "1" + register "PcieRpClkSrcNumber[0]" = "1" + register "PcieRpAdvancedErrorReporting[0]" = "1" + register "PcieRpLtrEnable[0]" = "1" chip drivers/intel/wifi register "wake" = "GPE0_DW0_00" device pci 00.0 on end @@ -415,9 +395,17 @@ device pci 1e.1 off end # UART #1 device pci 1e.2 off end # GSPI #0 device pci 1e.3 off end # GSPI #1 - device pci 1e.4 on end # eMMC + device pci 1e.4 on # eMMC + register "ScsEmmcEnabled" = "1" + register "ScsEmmcHs400Enabled" = "1" + end device pci 1e.5 off end # SDIO - device pci 1e.6 on end # SDCard + device pci 1e.6 on # SDCard + register "ScsSdCardEnabled" = "2" + + # Use default SD card detect GPIO configuration + register "sdcard_cd_gpio_default" = "GPP_E15" + end device pci 1f.0 on chip ec/google/chromeec device pnp 0c09.0 on end @@ -425,9 +413,17 @@ end # LPC Interface device pci 1f.1 on end # P2SB device pci 1f.2 on end # Power Management Controller - device pci 1f.3 on end # Intel HDA - device pci 1f.4 on end # SMBus + device pci 1f.3 on # Intel HDA + register "EnableAzalia" = "1" + end + device pci 1f.4 on # SMBus + register "SmbusEnable" = "1" + end device pci 1f.5 on end # PCH SPI - device pci 1f.6 off end # GbE + device pci 1f.6 off # GbE + register "EnableLan" = "0" + end + + register "EnableTraceHub" = "0" end end
Angel Pons has uploaded a new patch set (#2). ( https://review.coreboot.org/c/coreboot/+/43879 )
Change subject: mb/google/poppy/var/nautilus: Relocate devicetree FSP settings ......................................................................
mb/google/poppy/var/nautilus: Relocate devicetree FSP settings
Also drop some redundant comments about these settings.
Tested with BUILD_TIMELESS=1, its coreboot.rom does not change.
Change-Id: Ic1a0c3d3013718d832f6afafc59fe1cae210403c Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/google/poppy/variants/nautilus/devicetree.cb 1 file changed, 106 insertions(+), 126 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/43879/2
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43879 )
Change subject: mb/google/poppy/var/nautilus: Relocate devicetree FSP settings ......................................................................
Patch Set 2: Code-Review+2
Hello build bot (Jenkins), Michael Niewöhner,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/43879
to look at the new patch set (#3).
Change subject: mb/google/poppy/var/nautilus: Relocate devicetree settings ......................................................................
mb/google/poppy/var/nautilus: Relocate devicetree settings
Also drop some redundant comments about these settings.
Tested with BUILD_TIMELESS=1, its coreboot.rom does not change.
Change-Id: Ic1a0c3d3013718d832f6afafc59fe1cae210403c Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/google/poppy/variants/nautilus/devicetree.cb 1 file changed, 106 insertions(+), 126 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/43879/3
Angel Pons has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/43879 )
Change subject: mb/google/poppy/var/nautilus: Relocate devicetree settings ......................................................................
Abandoned
-
Angel Pons (Code Review) -
Michael Niewöhner (Code Review)