mfd: mc13xxx: Add support for mc34708

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Marc Reilly <marc@cpdesign.com.au>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 40afdb9b73f59bbee028550602645856aaccc9f9..2a9b100c48259deed696305ada91a65faa8b4e46 100644 (file)
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -119,6 +119,11 @@
 #define MC13XXX_REVISION_FAB           (0x03 << 11)
 #define MC13XXX_REVISION_ICIDCODE      (0x3f << 13)
 
+#define MC34708_REVISION_REVMETAL      (0x07 <<  0)
+#define MC34708_REVISION_REVFULL       (0x07 <<  3)
+#define MC34708_REVISION_FIN           (0x07 <<  6)
+#define MC34708_REVISION_FAB           (0x07 <<  9)
+
 #define MC13XXX_ADC1           44
 #define MC13XXX_ADC1_ADEN              (1 << 0)
 #define MC13XXX_ADC1_RAND              (1 << 1)
@@ -424,6 +429,16 @@ static void mc13xxx_print_revision(struct mc13xxx *mc13xxx, u32 revision)
                        maskval(revision, MC13XXX_REVISION_ICIDCODE));
 }
 
+static void mc34708_print_revision(struct mc13xxx *mc13xxx, u32 revision)
+{
+       dev_info(mc13xxx->dev, "%s: rev %d.%d, fin: %d, fab: %d\n",
+                       mc13xxx->variant->name,
+                       maskval(revision, MC34708_REVISION_REVFULL),
+                       maskval(revision, MC34708_REVISION_REVMETAL),
+                       maskval(revision, MC34708_REVISION_FIN),
+                       maskval(revision, MC34708_REVISION_FAB));
+}
+
 /* These are only exported for mc13xxx-i2c and mc13xxx-spi */
 struct mc13xxx_variant mc13xxx_variant_mc13783 = {
        .name = "mc13783",
@@ -437,6 +452,12 @@ struct mc13xxx_variant mc13xxx_variant_mc13892 = {
 };
 EXPORT_SYMBOL_GPL(mc13xxx_variant_mc13892);
 
+struct mc13xxx_variant mc13xxx_variant_mc34708 = {
+       .name = "mc34708",
+       .print_revision = mc34708_print_revision,
+};
+EXPORT_SYMBOL_GPL(mc13xxx_variant_mc34708);
+
 static const char *mc13xxx_get_chipname(struct mc13xxx *mc13xxx)
 {
        return mc13xxx->variant->name;

diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c
index 4a0afc7f2d4e4b8d6a37927522a2f15952d5ddc6..bfc1284537ea46ae67ed84720ffb9b24e190975d 100644 (file)
--- a/drivers/mfd/mc13xxx-i2c.c
+++ b/drivers/mfd/mc13xxx-i2c.c
@@ -25,6 +25,9 @@ static const struct i2c_device_id mc13xxx_i2c_device_id[] = {
        {
                .name = "mc13892",
                .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc13892,
+       }, {
+               .name = "mc34708",
+               .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc34708,
        }, {
                /* sentinel */
        }
@@ -35,6 +38,9 @@ static const struct of_device_id mc13xxx_dt_ids[] = {
        {
                .compatible = "fsl,mc13892",
                .data = &mc13xxx_variant_mc13892,
+       }, {
+               .compatible = "fsl,mc34708",
+               .data = &mc13xxx_variant_mc34708,
        }, {
                /* sentinel */
        }

diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
index 9b1e60827f377df14de019ca7cf5d1f84ab422d6..afca4f92f0cfd547c439736822f5d95369c24ddb 100644 (file)
--- a/drivers/mfd/mc13xxx-spi.c
+++ b/drivers/mfd/mc13xxx-spi.c
@@ -32,6 +32,9 @@ static const struct spi_device_id mc13xxx_device_id[] = {
        }, {
                .name = "mc13892",
                .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc13892,
+       }, {
+               .name = "mc34708",
+               .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc34708,
        }, {
                /* sentinel */
        }
@@ -41,6 +44,7 @@ MODULE_DEVICE_TABLE(spi, mc13xxx_device_id);
 static const struct of_device_id mc13xxx_dt_ids[] = {
        { .compatible = "fsl,mc13783", .data = &mc13xxx_variant_mc13783, },
        { .compatible = "fsl,mc13892", .data = &mc13xxx_variant_mc13892, },
+       { .compatible = "fsl,mc34708", .data = &mc13xxx_variant_mc34708, },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, mc13xxx_dt_ids);

diff --git a/drivers/mfd/mc13xxx.h b/drivers/mfd/mc13xxx.h
index 78bf4c3c1fac22eff5b14455e43bd019cd005138..460ec5c7b18c1f14597244fbfad68efb2f716fe5 100644 (file)
--- a/drivers/mfd/mc13xxx.h
+++ b/drivers/mfd/mc13xxx.h
@@ -24,7 +24,8 @@ struct mc13xxx_variant {
 
 extern struct mc13xxx_variant
                mc13xxx_variant_mc13783,
-               mc13xxx_variant_mc13892;
+               mc13xxx_variant_mc13892,
+               mc13xxx_variant_mc34708;
 
 struct mc13xxx {
        struct regmap *regmap;