Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0312e024 authored Jul 12, 2012 by Uwe Kleine-KÃ¶nig Committed by Samuel Ortiz Nov 06, 2012

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>

parent cd0f34b0

drivers/mfd/mc13xxx-core.c

+21 −0

Original line number	Diff line number	Diff line
		@@ -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;

drivers/mfd/mc13xxx-i2c.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -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 */
		}

drivers/mfd/mc13xxx-spi.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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);

drivers/mfd/mc13xxx.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;