tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
pinctrl: mvebu: dove: reuse mpp_{set,get} in pmu callbacks
Dove has pins that can be switched between normal and pmu functions.
Rework pmu_mpp callbacks to reuse default mpp ctrl helpers.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+17
-20
+17
-20
drivers/pinctrl/mvebu/pinctrl-dove.c
+17
-20
drivers/pinctrl/mvebu/pinctrl-dove.c
···
70
70
unsigned long pmu = readl(DOVE_PMU_MPP_GENERAL_CTRL);
71
71
unsigned long func;
72
72
73
-
if (pmu & (1 << pid)) {
74
-
func = readl(DOVE_PMU_SIGNAL_SELECT_0 + off);
75
-
*config = (func >> shift) & MVEBU_MPP_MASK;
76
-
*config |= CONFIG_PMU;
77
-
} else {
78
-
func = readl(DOVE_MPP_VIRT_BASE + off);
79
-
*config = (func >> shift) & MVEBU_MPP_MASK;
80
-
}
73
+
if ((pmu & BIT(pid)) == 0)
74
+
return default_mpp_ctrl_get(mpp_base, pid, config);
75
+
76
+
func = readl(DOVE_PMU_SIGNAL_SELECT_0 + off);
77
+
*config = (func >> shift) & MVEBU_MPP_MASK;
78
+
*config |= CONFIG_PMU;
79
+
81
80
return 0;
82
81
}
83
82
···
87
88
unsigned long pmu = readl(DOVE_PMU_MPP_GENERAL_CTRL);
88
89
unsigned long func;
89
90
90
-
if (config & CONFIG_PMU) {
91
-
writel(pmu | (1 << pid), DOVE_PMU_MPP_GENERAL_CTRL);
92
-
func = readl(DOVE_PMU_SIGNAL_SELECT_0 + off);
93
-
func &= ~(MVEBU_MPP_MASK << shift);
94
-
func |= (config & MVEBU_MPP_MASK) << shift;
95
-
writel(func, DOVE_PMU_SIGNAL_SELECT_0 + off);
96
-
} else {
97
-
writel(pmu & ~(1 << pid), DOVE_PMU_MPP_GENERAL_CTRL);
98
-
func = readl(DOVE_MPP_VIRT_BASE + off);
99
-
func &= ~(MVEBU_MPP_MASK << shift);
100
-
func |= (config & MVEBU_MPP_MASK) << shift;
101
-
writel(func, DOVE_MPP_VIRT_BASE + off);
91
+
if ((config & CONFIG_PMU) == 0) {
92
+
writel(pmu & ~BIT(pid), DOVE_PMU_MPP_GENERAL_CTRL);
93
+
return default_mpp_ctrl_set(mpp_base, pid, config);
102
94
}
95
+
96
+
writel(pmu | BIT(pid), DOVE_PMU_MPP_GENERAL_CTRL);
97
+
func = readl(DOVE_PMU_SIGNAL_SELECT_0 + off);
98
+
func &= ~(MVEBU_MPP_MASK << shift);
99
+
func |= (config & MVEBU_MPP_MASK) << shift;
100
+
writel(func, DOVE_PMU_SIGNAL_SELECT_0 + off);
101
+
103
102
return 0;
104
103
}
105
104