drivers/spi: Get rid of spi_get_config
There is only one user for spi_get_config i.e. SPI ACPI. Also, the
values provided by spi_get_config are constant for now. Thus, get rid
of the spi_get_config call and fill in these constant values in SPI
ACPI code itself. If there is a need in the future to change these,
appropriate device-tree configs can be added.
BUG=b:36873582
Change-Id: Ied38e2670784ee3317bb12e542666c224bd9e819
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/19203
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c
index 028a37c..102780f 100644
--- a/src/drivers/spi/acpi/acpi.c
+++ b/src/drivers/spi/acpi/acpi.c
@@ -76,13 +76,15 @@
struct drivers_spi_acpi_config *config = dev->chip_info;
const char *scope = acpi_device_scope(dev);
const char *path = acpi_device_path(dev);
- struct spi_cfg spi_cfg;
- struct spi_slave slave;
- int bus = -1, cs = dev->path.spi.cs;
struct acpi_spi spi = {
- .device_select = cs,
+ .device_select = dev->path.spi.cs,
.speed = config->speed ? : 1 * MHz,
.resource = scope,
+ .device_select_polarity = SPI_POLARITY_LOW,
+ .wire_mode = SPI_4_WIRE_MODE,
+ .data_bit_length = 8,
+ .clock_phase = SPI_CLOCK_PHASE_FIRST,
+ .clock_polarity = SPI_POLARITY_LOW,
};
int curr_index = 0;
int irq_gpio_index = -1;
@@ -92,10 +94,9 @@
if (!dev->enabled || !scope)
return;
- bus = spi_acpi_get_bus(dev);
- if (bus == -1) {
+ if (spi_acpi_get_bus(dev) == -1) {
printk(BIOS_ERR, "%s: ERROR: Cannot get bus for device.\n",
- dev_path(dev));
+ dev_path(dev));
return;
}
@@ -104,23 +105,6 @@
return;
}
- if (spi_setup_slave(bus, cs, &slave)) {
- printk(BIOS_ERR, "%s: ERROR: SPI setup failed.\n",
- dev_path(dev));
- return;
- }
-
- if (spi_get_config(&slave, &spi_cfg)) {
- printk(BIOS_ERR, "%s: ERROR: SPI get config failed.\n",
- dev_path(dev));
- return;
- }
-
- spi.device_select_polarity = spi_cfg.cs_polarity;
- spi.wire_mode = spi_cfg.wire_mode;
- spi.data_bit_length = spi_cfg.data_bit_length;
- spi.clock_phase = spi_cfg.clk_phase;
-
/* Device */
acpigen_write_scope(scope);
acpigen_write_device(acpi_device_name(dev));