aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBen Dooks <ben@simtec.co.uk>2011-11-21 03:57:56 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-26 14:59:38 -0500
commitb30f8bdcfa7dd05f4268348f3388ff903132f28e (patch)
tree6781a42fe2cfe8eacc2ba981cab8cec594f7bfef /drivers
parente9008ee99c77207b2f6aee67e5f849b1e1400a11 (diff)
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: Ben Dooks <ben@simtec.co.uk> Cc: Wolfram Sang <w.sang@pengutronix.de> Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/eeprom/eeprom_93cx6.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/misc/eeprom/eeprom_93cx6.c b/drivers/misc/eeprom/eeprom_93cx6.c
index 7b33de95c4bf..a6037af6f076 100644
--- a/drivers/misc/eeprom/eeprom_93cx6.c
+++ b/drivers/misc/eeprom/eeprom_93cx6.c
@@ -63,6 +63,7 @@ static void eeprom_93cx6_startup(struct eeprom_93cx6 *eeprom)
63 eeprom->reg_data_out = 0; 63 eeprom->reg_data_out = 0;
64 eeprom->reg_data_clock = 0; 64 eeprom->reg_data_clock = 0;
65 eeprom->reg_chip_select = 1; 65 eeprom->reg_chip_select = 1;
66 eeprom->drive_data = 1;
66 eeprom->register_write(eeprom); 67 eeprom->register_write(eeprom);
67 68
68 /* 69 /*
@@ -101,6 +102,7 @@ static void eeprom_93cx6_write_bits(struct eeprom_93cx6 *eeprom,
101 */ 102 */
102 eeprom->reg_data_in = 0; 103 eeprom->reg_data_in = 0;
103 eeprom->reg_data_out = 0; 104 eeprom->reg_data_out = 0;
105 eeprom->drive_data = 1;
104 106
105 /* 107 /*
106 * Start writing all bits. 108 * Start writing all bits.
@@ -140,6 +142,7 @@ static void eeprom_93cx6_read_bits(struct eeprom_93cx6 *eeprom,
140 */ 142 */
141 eeprom->reg_data_in = 0; 143 eeprom->reg_data_in = 0;
142 eeprom->reg_data_out = 0; 144 eeprom->reg_data_out = 0;
145 eeprom->drive_data = 0;
143 146
144 /* 147 /*
145 * Start reading all bits. 148 * Start reading all bits.