From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 05/21] pinctrl: mvebu: prepare to fix misdesigned resource allocation
Date: Tue, 28 Jan 2014 01:39:17 +0100 [thread overview]
Message-ID: <1390869573-27624-6-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1390869573-27624-1-git-send-email-sebastian.hesselbarth@gmail.com>
Allocating the pinctrl resource in common pinctrl-mvebu was a misdesign,
as it does not allow SoC specific parts to access the allocated resource.
This moves resource allocation from mvebu_pinctrl_probe to SoC specific
_probe functions and temporarily passes the base address to common pinctrl
driver instead.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
drivers/pinctrl/mvebu/pinctrl-armada-370.c | 10 +++++++++-
drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 10 +++++++++-
drivers/pinctrl/mvebu/pinctrl-dove.c | 11 ++++++++++-
drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 11 ++++++++++-
drivers/pinctrl/mvebu/pinctrl-mvebu.c | 14 ++++++--------
drivers/pinctrl/mvebu/pinctrl-mvebu.h | 2 +-
6 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-370.c b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
index ae1f760cbdd2..7586072e66c6 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-370.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
@@ -23,6 +23,8 @@
#include "pinctrl-mvebu.h"
+static void __iomem *mpp_base;
+
static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
MPP_MODE(0,
MPP_FUNCTION(0x0, "gpio", NULL),
@@ -385,6 +387,12 @@ static struct pinctrl_gpio_range mv88f6710_mpp_gpio_ranges[] = {
static int armada_370_pinctrl_probe(struct platform_device *pdev)
{
struct mvebu_pinctrl_soc_info *soc = &armada_370_pinctrl_info;
+ struct resource *res;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ mpp_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(mpp_base))
+ return PTR_ERR(mpp_base);
soc->variant = 0; /* no variants for Armada 370 */
soc->controls = mv88f6710_mpp_controls;
@@ -396,7 +404,7 @@ static int armada_370_pinctrl_probe(struct platform_device *pdev)
pdev->dev.platform_data = soc;
- return mvebu_pinctrl_probe(pdev);
+ return mvebu_pinctrl_probe(pdev, mpp_base);
}
static int armada_370_pinctrl_remove(struct platform_device *pdev)
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
index 843a51f9d129..786c629af8a8 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
@@ -33,6 +33,8 @@
#include "pinctrl-mvebu.h"
+static void __iomem *mpp_base;
+
enum armada_xp_variant {
V_MV78230 = BIT(0),
V_MV78260 = BIT(1),
@@ -399,10 +401,16 @@ static int armada_xp_pinctrl_probe(struct platform_device *pdev)
struct mvebu_pinctrl_soc_info *soc = &armada_xp_pinctrl_info;
const struct of_device_id *match =
of_match_device(armada_xp_pinctrl_of_match, &pdev->dev);
+ struct resource *res;
if (!match)
return -ENODEV;
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ mpp_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(mpp_base))
+ return PTR_ERR(mpp_base);
+
soc->variant = (unsigned) match->data & 0xff;
switch (soc->variant) {
@@ -443,7 +451,7 @@ static int armada_xp_pinctrl_probe(struct platform_device *pdev)
pdev->dev.platform_data = soc;
- return mvebu_pinctrl_probe(pdev);
+ return mvebu_pinctrl_probe(pdev, mpp_base);
}
static int armada_xp_pinctrl_remove(struct platform_device *pdev)
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 47268393af34..4d051ba17fee 100644
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -55,6 +55,8 @@
#define CONFIG_PMU BIT(4)
+static void __iomem *mpp_base;
+
static int dove_pmu_mpp_ctrl_get(struct mvebu_mpp_ctrl *ctrl,
unsigned long *config)
{
@@ -776,6 +778,13 @@ static int dove_pinctrl_probe(struct platform_device *pdev)
{
const struct of_device_id *match =
of_match_device(dove_pinctrl_of_match, &pdev->dev);
+ struct resource *mpp_res;
+
+ mpp_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ mpp_base = devm_ioremap_resource(&pdev->dev, mpp_res);
+ if (IS_ERR(mpp_base))
+ return PTR_ERR(mpp_base);
+
pdev->dev.platform_data = (void *)match->data;
/*
@@ -789,7 +798,7 @@ static int dove_pinctrl_probe(struct platform_device *pdev)
}
clk_prepare_enable(clk);
- return mvebu_pinctrl_probe(pdev);
+ return mvebu_pinctrl_probe(pdev, mpp_base);
}
static int dove_pinctrl_remove(struct platform_device *pdev)
diff --git a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
index 6b504b5935a5..842ceb196726 100644
--- a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
+++ b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
@@ -21,6 +21,8 @@
#include "pinctrl-mvebu.h"
+static void __iomem *mpp_base;
+
#define V(f6180, f6190, f6192, f6281, f6282, dx4122) \
((f6180 << 0) | (f6190 << 1) | (f6192 << 2) | \
(f6281 << 3) | (f6282 << 4) | (dx4122 << 5))
@@ -458,8 +460,15 @@ static int kirkwood_pinctrl_probe(struct platform_device *pdev)
{
const struct of_device_id *match =
of_match_device(kirkwood_pinctrl_of_match, &pdev->dev);
+ struct resource *res;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ mpp_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(mpp_base))
+ return PTR_ERR(mpp_base);
+
pdev->dev.platform_data = (void *)match->data;
- return mvebu_pinctrl_probe(pdev);
+ return mvebu_pinctrl_probe(pdev, mpp_base);
}
static int kirkwood_pinctrl_remove(struct platform_device *pdev)
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index 0fd1ad31fbf9..90c35b20a7af 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -590,26 +590,24 @@ static int mvebu_pinctrl_build_functions(struct platform_device *pdev,
return 0;
}
-int mvebu_pinctrl_probe(struct platform_device *pdev)
+int mvebu_pinctrl_probe(struct platform_device *pdev, void __iomem *base)
{
struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
- struct resource *res;
struct mvebu_pinctrl *pctl;
- void __iomem *base;
struct pinctrl_pin_desc *pdesc;
unsigned gid, n, k;
int ret;
+ if (!base) {
+ dev_err(&pdev->dev, "missing base address\n");
+ return -EINVAL;
+ }
+
if (!soc || !soc->controls || !soc->modes) {
dev_err(&pdev->dev, "wrong pinctrl soc info\n");
return -EINVAL;
}
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(base))
- return PTR_ERR(base);
-
pctl = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_pinctrl),
GFP_KERNEL);
if (!pctl) {
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.h b/drivers/pinctrl/mvebu/pinctrl-mvebu.h
index 90bd3beee860..b66949040e0a 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.h
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.h
@@ -186,7 +186,7 @@ struct mvebu_pinctrl_soc_info {
.npins = _npins, \
}
-int mvebu_pinctrl_probe(struct platform_device *pdev);
+int mvebu_pinctrl_probe(struct platform_device *pdev, void __iomem *base);
int mvebu_pinctrl_remove(struct platform_device *pdev);
#endif
--
1.8.5.2
next prev parent reply other threads:[~2014-01-28 0:39 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-25 18:34 [PATCH 00/11] pinctrl: mvebu: remove hardcoded addresses from Dove pinctrl Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 01/11] devicetree: binding: add missing Marvell Dove SoC documentation Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 02/11] devicetree: bindings: update MVEBU pinctrl binding documentation Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 03/11] ARM: dove: add additional pinctrl registers Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 04/11] ARM: dove: add global-config register node Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 05/11] pinctrl: mvebu: fix misdesigned resource allocation Sebastian Hesselbarth
2014-01-27 14:45 ` Thomas Petazzoni
2014-01-27 18:26 ` Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 06/11] pinctrl: mvebu: dove: request additional resources Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 07/11] pinctrl: mvebu: dove: request syscon regmap for global registers Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 08/11] pinctrl: mvebu: dove: use remapped mpp base registers Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 09/11] pinctrl: mvebu: dove: use remapped mpp4 register Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 10/11] pinctrl: mvebu: dove: use remapped pmu_mpp registers Sebastian Hesselbarth
2014-01-25 18:34 ` [PATCH 11/11] pinctrl: mvebu: dove: use global register regmap Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 00/21] pinctrl: mvebu: restructure and remove hardcoded addresses from Dove pinctrl Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 01/21] devicetree: bindings: add missing Marvell Dove SoC documentation Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 02/21] devicetree: bindings: update MVEBU pinctrl binding documentation Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 03/21] ARM: dove: add additional pinctrl registers Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 04/21] ARM: dove: add global-config register node Sebastian Hesselbarth
2014-01-28 0:39 ` Sebastian Hesselbarth [this message]
2014-01-28 0:39 ` [PATCH v2 06/21] pinctrl: mvebu: add common mpp reg defines to mvebu pinctrl include Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 07/21] pinctrl: mvebu: move generic group name generation Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 08/21] pinctrl: mvebu: remove checks for mpp_get/set Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 09/21] pinctrl: mvebu: dove: provide generic mpp callbacks Sebastian Hesselbarth
2014-01-31 10:13 ` Linus Walleij
2014-01-31 10:19 ` Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 10/21] pinctrl: mvebu: kirkwood: " Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 11/21] pinctrl: mvebu: armada-370: " Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 12/21] pinctrl: mvebu: armada-xp: " Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 13/21] pinctrl: mvebu: remove unused macros and functions Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 14/21] pinctrl: mvebu: remove base address from common driver Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 15/21] pinctrl: mvebu: dove: request additional resources Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 16/21] pinctrl: mvebu: dove: request syscon regmap for global registers Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 17/21] pinctrl: mvebu: dove: use remapped mpp base registers Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 18/21] pinctrl: mvebu: dove: use remapped mpp4 register Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 19/21] pinctrl: mvebu: dove: use remapped pmu_mpp registers Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 20/21] pinctrl: mvebu: dove: use global register regmap Sebastian Hesselbarth
2014-01-28 0:39 ` [PATCH v2 21/21] pinctrl: mvebu: dove: consolidate auto-numbered pmu mpp ranges Sebastian Hesselbarth
2014-01-30 18:29 ` [PATCH v2 00/21] pinctrl: mvebu: restructure and remove hardcoded addresses from Dove pinctrl Andrew Lunn
2014-01-30 18:50 ` Sebastian Hesselbarth
2014-01-30 20:25 ` Andrew Lunn
2014-01-31 2:18 ` Sebastian Hesselbarth
2014-02-01 11:13 ` Andrew Lunn
2014-01-31 10:17 ` Linus Walleij
2014-01-31 10:22 ` Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 00/13] pinctrl: mvebu: restructure resource allocation Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 01/13] pinctrl: mvebu: count unnamed controls and allocate name buffer Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 02/13] pinctrl: mvebu: remove obsolete per-control name buffer allocation Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 03/13] pinctrl: mvebu: identify generic controls by name Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 04/13] pinctrl: mvebu: remove passing mvebu_mpp_ctrl to callbacks Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 05/13] pinctrl: mvebu: add common mpp reg defines to mvebu pinctrl include Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 06/13] pinctrl: mvebu: dove: provide generic mpp callbacks Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 07/13] pinctrl: mvebu: kirkwood: " Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 08/13] pinctrl: mvebu: armada-370: " Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 09/13] pinctrl: mvebu: armada-xp: " Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 10/13] pinctrl: mvebu: move resource allocation to SoC specific drivers Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 11/13] pinctrl: mvebu: remove common get/set functions Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 12/13] pinctrl: mvebu: dove: consolidate auto-numbered pmu mpp ranges Sebastian Hesselbarth
2014-02-12 15:59 ` [PATCH v3 13/13] pinctrl: mvebu: dove: reuse mpp_{set, get} in pmu callbacks Sebastian Hesselbarth
2014-02-13 16:26 ` [PATCH v3 00/13] pinctrl: mvebu: restructure resource allocation Thomas Petazzoni
2014-02-13 16:41 ` Sebastian Hesselbarth
2014-02-13 16:59 ` Thomas Petazzoni
2014-02-13 17:10 ` Sebastian Hesselbarth
2014-02-13 18:38 ` Thomas Petazzoni
2014-02-23 14:20 ` [PATCH v4 00/16] " Sebastian Hesselbarth
2014-02-23 14:20 ` [PATCH v4 01/16] pinctrl: mvebu: count unnamed controls and allocate name buffer Sebastian Hesselbarth
2014-02-24 10:04 ` Linus Walleij
2014-02-23 14:21 ` [PATCH v4 02/16] pinctrl: mvebu: remove obsolete per-control name buffer allocation Sebastian Hesselbarth
2014-02-24 10:05 ` Linus Walleij
2014-02-23 14:21 ` [PATCH v4 03/16] pinctrl: mvebu: identify generic controls by name Sebastian Hesselbarth
2014-02-24 10:06 ` Linus Walleij
2014-02-23 14:21 ` [PATCH v4 04/16] pinctrl: mvebu: remove passing mvebu_mpp_ctrl to callbacks Sebastian Hesselbarth
2014-02-24 10:07 ` Linus Walleij
2014-02-23 14:21 ` [PATCH v4 05/16] pinctrl: mvebu: add common mpp reg helper to mvebu pinctrl include Sebastian Hesselbarth
2014-02-24 10:08 ` Linus Walleij
2014-02-23 14:21 ` [PATCH v4 06/16] pinctrl: mvebu: dove: provide generic mpp callbacks Sebastian Hesselbarth
2014-02-23 14:21 ` [PATCH v4 07/16] pinctrl: mvebu: kirkwood: " Sebastian Hesselbarth
2014-02-23 14:21 ` [PATCH v4 08/16] pinctrl: mvebu: armada-370: " Sebastian Hesselbarth
2014-02-23 14:21 ` [PATCH v4 09/16] pinctrl: mvebu: armada-xp: " Sebastian Hesselbarth
2014-02-23 14:21 ` [PATCH v4 10/16] pinctrl: mvebu: armada-375: " Sebastian Hesselbarth
2014-02-23 14:21 ` [PATCH v4 11/16] pinctrl: mvebu: armada-38x: " Sebastian Hesselbarth
2014-02-23 14:21 ` [PATCH v4 12/16] pinctrl: mvebu: move resource allocation to SoC specific drivers Sebastian Hesselbarth
2014-02-23 14:21 ` [PATCH v4 13/16] pinctrl: mvebu: remove common get/set functions Sebastian Hesselbarth
2014-02-23 14:21 ` [PATCH v4 14/16] pinctrl: mvebu: remove MPP_REG_CTRL macro Sebastian Hesselbarth
2014-02-23 14:21 ` [PATCH v4 15/16] pinctrl: mvebu: dove: consolidate auto-numbered pmu mpp ranges Sebastian Hesselbarth
2014-02-23 14:21 ` [PATCH v4 16/16] pinctrl: mvebu: dove: reuse mpp_{set, get} in pmu callbacks Sebastian Hesselbarth
2014-02-23 15:40 ` [PATCH v4 00/16] pinctrl: mvebu: restructure resource allocation Jason Cooper
2014-02-23 16:03 ` Sebastian Hesselbarth
2014-02-24 10:22 ` Linus Walleij
2014-02-24 15:05 ` Jason Cooper
2014-02-23 22:06 ` Jason Cooper
2014-02-23 22:12 ` Sebastian Hesselbarth
2014-02-23 22:25 ` Jason Cooper
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=1390869573-27624-6-git-send-email-sebastian.hesselbarth@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).