Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9efd3831 authored by Sergey Shcherbakov's avatar Sergey Shcherbakov Committed by David S. Miller
Browse files

net: ks8851: Added support for half-duplex SPI 



In original driver was implemented support for half-
and full-duplex modes, but it was not enabled. Instead
of it ks8851_rx_1msg method always returns "true" that
means "full-duplex" mode.

This patch replaces hard-coded functionality with
flexible solution that supports both SPI modes.

Signed-off-by: default avatarSergey Shcherbakov <shchers@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 825d2c50

drivers/net/ethernet/micrel/ks8851.c

+11 −30
Original line number Original line Diff line number Diff line
@@ -211,25 +211,6 @@ static void ks8851_wrreg8(struct ks8851_net *ks, unsigned reg, unsigned val) 
		netdev_err(ks->netdev, "spi_sync() failed\n");

		netdev_err(ks->netdev, "spi_sync() failed\n");

}

}





/**

 * ks8851_rx_1msg - select whether to use one or two messages for spi read

 * @ks: The device structure

 *

 * Return whether to generate a single message with a tx and rx buffer

 * supplied to spi_sync(), or alternatively send the tx and rx buffers

 * as separate messages.

 *

 * Depending on the hardware in use, a single message may be more efficient

 * on interrupts or work done by the driver.

 *

 * This currently always returns true until we add some per-device data passed

 * from the platform code to specify which mode is better.

 */

static inline bool ks8851_rx_1msg(struct ks8851_net *ks)

{

	return true;

}



/**

/**

 * ks8851_rdreg - issue read register command and return the data

 * ks8851_rdreg - issue read register command and return the data

 * @ks: The device state

 * @ks: The device state
@@ -251,14 +232,7 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigned op, 




	txb[0] = cpu_to_le16(op | KS_SPIOP_RD);

	txb[0] = cpu_to_le16(op | KS_SPIOP_RD);





	if (ks8851_rx_1msg(ks)) {

	if (ks->spidev->master->flags & SPI_MASTER_HALF_DUPLEX) {

		msg = &ks->spi_msg1;

		xfer = &ks->spi_xfer1;



		xfer->tx_buf = txb;

		xfer->rx_buf = trx;

		xfer->len = rxl + 2;

	} else {

		msg = &ks->spi_msg2;

		msg = &ks->spi_msg2;

		xfer = ks->spi_xfer2;

		xfer = ks->spi_xfer2;
@@ -270,15 +244,22 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigned op, 
		xfer->tx_buf = NULL;

		xfer->tx_buf = NULL;

		xfer->rx_buf = trx;

		xfer->rx_buf = trx;

		xfer->len = rxl;

		xfer->len = rxl;

	} else {

		msg = &ks->spi_msg1;

		xfer = &ks->spi_xfer1;



		xfer->tx_buf = txb;

		xfer->rx_buf = trx;

		xfer->len = rxl + 2;

	}

	}





	ret = spi_sync(ks->spidev, msg);

	ret = spi_sync(ks->spidev, msg);

	if (ret < 0)

	if (ret < 0)

		netdev_err(ks->netdev, "read: spi_sync() failed\n");

		netdev_err(ks->netdev, "read: spi_sync() failed\n");

	else if (ks8851_rx_1msg(ks))

	else if (ks->spidev->master->flags & SPI_MASTER_HALF_DUPLEX)

		memcpy(rxb, trx + 2, rxl);

	else

		memcpy(rxb, trx, rxl);

		memcpy(rxb, trx, rxl);

	else

		memcpy(rxb, trx + 2, rxl);

}

}





/**

/**