提交 1f3e25a0 编写于 作者: L Luca Ceresoli 提交者: Linus Walleij

pinctrl: rockchip: fix RK3308 pinmux bits

Some of the pinmuxing bits described in rk3308_mux_recalced_data are wrong,
pointing to non-existing registers.

Fix the entire table.

Also add a comment in front of each entry with the same string that appears
in the datasheet to make the table easier to compare with the docs.

This fix has been tested on real hardware for the gpio3b3_sel entry.

Fixes: 7825aeb7 ("pinctrl: rockchip: add rk3308 SoC support")
Signed-off-by: NLuca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: NHeiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20220420142432.248565-1-luca.ceresoli@bootlin.comSigned-off-by: NLinus Walleij <linus.walleij@linaro.org>
上级 b3af8596
...@@ -457,95 +457,110 @@ static struct rockchip_mux_recalced_data rk3128_mux_recalced_data[] = { ...@@ -457,95 +457,110 @@ static struct rockchip_mux_recalced_data rk3128_mux_recalced_data[] = {
static struct rockchip_mux_recalced_data rk3308_mux_recalced_data[] = { static struct rockchip_mux_recalced_data rk3308_mux_recalced_data[] = {
{ {
/* gpio1b6_sel */
.num = 1, .num = 1,
.pin = 14, .pin = 14,
.reg = 0x28, .reg = 0x28,
.bit = 12, .bit = 12,
.mask = 0xf .mask = 0xf
}, { }, {
/* gpio1b7_sel */
.num = 1, .num = 1,
.pin = 15, .pin = 15,
.reg = 0x2c, .reg = 0x2c,
.bit = 0, .bit = 0,
.mask = 0x3 .mask = 0x3
}, { }, {
/* gpio1c2_sel */
.num = 1, .num = 1,
.pin = 18, .pin = 18,
.reg = 0x30, .reg = 0x30,
.bit = 4, .bit = 4,
.mask = 0xf .mask = 0xf
}, { }, {
/* gpio1c3_sel */
.num = 1, .num = 1,
.pin = 19, .pin = 19,
.reg = 0x30, .reg = 0x30,
.bit = 8, .bit = 8,
.mask = 0xf .mask = 0xf
}, { }, {
/* gpio1c4_sel */
.num = 1, .num = 1,
.pin = 20, .pin = 20,
.reg = 0x30, .reg = 0x30,
.bit = 12, .bit = 12,
.mask = 0xf .mask = 0xf
}, { }, {
/* gpio1c5_sel */
.num = 1, .num = 1,
.pin = 21, .pin = 21,
.reg = 0x34, .reg = 0x34,
.bit = 0, .bit = 0,
.mask = 0xf .mask = 0xf
}, { }, {
/* gpio1c6_sel */
.num = 1, .num = 1,
.pin = 22, .pin = 22,
.reg = 0x34, .reg = 0x34,
.bit = 4, .bit = 4,
.mask = 0xf .mask = 0xf
}, { }, {
/* gpio1c7_sel */
.num = 1, .num = 1,
.pin = 23, .pin = 23,
.reg = 0x34, .reg = 0x34,
.bit = 8, .bit = 8,
.mask = 0xf .mask = 0xf
}, { }, {
/* gpio3b4_sel */
.num = 3, .num = 3,
.pin = 12, .pin = 12,
.reg = 0x68, .reg = 0x68,
.bit = 8, .bit = 8,
.mask = 0xf .mask = 0xf
}, { }, {
/* gpio3b5_sel */
.num = 3, .num = 3,
.pin = 13, .pin = 13,
.reg = 0x68, .reg = 0x68,
.bit = 12, .bit = 12,
.mask = 0xf .mask = 0xf
}, { }, {
/* gpio2a2_sel */
.num = 2, .num = 2,
.pin = 2, .pin = 2,
.reg = 0x608, .reg = 0x40,
.bit = 0, .bit = 4,
.mask = 0x7 .mask = 0x3
}, { }, {
/* gpio2a3_sel */
.num = 2, .num = 2,
.pin = 3, .pin = 3,
.reg = 0x608, .reg = 0x40,
.bit = 4, .bit = 6,
.mask = 0x7 .mask = 0x3
}, { }, {
/* gpio2c0_sel */
.num = 2, .num = 2,
.pin = 16, .pin = 16,
.reg = 0x610, .reg = 0x50,
.bit = 8, .bit = 0,
.mask = 0x7 .mask = 0x3
}, { }, {
/* gpio3b2_sel */
.num = 3, .num = 3,
.pin = 10, .pin = 10,
.reg = 0x610, .reg = 0x68,
.bit = 0, .bit = 4,
.mask = 0x7 .mask = 0x3
}, { }, {
/* gpio3b3_sel */
.num = 3, .num = 3,
.pin = 11, .pin = 11,
.reg = 0x610, .reg = 0x68,
.bit = 4, .bit = 6,
.mask = 0x7 .mask = 0x3
}, },
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册