dm: cros_ec_spi: Remove old pre-driver-model code

This is no-longer needed since all platforms use SPI for cros_ec.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-01-25 08:27:19 -07:00
parent 8bbb38b15f
commit b2568f0d57

View file

@ -21,14 +21,9 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_DM_CROS_EC
int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes) int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes)
{ {
struct cros_ec_dev *dev = udev->uclass_priv; struct cros_ec_dev *dev = udev->uclass_priv;
#else
int cros_ec_spi_packet(struct cros_ec_dev *dev, int out_bytes, int in_bytes)
{
#endif
struct spi_slave *slave = dev_get_parentdata(dev->dev); struct spi_slave *slave = dev_get_parentdata(dev->dev);
int rv; int rv;
@ -67,18 +62,11 @@ int cros_ec_spi_packet(struct cros_ec_dev *dev, int out_bytes, int in_bytes)
* @param din_len Maximum size of response in bytes * @param din_len Maximum size of response in bytes
* @return number of bytes in response, or -1 on error * @return number of bytes in response, or -1 on error
*/ */
#ifdef CONFIG_DM_CROS_EC
int cros_ec_spi_command(struct udevice *udev, uint8_t cmd, int cmd_version, int cros_ec_spi_command(struct udevice *udev, uint8_t cmd, int cmd_version,
const uint8_t *dout, int dout_len, const uint8_t *dout, int dout_len,
uint8_t **dinp, int din_len) uint8_t **dinp, int din_len)
{ {
struct cros_ec_dev *dev = udev->uclass_priv; struct cros_ec_dev *dev = udev->uclass_priv;
#else
int cros_ec_spi_command(struct cros_ec_dev *dev, uint8_t cmd, int cmd_version,
const uint8_t *dout, int dout_len,
uint8_t **dinp, int din_len)
{
#endif
struct spi_slave *slave = dev_get_parentdata(dev->dev); struct spi_slave *slave = dev_get_parentdata(dev->dev);
int in_bytes = din_len + 4; /* status, length, checksum, trailer */ int in_bytes = din_len + 4; /* status, length, checksum, trailer */
uint8_t *out; uint8_t *out;
@ -166,46 +154,12 @@ int cros_ec_spi_command(struct cros_ec_dev *dev, uint8_t cmd, int cmd_version,
return len; return len;
} }
#ifndef CONFIG_DM_CROS_EC static int cros_ec_probe(struct udevice *dev)
int cros_ec_spi_decode_fdt(struct cros_ec_dev *dev, const void *blob)
{
/* Decode interface-specific FDT params */
dev->max_frequency = fdtdec_get_int(blob, dev->node,
"spi-max-frequency", 500000);
dev->cs = fdtdec_get_int(blob, dev->node, "reg", 0);
return 0;
}
/**
* Initialize SPI protocol.
*
* @param dev CROS_EC device
* @param blob Device tree blob
* @return 0 if ok, -1 on error
*/
int cros_ec_spi_init(struct cros_ec_dev *dev, const void *blob)
{
int ret;
ret = spi_setup_slave_fdt(blob, dev->node, dev->parent_node,
&slave);
if (ret) {
debug("%s: Could not setup SPI slave\n", __func__);
return ret;
}
return 0;
}
#endif
#ifdef CONFIG_DM_CROS_EC
int cros_ec_probe(struct udevice *dev)
{ {
return cros_ec_register(dev); return cros_ec_register(dev);
} }
struct dm_cros_ec_ops cros_ec_ops = { static struct dm_cros_ec_ops cros_ec_ops = {
.packet = cros_ec_spi_packet, .packet = cros_ec_spi_packet,
.command = cros_ec_spi_command, .command = cros_ec_spi_command,
}; };
@ -222,4 +176,3 @@ U_BOOT_DRIVER(cros_ec_spi) = {
.probe = cros_ec_probe, .probe = cros_ec_probe,
.ops = &cros_ec_ops, .ops = &cros_ec_ops,
}; };
#endif