Skip to content

Commit 1fd6bb5

Browse files
Andre-ARMLinus Walleij
authored andcommitted
pinctrl: sunxi: Fix H616 I2S3 pin data
Two bugs have sneaked in the H616 pinctrl data: - PH9 uses the mux value of 0x3 twice (one should be 0x5 instead) - PH8 and PH9 use the "i2s3" function name twice in each pin For the double pin name we use the same trick we pulled for i2s0: append the pin function to the group name to designate the special function. Fixes: 25adc29 ("pinctrl: sunxi: Add support for the Allwinner H616 pin controller") Reported-by: SASANO Takayoshi <uaa@mx5.nisiq.net> Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com> Reviewed-by: Samuel Holland <samuel@sholland.org> Link: https://lore.kernel.org/r/20220105172952.23347-1-andre.przywara@arm.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent aa28514 commit 1fd6bb5

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,16 +363,16 @@ static const struct sunxi_desc_pin h616_pins[] = {
363363
SUNXI_FUNCTION(0x0, "gpio_in"),
364364
SUNXI_FUNCTION(0x1, "gpio_out"),
365365
SUNXI_FUNCTION(0x2, "uart2"), /* CTS */
366-
SUNXI_FUNCTION(0x3, "i2s3"), /* DO0 */
366+
SUNXI_FUNCTION(0x3, "i2s3_dout0"), /* DO0 */
367367
SUNXI_FUNCTION(0x4, "spi1"), /* MISO */
368-
SUNXI_FUNCTION(0x5, "i2s3"), /* DI1 */
368+
SUNXI_FUNCTION(0x5, "i2s3_din1"), /* DI1 */
369369
SUNXI_FUNCTION_IRQ_BANK(0x6, 6, 8)), /* PH_EINT8 */
370370
SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 9),
371371
SUNXI_FUNCTION(0x0, "gpio_in"),
372372
SUNXI_FUNCTION(0x1, "gpio_out"),
373-
SUNXI_FUNCTION(0x3, "i2s3"), /* DI0 */
373+
SUNXI_FUNCTION(0x3, "i2s3_din0"), /* DI0 */
374374
SUNXI_FUNCTION(0x4, "spi1"), /* CS1 */
375-
SUNXI_FUNCTION(0x3, "i2s3"), /* DO1 */
375+
SUNXI_FUNCTION(0x5, "i2s3_dout1"), /* DO1 */
376376
SUNXI_FUNCTION_IRQ_BANK(0x6, 6, 9)), /* PH_EINT9 */
377377
SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 10),
378378
SUNXI_FUNCTION(0x0, "gpio_in"),

0 commit comments

Comments
 (0)