On Thu, Jul 12, 2012 at 11:57:52AM +0200, Uwe Kleine-König wrote:
> This removes auto-detection of which variant of mc13xxx is used because
> mc34708 uses a different layout in the revision register that doesn't
> allow differentiation any more.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
> ---
> drivers/mfd/mc13xxx-core.c | 77
> ++++++++++++++++----------------------------
> drivers/mfd/mc13xxx-i2c.c | 16 +++++----
> drivers/mfd/mc13xxx-spi.c | 25 +++++++-------
> drivers/mfd/mc13xxx.h | 17 ++++++----
> 4 files changed, 60 insertions(+), 75 deletions(-)
>
> diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
> index f0ea3b8..7874711 100644
> --- a/drivers/mfd/mc13xxx-core.c
> +++ b/drivers/mfd/mc13xxx-core.c
> @@ -410,62 +410,36 @@ static irqreturn_t mc13xxx_irq_thread(int irq, void
> *data)
> return IRQ_RETVAL(handled);
> }
>
> -static const char *mc13xxx_chipname[] = {
> - [MC13XXX_ID_MC13783] = "mc13783",
> - [MC13XXX_ID_MC13892] = "mc13892",
> -};
> -
> #define maskval(reg, mask) (((reg) & (mask)) >> __ffs(mask))
> -static int mc13xxx_identify(struct mc13xxx *mc13xxx)
> +static void mc13xxx_print_revision(struct mc13xxx *mc13xxx, u32 revision)
> {
> - u32 icid;
> - u32 revision;
> - int ret;
> -
> - /*
> - * Get the generation ID from register 46, as apparently some older
> - * IC revisions only have this info at this location. Newer ICs seem to
> - * have both.
> - */
> - ret = mc13xxx_reg_read(mc13xxx, 46, &icid);
> - if (ret)
> - return ret;
> -
> - icid = (icid >> 6) & 0x7;
> -
> - switch (icid) {
> - case 2:
> - mc13xxx->ictype = MC13XXX_ID_MC13783;
> - break;
> - case 7:
> - mc13xxx->ictype = MC13XXX_ID_MC13892;
> - break;
> - default:
> - mc13xxx->ictype = MC13XXX_ID_INVALID;
> - break;
> - }
> + dev_info(mc13xxx->dev, "%s: rev: %d.%d, "
> + "fin: %d, fab: %d, icid: %d/%d\n",
> + mc13xxx->variant->name,
> + maskval(revision, MC13XXX_REVISION_REVFULL),
> + maskval(revision, MC13XXX_REVISION_REVMETAL),
> + maskval(revision, MC13XXX_REVISION_FIN),
> + maskval(revision, MC13XXX_REVISION_FAB),
> + maskval(revision, MC13XXX_REVISION_ICID),
> + maskval(revision, MC13XXX_REVISION_ICIDCODE));
> +}
>
> - if (mc13xxx->ictype == MC13XXX_ID_MC13783 ||
> - mc13xxx->ictype == MC13XXX_ID_MC13892) {
> - ret = mc13xxx_reg_read(mc13xxx, MC13XXX_REVISION, &revision);
> -
> - dev_info(mc13xxx->dev, "%s: rev: %d.%d, "
> - "fin: %d, fab: %d, icid: %d/%d\n",
> - mc13xxx_chipname[mc13xxx->ictype],
> - maskval(revision, MC13XXX_REVISION_REVFULL),
> - maskval(revision, MC13XXX_REVISION_REVMETAL),
> - maskval(revision, MC13XXX_REVISION_FIN),
> - maskval(revision, MC13XXX_REVISION_FAB),
> - maskval(revision, MC13XXX_REVISION_ICID),
> - maskval(revision, MC13XXX_REVISION_ICIDCODE));
> - }
> +/* These are only exported for mc13xxx-i2c and mc13xxx-spi */
> +struct mc13xxx_variant mc13xxx_variant_mc13783 = {
> + .name = "mc13783",
> + .print_revision = mc13xxx_print_revision,
> +};
> +EXPORT_SYMBOL_GPL(mc13xxx_variant_mc13783);
>
> - return (mc13xxx->ictype == MC13XXX_ID_INVALID) ? -ENODEV : 0;
> -}
> +struct mc13xxx_variant mc13xxx_variant_mc13892 = {
> + .name = "mc13892",
> + .print_revision = mc13xxx_print_revision,
> +};
> +EXPORT_SYMBOL_GPL(mc13xxx_variant_mc13892);
>
> static const char *mc13xxx_get_chipname(struct mc13xxx *mc13xxx)
> {
> - return mc13xxx_chipname[mc13xxx->ictype];
> + return mc13xxx->variant->name;
> }
>
> int mc13xxx_get_flags(struct mc13xxx *mc13xxx)
> @@ -653,13 +627,16 @@ int mc13xxx_common_init(struct mc13xxx *mc13xxx,
> struct mc13xxx_platform_data *pdata, int irq)
> {
> int ret;
> + u32 revision;
>
> mc13xxx_lock(mc13xxx);
>
> - ret = mc13xxx_identify(mc13xxx);
> + ret = mc13xxx_reg_read(mc13xxx, MC13XXX_REVISION, &revision);
> if (ret)
> goto err_revision;
>
> + mc13xxx_print_revision(mc13xxx, revision);
This must read:
mc13xxx->variant->print_revision(mc13xxx, revision);
I fixed that in my tree, Samuel, please tell me if I should resend or if
you can fix that up.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
