GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Furquan Shaikh 2017-04-07 07:13:24 -07:00 committed by Furquan Shaikh
parent bc17cdef0d
commit 5bda642bcb
4 changed files with 8 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/drivers/spi/acpi/acpi.c
View File

@ -76,13 +76,15 @@ static void spi_acpi_fill_ssdt_generator(struct device *dev)
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,8 +94,7 @@ static void spi_acpi_fill_ssdt_generator(struct device *dev)
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));
return;
@ -104,23 +105,6 @@ static void spi_acpi_fill_ssdt_generator(struct device *dev)
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));

10
src/drivers/spi/spi-generic.c
View File

@ -88,16 +88,6 @@ int spi_xfer(const struct spi_slave *slave, const void *dout, size_t bytesout,
return -1;
}
int spi_get_config(const struct spi_slave *slave, struct spi_cfg *cfg)
{
const struct spi_ctrlr *ctrlr = slave->ctrlr;
if (ctrlr && ctrlr->get_config)
return ctrlr->get_config(slave, cfg);
return -1;
}
void __attribute__((weak)) spi_init(void)
{
/* Default weak implementation - do nothing. */

3
src/include/spi-generic.h
View File

@ -90,7 +90,6 @@ struct spi_cfg {
/*-----------------------------------------------------------------------
* Representation of a SPI contoller.
*
* get_config: Get configuration of SPI bus
* claim_bus: Claim SPI bus and prepare for communication.
* release_bus: Release SPI bus.
* setup: Setup given SPI device bus.
@ -98,8 +97,6 @@ struct spi_cfg {
* xfer_vector: Vector of SPI transfer operations.
*/
struct spi_ctrlr {
int (*get_config)(const struct spi_slave *slave,
struct spi_cfg *cfg);
int (*claim_bus)(const struct spi_slave *slave);
void (*release_bus)(const struct spi_slave *slave);
int (*setup)(const struct spi_slave *slave);

21
src/soc/intel/common/block/gspi/gspi.c
View File

@ -307,26 +307,6 @@ int __attribute__((weak)) gspi_get_soc_spi_cfg(unsigned int gspi_bus,
return 0;
}
static int gspi_ctrlr_get_config(const struct spi_slave *dev,
struct spi_cfg *cfg)
{
unsigned int gspi_bus;
/* Currently, only chip select 0 is supported. */
if (dev->cs != 0) {
printk(BIOS_ERR, "%s: Invalid CS value: cs=%u.\n", __func__,
dev->cs);
return -1;
}
if (gspi_soc_spi_to_gspi_bus(dev->bus, &gspi_bus)) {
printk(BIOS_ERR, "%s: Failed to find GSPI bus for SPI %u.\n",
__func__, dev->bus);
return -1;
}
return gspi_get_soc_spi_cfg(gspi_bus, cfg);
}
static int gspi_cs_assert(const struct spi_slave *dev)
{
return gspi_cs_change(dev, CS_ASSERT);
@ -627,7 +607,6 @@ static int gspi_ctrlr_xfer(const struct spi_slave *dev,
}
const struct spi_ctrlr gspi_ctrlr = {
.get_config = gspi_ctrlr_get_config,
.claim_bus = gspi_cs_assert,
.release_bus = gspi_cs_deassert,
.setup = gspi_ctrlr_setup,