From ce5813fdc5d527803ab560cec5e798a04b210d3e Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 12 Aug 2021 12:45:16 -0600 Subject: mb/(amd,google): Remove spi configuration from devicetree Now that the SPI configuration has been moved into Kconfig, it is no longer needed in devicetree. BUG=b:194919326 TEST=Build & boot guybrush Signed-off-by: Martin Roth Change-Id: Ifdcd3f33173194c4a25794137756b143751edd70 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56962 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held Reviewed-by: Karthik Ramasubramanian --- src/mainboard/amd/bilby/devicetree.cb | 9 --------- src/mainboard/amd/mandolin/variants/cereme/devicetree.cb | 9 --------- src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb | 9 --------- .../google/zork/variants/baseboard/devicetree_dalboz.cb | 9 --------- .../google/zork/variants/baseboard/devicetree_trembyle.cb | 9 --------- 5 files changed, 45 deletions(-) diff --git a/src/mainboard/amd/bilby/devicetree.cb b/src/mainboard/amd/bilby/devicetree.cb index 7073aeeeac..c089d0ddc1 100644 --- a/src/mainboard/amd/bilby/devicetree.cb +++ b/src/mainboard/amd/bilby/devicetree.cb @@ -109,15 +109,6 @@ chip soc/amd/picasso register "usb_port_overcurrent_pin[4]" = "USB_OC_PIN_0" register "usb_port_overcurrent_pin[5]" = "USB_OC_PIN_0" - # SPI Configuration - register "common_config.spi_config" = "{ - .normal_speed = SPI_SPEED_33M, /* MHz */ - .fast_speed = SPI_SPEED_66M, /* MHz */ - .altio_speed = SPI_SPEED_33M, /* MHz */ - .tpm_speed = SPI_SPEED_33M, /* MHz */ - .read_mode = SPI_READ_MODE_QUAD114, - }" - # eSPI Configuration register "common_config.espi_config" = "{ .std_io_decode_bitmap = ESPI_DECODE_IO_0X60_0X64_EN, diff --git a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb index 628ba64725..dbb1a14d6d 100644 --- a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb @@ -100,15 +100,6 @@ chip soc/amd/picasso register "usb_port_overcurrent_pin[4]" = "USB_OC_PIN_0" register "usb_port_overcurrent_pin[5]" = "USB_OC_PIN_0" - # SPI Configuration - register "common_config.spi_config" = "{ - .normal_speed = SPI_SPEED_33M, /* MHz */ - .fast_speed = SPI_SPEED_66M, /* MHz */ - .altio_speed = SPI_SPEED_33M, /* MHz */ - .tpm_speed = SPI_SPEED_33M, /* MHz */ - .read_mode = SPI_READ_MODE_QUAD114, - }" - # eSPI Configuration register "common_config.espi_config" = "{ .std_io_decode_bitmap = ESPI_DECODE_IO_0X60_0X64_EN, diff --git a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb index 2aac197464..6b5a60b14f 100644 --- a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb @@ -100,15 +100,6 @@ chip soc/amd/picasso register "usb_port_overcurrent_pin[4]" = "USB_OC_PIN_0" register "usb_port_overcurrent_pin[5]" = "USB_OC_PIN_0" - # SPI Configuration - register "common_config.spi_config" = "{ - .normal_speed = SPI_SPEED_33M, /* MHz */ - .fast_speed = SPI_SPEED_66M, /* MHz */ - .altio_speed = SPI_SPEED_33M, /* MHz */ - .tpm_speed = SPI_SPEED_33M, /* MHz */ - .read_mode = SPI_READ_MODE_QUAD114, - }" - # eSPI Configuration register "common_config.espi_config" = "{ .std_io_decode_bitmap = ESPI_DECODE_IO_0X60_0X64_EN, diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb index 92ca4e30ed..f1300c6f4b 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb @@ -193,15 +193,6 @@ chip soc/amd/picasso register "usb_port_overcurrent_pin[4]" = "USB_OC_NONE" # Camera register "usb_port_overcurrent_pin[5]" = "USB_OC_NONE" # Bluetooth - # SPI Configuration - register "common_config.spi_config" = "{ - .normal_speed = SPI_SPEED_33M, /* MHz */ - .fast_speed = SPI_SPEED_66M, /* MHz */ - .altio_speed = SPI_SPEED_66M, /* MHz */ - .tpm_speed = SPI_SPEED_66M, /* MHz */ - .read_mode = SPI_READ_MODE_DUAL122, - }" - # eSPI Configuration register "common_config.espi_config" = "{ .std_io_decode_bitmap = ESPI_DECODE_IO_0x80_EN | ESPI_DECODE_IO_0X60_0X64_EN, diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb index a475202888..824a007eec 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb @@ -183,15 +183,6 @@ chip soc/amd/picasso # End RV2 USB3 phy setting - # SPI Configuration - register "common_config.spi_config" = "{ - .normal_speed = SPI_SPEED_33M, /* MHz */ - .fast_speed = SPI_SPEED_66M, /* MHz */ - .altio_speed = SPI_SPEED_66M, /* MHz */ - .tpm_speed = SPI_SPEED_66M, /* MHz */ - .read_mode = SPI_READ_MODE_DUAL122, - }" - # USB OC pin mapping register "usb_port_overcurrent_pin[0]" = "USB_OC_PIN_0" # USB C0 register "usb_port_overcurrent_pin[1]" = "USB_OC_PIN_0" # USB A0 -- cgit v1.2.3