Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18e6f28e authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth
Browse files

pinctrl: mvebu: dove: use remapped pmu_mpp registers 



Now that we have ioremapped pmu_mpp registers, get rid of hardcoded
physical addresses. While at it, also remove DOVE_ prefix from those
macros.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2c4b229b

drivers/pinctrl/mvebu/pinctrl-dove.c

+7 −5
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
#define GC_REGS_OFFS		0xe802c



#define DOVE_SB_REGS_VIRT_BASE		IOMEM(0xfde00000)

#define DOVE_PMU_SIGNAL_SELECT_0	(DOVE_SB_REGS_VIRT_BASE + 0xd802C)

#define DOVE_PMU_SIGNAL_SELECT_1	(DOVE_SB_REGS_VIRT_BASE + 0xd8030)

#define DOVE_GLOBAL_CONFIG_1		(DOVE_SB_REGS_VIRT_BASE + 0xe802C)

#define DOVE_GLOBAL_CONFIG_1		(DOVE_SB_REGS_VIRT_BASE + 0xe802C)

#define  DOVE_TWSI_ENABLE_OPTION1	BIT(7)
@@ -59,6 +57,10 @@ 
#define SD1_GPIO_SEL		BIT(1)

#define SD0_GPIO_SEL		BIT(0)



/* PMU Signal Select registers */

#define PMU_SIGNAL_SELECT_0	0x00

#define PMU_SIGNAL_SELECT_1	0x04



#define CONFIG_PMU	BIT(4)



static void __iomem *mpp_base;
@@ -86,7 +88,7 @@ static int dove_pmu_mpp_ctrl_get(unsigned pid, unsigned long *config) 
	if ((pmu & BIT(pid)) == 0)

		return default_mpp_ctrl_get(mpp_base, pid, config);



	func = readl(DOVE_PMU_SIGNAL_SELECT_0 + off);

	func = readl(pmu_base + PMU_SIGNAL_SELECT_0 + off);

	*config = (func >> shift) & MVEBU_MPP_MASK;

	*config |= CONFIG_PMU;
@@ -106,10 +108,10 @@ static int dove_pmu_mpp_ctrl_set(unsigned pid, unsigned long config) 
	}



	writel(pmu | BIT(pid), mpp_base + PMU_MPP_GENERAL_CTRL);

	func = readl(DOVE_PMU_SIGNAL_SELECT_0 + off);

	func = readl(pmu_base + PMU_SIGNAL_SELECT_0 + off);

	func &= ~(MVEBU_MPP_MASK << shift);

	func |= (config & MVEBU_MPP_MASK) << shift;

	writel(func, DOVE_PMU_SIGNAL_SELECT_0 + off);

	writel(func, pmu_base + PMU_SIGNAL_SELECT_0 + off);



	return 0;

}