From: John Crispin <blogic@openwrt.org> To: Lee Jones <lee.jones@linaro.org> Cc: Matthias Brugger <matthias.bgg@gmail.com>, Flora Fu <flora.fu@mediatek.com>, Sascha Hauer <s.hauer@pengutronix.de>, Henry Chen <henryc.chen@mediatek.com>, Steven Liu <steven.liu@mediatek.com>, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, John Crispin <blogic@openwrt.org> Subject: [PATCH V2 3/4] mfd: mediatek: add support for different Slave types Date: Mon, 25 Jan 2016 11:14:46 +0100 [thread overview] Message-ID: <1453716887-38442-4-git-send-email-blogic@openwrt.org> (raw) In-Reply-To: <1453716887-38442-1-git-send-email-blogic@openwrt.org> Signed-off-by: John Crispin <blogic@openwrt.org> --- drivers/mfd/mt6397-core.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index 75ad0fe..51e194b 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -24,6 +24,9 @@ #define MT6397_RTC_BASE 0xe000 #define MT6397_RTC_SIZE 0x3e +#define MT6391_CID_CODE 0x91 +#define MT6397_CID_CODE 0x97 + static const struct resource mt6397_rtc_resources[] = { { .start = MT6397_RTC_BASE, @@ -232,6 +235,7 @@ static SIMPLE_DEV_PM_OPS(mt6397_pm_ops, mt6397_irq_suspend, static int mt6397_probe(struct platform_device *pdev) { int ret; + unsigned int id; struct mt6397_chip *mt6397; mt6397 = devm_kzalloc(&pdev->dev, sizeof(*mt6397), GFP_KERNEL); @@ -239,10 +243,6 @@ static int mt6397_probe(struct platform_device *pdev) return -ENOMEM; mt6397->dev = &pdev->dev; - mt6397->int_con[0] = MT6397_INT_CON0; - mt6397->int_con[1] = MT6397_INT_CON1; - mt6397->int_status[0] = MT6397_INT_STATUS0; - mt6397->int_status[1] = MT6397_INT_STATUS1; /* * mt6397 MFD is child device of soc pmic wrapper. @@ -254,6 +254,29 @@ static int mt6397_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mt6397); + ret = regmap_read(mt6397->regmap, MT6397_CID, &id); + if (ret) { + dev_err(mt6397->dev, "Failed to read chip id: %d\n", ret); + goto fail_irq; + } + + switch (id & 0xff) { + case MT6397_CID_CODE: + case MT6391_CID_CODE: + mt6397->int_con[0] = MT6397_INT_CON0; + mt6397->int_con[1] = MT6397_INT_CON1; + mt6397->int_status[0] = MT6397_INT_STATUS0; + mt6397->int_status[1] = MT6397_INT_STATUS1; + ret = mfd_add_devices(&pdev->dev, -1, mt6397_devs, + ARRAY_SIZE(mt6397_devs), NULL, 0, NULL); + break; + + default: + dev_err(&pdev->dev, "unsupported chip: %d\n", id); + ret = -ENODEV; + break; + } + mt6397->irq = platform_get_irq(pdev, 0); if (mt6397->irq > 0) { ret = mt6397_irq_init(mt6397); @@ -261,10 +284,11 @@ static int mt6397_probe(struct platform_device *pdev) return ret; } - ret = mfd_add_devices(&pdev->dev, -1, mt6397_devs, - ARRAY_SIZE(mt6397_devs), NULL, 0, NULL); - if (ret) +fail_irq: + if (ret) { + irq_domain_remove(mt6397->irq_domain); dev_err(&pdev->dev, "failed to add child devices: %d\n", ret); + } return ret; } -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: blogic@openwrt.org (John Crispin) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V2 3/4] mfd: mediatek: add support for different Slave types Date: Mon, 25 Jan 2016 11:14:46 +0100 [thread overview] Message-ID: <1453716887-38442-4-git-send-email-blogic@openwrt.org> (raw) In-Reply-To: <1453716887-38442-1-git-send-email-blogic@openwrt.org> Signed-off-by: John Crispin <blogic@openwrt.org> --- drivers/mfd/mt6397-core.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index 75ad0fe..51e194b 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -24,6 +24,9 @@ #define MT6397_RTC_BASE 0xe000 #define MT6397_RTC_SIZE 0x3e +#define MT6391_CID_CODE 0x91 +#define MT6397_CID_CODE 0x97 + static const struct resource mt6397_rtc_resources[] = { { .start = MT6397_RTC_BASE, @@ -232,6 +235,7 @@ static SIMPLE_DEV_PM_OPS(mt6397_pm_ops, mt6397_irq_suspend, static int mt6397_probe(struct platform_device *pdev) { int ret; + unsigned int id; struct mt6397_chip *mt6397; mt6397 = devm_kzalloc(&pdev->dev, sizeof(*mt6397), GFP_KERNEL); @@ -239,10 +243,6 @@ static int mt6397_probe(struct platform_device *pdev) return -ENOMEM; mt6397->dev = &pdev->dev; - mt6397->int_con[0] = MT6397_INT_CON0; - mt6397->int_con[1] = MT6397_INT_CON1; - mt6397->int_status[0] = MT6397_INT_STATUS0; - mt6397->int_status[1] = MT6397_INT_STATUS1; /* * mt6397 MFD is child device of soc pmic wrapper. @@ -254,6 +254,29 @@ static int mt6397_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mt6397); + ret = regmap_read(mt6397->regmap, MT6397_CID, &id); + if (ret) { + dev_err(mt6397->dev, "Failed to read chip id: %d\n", ret); + goto fail_irq; + } + + switch (id & 0xff) { + case MT6397_CID_CODE: + case MT6391_CID_CODE: + mt6397->int_con[0] = MT6397_INT_CON0; + mt6397->int_con[1] = MT6397_INT_CON1; + mt6397->int_status[0] = MT6397_INT_STATUS0; + mt6397->int_status[1] = MT6397_INT_STATUS1; + ret = mfd_add_devices(&pdev->dev, -1, mt6397_devs, + ARRAY_SIZE(mt6397_devs), NULL, 0, NULL); + break; + + default: + dev_err(&pdev->dev, "unsupported chip: %d\n", id); + ret = -ENODEV; + break; + } + mt6397->irq = platform_get_irq(pdev, 0); if (mt6397->irq > 0) { ret = mt6397_irq_init(mt6397); @@ -261,10 +284,11 @@ static int mt6397_probe(struct platform_device *pdev) return ret; } - ret = mfd_add_devices(&pdev->dev, -1, mt6397_devs, - ARRAY_SIZE(mt6397_devs), NULL, 0, NULL); - if (ret) +fail_irq: + if (ret) { + irq_domain_remove(mt6397->irq_domain); dev_err(&pdev->dev, "failed to add child devices: %d\n", ret); + } return ret; } -- 1.7.10.4
next prev parent reply other threads:[~2016-01-25 10:15 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-25 10:14 [PATCH V2 0/4] mfd: mediatek: add mt6323 support to the mt6397 driver John Crispin 2016-01-25 10:14 ` John Crispin 2016-01-25 10:14 ` [PATCH V2 1/4] dt-bindings: mfd: Add bindings for the MediaTek MT6323 PMIC John Crispin 2016-01-25 10:14 ` John Crispin 2016-01-25 10:14 ` John Crispin 2016-01-25 12:41 ` Lee Jones 2016-01-25 12:41 ` Lee Jones 2016-01-25 10:14 ` [PATCH V2 2/4] mfd: mediatek: int_con and int_status may vary in location John Crispin 2016-01-25 10:14 ` John Crispin 2016-01-25 12:33 ` Lee Jones 2016-01-25 12:33 ` Lee Jones 2016-01-25 10:14 ` John Crispin [this message] 2016-01-25 10:14 ` [PATCH V2 3/4] mfd: mediatek: add support for different Slave types John Crispin 2016-01-25 12:37 ` Lee Jones 2016-01-25 12:37 ` Lee Jones 2016-01-25 10:14 ` [PATCH V2 4/4] mfd: mediatek: add MT6323 support to MT6397 driver John Crispin 2016-01-25 10:14 ` John Crispin 2016-01-25 12:41 ` Lee Jones 2016-01-25 12:41 ` Lee Jones 2016-01-25 15:36 ` John Crispin 2016-01-25 15:36 ` John Crispin 2016-01-25 18:44 ` Matthias Brugger 2016-01-25 18:44 ` Matthias Brugger 2016-01-25 18:59 ` John Crispin 2016-01-25 18:59 ` John Crispin 2016-01-26 3:07 ` Henry Chen 2016-01-26 3:07 ` Henry Chen 2016-01-26 3:07 ` Henry Chen 2016-01-26 7:14 ` John Crispin 2016-01-26 7:14 ` John Crispin 2016-01-26 8:34 ` Lee Jones 2016-01-26 8:34 ` Lee Jones 2016-01-26 8:44 ` John Crispin 2016-01-26 8:44 ` John Crispin 2016-01-26 12:05 ` John Crispin 2016-01-26 12:05 ` John Crispin 2016-01-26 14:00 ` Lee Jones 2016-01-26 14:00 ` Lee Jones
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1453716887-38442-4-git-send-email-blogic@openwrt.org \ --to=blogic@openwrt.org \ --cc=flora.fu@mediatek.com \ --cc=henryc.chen@mediatek.com \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=matthias.bgg@gmail.com \ --cc=s.hauer@pengutronix.de \ --cc=steven.liu@mediatek.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.