lkml.org 
[lkml]   [2014]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/11] pinctrl: mvebu: dove: use remapped mpp4 register
    Date
    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: Linus Walleij <linus.walleij@linaro.org>
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: linux-kernel@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 79106e7ecdd0..0c7616e086b2 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
    @@ -117,24 +119,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;
    @@ -148,24 +150,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;
    @@ -175,7 +177,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;
    }
    @@ -230,13 +232,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);
    @@ -257,7 +259,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);
    @@ -268,7 +270,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;
    @@ -277,9 +279,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


    \
     
     \ /
      Last update: 2014-01-25 20:01    [W:4.157 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site