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

Commit b30f8bdc authored by Ben Dooks's avatar Ben Dooks Committed by David S. Miller
Browse files

eeprom_93cx6: Add data direction control. 



Some devices need to know if the data is to be output or read, so add a
data direction into the eeprom structure to tell the driver whether the
data line should be driven.

The user in this case is the Micrel KS8851 which has a direction
control for the EEPROM data line and thus needs to know whether
to drive it (writing) or to tristate it for receiving.

Signed-off-by: default avatarBen Dooks <ben@simtec.co.uk>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9008ee9

drivers/misc/eeprom/eeprom_93cx6.c

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static void eeprom_93cx6_startup(struct eeprom_93cx6 *eeprom) 
	eeprom->reg_data_out = 0;

	eeprom->reg_data_clock = 0;

	eeprom->reg_chip_select = 1;

	eeprom->drive_data = 1;

	eeprom->register_write(eeprom);



	/*
@@ -101,6 +102,7 @@ static void eeprom_93cx6_write_bits(struct eeprom_93cx6 *eeprom, 
	 */

	eeprom->reg_data_in = 0;

	eeprom->reg_data_out = 0;

	eeprom->drive_data = 1;



	/*

	 * Start writing all bits.
@@ -140,6 +142,7 @@ static void eeprom_93cx6_read_bits(struct eeprom_93cx6 *eeprom, 
	 */

	eeprom->reg_data_in = 0;

	eeprom->reg_data_out = 0;

	eeprom->drive_data = 0;



	/*

	 * Start reading all bits.

include/linux/eeprom_93cx6.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
 * @register_write(struct eeprom_93cx6 *eeprom): handler to

 * write to the eeprom register by using all reg_* fields.

 * @width: eeprom width, should be one of the PCI_EEPROM_WIDTH_* defines

 * @drive_data: Set if we're driving the data line.

 * @reg_data_in: register field to indicate data input

 * @reg_data_out: register field to indicate data output

 * @reg_data_clock: register field to set the data clock
@@ -62,6 +63,7 @@ struct eeprom_93cx6 { 


	int width;



	char drive_data;

	char reg_data_in;

	char reg_data_out;

	char reg_data_clock;