Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 dfc04955 编写于 作者: K Kunihiko Hayashi 提交者： Linus Walleij
浏览文件
操作

pinctrl: uniphier: Divide pinmux group to support 1ch and 2ch I2S 

Current pinmux group for audio in/out assumes 4ch I2S case but the
UniPhier AIO hardware also supports 1ch and 2ch I2S. So divide current
ain1 group into ain1, ain1_dat2 and ain1_dat4 groups. Divide other
ain and aout in the same way.
Signed-off-by: NRyuta NAKANISHI <nakanishi.ryuta@socionext.com>
Signed-off-by: NKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Link: https://lore.kernel.org/r/1643376903-18623-3-git-send-email-hayashi.kunihiko@socionext.comSigned-off-by: NLinus Walleij <linus.walleij@linaro.org>
上级 8e703784
隐藏空白更改
内联 并排
Showing with 152 addition and 44 deletion
drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c
浏览文件 @ dfc04955
......@@ -461,10 +461,18 @@ static const struct pinctrl_pin_desc uniphier_ld11_pins[] = {
166, UNIPHIER_PIN_PULL_DOWN),
};
static const unsigned ain1_pins[] = {151, 152, 153, 154, 155, 156, 157};
static const int ain1_muxvals[] = {4, 4, 4, 4, 4, 4, 4};
static const unsigned aout1_pins[] = {137, 138, 139, 140, 141, 142};
static const int aout1_muxvals[] = {0, 0, 0, 0, 0, 0};
static const unsigned ain1_pins[] = {151, 152, 153, 154};
static const int ain1_muxvals[] = {4, 4, 4, 4};
static const unsigned ain1_dat2_pins[] = {155};
static const int ain1_dat2_muxvals[] = {4};
static const unsigned ain1_dat4_pins[] = {156, 157};
static const int ain1_dat4_muxvals[] = {4, 4};
static const unsigned aout1_pins[] = {137, 138, 139, 140};
static const int aout1_muxvals[] = {0, 0, 0, 0};
static const unsigned aout1_dat2_pins[] = {141};
static const int aout1_dat2_muxvals[] = {0};
static const unsigned aout1_dat4_pins[] = {142, 143};
static const int aout1_dat4_muxvals[] = {0, 3};
static const unsigned ainiec1_pins[] = {150};
static const int ainiec1_muxvals[] = {4};
static const unsigned ainiec1b_pins[] = {141};
......@@ -582,7 +590,11 @@ static const unsigned int gpio_range5_pins[] = {
static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = {
UNIPHIER_PINCTRL_GROUP(ain1),
UNIPHIER_PINCTRL_GROUP(ain1_dat2),
UNIPHIER_PINCTRL_GROUP(ain1_dat4),
UNIPHIER_PINCTRL_GROUP(aout1),
UNIPHIER_PINCTRL_GROUP(aout1_dat2),
UNIPHIER_PINCTRL_GROUP(aout1_dat4),
UNIPHIER_PINCTRL_GROUP(ainiec1),
UNIPHIER_PINCTRL_GROUP(ainiec1b),
UNIPHIER_PINCTRL_GROUP(aoutiec1),
......@@ -626,8 +638,10 @@ static const struct uniphier_pinctrl_group uniphier_ld11_groups[] = {
UNIPHIER_PINCTRL_GROUP_GPIO(gpio_range5),
};
static const char * const ain1_groups[] = {"ain1"};
static const char * const aout1_groups[] = {"aout1"};
static const char * const ain1_groups[] = {"ain1", "ain1_dat2",
"ain1_dat4"};
static const char * const aout1_groups[] = {"aout1", "aout1_dat2",
"aout1_dat4"};
static const char * const ainiec1_groups[] = {"ainiec1", "ainiec1b"};
static const char * const aoutiec1_groups[] = {"aoutiec1"};
static const char * const aoutiec2_groups[] = {"aoutiec2"};
......
drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
浏览文件 @ dfc04955
......@@ -542,18 +542,38 @@ static const struct pinctrl_pin_desc uniphier_ld20_pins[] = {
175, UNIPHIER_PIN_PULL_DOWN),
};
static const unsigned ain1_pins[] = {150, 151, 152, 153, 154, 155, 156};
static const int ain1_muxvals[] = {4, 4, 4, 4, 4, 4, 4};
static const unsigned ain2_pins[] = {116, 117, 118, 119, 120, 121, 122};
static const int ain2_muxvals[] = {26, 26, 26, 26, 26, 26, 26};
static const unsigned ain1_pins[] = {150, 151, 152, 153};
static const int ain1_muxvals[] = {4, 4, 4, 4};
static const unsigned ain1_dat2_pins[] = {154};
static const int ain1_dat2_muxvals[] = {4};
static const unsigned ain1_dat4_pins[] = {155, 156};
static const int ain1_dat4_muxvals[] = {4, 4};
static const unsigned ain2_pins[] = {116, 117, 118, 119};
static const int ain2_muxvals[] = {26, 26, 26, 26};
static const unsigned ain2_dat2_pins[] = {120};
static const int ain2_dat2_muxvals[] = {26};
static const unsigned ain2_dat4_pins[] = {121, 122};
static const int ain2_dat4_muxvals[] = {26, 26};
static const unsigned ain3_pins[] = {116, 117, 118, 119};
static const int ain3_muxvals[] = {27, 27, 27, 27};
static const unsigned aout1_pins[] = {137, 138, 139, 140, 141, 142};
static const int aout1_muxvals[] = {0, 0, 0, 0, 0, 0};
static const unsigned aout1b_pins[] = {150, 151, 152, 153, 154, 155, 156};
static const int aout1b_muxvals[] = {1, 1, 1, 1, 1, 1, 1};
static const unsigned aout2_pins[] = {165, 157, 162, 158, 159, 160, 161};
static const int aout2_muxvals[] = {2, 2, 2, 1, 1, 1, 1};
static const unsigned aout1_pins[] = {137, 138, 139, 140};
static const int aout1_muxvals[] = {0, 0, 0, 0};
static const unsigned aout1_dat2_pins[] = {141};
static const int aout1_dat2_muxvals[] = {0};
static const unsigned aout1_dat4_pins[] = {142, 156};
static const int aout1_dat4_muxvals[] = {0, 1};
static const unsigned aout1b_pins[] = {150, 151, 152, 153};
static const int aout1b_muxvals[] = {1, 1, 1, 1};
static const unsigned aout1b_dat2_pins[] = {154};
static const int aout1b_dat2_muxvals[] = {1};
static const unsigned aout1b_dat4_pins[] = {155, 156};
static const int aout1b_dat4_muxvals[] = {1, 1};
static const unsigned aout2_pins[] = {165, 157, 162, 158};
static const int aout2_muxvals[] = {2, 2, 2, 1};
static const unsigned aout2_dat2_pins[] = {159};
static const int aout2_dat2_muxvals[] = {1};
static const unsigned aout2_dat4_pins[] = {160, 161};
static const int aout2_dat4_muxvals[] = {1, 1};
static const unsigned aout3_pins[] = {166, 167, 168, 163};
static const int aout3_muxvals[] = {2, 2, 2, 1};
static const unsigned aout4_pins[] = {169, 170, 171, 164};
......@@ -682,11 +702,21 @@ static const unsigned int gpio_range2_pins[] = {
static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = {
UNIPHIER_PINCTRL_GROUP(ain1),
UNIPHIER_PINCTRL_GROUP(ain1_dat2),
UNIPHIER_PINCTRL_GROUP(ain1_dat4),
UNIPHIER_PINCTRL_GROUP(ain2),
UNIPHIER_PINCTRL_GROUP(ain2_dat2),
UNIPHIER_PINCTRL_GROUP(ain2_dat4),
UNIPHIER_PINCTRL_GROUP(ain3),
UNIPHIER_PINCTRL_GROUP(aout1),
UNIPHIER_PINCTRL_GROUP(aout1_dat2),
UNIPHIER_PINCTRL_GROUP(aout1_dat4),
UNIPHIER_PINCTRL_GROUP(aout1b),
UNIPHIER_PINCTRL_GROUP(aout1b_dat2),
UNIPHIER_PINCTRL_GROUP(aout1b_dat4),
UNIPHIER_PINCTRL_GROUP(aout2),
UNIPHIER_PINCTRL_GROUP(aout2_dat2),
UNIPHIER_PINCTRL_GROUP(aout2_dat4),
UNIPHIER_PINCTRL_GROUP(aout3),
UNIPHIER_PINCTRL_GROUP(aout4),
UNIPHIER_PINCTRL_GROUP(aoutiec1),
......@@ -734,11 +764,17 @@ static const struct uniphier_pinctrl_group uniphier_ld20_groups[] = {
UNIPHIER_PINCTRL_GROUP_GPIO(gpio_range2),
};
static const char * const ain1_groups[] = {"ain1"};
static const char * const ain2_groups[] = {"ain2"};
static const char * const ain1_groups[] = {"ain1", "ain1_dat2",
"ain1_dat4"};
static const char * const ain2_groups[] = {"ain2", "ain2_dat2",
"ain2_dat4"};
static const char * const ain3_groups[] = {"ain3"};
static const char * const aout1_groups[] = {"aout1", "aout1b"};
static const char * const aout2_groups[] = {"aout2"};
static const char * const aout1_groups[] = {"aout1", "aout1_dat2",
"aout1_dat4",
"aout1b", "aout1b_dat2",
"aout1b_dat4"};
static const char * const aout2_groups[] = {"aout2", "aout2_dat2",
"aout2_dat4"};
static const char * const aout3_groups[] = {"aout3"};
static const char * const aout4_groups[] = {"aout4"};
static const char * const aoutiec1_groups[] = {"aoutiec1"};
......
drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
浏览文件 @ dfc04955
......@@ -719,18 +719,34 @@ static const struct pinctrl_pin_desc uniphier_pxs2_pins[] = {
234, UNIPHIER_PIN_PULL_DOWN),
};
static const unsigned ain1_pins[] = {161, 162, 173, 174, 127, 128, 129};
static const int ain1_muxvals[] = {8, 8, 8, 8, 3, 3, 3};
static const unsigned ain2_pins[] = {98, 99, 100, 101, 102, 103, 104};
static const int ain2_muxvals[] = {8, 8, 8, 8, 8, 8, 8};
static const unsigned ain1_pins[] = {161, 162, 173, 174};
static const int ain1_muxvals[] = {8, 8, 8, 8};
static const unsigned ain1_dat2_pins[] = {127};
static const int ain1_dat2_muxvals[] = {3};
static const unsigned ain1_dat4_pins[] = {128, 129};
static const int ain1_dat4_muxvals[] = {3, 3};
static const unsigned ain2_pins[] = {98, 99, 100, 101};
static const int ain2_muxvals[] = {8, 8, 8, 8};
static const unsigned ain2_dat2_pins[] = {102};
static const int ain2_dat2_muxvals[] = {8};
static const unsigned ain2_dat4_pins[] = {103, 104};
static const int ain2_dat4_muxvals[] = {8, 8};
static const unsigned ain3_pins[] = {132, 133, 134, 131};
static const int ain3_muxvals[] = {5, 5, 5, 5};
static const unsigned ainiec1_pins[] = {91};
static const int ainiec1_muxvals[] = {11};
static const unsigned aout1_pins[] = {87, 88, 89, 90, 92, 93, 94};
static const int aout1_muxvals[] = {11, 11, 11, 11, 11, 11, 11};
static const unsigned aout2_pins[] = {175, 176, 177, 178, 183, 184, 185};
static const int aout2_muxvals[] = {8, 8, 8, 8, 9, 9, 9};
static const unsigned aout1_pins[] = {87, 88, 89, 90};
static const int aout1_muxvals[] = {11, 11, 11, 11};
static const unsigned aout1_dat2_pins[] = {92};
static const int aout1_dat2_muxvals[] = {11};
static const unsigned aout1_dat4_pins[] = {93, 94};
static const int aout1_dat4_muxvals[] = {11, 11};
static const unsigned aout2_pins[] = {177, 178, 175, 176};
static const int aout2_muxvals[] = {8, 8, 8, 8};
static const unsigned aout2_dat2_pins[] = {183};
static const int aout2_dat2_muxvals[] = {9};
static const unsigned aout2_dat4_pins[] = {184, 185};
static const int aout2_dat4_muxvals[] = {9, 9};
static const unsigned aout3_pins[] = {105, 106, 107, 108};
static const int aout3_muxvals[] = {8, 8, 8, 8};
static const unsigned aoutiec1_pins[] = {95};
......@@ -842,11 +858,19 @@ static const unsigned int gpio_range1_pins[] = {
static const struct uniphier_pinctrl_group uniphier_pxs2_groups[] = {
UNIPHIER_PINCTRL_GROUP(ain1),
UNIPHIER_PINCTRL_GROUP(ain1_dat2),
UNIPHIER_PINCTRL_GROUP(ain1_dat4),
UNIPHIER_PINCTRL_GROUP(ain2),
UNIPHIER_PINCTRL_GROUP(ain2_dat2),
UNIPHIER_PINCTRL_GROUP(ain2_dat4),
UNIPHIER_PINCTRL_GROUP(ain3),
UNIPHIER_PINCTRL_GROUP(ainiec1),
UNIPHIER_PINCTRL_GROUP(aout1),
UNIPHIER_PINCTRL_GROUP(aout1_dat2),
UNIPHIER_PINCTRL_GROUP(aout1_dat4),
UNIPHIER_PINCTRL_GROUP(aout2),
UNIPHIER_PINCTRL_GROUP(aout2_dat2),
UNIPHIER_PINCTRL_GROUP(aout2_dat4),
UNIPHIER_PINCTRL_GROUP(aout3),
UNIPHIER_PINCTRL_GROUP(aoutiec1),
UNIPHIER_PINCTRL_GROUP(aoutiec2),
......@@ -884,12 +908,16 @@ static const struct uniphier_pinctrl_group uniphier_pxs2_groups[] = {
UNIPHIER_PINCTRL_GROUP_GPIO(gpio_range1),
};
static const char * const ain1_groups[] = {"ain1"};
static const char * const ain2_groups[] = {"ain2"};
static const char * const ain1_groups[] = {"ain1", "ain1_dat2",
"ain1_dat4"};
static const char * const ain2_groups[] = {"ain2", "ain2_dat2",
"ain2_dat4"};
static const char * const ain3_groups[] = {"ain3"};
static const char * const ainiec1_groups[] = {"ainiec1"};
static const char * const aout1_groups[] = {"aout1"};
static const char * const aout2_groups[] = {"aout2"};
static const char * const aout1_groups[] = {"aout1", "aout1_dat2",
"aout1_dat4"};
static const char * const aout2_groups[] = {"aout2", "aout2_dat2",
"aout2_dat4"};
static const char * const aout3_groups[] = {"aout3"};
static const char * const aoutiec1_groups[] = {"aoutiec1"};
static const char * const aoutiec2_groups[] = {"aoutiec2"};
......@@ -922,7 +950,9 @@ static const char * const usb3_groups[] = {"usb3"};
static const struct uniphier_pinmux_function uniphier_pxs2_functions[] = {
UNIPHIER_PINMUX_FUNCTION(ain1),
UNIPHIER_PINMUX_FUNCTION(ain2),
UNIPHIER_PINMUX_FUNCTION(ain3),
UNIPHIER_PINMUX_FUNCTION(ainiec1),
UNIPHIER_PINMUX_FUNCTION(aout1),
UNIPHIER_PINMUX_FUNCTION(aout2),
UNIPHIER_PINMUX_FUNCTION(aout3),
UNIPHIER_PINMUX_FUNCTION(aoutiec1),
......
drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c
浏览文件 @ dfc04955
......@@ -767,14 +767,30 @@ static const struct pinctrl_pin_desc uniphier_pxs3_pins[] = {
250, UNIPHIER_PIN_PULL_DOWN),
};
static const unsigned ain1_pins[] = {186, 187, 188, 189, 237, 238, 239};
static const int ain1_muxvals[] = {0, 0, 0, 0, 1, 1, 1};
static const unsigned ain2_pins[] = {243, 244, 245, 246, 247, 248, 249};
static const int ain2_muxvals[] = {1, 1, 1, 1, 1, 1, 1};
static const unsigned aout1_pins[] = {226, 227, 228, 229, 230, 231, 232};
static const int aout1_muxvals[] = {1, 1, 1, 1, 1, 1, 1};
static const unsigned aout2_pins[] = {192, 193, 194, 195, 196, 197, 198};
static const int aout2_muxvals[] = {0, 0, 0, 0, 0, 0, 0};
static const unsigned ain1_pins[] = {186, 187, 188, 189};
static const int ain1_muxvals[] = {0, 0, 0, 0};
static const unsigned ain1_dat2_pins[] = {237};
static const int ain1_dat2_muxvals[] = {1};
static const unsigned ain1_dat4_pins[] = {238, 239};
static const int ain1_dat4_muxvals[] = {1, 1};
static const unsigned ain2_pins[] = {243, 244, 245, 246};
static const int ain2_muxvals[] = {1, 1, 1, 1};
static const unsigned ain2_dat2_pins[] = {247};
static const int ain2_dat2_muxvals[] = {1};
static const unsigned ain2_dat4_pins[] = {248, 249};
static const int ain2_dat4_muxvals[] = {1, 1};
static const unsigned aout1_pins[] = {226, 227, 228, 229};
static const int aout1_muxvals[] = {1, 1, 1, 1};
static const unsigned aout1_dat2_pins[] = {230};
static const int aout1_dat2_muxvals[] = {1};
static const unsigned aout1_dat4_pins[] = {231, 232};
static const int aout1_dat4_muxvals[] = {1, 1};
static const unsigned aout2_pins[] = {192, 193, 194, 195};
static const int aout2_muxvals[] = {0, 0, 0, 0};
static const unsigned aout2_dat2_pins[] = {196};
static const int aout2_dat2_muxvals[] = {0};
static const unsigned aout2_dat4_pins[] = {197, 198};
static const int aout2_dat4_muxvals[] = {0, 0};
static const unsigned aout3_pins[] = {199, 200, 201, 202};
static const int aout3_muxvals[] = {0, 0, 0, 0};
static const unsigned ainiec1_pins[] = {240};
......@@ -888,9 +904,17 @@ static const unsigned int gpio_range2_pins[] = {
static const struct uniphier_pinctrl_group uniphier_pxs3_groups[] = {
UNIPHIER_PINCTRL_GROUP(ain1),
UNIPHIER_PINCTRL_GROUP(ain1_dat2),
UNIPHIER_PINCTRL_GROUP(ain1_dat4),
UNIPHIER_PINCTRL_GROUP(ain2),
UNIPHIER_PINCTRL_GROUP(ain2_dat2),
UNIPHIER_PINCTRL_GROUP(ain2_dat4),
UNIPHIER_PINCTRL_GROUP(aout1),
UNIPHIER_PINCTRL_GROUP(aout1_dat2),
UNIPHIER_PINCTRL_GROUP(aout1_dat4),
UNIPHIER_PINCTRL_GROUP(aout2),
UNIPHIER_PINCTRL_GROUP(aout2_dat2),
UNIPHIER_PINCTRL_GROUP(aout2_dat4),
UNIPHIER_PINCTRL_GROUP(aout3),
UNIPHIER_PINCTRL_GROUP(ainiec1),
UNIPHIER_PINCTRL_GROUP(aoutiec1),
......@@ -926,10 +950,14 @@ static const struct uniphier_pinctrl_group uniphier_pxs3_groups[] = {
UNIPHIER_PINCTRL_GROUP_GPIO(gpio_range2),
};
static const char * const ain1_groups[] = {"ain1"};
static const char * const ain2_groups[] = {"ain2"};
static const char * const aout1_groups[] = {"aout1"};
static const char * const aout2_groups[] = {"aout2"};
static const char * const ain1_groups[] = {"ain1", "ain1_dat2",
"ain1_dat4"};
static const char * const ain2_groups[] = {"ain2", "ain2_dat2",
"ain1_dat4"};
static const char * const aout1_groups[] = {"aout1", "aout1_dat2",
"aout1_dat4"};
static const char * const aout2_groups[] = {"aout2", "aout2_dat2",
"aout2_dat4"};
static const char * const aout3_groups[] = {"aout3"};
static const char * const ainiec1_groups[] = {"ainiec1"};
static const char * const aoutiec1_groups[] = {"aoutiec1"};
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或