From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 18/21] pinctrl: mvebu: dove: use remapped mpp4 register
Date: Tue, 28 Jan 2014 01:39:30 +0100 [thread overview]
Message-ID: <1390869573-27624-19-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1390869573-27624-1-git-send-email-sebastian.hesselbarth@gmail.com>
Now that we have an ioremapped mpp4 register, get rid of hardcoded
physical addresses. While at it, also remove DOVE_ prefix from those
macros.
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-dove.c | 54 +++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 43e037cf6db0..1487bd270401 100644
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -46,18 +46,20 @@
#define DOVE_AU1_SPDIFO_GPIO_EN BIT(1)
#define DOVE_NAND_GPIO_EN BIT(0)
#define DOVE_GPIO_LO_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE + 0xd0400)
-#define DOVE_MPP_CTRL4_VIRT_BASE (DOVE_GPIO_LO_VIRT_BASE + 0x40)
-#define DOVE_SPI_GPIO_SEL BIT(5)
-#define DOVE_UART1_GPIO_SEL BIT(4)
-#define DOVE_AU1_GPIO_SEL BIT(3)
-#define DOVE_CAM_GPIO_SEL BIT(2)
-#define DOVE_SD1_GPIO_SEL BIT(1)
-#define DOVE_SD0_GPIO_SEL BIT(0)
/* MPP Base registers */
#define PMU_MPP_GENERAL_CTRL 0x10
#define AU0_AC97_SEL BIT(16)
+/* MPP Control 4 register */
+#define MPP_CTRL4 0x40
+#define SPI_GPIO_SEL BIT(5)
+#define UART1_GPIO_SEL BIT(4)
+#define AU1_GPIO_SEL BIT(3)
+#define CAM_GPIO_SEL BIT(2)
+#define SD1_GPIO_SEL BIT(1)
+#define SD0_GPIO_SEL BIT(0)
+
#define MPPS_PER_REG 8
#define MPP_BITS 4
#define MPP_MASK 0xf
@@ -141,24 +143,24 @@ static int dove_pmu_mpp_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
static int dove_mpp4_ctrl_get(struct mvebu_mpp_ctrl *ctrl,
unsigned long *config)
{
- unsigned long mpp4 = readl(DOVE_MPP_CTRL4_VIRT_BASE);
+ unsigned long mpp4 = readl(mpp4_base + MPP_CTRL4);
unsigned long mask;
switch (ctrl->pid) {
case 24: /* mpp_camera */
- mask = DOVE_CAM_GPIO_SEL;
+ mask = CAM_GPIO_SEL;
break;
case 40: /* mpp_sdio0 */
- mask = DOVE_SD0_GPIO_SEL;
+ mask = SD0_GPIO_SEL;
break;
case 46: /* mpp_sdio1 */
- mask = DOVE_SD1_GPIO_SEL;
+ mask = SD1_GPIO_SEL;
break;
case 58: /* mpp_spi0 */
- mask = DOVE_SPI_GPIO_SEL;
+ mask = SPI_GPIO_SEL;
break;
case 62: /* mpp_uart1 */
- mask = DOVE_UART1_GPIO_SEL;
+ mask = UART1_GPIO_SEL;
break;
default:
return -EINVAL;
@@ -172,24 +174,24 @@ static int dove_mpp4_ctrl_get(struct mvebu_mpp_ctrl *ctrl,
static int dove_mpp4_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
unsigned long config)
{
- unsigned long mpp4 = readl(DOVE_MPP_CTRL4_VIRT_BASE);
+ unsigned long mpp4 = readl(mpp4_base + MPP_CTRL4);
unsigned long mask;
switch (ctrl->pid) {
case 24: /* mpp_camera */
- mask = DOVE_CAM_GPIO_SEL;
+ mask = CAM_GPIO_SEL;
break;
case 40: /* mpp_sdio0 */
- mask = DOVE_SD0_GPIO_SEL;
+ mask = SD0_GPIO_SEL;
break;
case 46: /* mpp_sdio1 */
- mask = DOVE_SD1_GPIO_SEL;
+ mask = SD1_GPIO_SEL;
break;
case 58: /* mpp_spi0 */
- mask = DOVE_SPI_GPIO_SEL;
+ mask = SPI_GPIO_SEL;
break;
case 62: /* mpp_uart1 */
- mask = DOVE_UART1_GPIO_SEL;
+ mask = UART1_GPIO_SEL;
break;
default:
return -EINVAL;
@@ -199,7 +201,7 @@ static int dove_mpp4_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
if (config)
mpp4 |= mask;
- writel(mpp4, DOVE_MPP_CTRL4_VIRT_BASE);
+ writel(mpp4, mpp4_base + MPP_CTRL4);
return 0;
}
@@ -254,13 +256,13 @@ static int dove_audio0_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
static int dove_audio1_ctrl_get(struct mvebu_mpp_ctrl *ctrl,
unsigned long *config)
{
- unsigned long mpp4 = readl(DOVE_MPP_CTRL4_VIRT_BASE);
+ unsigned long mpp4 = readl(mpp4_base + MPP_CTRL4);
unsigned long sspc1 = readl(DOVE_SSP_CTRL_STATUS_1);
unsigned long gmpp = readl(DOVE_MPP_GENERAL_VIRT_BASE);
unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2);
*config = 0;
- if (mpp4 & DOVE_AU1_GPIO_SEL)
+ if (mpp4 & AU1_GPIO_SEL)
*config |= BIT(3);
if (sspc1 & DOVE_SSP_ON_AU1)
*config |= BIT(2);
@@ -281,7 +283,7 @@ static int dove_audio1_ctrl_get(struct mvebu_mpp_ctrl *ctrl,
static int dove_audio1_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
unsigned long config)
{
- unsigned long mpp4 = readl(DOVE_MPP_CTRL4_VIRT_BASE);
+ unsigned long mpp4 = readl(mpp4_base + MPP_CTRL4);
unsigned long sspc1 = readl(DOVE_SSP_CTRL_STATUS_1);
unsigned long gmpp = readl(DOVE_MPP_GENERAL_VIRT_BASE);
unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2);
@@ -292,7 +294,7 @@ static int dove_audio1_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
gcfg2 &= ~DOVE_TWSI_OPTION3_GPIO;
gmpp &= ~DOVE_AU1_SPDIFO_GPIO_EN;
sspc1 &= ~DOVE_SSP_ON_AU1;
- mpp4 &= ~DOVE_AU1_GPIO_SEL;
+ mpp4 &= ~AU1_GPIO_SEL;
if (config & BIT(0))
gcfg2 |= DOVE_TWSI_OPTION3_GPIO;
@@ -301,9 +303,9 @@ static int dove_audio1_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
if (config & BIT(2))
sspc1 |= DOVE_SSP_ON_AU1;
if (config & BIT(3))
- mpp4 |= DOVE_AU1_GPIO_SEL;
+ mpp4 |= AU1_GPIO_SEL;
- writel(mpp4, DOVE_MPP_CTRL4_VIRT_BASE);
+ writel(mpp4, mpp4_base + MPP_CTRL4);
writel(sspc1, DOVE_SSP_CTRL_STATUS_1);
writel(gmpp, DOVE_MPP_GENERAL_VIRT_BASE);
writel(gcfg2, DOVE_GLOBAL_CONFIG_2);
--
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 ` [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 ` [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 ` Sebastian Hesselbarth [this message]
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-19-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).