diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-07-12 05:57:53 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-11-06 17:14:08 -0500 |
commit | 0312e024d6cde5ef02900c4c6e2f5bb982e24af5 (patch) | |
tree | a56296bfe8d25f040b78e3cba4840f30caf81bf6 | |
parent | cd0f34b08f98af72bb2f74fe4bd251558fc734d3 (diff) |
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>
-rw-r--r-- | drivers/mfd/mc13xxx-core.c | 21 | ||||
-rw-r--r-- | drivers/mfd/mc13xxx-i2c.c | 6 | ||||
-rw-r--r-- | drivers/mfd/mc13xxx-spi.c | 4 | ||||
-rw-r--r-- | drivers/mfd/mc13xxx.h | 3 |
4 files changed, 33 insertions, 1 deletions
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c index 40afdb9b73f5..2a9b100c4825 100644 --- a/drivers/mfd/mc13xxx-core.c +++ b/drivers/mfd/mc13xxx-core.c | |||
@@ -119,6 +119,11 @@ | |||
119 | #define MC13XXX_REVISION_FAB (0x03 << 11) | 119 | #define MC13XXX_REVISION_FAB (0x03 << 11) |
120 | #define MC13XXX_REVISION_ICIDCODE (0x3f << 13) | 120 | #define MC13XXX_REVISION_ICIDCODE (0x3f << 13) |
121 | 121 | ||
122 | #define MC34708_REVISION_REVMETAL (0x07 << 0) | ||
123 | #define MC34708_REVISION_REVFULL (0x07 << 3) | ||
124 | #define MC34708_REVISION_FIN (0x07 << 6) | ||
125 | #define MC34708_REVISION_FAB (0x07 << 9) | ||
126 | |||
122 | #define MC13XXX_ADC1 44 | 127 | #define MC13XXX_ADC1 44 |
123 | #define MC13XXX_ADC1_ADEN (1 << 0) | 128 | #define MC13XXX_ADC1_ADEN (1 << 0) |
124 | #define MC13XXX_ADC1_RAND (1 << 1) | 129 | #define MC13XXX_ADC1_RAND (1 << 1) |
@@ -424,6 +429,16 @@ static void mc13xxx_print_revision(struct mc13xxx *mc13xxx, u32 revision) | |||
424 | maskval(revision, MC13XXX_REVISION_ICIDCODE)); | 429 | maskval(revision, MC13XXX_REVISION_ICIDCODE)); |
425 | } | 430 | } |
426 | 431 | ||
432 | static void mc34708_print_revision(struct mc13xxx *mc13xxx, u32 revision) | ||
433 | { | ||
434 | dev_info(mc13xxx->dev, "%s: rev %d.%d, fin: %d, fab: %d\n", | ||
435 | mc13xxx->variant->name, | ||
436 | maskval(revision, MC34708_REVISION_REVFULL), | ||
437 | maskval(revision, MC34708_REVISION_REVMETAL), | ||
438 | maskval(revision, MC34708_REVISION_FIN), | ||
439 | maskval(revision, MC34708_REVISION_FAB)); | ||
440 | } | ||
441 | |||
427 | /* These are only exported for mc13xxx-i2c and mc13xxx-spi */ | 442 | /* These are only exported for mc13xxx-i2c and mc13xxx-spi */ |
428 | struct mc13xxx_variant mc13xxx_variant_mc13783 = { | 443 | struct mc13xxx_variant mc13xxx_variant_mc13783 = { |
429 | .name = "mc13783", | 444 | .name = "mc13783", |
@@ -437,6 +452,12 @@ struct mc13xxx_variant mc13xxx_variant_mc13892 = { | |||
437 | }; | 452 | }; |
438 | EXPORT_SYMBOL_GPL(mc13xxx_variant_mc13892); | 453 | EXPORT_SYMBOL_GPL(mc13xxx_variant_mc13892); |
439 | 454 | ||
455 | struct mc13xxx_variant mc13xxx_variant_mc34708 = { | ||
456 | .name = "mc34708", | ||
457 | .print_revision = mc34708_print_revision, | ||
458 | }; | ||
459 | EXPORT_SYMBOL_GPL(mc13xxx_variant_mc34708); | ||
460 | |||
440 | static const char *mc13xxx_get_chipname(struct mc13xxx *mc13xxx) | 461 | static const char *mc13xxx_get_chipname(struct mc13xxx *mc13xxx) |
441 | { | 462 | { |
442 | return mc13xxx->variant->name; | 463 | return mc13xxx->variant->name; |
diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c index 4a0afc7f2d4e..bfc1284537ea 100644 --- a/drivers/mfd/mc13xxx-i2c.c +++ b/drivers/mfd/mc13xxx-i2c.c | |||
@@ -26,6 +26,9 @@ static const struct i2c_device_id mc13xxx_i2c_device_id[] = { | |||
26 | .name = "mc13892", | 26 | .name = "mc13892", |
27 | .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc13892, | 27 | .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc13892, |
28 | }, { | 28 | }, { |
29 | .name = "mc34708", | ||
30 | .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc34708, | ||
31 | }, { | ||
29 | /* sentinel */ | 32 | /* sentinel */ |
30 | } | 33 | } |
31 | }; | 34 | }; |
@@ -36,6 +39,9 @@ static const struct of_device_id mc13xxx_dt_ids[] = { | |||
36 | .compatible = "fsl,mc13892", | 39 | .compatible = "fsl,mc13892", |
37 | .data = &mc13xxx_variant_mc13892, | 40 | .data = &mc13xxx_variant_mc13892, |
38 | }, { | 41 | }, { |
42 | .compatible = "fsl,mc34708", | ||
43 | .data = &mc13xxx_variant_mc34708, | ||
44 | }, { | ||
39 | /* sentinel */ | 45 | /* sentinel */ |
40 | } | 46 | } |
41 | }; | 47 | }; |
diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c index 9b1e60827f37..afca4f92f0cf 100644 --- a/drivers/mfd/mc13xxx-spi.c +++ b/drivers/mfd/mc13xxx-spi.c | |||
@@ -33,6 +33,9 @@ static const struct spi_device_id mc13xxx_device_id[] = { | |||
33 | .name = "mc13892", | 33 | .name = "mc13892", |
34 | .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc13892, | 34 | .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc13892, |
35 | }, { | 35 | }, { |
36 | .name = "mc34708", | ||
37 | .driver_data = (kernel_ulong_t)&mc13xxx_variant_mc34708, | ||
38 | }, { | ||
36 | /* sentinel */ | 39 | /* sentinel */ |
37 | } | 40 | } |
38 | }; | 41 | }; |
@@ -41,6 +44,7 @@ MODULE_DEVICE_TABLE(spi, mc13xxx_device_id); | |||
41 | static const struct of_device_id mc13xxx_dt_ids[] = { | 44 | static const struct of_device_id mc13xxx_dt_ids[] = { |
42 | { .compatible = "fsl,mc13783", .data = &mc13xxx_variant_mc13783, }, | 45 | { .compatible = "fsl,mc13783", .data = &mc13xxx_variant_mc13783, }, |
43 | { .compatible = "fsl,mc13892", .data = &mc13xxx_variant_mc13892, }, | 46 | { .compatible = "fsl,mc13892", .data = &mc13xxx_variant_mc13892, }, |
47 | { .compatible = "fsl,mc34708", .data = &mc13xxx_variant_mc34708, }, | ||
44 | { /* sentinel */ } | 48 | { /* sentinel */ } |
45 | }; | 49 | }; |
46 | MODULE_DEVICE_TABLE(of, mc13xxx_dt_ids); | 50 | MODULE_DEVICE_TABLE(of, mc13xxx_dt_ids); |
diff --git a/drivers/mfd/mc13xxx.h b/drivers/mfd/mc13xxx.h index 78bf4c3c1fac..460ec5c7b18c 100644 --- a/drivers/mfd/mc13xxx.h +++ b/drivers/mfd/mc13xxx.h | |||
@@ -24,7 +24,8 @@ struct mc13xxx_variant { | |||
24 | 24 | ||
25 | extern struct mc13xxx_variant | 25 | extern struct mc13xxx_variant |
26 | mc13xxx_variant_mc13783, | 26 | mc13xxx_variant_mc13783, |
27 | mc13xxx_variant_mc13892; | 27 | mc13xxx_variant_mc13892, |
28 | mc13xxx_variant_mc34708; | ||
28 | 29 | ||
29 | struct mc13xxx { | 30 | struct mc13xxx { |
30 | struct regmap *regmap; | 31 | struct regmap *regmap; |