linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 14/21] pinctrl: mvebu: remove base address from common driver
Date: Tue, 28 Jan 2014 01:39:26 +0100	[thread overview]
Message-ID: <1390869573-27624-15-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1390869573-27624-1-git-send-email-sebastian.hesselbarth@gmail.com>

Common pinctrl driver does not need to know about any addresses now,
so remove anything related to it from our pinctrl drivers.

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 | 2 +-
 drivers/pinctrl/mvebu/pinctrl-armada-xp.c  | 2 +-
 drivers/pinctrl/mvebu/pinctrl-dove.c       | 2 +-
 drivers/pinctrl/mvebu/pinctrl-kirkwood.c   | 2 +-
 drivers/pinctrl/mvebu/pinctrl-mvebu.c      | 9 +--------
 drivers/pinctrl/mvebu/pinctrl-mvebu.h      | 2 +-
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-370.c b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
index 5e8e83f57b8e..7e2f0f694210 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-370.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
@@ -428,7 +428,7 @@ static int armada_370_pinctrl_probe(struct platform_device *pdev)
 
 	pdev->dev.platform_data = soc;
 
-	return mvebu_pinctrl_probe(pdev, mpp_base);
+	return mvebu_pinctrl_probe(pdev);
 }
 
 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 5cfa00cae490..678a8078d100 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
@@ -475,7 +475,7 @@ static int armada_xp_pinctrl_probe(struct platform_device *pdev)
 
 	pdev->dev.platform_data = soc;
 
-	return mvebu_pinctrl_probe(pdev, mpp_base);
+	return mvebu_pinctrl_probe(pdev);
 }
 
 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 cd55f2ca4e8a..98f8cae72ace 100644
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -822,7 +822,7 @@ static int dove_pinctrl_probe(struct platform_device *pdev)
 	}
 	clk_prepare_enable(clk);
 
-	return mvebu_pinctrl_probe(pdev, mpp_base);
+	return mvebu_pinctrl_probe(pdev);
 }
 
 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 2872f28057fb..9e80e2fe0bda 100644
--- a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
+++ b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
@@ -492,7 +492,7 @@ static int kirkwood_pinctrl_probe(struct platform_device *pdev)
 		return PTR_ERR(mpp_base);
 
 	pdev->dev.platform_data = (void *)match->data;
-	return mvebu_pinctrl_probe(pdev, mpp_base);
+	return mvebu_pinctrl_probe(pdev);
 }
 
 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 dd65b8c44b26..7c9533b8b527 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -50,7 +50,6 @@ struct mvebu_pinctrl {
 	struct device *dev;
 	struct pinctrl_dev *pctldev;
 	struct pinctrl_desc desc;
-	void __iomem *base;
 	struct mvebu_pinctrl_group *groups;
 	unsigned num_groups;
 	struct mvebu_pinctrl_function *functions;
@@ -546,7 +545,7 @@ static int mvebu_pinctrl_build_functions(struct platform_device *pdev,
 	return 0;
 }
 
-int mvebu_pinctrl_probe(struct platform_device *pdev, void __iomem *base)
+int mvebu_pinctrl_probe(struct platform_device *pdev)
 {
 	struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
 	struct mvebu_pinctrl *pctl;
@@ -554,11 +553,6 @@ int mvebu_pinctrl_probe(struct platform_device *pdev, void __iomem *base)
 	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;
@@ -577,7 +571,6 @@ int mvebu_pinctrl_probe(struct platform_device *pdev, void __iomem *base)
 	pctl->desc.pmxops = &mvebu_pinmux_ops;
 	pctl->desc.confops = &mvebu_pinconf_ops;
 	pctl->variant = soc->variant;
-	pctl->base = base;
 	pctl->dev = &pdev->dev;
 	platform_set_drvdata(pdev, pctl);
 
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.h b/drivers/pinctrl/mvebu/pinctrl-mvebu.h
index 6c8451af95b6..5d3093673e48 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.h
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.h
@@ -178,7 +178,7 @@ struct mvebu_pinctrl_soc_info {
 #define MVEBU_MPP_BITS		4
 #define MVEBU_MPP_MASK		0xf
 
-int mvebu_pinctrl_probe(struct platform_device *pdev, void __iomem *base);
+int mvebu_pinctrl_probe(struct platform_device *pdev);
 int mvebu_pinctrl_remove(struct platform_device *pdev);
 
 #endif
-- 
1.8.5.2

  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   ` [PATCH v2 05/21] pinctrl: mvebu: prepare to fix misdesigned resource allocation Sebastian Hesselbarth
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   ` Sebastian Hesselbarth [this message]
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-15-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).