mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
pinctrl: mvebu: armada-xp: remove non-existing VDD cpu_pd functions
The latest version of the Armada XP datasheet no longer documents the
VDD cpu_pd functions, which might indicate they are not working and/or
not supported. This commit ensures the pinctrl driver matches the
datasheet.
Signed-off-by: Thomas Petazzoni <[email protected]>
Cc: <[email protected]> # v3.7+
Fixes: 463e270f76 ("pinctrl: mvebu: add pinctrl driver for Armada XP")
Signed-off-by: Linus Walleij <[email protected]>
This commit is contained in:
Thomas Petazzoni
Linus Walleij
parent
bc99357f36
commit
80b3d04fea
2 changed files with 20 additions and 39 deletions
|
|
@ -14,10 +14,7 @@
|
|||
* available: mv78230, mv78260 and mv78460. From a pin muxing
|
||||
* perspective, the mv78230 has 49 MPP pins. The mv78260 and mv78460
|
||||
* both have 67 MPP pins (more GPIOs and address lines for the memory
|
||||
* bus mainly). The only difference between the mv78260 and the
|
||||
* mv78460 in terms of pin muxing is the addition of two functions on
|
||||
* pins 43 and 56 to access the VDD of the CPU2 and 3 (mv78260 has two
|
||||
* cores, mv78460 has four cores).
|
||||
* bus mainly).
|
||||
*/
|
||||
|
||||
#include <linux/err.h>
|
||||
|
|
@ -182,8 +179,7 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = {
|
|||
MPP_MODE(26,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x3, "tdm", "fsync", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x4, "lcd", "clk", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x5, "vdd", "cpu1-pd", V_MV78230_PLUS)),
|
||||
MPP_VAR_FUNCTION(0x4, "lcd", "clk", V_MV78230_PLUS)),
|
||||
MPP_MODE(27,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "ptp", "trig", V_MV78230_PLUS),
|
||||
|
|
@ -198,8 +194,7 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = {
|
|||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "ptp", "clk", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x3, "tdm", "int0", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x4, "lcd", "ref-clk", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x5, "vdd", "cpu0-pd", V_MV78230_PLUS)),
|
||||
MPP_VAR_FUNCTION(0x4, "lcd", "ref-clk", V_MV78230_PLUS)),
|
||||
MPP_MODE(30,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "sd0", "clk", V_MV78230_PLUS),
|
||||
|
|
@ -207,13 +202,11 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = {
|
|||
MPP_MODE(31,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "sd0", "cmd", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x3, "tdm", "int2", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x5, "vdd", "cpu0-pd", V_MV78230_PLUS)),
|
||||
MPP_VAR_FUNCTION(0x3, "tdm", "int2", V_MV78230_PLUS)),
|
||||
MPP_MODE(32,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "sd0", "d0", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x3, "tdm", "int3", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x5, "vdd", "cpu1-pd", V_MV78230_PLUS)),
|
||||
MPP_VAR_FUNCTION(0x3, "tdm", "int3", V_MV78230_PLUS)),
|
||||
MPP_MODE(33,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "sd0", "d1", V_MV78230_PLUS),
|
||||
|
|
@ -245,7 +238,6 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = {
|
|||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "spi", "cs1", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x2, "uart2", "cts", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x3, "vdd", "cpu1-pd", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x4, "lcd", "vga-hsync", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x5, "pcie", "clkreq0", V_MV78230_PLUS)),
|
||||
MPP_MODE(41,
|
||||
|
|
@ -260,15 +252,13 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = {
|
|||
MPP_VAR_FUNCTION(0x1, "uart2", "rxd", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x2, "uart0", "cts", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x3, "tdm", "int7", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x4, "tdm-1", "timer", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x5, "vdd", "cpu0-pd", V_MV78230_PLUS)),
|
||||
MPP_VAR_FUNCTION(0x4, "tdm-1", "timer", V_MV78230_PLUS)),
|
||||
MPP_MODE(43,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "uart2", "txd", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x2, "uart0", "rts", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x3, "spi", "cs3", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x4, "pcie", "rstout", V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x5, "vdd", "cpu2-3-pd", V_MV78460)),
|
||||
MPP_VAR_FUNCTION(0x4, "pcie", "rstout", V_MV78230_PLUS)),
|
||||
MPP_MODE(44,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "uart2", "cts", V_MV78230_PLUS),
|
||||
|
|
@ -319,16 +309,13 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = {
|
|||
MPP_VAR_FUNCTION(0x1, "dev", "ad19", V_MV78260_PLUS)),
|
||||
MPP_MODE(55,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78260_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "dev", "ad20", V_MV78260_PLUS),
|
||||
MPP_VAR_FUNCTION(0x2, "vdd", "cpu0-pd", V_MV78260_PLUS)),
|
||||
MPP_VAR_FUNCTION(0x1, "dev", "ad20", V_MV78260_PLUS)),
|
||||
MPP_MODE(56,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78260_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "dev", "ad21", V_MV78260_PLUS),
|
||||
MPP_VAR_FUNCTION(0x2, "vdd", "cpu1-pd", V_MV78260_PLUS)),
|
||||
MPP_VAR_FUNCTION(0x1, "dev", "ad21", V_MV78260_PLUS)),
|
||||
MPP_MODE(57,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78260_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "dev", "ad22", V_MV78260_PLUS),
|
||||
MPP_VAR_FUNCTION(0x2, "vdd", "cpu2-3-pd", V_MV78460)),
|
||||
MPP_VAR_FUNCTION(0x1, "dev", "ad22", V_MV78260_PLUS)),
|
||||
MPP_MODE(58,
|
||||
MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78260_PLUS),
|
||||
MPP_VAR_FUNCTION(0x1, "dev", "ad23", V_MV78260_PLUS)),
|
||||
|
|
|
|||
Loading…
Reference in a new issue