leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: mvebu: dove: use remapped mpp4 register

Browse Source 
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>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Sebastian Hesselbarth 2014-01-24 23:33:16 +01:00
parent 00202b013e
commit 2c4b229baf
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/pinctrl/mvebu/pinctrl-dove.c
View File

@ -46,18 +46,19 @@
#define DOVE_AU1_SPDIFO_GPIO_EN BIT(1) #define DOVE_AU1_SPDIFO_GPIO_EN BIT(1)
#define DOVE_NAND_GPIO_EN BIT(0) #define DOVE_NAND_GPIO_EN BIT(0)
#define DOVE_GPIO_LO_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE + 0xd0400) #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 */ /* MPP Base registers */
#define PMU_MPP_GENERAL_CTRL 0x10 #define PMU_MPP_GENERAL_CTRL 0x10
#define AU0_AC97_SEL BIT(16) #define AU0_AC97_SEL BIT(16)
/* MPP Control 4 register */
#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 CONFIG_PMU BIT(4) #define CONFIG_PMU BIT(4)
static void __iomem *mpp_base; static void __iomem *mpp_base;
@ -115,24 +116,24 @@ static int dove_pmu_mpp_ctrl_set(unsigned pid, unsigned long config)
static int dove_mpp4_ctrl_get(unsigned pid, unsigned long *config) static int dove_mpp4_ctrl_get(unsigned pid, unsigned long *config)
{ {
unsigned long mpp4 = readl(DOVE_MPP_CTRL4_VIRT_BASE); unsigned long mpp4 = readl(mpp4_base);
unsigned long mask; unsigned long mask;
switch (pid) { switch (pid) {
case 24: /* mpp_camera */ case 24: /* mpp_camera */
mask = DOVE_CAM_GPIO_SEL; mask = CAM_GPIO_SEL;
break; break;
case 40: /* mpp_sdio0 */ case 40: /* mpp_sdio0 */
mask = DOVE_SD0_GPIO_SEL; mask = SD0_GPIO_SEL;
break; break;
case 46: /* mpp_sdio1 */ case 46: /* mpp_sdio1 */
mask = DOVE_SD1_GPIO_SEL; mask = SD1_GPIO_SEL;
break; break;
case 58: /* mpp_spi0 */ case 58: /* mpp_spi0 */
mask = DOVE_SPI_GPIO_SEL; mask = SPI_GPIO_SEL;
break; break;
case 62: /* mpp_uart1 */ case 62: /* mpp_uart1 */
mask = DOVE_UART1_GPIO_SEL; mask = UART1_GPIO_SEL;
break; break;
default: default:
return -EINVAL; return -EINVAL;
@ -145,24 +146,24 @@ static int dove_mpp4_ctrl_get(unsigned pid, unsigned long *config)
static int dove_mpp4_ctrl_set(unsigned pid, unsigned long config) static int dove_mpp4_ctrl_set(unsigned pid, unsigned long config)
{ {
unsigned long mpp4 = readl(DOVE_MPP_CTRL4_VIRT_BASE); unsigned long mpp4 = readl(mpp4_base);
unsigned long mask; unsigned long mask;
switch (pid) { switch (pid) {
case 24: /* mpp_camera */ case 24: /* mpp_camera */
mask = DOVE_CAM_GPIO_SEL; mask = CAM_GPIO_SEL;
break; break;
case 40: /* mpp_sdio0 */ case 40: /* mpp_sdio0 */
mask = DOVE_SD0_GPIO_SEL; mask = SD0_GPIO_SEL;
break; break;
case 46: /* mpp_sdio1 */ case 46: /* mpp_sdio1 */
mask = DOVE_SD1_GPIO_SEL; mask = SD1_GPIO_SEL;
break; break;
case 58: /* mpp_spi0 */ case 58: /* mpp_spi0 */
mask = DOVE_SPI_GPIO_SEL; mask = SPI_GPIO_SEL;
break; break;
case 62: /* mpp_uart1 */ case 62: /* mpp_uart1 */
mask = DOVE_UART1_GPIO_SEL; mask = UART1_GPIO_SEL;
break; break;
default: default:
return -EINVAL; return -EINVAL;
@ -172,7 +173,7 @@ static int dove_mpp4_ctrl_set(unsigned pid, unsigned long config)
if (config) if (config)
mpp4 |= mask; mpp4 |= mask;
writel(mpp4, DOVE_MPP_CTRL4_VIRT_BASE); writel(mpp4, mpp4_base);
return 0; return 0;
} }
@ -222,13 +223,13 @@ static int dove_audio0_ctrl_set(unsigned pid, unsigned long config)
static int dove_audio1_ctrl_get(unsigned pid, unsigned long *config) static int dove_audio1_ctrl_get(unsigned pid, unsigned long *config)
{ {
unsigned long mpp4 = readl(DOVE_MPP_CTRL4_VIRT_BASE); unsigned int mpp4 = readl(mpp4_base);
unsigned long sspc1 = readl(DOVE_SSP_CTRL_STATUS_1); unsigned long sspc1 = readl(DOVE_SSP_CTRL_STATUS_1);
unsigned long gmpp = readl(DOVE_MPP_GENERAL_VIRT_BASE); unsigned long gmpp = readl(DOVE_MPP_GENERAL_VIRT_BASE);
unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2); unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2);
*config = 0; *config = 0;
if (mpp4 & DOVE_AU1_GPIO_SEL) if (mpp4 & AU1_GPIO_SEL)
*config |= BIT(3); *config |= BIT(3);
if (sspc1 & DOVE_SSP_ON_AU1) if (sspc1 & DOVE_SSP_ON_AU1)
*config |= BIT(2); *config |= BIT(2);
@ -248,7 +249,7 @@ static int dove_audio1_ctrl_get(unsigned pid, unsigned long *config)
static int dove_audio1_ctrl_set(unsigned pid, unsigned long config) static int dove_audio1_ctrl_set(unsigned pid, unsigned long config)
{ {
unsigned long mpp4 = readl(DOVE_MPP_CTRL4_VIRT_BASE); unsigned int mpp4 = readl(mpp4_base);
unsigned long sspc1 = readl(DOVE_SSP_CTRL_STATUS_1); unsigned long sspc1 = readl(DOVE_SSP_CTRL_STATUS_1);
unsigned long gmpp = readl(DOVE_MPP_GENERAL_VIRT_BASE); unsigned long gmpp = readl(DOVE_MPP_GENERAL_VIRT_BASE);
unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2); unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2);
@ -259,7 +260,7 @@ static int dove_audio1_ctrl_set(unsigned pid, unsigned long config)
gcfg2 &= ~DOVE_TWSI_OPTION3_GPIO; gcfg2 &= ~DOVE_TWSI_OPTION3_GPIO;
gmpp &= ~DOVE_AU1_SPDIFO_GPIO_EN; gmpp &= ~DOVE_AU1_SPDIFO_GPIO_EN;
sspc1 &= ~DOVE_SSP_ON_AU1; sspc1 &= ~DOVE_SSP_ON_AU1;
mpp4 &= ~DOVE_AU1_GPIO_SEL; mpp4 &= ~AU1_GPIO_SEL;
if (config & BIT(0)) if (config & BIT(0))
gcfg2 |= DOVE_TWSI_OPTION3_GPIO; gcfg2 |= DOVE_TWSI_OPTION3_GPIO;
@ -268,9 +269,9 @@ static int dove_audio1_ctrl_set(unsigned pid, unsigned long config)
if (config & BIT(2)) if (config & BIT(2))
sspc1 |= DOVE_SSP_ON_AU1; sspc1 |= DOVE_SSP_ON_AU1;
if (config & BIT(3)) if (config & BIT(3))
mpp4 |= DOVE_AU1_GPIO_SEL; mpp4 |= AU1_GPIO_SEL;
writel(mpp4, DOVE_MPP_CTRL4_VIRT_BASE); writel(mpp4, mpp4_base);
writel(sspc1, DOVE_SSP_CTRL_STATUS_1); writel(sspc1, DOVE_SSP_CTRL_STATUS_1);
writel(gmpp, DOVE_MPP_GENERAL_VIRT_BASE); writel(gmpp, DOVE_MPP_GENERAL_VIRT_BASE);
writel(gcfg2, DOVE_GLOBAL_CONFIG_2); writel(gcfg2, DOVE_GLOBAL_CONFIG_2);