From 74fbeec8a6d44f1815f88f9dbeb1193444ce1087 Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@queued.net>
Date: Fri, 2 May 2008 13:41:58 -0700
Subject: [PATCH] --- yaml --- r: 107223 b: refs/heads/master c:
 d7eb9e36c42504e87c7d92dd5c05cb6f2cf74d28 h: refs/heads/master i:   107221:
 4e950db51f60269e9fd9293b9aa691831d6141bd   107219:
 6353a837ecd31c74a1a8ca87db4709b7540d4f91   107215:
 4dcab676edf6ab6c5dafdc56c22c68bed752f84f v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/power/olpc_battery.c | 49 ++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 10ba21bc2bb8..c1f909b796d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ca5b9d2183f11bb8b69e04b19a7faf7f600a840
+refs/heads/master: d7eb9e36c42504e87c7d92dd5c05cb6f2cf74d28
diff --git a/trunk/drivers/power/olpc_battery.c b/trunk/drivers/power/olpc_battery.c
index 7524a63a54cb..f8dc2b18bb49 100644
--- a/trunk/drivers/power/olpc_battery.c
+++ b/trunk/drivers/power/olpc_battery.c
@@ -274,6 +274,48 @@ static enum power_supply_property olpc_bat_props[] = {
 	POWER_SUPPLY_PROP_SERIAL_NUMBER,
 };
 
+/* EEPROM reading goes completely around the power_supply API, sadly */
+
+#define EEPROM_START	0x20
+#define EEPROM_END	0x80
+#define EEPROM_SIZE	(EEPROM_END - EEPROM_START)
+
+static ssize_t olpc_bat_eeprom_read(struct kobject *kobj,
+		struct bin_attribute *attr, char *buf, loff_t off, size_t count)
+{
+	uint8_t ec_byte;
+	int ret, end;
+
+	if (off >= EEPROM_SIZE)
+		return 0;
+	if (off + count > EEPROM_SIZE)
+		count = EEPROM_SIZE - off;
+
+	end = EEPROM_START + off + count;
+	for (ec_byte = EEPROM_START + off; ec_byte < end; ec_byte++) {
+		ret = olpc_ec_cmd(EC_BAT_EEPROM, &ec_byte, 1,
+				&buf[ec_byte - EEPROM_START], 1);
+		if (ret) {
+			printk(KERN_ERR "olpc-battery:  EC command "
+					"EC_BAT_EEPROM @ 0x%x failed -"
+					" %d!\n", ec_byte, ret);
+			return -EIO;
+		}
+	}
+
+	return count;
+}
+
+static struct bin_attribute olpc_bat_eeprom = {
+	.attr = {
+		.name = "eeprom",
+		.mode = S_IRUGO,
+		.owner = THIS_MODULE,
+	},
+	.size = 0,
+	.read = olpc_bat_eeprom_read,
+};
+
 /*********************************************************************
  *		Initialisation
  *********************************************************************/
@@ -327,8 +369,14 @@ static int __init olpc_bat_init(void)
 	if (ret)
 		goto battery_failed;
 
+	ret = device_create_bin_file(olpc_bat.dev, &olpc_bat_eeprom);
+	if (ret)
+		goto eeprom_failed;
+
 	goto success;
 
+eeprom_failed:
+	power_supply_unregister(&olpc_bat);
 battery_failed:
 	power_supply_unregister(&olpc_ac);
 ac_failed:
@@ -339,6 +387,7 @@ static int __init olpc_bat_init(void)
 
 static void __exit olpc_bat_exit(void)
 {
+	device_remove_bin_file(olpc_bat.dev, &olpc_bat_eeprom);
 	power_supply_unregister(&olpc_bat);
 	power_supply_unregister(&olpc_ac);
 	platform_device_unregister(bat_pdev);