+++ /dev/null
-From b885df7cf938ec6af1c0d73576998310be859a09 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 20 Apr 2021 17:12:40 +0800
-Subject: pinctrl: rockchip: do coding style for mux route struct
-
-From: Jianqun Xu <jay.xu@rock-chips.com>
-
-[ Upstream commit fe202ea8e5b170ef7b3741da885e8cb7bae1106e ]
-
-The mux route tables take many lines for each SoC, and it will be more
-instances for newly SoC, that makes the file size increase larger.
-
-This patch only do coding style for mux route struct, by adding a new
-definition and replace the structs by script which supplied by
-huangtao@rock-chips.com
-
-sed -i -e "
-/static struct rockchip_mux_route_data /bcheck
-b
-:append-next-line
-N
-:check
-/^[^;]*$/bappend-next-line
-s/[[:blank:]]*.bank_num = \([[:digit:]]*,\)\n/\tRK_MUXROUTE_SAME(\1/g
-s/[[:blank:]]*.pin =[[:blank:]]*0,\n/ RK_PA0,/g
-s/[[:blank:]]*.pin =[[:blank:]]*1,\n/ RK_PA1,/g
-s/[[:blank:]]*.pin =[[:blank:]]*2,\n/ RK_PA2,/g
-s/[[:blank:]]*.pin =[[:blank:]]*3,\n/ RK_PA3,/g
-s/[[:blank:]]*.pin =[[:blank:]]*4,\n/ RK_PA4,/g
-s/[[:blank:]]*.pin =[[:blank:]]*5,\n/ RK_PA5,/g
-s/[[:blank:]]*.pin =[[:blank:]]*6,\n/ RK_PA6,/g
-s/[[:blank:]]*.pin =[[:blank:]]*7,\n/ RK_PA7,/g
-s/[[:blank:]]*.pin =[[:blank:]]*8,\n/ RK_PB0,/g
-s/[[:blank:]]*.pin =[[:blank:]]*9,\n/ RK_PB1,/g
-s/[[:blank:]]*.pin =[[:blank:]]*10,\n/ RK_PB2,/g
-s/[[:blank:]]*.pin =[[:blank:]]*11,\n/ RK_PB3,/g
-s/[[:blank:]]*.pin =[[:blank:]]*12,\n/ RK_PB4,/g
-s/[[:blank:]]*.pin =[[:blank:]]*13,\n/ RK_PB5,/g
-s/[[:blank:]]*.pin =[[:blank:]]*14,\n/ RK_PB6,/g
-s/[[:blank:]]*.pin =[[:blank:]]*15,\n/ RK_PB7,/g
-s/[[:blank:]]*.pin =[[:blank:]]*16,\n/ RK_PC0,/g
-s/[[:blank:]]*.pin =[[:blank:]]*17,\n/ RK_PC1,/g
-s/[[:blank:]]*.pin =[[:blank:]]*18,\n/ RK_PC2,/g
-s/[[:blank:]]*.pin =[[:blank:]]*19,\n/ RK_PC3,/g
-s/[[:blank:]]*.pin =[[:blank:]]*20,\n/ RK_PC4,/g
-s/[[:blank:]]*.pin =[[:blank:]]*21,\n/ RK_PC5,/g
-s/[[:blank:]]*.pin =[[:blank:]]*22,\n/ RK_PC6,/g
-s/[[:blank:]]*.pin =[[:blank:]]*23,\n/ RK_PC7,/g
-s/[[:blank:]]*.pin =[[:blank:]]*24,\n/ RK_PD0,/g
-s/[[:blank:]]*.pin =[[:blank:]]*25,\n/ RK_PD1,/g
-s/[[:blank:]]*.pin =[[:blank:]]*26,\n/ RK_PD2,/g
-s/[[:blank:]]*.pin =[[:blank:]]*27,\n/ RK_PD3,/g
-s/[[:blank:]]*.pin =[[:blank:]]*28,\n/ RK_PD4,/g
-s/[[:blank:]]*.pin =[[:blank:]]*29,\n/ RK_PD5,/g
-s/[[:blank:]]*.pin =[[:blank:]]*30,\n/ RK_PD6,/g
-s/[[:blank:]]*.pin =[[:blank:]]*31,\n/ RK_PD7,/g
-s/[[:blank:]]*.func = \([[:digit:]]*,\)\n/ \1/g
-s/[[:blank:]]*.route_location =[[:blank:]]*\([[:print:]]*,\)\n//g
-s/[[:blank:]]*.route_offset = \(0x[[:xdigit:]]*,\)\n/ \1/g
-s/[[:blank:]]*.route_val =[[:blank:]]*\([[:print:]]*\),\n/ \1),/g
-s/\t{\n//g
-s/\t}, {\n//g
-s/\t},//g
-s/[[:blank:]]*\(\/\*[[:print:]]*\*\/\)\n[[:blank:]]*RK_MUXROUTE_SAME(\([[:print:]]*\)),\n/\tRK_MUXROUTE_SAME(\2), \1\n/g
-s/[[:blank:]]*\(\/\*[[:print:]]*\*\/\)\n[[:blank:]]*RK_MUXROUTE_SAME(\([[:print:]]*\)),/\tRK_MUXROUTE_SAME(\2), \1\n/g
-" drivers/pinctrl/pinctrl-rockchip.c
-
-Reviewed-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
-Link: https://lore.kernel.org/r/20210420091240.1246429-1-jay.xu@rock-chips.com
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Stable-dep-of: bee55f2e7a44 ("pinctrl: rockchip: list all pins in a possible mux route for PX30")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pinctrl/pinctrl-rockchip.c | 650 ++++-------------------------
- 1 file changed, 80 insertions(+), 570 deletions(-)
-
-diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
-index 07b1204174bf..f0da98655794 100644
---- a/drivers/pinctrl/pinctrl-rockchip.c
-+++ b/drivers/pinctrl/pinctrl-rockchip.c
-@@ -816,597 +816,107 @@ static void rockchip_get_recalced_mux(struct rockchip_pin_bank *bank, int pin,
- }
-
- static struct rockchip_mux_route_data px30_mux_route_data[] = {
-- {
-- /* cif-d2m0 */
-- .bank_num = 2,
-- .pin = 0,
-- .func = 1,
-- .route_offset = 0x184,
-- .route_val = BIT(16 + 7),
-- }, {
-- /* cif-d2m1 */
-- .bank_num = 3,
-- .pin = 3,
-- .func = 3,
-- .route_offset = 0x184,
-- .route_val = BIT(16 + 7) | BIT(7),
-- }, {
-- /* pdm-m0 */
-- .bank_num = 3,
-- .pin = 22,
-- .func = 2,
-- .route_offset = 0x184,
-- .route_val = BIT(16 + 8),
-- }, {
-- /* pdm-m1 */
-- .bank_num = 2,
-- .pin = 22,
-- .func = 1,
-- .route_offset = 0x184,
-- .route_val = BIT(16 + 8) | BIT(8),
-- }, {
-- /* uart2-rxm0 */
-- .bank_num = 1,
-- .pin = 27,
-- .func = 2,
-- .route_offset = 0x184,
-- .route_val = BIT(16 + 10),
-- }, {
-- /* uart2-rxm1 */
-- .bank_num = 2,
-- .pin = 14,
-- .func = 2,
-- .route_offset = 0x184,
-- .route_val = BIT(16 + 10) | BIT(10),
-- }, {
-- /* uart3-rxm0 */
-- .bank_num = 0,
-- .pin = 17,
-- .func = 2,
-- .route_offset = 0x184,
-- .route_val = BIT(16 + 9),
-- }, {
-- /* uart3-rxm1 */
-- .bank_num = 1,
-- .pin = 15,
-- .func = 2,
-- .route_offset = 0x184,
-- .route_val = BIT(16 + 9) | BIT(9),
-- },
-+ RK_MUXROUTE_SAME(2, RK_PA0, 1, 0x184, BIT(16 + 7)), /* cif-d2m0 */
-+ RK_MUXROUTE_SAME(3, RK_PA3, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d2m1 */
-+ RK_MUXROUTE_SAME(3, RK_PC6, 2, 0x184, BIT(16 + 8)), /* pdm-m0 */
-+ RK_MUXROUTE_SAME(2, RK_PC6, 1, 0x184, BIT(16 + 8) | BIT(8)), /* pdm-m1 */
-+ RK_MUXROUTE_SAME(1, RK_PD3, 2, 0x184, BIT(16 + 10)), /* uart2-rxm0 */
-+ RK_MUXROUTE_SAME(2, RK_PB6, 2, 0x184, BIT(16 + 10) | BIT(10)), /* uart2-rxm1 */
-+ RK_MUXROUTE_SAME(0, RK_PC1, 2, 0x184, BIT(16 + 9)), /* uart3-rxm0 */
-+ RK_MUXROUTE_SAME(1, RK_PB7, 2, 0x184, BIT(16 + 9) | BIT(9)), /* uart3-rxm1 */
- };
-
- static struct rockchip_mux_route_data rk3128_mux_route_data[] = {
-- {
-- /* spi-0 */
-- .bank_num = 1,
-- .pin = 10,
-- .func = 1,
-- .route_offset = 0x144,
-- .route_val = BIT(16 + 3) | BIT(16 + 4),
-- }, {
-- /* spi-1 */
-- .bank_num = 1,
-- .pin = 27,
-- .func = 3,
-- .route_offset = 0x144,
-- .route_val = BIT(16 + 3) | BIT(16 + 4) | BIT(3),
-- }, {
-- /* spi-2 */
-- .bank_num = 0,
-- .pin = 13,
-- .func = 2,
-- .route_offset = 0x144,
-- .route_val = BIT(16 + 3) | BIT(16 + 4) | BIT(4),
-- }, {
-- /* i2s-0 */
-- .bank_num = 1,
-- .pin = 5,
-- .func = 1,
-- .route_offset = 0x144,
-- .route_val = BIT(16 + 5),
-- }, {
-- /* i2s-1 */
-- .bank_num = 0,
-- .pin = 14,
-- .func = 1,
-- .route_offset = 0x144,
-- .route_val = BIT(16 + 5) | BIT(5),
-- }, {
-- /* emmc-0 */
-- .bank_num = 1,
-- .pin = 22,
-- .func = 2,
-- .route_offset = 0x144,
-- .route_val = BIT(16 + 6),
-- }, {
-- /* emmc-1 */
-- .bank_num = 2,
-- .pin = 4,
-- .func = 2,
-- .route_offset = 0x144,
-- .route_val = BIT(16 + 6) | BIT(6),
-- },
-+ RK_MUXROUTE_SAME(1, RK_PB2, 1, 0x144, BIT(16 + 3) | BIT(16 + 4)), /* spi-0 */
-+ RK_MUXROUTE_SAME(1, RK_PD3, 3, 0x144, BIT(16 + 3) | BIT(16 + 4) | BIT(3)), /* spi-1 */
-+ RK_MUXROUTE_SAME(0, RK_PB5, 2, 0x144, BIT(16 + 3) | BIT(16 + 4) | BIT(4)), /* spi-2 */
-+ RK_MUXROUTE_SAME(1, RK_PA5, 1, 0x144, BIT(16 + 5)), /* i2s-0 */
-+ RK_MUXROUTE_SAME(0, RK_PB6, 1, 0x144, BIT(16 + 5) | BIT(5)), /* i2s-1 */
-+ RK_MUXROUTE_SAME(1, RK_PC6, 2, 0x144, BIT(16 + 6)), /* emmc-0 */
-+ RK_MUXROUTE_SAME(2, RK_PA4, 2, 0x144, BIT(16 + 6) | BIT(6)), /* emmc-1 */
- };
-
- static struct rockchip_mux_route_data rk3188_mux_route_data[] = {
-- {
-- /* non-iomuxed emmc/flash pins on flash-dqs */
-- .bank_num = 0,
-- .pin = 24,
-- .func = 1,
-- .route_location = ROCKCHIP_ROUTE_GRF,
-- .route_offset = 0xa0,
-- .route_val = BIT(16 + 11),
-- }, {
-- /* non-iomuxed emmc/flash pins on emmc-clk */
-- .bank_num = 0,
-- .pin = 24,
-- .func = 2,
-- .route_location = ROCKCHIP_ROUTE_GRF,
-- .route_offset = 0xa0,
-- .route_val = BIT(16 + 11) | BIT(11),
-- },
-+ RK_MUXROUTE_SAME(0, RK_PD0, 1, 0xa0, BIT(16 + 11)), /* non-iomuxed emmc/flash pins on flash-dqs */
-+ RK_MUXROUTE_SAME(0, RK_PD0, 2, 0xa0, BIT(16 + 11) | BIT(11)), /* non-iomuxed emmc/flash pins on emmc-clk */
- };
-
- static struct rockchip_mux_route_data rk3228_mux_route_data[] = {
-- {
-- /* pwm0-0 */
-- .bank_num = 0,
-- .pin = 26,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16),
-- }, {
-- /* pwm0-1 */
-- .bank_num = 3,
-- .pin = 21,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16) | BIT(0),
-- }, {
-- /* pwm1-0 */
-- .bank_num = 0,
-- .pin = 27,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 1),
-- }, {
-- /* pwm1-1 */
-- .bank_num = 0,
-- .pin = 30,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 1) | BIT(1),
-- }, {
-- /* pwm2-0 */
-- .bank_num = 0,
-- .pin = 28,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 2),
-- }, {
-- /* pwm2-1 */
-- .bank_num = 1,
-- .pin = 12,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 2) | BIT(2),
-- }, {
-- /* pwm3-0 */
-- .bank_num = 3,
-- .pin = 26,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 3),
-- }, {
-- /* pwm3-1 */
-- .bank_num = 1,
-- .pin = 11,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 3) | BIT(3),
-- }, {
-- /* sdio-0_d0 */
-- .bank_num = 1,
-- .pin = 1,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 4),
-- }, {
-- /* sdio-1_d0 */
-- .bank_num = 3,
-- .pin = 2,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 4) | BIT(4),
-- }, {
-- /* spi-0_rx */
-- .bank_num = 0,
-- .pin = 13,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 5),
-- }, {
-- /* spi-1_rx */
-- .bank_num = 2,
-- .pin = 0,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 5) | BIT(5),
-- }, {
-- /* emmc-0_cmd */
-- .bank_num = 1,
-- .pin = 22,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 7),
-- }, {
-- /* emmc-1_cmd */
-- .bank_num = 2,
-- .pin = 4,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 7) | BIT(7),
-- }, {
-- /* uart2-0_rx */
-- .bank_num = 1,
-- .pin = 19,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 8),
-- }, {
-- /* uart2-1_rx */
-- .bank_num = 1,
-- .pin = 10,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 8) | BIT(8),
-- }, {
-- /* uart1-0_rx */
-- .bank_num = 1,
-- .pin = 10,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 11),
-- }, {
-- /* uart1-1_rx */
-- .bank_num = 3,
-- .pin = 13,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 11) | BIT(11),
-- },
-+ RK_MUXROUTE_SAME(0, RK_PD2, 1, 0x50, BIT(16)), /* pwm0-0 */
-+ RK_MUXROUTE_SAME(3, RK_PC5, 1, 0x50, BIT(16) | BIT(0)), /* pwm0-1 */
-+ RK_MUXROUTE_SAME(0, RK_PD3, 1, 0x50, BIT(16 + 1)), /* pwm1-0 */
-+ RK_MUXROUTE_SAME(0, RK_PD6, 2, 0x50, BIT(16 + 1) | BIT(1)), /* pwm1-1 */
-+ RK_MUXROUTE_SAME(0, RK_PD4, 1, 0x50, BIT(16 + 2)), /* pwm2-0 */
-+ RK_MUXROUTE_SAME(1, RK_PB4, 2, 0x50, BIT(16 + 2) | BIT(2)), /* pwm2-1 */
-+ RK_MUXROUTE_SAME(3, RK_PD2, 1, 0x50, BIT(16 + 3)), /* pwm3-0 */
-+ RK_MUXROUTE_SAME(1, RK_PB3, 2, 0x50, BIT(16 + 3) | BIT(3)), /* pwm3-1 */
-+ RK_MUXROUTE_SAME(1, RK_PA1, 1, 0x50, BIT(16 + 4)), /* sdio-0_d0 */
-+ RK_MUXROUTE_SAME(3, RK_PA2, 1, 0x50, BIT(16 + 4) | BIT(4)), /* sdio-1_d0 */
-+ RK_MUXROUTE_SAME(0, RK_PB5, 2, 0x50, BIT(16 + 5)), /* spi-0_rx */
-+ RK_MUXROUTE_SAME(2, RK_PA0, 2, 0x50, BIT(16 + 5) | BIT(5)), /* spi-1_rx */
-+ RK_MUXROUTE_SAME(1, RK_PC6, 2, 0x50, BIT(16 + 7)), /* emmc-0_cmd */
-+ RK_MUXROUTE_SAME(2, RK_PA4, 2, 0x50, BIT(16 + 7) | BIT(7)), /* emmc-1_cmd */
-+ RK_MUXROUTE_SAME(1, RK_PC3, 2, 0x50, BIT(16 + 8)), /* uart2-0_rx */
-+ RK_MUXROUTE_SAME(1, RK_PB2, 2, 0x50, BIT(16 + 8) | BIT(8)), /* uart2-1_rx */
-+ RK_MUXROUTE_SAME(1, RK_PB2, 1, 0x50, BIT(16 + 11)), /* uart1-0_rx */
-+ RK_MUXROUTE_SAME(3, RK_PB5, 1, 0x50, BIT(16 + 11) | BIT(11)), /* uart1-1_rx */
- };
-
- static struct rockchip_mux_route_data rk3288_mux_route_data[] = {
-- {
-- /* edphdmi_cecinoutt1 */
-- .bank_num = 7,
-- .pin = 16,
-- .func = 2,
-- .route_offset = 0x264,
-- .route_val = BIT(16 + 12) | BIT(12),
-- }, {
-- /* edphdmi_cecinout */
-- .bank_num = 7,
-- .pin = 23,
-- .func = 4,
-- .route_offset = 0x264,
-- .route_val = BIT(16 + 12),
-- },
-+ RK_MUXROUTE_SAME(7, RK_PC0, 2, 0x264, BIT(16 + 12) | BIT(12)), /* edphdmi_cecinoutt1 */
-+ RK_MUXROUTE_SAME(7, RK_PC7, 4, 0x264, BIT(16 + 12)), /* edphdmi_cecinout */
- };
-
- static struct rockchip_mux_route_data rk3308_mux_route_data[] = {
-- {
-- /* rtc_clk */
-- .bank_num = 0,
-- .pin = 19,
-- .func = 1,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 0) | BIT(0),
-- }, {
-- /* uart2_rxm0 */
-- .bank_num = 1,
-- .pin = 22,
-- .func = 2,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 2) | BIT(16 + 3),
-- }, {
-- /* uart2_rxm1 */
-- .bank_num = 4,
-- .pin = 26,
-- .func = 2,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 2) | BIT(16 + 3) | BIT(2),
-- }, {
-- /* i2c3_sdam0 */
-- .bank_num = 0,
-- .pin = 15,
-- .func = 2,
-- .route_offset = 0x608,
-- .route_val = BIT(16 + 8) | BIT(16 + 9),
-- }, {
-- /* i2c3_sdam1 */
-- .bank_num = 3,
-- .pin = 12,
-- .func = 2,
-- .route_offset = 0x608,
-- .route_val = BIT(16 + 8) | BIT(16 + 9) | BIT(8),
-- }, {
-- /* i2c3_sdam2 */
-- .bank_num = 2,
-- .pin = 0,
-- .func = 3,
-- .route_offset = 0x608,
-- .route_val = BIT(16 + 8) | BIT(16 + 9) | BIT(9),
-- }, {
-- /* i2s-8ch-1-sclktxm0 */
-- .bank_num = 1,
-- .pin = 3,
-- .func = 2,
-- .route_offset = 0x308,
-- .route_val = BIT(16 + 3),
-- }, {
-- /* i2s-8ch-1-sclkrxm0 */
-- .bank_num = 1,
-- .pin = 4,
-- .func = 2,
-- .route_offset = 0x308,
-- .route_val = BIT(16 + 3),
-- }, {
-- /* i2s-8ch-1-sclktxm1 */
-- .bank_num = 1,
-- .pin = 13,
-- .func = 2,
-- .route_offset = 0x308,
-- .route_val = BIT(16 + 3) | BIT(3),
-- }, {
-- /* i2s-8ch-1-sclkrxm1 */
-- .bank_num = 1,
-- .pin = 14,
-- .func = 2,
-- .route_offset = 0x308,
-- .route_val = BIT(16 + 3) | BIT(3),
-- }, {
-- /* pdm-clkm0 */
-- .bank_num = 1,
-- .pin = 4,
-- .func = 3,
-- .route_offset = 0x308,
-- .route_val = BIT(16 + 12) | BIT(16 + 13),
-- }, {
-- /* pdm-clkm1 */
-- .bank_num = 1,
-- .pin = 14,
-- .func = 4,
-- .route_offset = 0x308,
-- .route_val = BIT(16 + 12) | BIT(16 + 13) | BIT(12),
-- }, {
-- /* pdm-clkm2 */
-- .bank_num = 2,
-- .pin = 6,
-- .func = 2,
-- .route_offset = 0x308,
-- .route_val = BIT(16 + 12) | BIT(16 + 13) | BIT(13),
-- }, {
-- /* pdm-clkm-m2 */
-- .bank_num = 2,
-- .pin = 4,
-- .func = 3,
-- .route_offset = 0x600,
-- .route_val = BIT(16 + 2) | BIT(2),
-- }, {
-- /* spi1_miso */
-- .bank_num = 3,
-- .pin = 10,
-- .func = 3,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 9),
-- }, {
-- /* spi1_miso_m1 */
-- .bank_num = 2,
-- .pin = 4,
-- .func = 2,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 9) | BIT(9),
-- }, {
-- /* owire_m0 */
-- .bank_num = 0,
-- .pin = 11,
-- .func = 3,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 10) | BIT(16 + 11),
-- }, {
-- /* owire_m1 */
-- .bank_num = 1,
-- .pin = 22,
-- .func = 7,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 10) | BIT(16 + 11) | BIT(10),
-- }, {
-- /* owire_m2 */
-- .bank_num = 2,
-- .pin = 2,
-- .func = 5,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 10) | BIT(16 + 11) | BIT(11),
-- }, {
-- /* can_rxd_m0 */
-- .bank_num = 0,
-- .pin = 11,
-- .func = 2,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 12) | BIT(16 + 13),
-- }, {
-- /* can_rxd_m1 */
-- .bank_num = 1,
-- .pin = 22,
-- .func = 5,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 12) | BIT(16 + 13) | BIT(12),
-- }, {
-- /* can_rxd_m2 */
-- .bank_num = 2,
-- .pin = 2,
-- .func = 4,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 12) | BIT(16 + 13) | BIT(13),
-- }, {
-- /* mac_rxd0_m0 */
-- .bank_num = 1,
-- .pin = 20,
-- .func = 3,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 14),
-- }, {
-- /* mac_rxd0_m1 */
-- .bank_num = 4,
-- .pin = 2,
-- .func = 2,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 14) | BIT(14),
-- }, {
-- /* uart3_rx */
-- .bank_num = 3,
-- .pin = 12,
-- .func = 4,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 15),
-- }, {
-- /* uart3_rx_m1 */
-- .bank_num = 0,
-- .pin = 17,
-- .func = 3,
-- .route_offset = 0x314,
-- .route_val = BIT(16 + 15) | BIT(15),
-- },
-+ RK_MUXROUTE_SAME(0, RK_PC3, 1, 0x314, BIT(16 + 0) | BIT(0)), /* rtc_clk */
-+ RK_MUXROUTE_SAME(1, RK_PC6, 2, 0x314, BIT(16 + 2) | BIT(16 + 3)), /* uart2_rxm0 */
-+ RK_MUXROUTE_SAME(4, RK_PD2, 2, 0x314, BIT(16 + 2) | BIT(16 + 3) | BIT(2)), /* uart2_rxm1 */
-+ RK_MUXROUTE_SAME(0, RK_PB7, 2, 0x608, BIT(16 + 8) | BIT(16 + 9)), /* i2c3_sdam0 */
-+ RK_MUXROUTE_SAME(3, RK_PB4, 2, 0x608, BIT(16 + 8) | BIT(16 + 9) | BIT(8)), /* i2c3_sdam1 */
-+ RK_MUXROUTE_SAME(2, RK_PA0, 3, 0x608, BIT(16 + 8) | BIT(16 + 9) | BIT(9)), /* i2c3_sdam2 */
-+ RK_MUXROUTE_SAME(1, RK_PA3, 2, 0x308, BIT(16 + 3)), /* i2s-8ch-1-sclktxm0 */
-+ RK_MUXROUTE_SAME(1, RK_PA4, 2, 0x308, BIT(16 + 3)), /* i2s-8ch-1-sclkrxm0 */
-+ RK_MUXROUTE_SAME(1, RK_PB5, 2, 0x308, BIT(16 + 3) | BIT(3)), /* i2s-8ch-1-sclktxm1 */
-+ RK_MUXROUTE_SAME(1, RK_PB6, 2, 0x308, BIT(16 + 3) | BIT(3)), /* i2s-8ch-1-sclkrxm1 */
-+ RK_MUXROUTE_SAME(1, RK_PA4, 3, 0x308, BIT(16 + 12) | BIT(16 + 13)), /* pdm-clkm0 */
-+ RK_MUXROUTE_SAME(1, RK_PB6, 4, 0x308, BIT(16 + 12) | BIT(16 + 13) | BIT(12)), /* pdm-clkm1 */
-+ RK_MUXROUTE_SAME(2, RK_PA6, 2, 0x308, BIT(16 + 12) | BIT(16 + 13) | BIT(13)), /* pdm-clkm2 */
-+ RK_MUXROUTE_SAME(2, RK_PA4, 3, 0x600, BIT(16 + 2) | BIT(2)), /* pdm-clkm-m2 */
-+ RK_MUXROUTE_SAME(3, RK_PB2, 3, 0x314, BIT(16 + 9)), /* spi1_miso */
-+ RK_MUXROUTE_SAME(2, RK_PA4, 2, 0x314, BIT(16 + 9) | BIT(9)), /* spi1_miso_m1 */
-+ RK_MUXROUTE_SAME(0, RK_PB3, 3, 0x314, BIT(16 + 10) | BIT(16 + 11)), /* owire_m0 */
-+ RK_MUXROUTE_SAME(1, RK_PC6, 7, 0x314, BIT(16 + 10) | BIT(16 + 11) | BIT(10)), /* owire_m1 */
-+ RK_MUXROUTE_SAME(2, RK_PA2, 5, 0x314, BIT(16 + 10) | BIT(16 + 11) | BIT(11)), /* owire_m2 */
-+ RK_MUXROUTE_SAME(0, RK_PB3, 2, 0x314, BIT(16 + 12) | BIT(16 + 13)), /* can_rxd_m0 */
-+ RK_MUXROUTE_SAME(1, RK_PC6, 5, 0x314, BIT(16 + 12) | BIT(16 + 13) | BIT(12)), /* can_rxd_m1 */
-+ RK_MUXROUTE_SAME(2, RK_PA2, 4, 0x314, BIT(16 + 12) | BIT(16 + 13) | BIT(13)), /* can_rxd_m2 */
-+ RK_MUXROUTE_SAME(1, RK_PC4, 3, 0x314, BIT(16 + 14)), /* mac_rxd0_m0 */
-+ RK_MUXROUTE_SAME(4, RK_PA2, 2, 0x314, BIT(16 + 14) | BIT(14)), /* mac_rxd0_m1 */
-+ RK_MUXROUTE_SAME(3, RK_PB4, 4, 0x314, BIT(16 + 15)), /* uart3_rx */
-+ RK_MUXROUTE_SAME(0, RK_PC1, 3, 0x314, BIT(16 + 15) | BIT(15)), /* uart3_rx_m1 */
- };
-
- static struct rockchip_mux_route_data rk3328_mux_route_data[] = {
-- {
-- /* uart2dbg_rxm0 */
-- .bank_num = 1,
-- .pin = 1,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16) | BIT(16 + 1),
-- }, {
-- /* uart2dbg_rxm1 */
-- .bank_num = 2,
-- .pin = 1,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16) | BIT(16 + 1) | BIT(0),
-- }, {
-- /* gmac-m1_rxd0 */
-- .bank_num = 1,
-- .pin = 11,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 2) | BIT(2),
-- }, {
-- /* gmac-m1-optimized_rxd3 */
-- .bank_num = 1,
-- .pin = 14,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 10) | BIT(10),
-- }, {
-- /* pdm_sdi0m0 */
-- .bank_num = 2,
-- .pin = 19,
-- .func = 2,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 3),
-- }, {
-- /* pdm_sdi0m1 */
-- .bank_num = 1,
-- .pin = 23,
-- .func = 3,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 3) | BIT(3),
-- }, {
-- /* spi_rxdm2 */
-- .bank_num = 3,
-- .pin = 2,
-- .func = 4,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 4) | BIT(16 + 5) | BIT(5),
-- }, {
-- /* i2s2_sdim0 */
-- .bank_num = 1,
-- .pin = 24,
-- .func = 1,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 6),
-- }, {
-- /* i2s2_sdim1 */
-- .bank_num = 3,
-- .pin = 2,
-- .func = 6,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 6) | BIT(6),
-- }, {
-- /* card_iom1 */
-- .bank_num = 2,
-- .pin = 22,
-- .func = 3,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 7) | BIT(7),
-- }, {
-- /* tsp_d5m1 */
-- .bank_num = 2,
-- .pin = 16,
-- .func = 3,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 8) | BIT(8),
-- }, {
-- /* cif_data5m1 */
-- .bank_num = 2,
-- .pin = 16,
-- .func = 4,
-- .route_offset = 0x50,
-- .route_val = BIT(16 + 9) | BIT(9),
-- },
-+ RK_MUXROUTE_SAME(1, RK_PA1, 2, 0x50, BIT(16) | BIT(16 + 1)), /* uart2dbg_rxm0 */
-+ RK_MUXROUTE_SAME(2, RK_PA1, 1, 0x50, BIT(16) | BIT(16 + 1) | BIT(0)), /* uart2dbg_rxm1 */
-+ RK_MUXROUTE_SAME(1, RK_PB3, 2, 0x50, BIT(16 + 2) | BIT(2)), /* gmac-m1_rxd0 */
-+ RK_MUXROUTE_SAME(1, RK_PB6, 2, 0x50, BIT(16 + 10) | BIT(10)), /* gmac-m1-optimized_rxd3 */
-+ RK_MUXROUTE_SAME(2, RK_PC3, 2, 0x50, BIT(16 + 3)), /* pdm_sdi0m0 */
-+ RK_MUXROUTE_SAME(1, RK_PC7, 3, 0x50, BIT(16 + 3) | BIT(3)), /* pdm_sdi0m1 */
-+ RK_MUXROUTE_SAME(3, RK_PA2, 4, 0x50, BIT(16 + 4) | BIT(16 + 5) | BIT(5)), /* spi_rxdm2 */
-+ RK_MUXROUTE_SAME(1, RK_PD0, 1, 0x50, BIT(16 + 6)), /* i2s2_sdim0 */
-+ RK_MUXROUTE_SAME(3, RK_PA2, 6, 0x50, BIT(16 + 6) | BIT(6)), /* i2s2_sdim1 */
-+ RK_MUXROUTE_SAME(2, RK_PC6, 3, 0x50, BIT(16 + 7) | BIT(7)), /* card_iom1 */
-+ RK_MUXROUTE_SAME(2, RK_PC0, 3, 0x50, BIT(16 + 8) | BIT(8)), /* tsp_d5m1 */
-+ RK_MUXROUTE_SAME(2, RK_PC0, 4, 0x50, BIT(16 + 9) | BIT(9)), /* cif_data5m1 */
- };
-
- static struct rockchip_mux_route_data rk3399_mux_route_data[] = {
-- {
-- /* uart2dbga_rx */
-- .bank_num = 4,
-- .pin = 8,
-- .func = 2,
-- .route_offset = 0xe21c,
-- .route_val = BIT(16 + 10) | BIT(16 + 11),
-- }, {
-- /* uart2dbgb_rx */
-- .bank_num = 4,
-- .pin = 16,
-- .func = 2,
-- .route_offset = 0xe21c,
-- .route_val = BIT(16 + 10) | BIT(16 + 11) | BIT(10),
-- }, {
-- /* uart2dbgc_rx */
-- .bank_num = 4,
-- .pin = 19,
-- .func = 1,
-- .route_offset = 0xe21c,
-- .route_val = BIT(16 + 10) | BIT(16 + 11) | BIT(11),
-- }, {
-- /* pcie_clkreqn */
-- .bank_num = 2,
-- .pin = 26,
-- .func = 2,
-- .route_offset = 0xe21c,
-- .route_val = BIT(16 + 14),
-- }, {
-- /* pcie_clkreqnb */
-- .bank_num = 4,
-- .pin = 24,
-- .func = 1,
-- .route_offset = 0xe21c,
-- .route_val = BIT(16 + 14) | BIT(14),
-- },
-+ RK_MUXROUTE_SAME(4, RK_PB0, 2, 0xe21c, BIT(16 + 10) | BIT(16 + 11)), /* uart2dbga_rx */
-+ RK_MUXROUTE_SAME(4, RK_PC0, 2, 0xe21c, BIT(16 + 10) | BIT(16 + 11) | BIT(10)), /* uart2dbgb_rx */
-+ RK_MUXROUTE_SAME(4, RK_PC3, 1, 0xe21c, BIT(16 + 10) | BIT(16 + 11) | BIT(11)), /* uart2dbgc_rx */
-+ RK_MUXROUTE_SAME(2, RK_PD2, 2, 0xe21c, BIT(16 + 14)), /* pcie_clkreqn */
-+ RK_MUXROUTE_SAME(4, RK_PD0, 1, 0xe21c, BIT(16 + 14) | BIT(14)), /* pcie_clkreqnb */
- };
-
- static bool rockchip_get_mux_route(struct rockchip_pin_bank *bank, int pin,
---
-2.35.1
-
+++ /dev/null
-From 43b7bd8cb3e6584fb7e9b4a992d50b04c61351ee Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 18 Oct 2022 14:17:23 +0200
-Subject: pinctrl: rockchip: list all pins in a possible mux route for PX30
-
-From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
-
-[ Upstream commit bee55f2e7a44e7a7676e264b42f026e34bd244d9 ]
-
-The mux routes are incomplete for the PX30. This was discovered because
-we had a HW design using cif-clkoutm1 with the correct pinmux in the
-Device Tree but the clock would still not work.
-
-There are actually two muxing required: the pin muxing (performed by the
-usual Device Tree pinctrl nodes) and the "function" muxing (m0 vs m1;
-performed by the mux routing inside the driver). The pin muxing was
-correct but the function muxing was not.
-
-This adds the missing pins and their configuration for the mux routes
-that are already specified in the driver.
-
-Note that there are some "conflicts": it is possible *in Device Tree* to
-(attempt to) mux the pins for e.g. clkoutm1 and clkinm0 at the same time
-but this is actually not possible in hardware (because both share the
-same bit for the function muxing). Since it is an impossible hardware
-design, it is not deemed necessary to prevent the user from attempting
-to "misconfigure" the pins/functions.
-
-Fixes: 87065ca9b8e5 ("pinctrl: rockchip: Add pinctrl support for PX30")
-Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
-Link: https://lore.kernel.org/r/20221017-upstream-px30-cif-clkoutm1-v1-0-4ea1389237f7@theobroma-systems.com
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pinctrl/pinctrl-rockchip.c | 40 ++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
-
-diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
-index f0da98655794..bab7400493db 100644
---- a/drivers/pinctrl/pinctrl-rockchip.c
-+++ b/drivers/pinctrl/pinctrl-rockchip.c
-@@ -816,14 +816,54 @@ static void rockchip_get_recalced_mux(struct rockchip_pin_bank *bank, int pin,
- }
-
- static struct rockchip_mux_route_data px30_mux_route_data[] = {
-+ RK_MUXROUTE_SAME(2, RK_PB4, 1, 0x184, BIT(16 + 7)), /* cif-d0m0 */
-+ RK_MUXROUTE_SAME(3, RK_PA1, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d0m1 */
-+ RK_MUXROUTE_SAME(2, RK_PB6, 1, 0x184, BIT(16 + 7)), /* cif-d1m0 */
-+ RK_MUXROUTE_SAME(3, RK_PA2, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d1m1 */
- RK_MUXROUTE_SAME(2, RK_PA0, 1, 0x184, BIT(16 + 7)), /* cif-d2m0 */
- RK_MUXROUTE_SAME(3, RK_PA3, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d2m1 */
-+ RK_MUXROUTE_SAME(2, RK_PA1, 1, 0x184, BIT(16 + 7)), /* cif-d3m0 */
-+ RK_MUXROUTE_SAME(3, RK_PA5, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d3m1 */
-+ RK_MUXROUTE_SAME(2, RK_PA2, 1, 0x184, BIT(16 + 7)), /* cif-d4m0 */
-+ RK_MUXROUTE_SAME(3, RK_PA7, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d4m1 */
-+ RK_MUXROUTE_SAME(2, RK_PA3, 1, 0x184, BIT(16 + 7)), /* cif-d5m0 */
-+ RK_MUXROUTE_SAME(3, RK_PB0, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d5m1 */
-+ RK_MUXROUTE_SAME(2, RK_PA4, 1, 0x184, BIT(16 + 7)), /* cif-d6m0 */
-+ RK_MUXROUTE_SAME(3, RK_PB1, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d6m1 */
-+ RK_MUXROUTE_SAME(2, RK_PA5, 1, 0x184, BIT(16 + 7)), /* cif-d7m0 */
-+ RK_MUXROUTE_SAME(3, RK_PB4, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d7m1 */
-+ RK_MUXROUTE_SAME(2, RK_PA6, 1, 0x184, BIT(16 + 7)), /* cif-d8m0 */
-+ RK_MUXROUTE_SAME(3, RK_PB6, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d8m1 */
-+ RK_MUXROUTE_SAME(2, RK_PA7, 1, 0x184, BIT(16 + 7)), /* cif-d9m0 */
-+ RK_MUXROUTE_SAME(3, RK_PB7, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d9m1 */
-+ RK_MUXROUTE_SAME(2, RK_PB7, 1, 0x184, BIT(16 + 7)), /* cif-d10m0 */
-+ RK_MUXROUTE_SAME(3, RK_PC6, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d10m1 */
-+ RK_MUXROUTE_SAME(2, RK_PC0, 1, 0x184, BIT(16 + 7)), /* cif-d11m0 */
-+ RK_MUXROUTE_SAME(3, RK_PC7, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-d11m1 */
-+ RK_MUXROUTE_SAME(2, RK_PB0, 1, 0x184, BIT(16 + 7)), /* cif-vsyncm0 */
-+ RK_MUXROUTE_SAME(3, RK_PD1, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-vsyncm1 */
-+ RK_MUXROUTE_SAME(2, RK_PB1, 1, 0x184, BIT(16 + 7)), /* cif-hrefm0 */
-+ RK_MUXROUTE_SAME(3, RK_PD2, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-hrefm1 */
-+ RK_MUXROUTE_SAME(2, RK_PB2, 1, 0x184, BIT(16 + 7)), /* cif-clkinm0 */
-+ RK_MUXROUTE_SAME(3, RK_PD3, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-clkinm1 */
-+ RK_MUXROUTE_SAME(2, RK_PB3, 1, 0x184, BIT(16 + 7)), /* cif-clkoutm0 */
-+ RK_MUXROUTE_SAME(3, RK_PD0, 3, 0x184, BIT(16 + 7) | BIT(7)), /* cif-clkoutm1 */
- RK_MUXROUTE_SAME(3, RK_PC6, 2, 0x184, BIT(16 + 8)), /* pdm-m0 */
- RK_MUXROUTE_SAME(2, RK_PC6, 1, 0x184, BIT(16 + 8) | BIT(8)), /* pdm-m1 */
-+ RK_MUXROUTE_SAME(3, RK_PD3, 2, 0x184, BIT(16 + 8)), /* pdm-sdi0m0 */
-+ RK_MUXROUTE_SAME(2, RK_PC5, 2, 0x184, BIT(16 + 8) | BIT(8)), /* pdm-sdi0m1 */
- RK_MUXROUTE_SAME(1, RK_PD3, 2, 0x184, BIT(16 + 10)), /* uart2-rxm0 */
- RK_MUXROUTE_SAME(2, RK_PB6, 2, 0x184, BIT(16 + 10) | BIT(10)), /* uart2-rxm1 */
-+ RK_MUXROUTE_SAME(1, RK_PD2, 2, 0x184, BIT(16 + 10)), /* uart2-txm0 */
-+ RK_MUXROUTE_SAME(2, RK_PB4, 2, 0x184, BIT(16 + 10) | BIT(10)), /* uart2-txm1 */
- RK_MUXROUTE_SAME(0, RK_PC1, 2, 0x184, BIT(16 + 9)), /* uart3-rxm0 */
- RK_MUXROUTE_SAME(1, RK_PB7, 2, 0x184, BIT(16 + 9) | BIT(9)), /* uart3-rxm1 */
-+ RK_MUXROUTE_SAME(0, RK_PC0, 2, 0x184, BIT(16 + 9)), /* uart3-txm0 */
-+ RK_MUXROUTE_SAME(1, RK_PB6, 2, 0x184, BIT(16 + 9) | BIT(9)), /* uart3-txm1 */
-+ RK_MUXROUTE_SAME(0, RK_PC2, 2, 0x184, BIT(16 + 9)), /* uart3-ctsm0 */
-+ RK_MUXROUTE_SAME(1, RK_PB4, 2, 0x184, BIT(16 + 9) | BIT(9)), /* uart3-ctsm1 */
-+ RK_MUXROUTE_SAME(0, RK_PC3, 2, 0x184, BIT(16 + 9)), /* uart3-rtsm0 */
-+ RK_MUXROUTE_SAME(1, RK_PB5, 2, 0x184, BIT(16 + 9) | BIT(9)), /* uart3-rtsm1 */
- };
-
- static struct rockchip_mux_route_data rk3128_mux_route_data[] = {
---
-2.35.1
-
projects / thirdparty / kernel / stable-queue.git / commitdiff
