mfd: rave-sp: Emulate CMD_GET_STATUS on device that don't support it

CMD_GET_STATUS is not supported by some devices implementing
RDU2-compatible ICD as well as "legacy" devices. To account for that
fact, add code that obtains the same information (app/bootloader FW
version) using several different commands.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c
index eee62ba..2a83696 100644 (file)
--- a/drivers/mfd/rave-sp.c
+++ b/drivers/mfd/rave-sp.c
@@ -117,14 +117,44 @@ struct rave_sp_checksum {
        void (*subroutine)(const u8 *, size_t, u8 *);
 };
 
+struct rave_sp_version {
+       u8     hardware;
+       __le16 major;
+       u8     minor;
+       u8     letter[2];
+} __packed;
+
+struct rave_sp_status {
+       struct rave_sp_version bootloader_version;
+       struct rave_sp_version firmware_version;
+       u16 rdu_eeprom_flag;
+       u16 dds_eeprom_flag;
+       u8  pic_flag;
+       u8  orientation;
+       u32 etc;
+       s16 temp[2];
+       u8  backlight_current[3];
+       u8  dip_switch;
+       u8  host_interrupt;
+       u16 voltage_28;
+       u8  i2c_device_status;
+       u8  power_status;
+       u8  general_status;
+       u8  deprecated1;
+       u8  power_led_status;
+       u8  deprecated2;
+       u8  periph_power_shutoff;
+} __packed;
+
 /**
  * struct rave_sp_variant_cmds - Variant specific command routines
  *
  * @translate: Generic to variant specific command mapping routine
- *
+ * @get_status: Variant specific implementation of CMD_GET_STATUS
  */
 struct rave_sp_variant_cmds {
        int (*translate)(enum rave_sp_command);
+       int (*get_status)(struct rave_sp *sp, struct rave_sp_status *);
 };
 
 /**
@@ -170,35 +200,6 @@ struct rave_sp {
        const char *part_number_bootloader;
 };
 
-struct rave_sp_version {
-       u8     hardware;
-       __le16 major;
-       u8     minor;
-       u8     letter[2];
-} __packed;
-
-struct rave_sp_status {
-       struct rave_sp_version bootloader_version;
-       struct rave_sp_version firmware_version;
-       u16 rdu_eeprom_flag;
-       u16 dds_eeprom_flag;
-       u8  pic_flag;
-       u8  orientation;
-       u32 etc;
-       s16 temp[2];
-       u8  backlight_current[3];
-       u8  dip_switch;
-       u8  host_interrupt;
-       u16 voltage_28;
-       u8  i2c_device_status;
-       u8  power_status;
-       u8  general_status;
-       u8  deprecated1;
-       u8  power_led_status;
-       u8  deprecated2;
-       u8  periph_power_shutoff;
-} __packed;
-
 static bool rave_sp_id_is_event(u8 code)
 {
        return (code & 0xF0) == RAVE_SP_EVNT_BASE;
@@ -660,18 +661,44 @@ static const char *devm_rave_sp_version(struct device *dev,
                              version->letter[1]);
 }
 
-static int rave_sp_get_status(struct rave_sp *sp)
+static int rave_sp_rdu1_get_status(struct rave_sp *sp,
+                                  struct rave_sp_status *status)
 {
-       struct device *dev = &sp->serdev->dev;
        u8 cmd[] = {
                [0] = RAVE_SP_CMD_STATUS,
                [1] = 0
        };
+
+       return rave_sp_exec(sp, cmd, sizeof(cmd), status, sizeof(*status));
+}
+
+static int rave_sp_emulated_get_status(struct rave_sp *sp,
+                                      struct rave_sp_status *status)
+{
+       u8 cmd[] = {
+               [0] = RAVE_SP_CMD_GET_FIRMWARE_VERSION,
+               [1] = 0,
+       };
+       int ret;
+
+       ret = rave_sp_exec(sp, cmd, sizeof(cmd), &status->firmware_version,
+                          sizeof(status->firmware_version));
+       if (ret)
+               return ret;
+
+       cmd[0] = RAVE_SP_CMD_GET_BOOTLOADER_VERSION;
+       return rave_sp_exec(sp, cmd, sizeof(cmd), &status->bootloader_version,
+                           sizeof(status->bootloader_version));
+}
+
+static int rave_sp_get_status(struct rave_sp *sp)
+{
+       struct device *dev = &sp->serdev->dev;
        struct rave_sp_status status;
        const char *version;
        int ret;
 
-       ret = rave_sp_exec(sp, cmd, sizeof(cmd), &status, sizeof(status));
+       ret = sp->variant->cmd.get_status(sp, &status);
        if (ret)
                return ret;
 
@@ -704,6 +731,7 @@ static const struct rave_sp_variant rave_sp_legacy = {
        .checksum = &rave_sp_checksum_ccitt,
        .cmd = {
                .translate = rave_sp_default_cmd_translate,
+               .get_status = rave_sp_emulated_get_status,
        },
 };
 
@@ -711,6 +739,7 @@ static const struct rave_sp_variant rave_sp_rdu1 = {
        .checksum = &rave_sp_checksum_8b2c,
        .cmd = {
                .translate = rave_sp_rdu1_cmd_translate,
+               .get_status = rave_sp_rdu1_get_status,
        },
 };
 
@@ -718,6 +747,7 @@ static const struct rave_sp_variant rave_sp_rdu2 = {
        .checksum = &rave_sp_checksum_ccitt,
        .cmd = {
                .translate = rave_sp_rdu2_cmd_translate,
+               .get_status = rave_sp_emulated_get_status,
        },
 };