Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pinctrl: aspeed: Describe the heartbeat function on ball Y23

The default pinmux configuration for Y23 is to route a heartbeat to
drive a LED. Previous revisions of the AST2600 datasheet did not include
a description of this function.

Fixes: 2eda1cdec49f ("pinctrl: aspeed: Add AST2600 pinmux support")
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20200701030756.2834657-1-joel@jms.id.au
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Andrew Jeffery and committed by
Linus Walleij
13c502c8 aa639e44

+6 -1
+6 -1
drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
··· 46 46 #define SCU634 0x634 /* Disable GPIO Internal Pull-Down #5 */ 47 47 #define SCU638 0x638 /* Disable GPIO Internal Pull-Down #6 */ 48 48 #define SCU694 0x694 /* Multi-function Pin Control #25 */ 49 + #define SCU69C 0x69C /* Multi-function Pin Control #27 */ 49 50 #define SCUC20 0xC20 /* PCIE configuration Setting Control */ 50 51 51 52 #define ASPEED_G6_NR_PINS 256 ··· 820 819 #define Y23 127 821 820 SIG_EXPR_LIST_DECL_SEMG(Y23, PWM15, PWM15G1, PWM15, SIG_DESC_SET(SCU41C, 31)); 822 821 SIG_EXPR_LIST_DECL_SESG(Y23, THRUOUT3, THRU3, SIG_DESC_SET(SCU4BC, 31)); 823 - PIN_DECL_2(Y23, GPIOP7, PWM15, THRUOUT3); 822 + SIG_EXPR_LIST_DECL_SESG(Y23, HEARTBEAT, HEARTBEAT, SIG_DESC_SET(SCU69C, 31)); 823 + PIN_DECL_3(Y23, GPIOP7, PWM15, THRUOUT3, HEARTBEAT); 824 824 GROUP_DECL(PWM15G1, Y23); 825 825 FUNC_DECL_2(PWM15, PWM15G0, PWM15G1); 826 826 827 827 FUNC_GROUP_DECL(THRU3, AB24, Y23); 828 + FUNC_GROUP_DECL(HEARTBEAT, Y23); 828 829 829 830 #define AA25 128 830 831 SSSF_PIN_DECL(AA25, GPIOQ0, TACH0, SIG_DESC_SET(SCU430, 0)); ··· 1923 1920 ASPEED_PINCTRL_GROUP(GPIU5), 1924 1921 ASPEED_PINCTRL_GROUP(GPIU6), 1925 1922 ASPEED_PINCTRL_GROUP(GPIU7), 1923 + ASPEED_PINCTRL_GROUP(HEARTBEAT), 1926 1924 ASPEED_PINCTRL_GROUP(HVI3C3), 1927 1925 ASPEED_PINCTRL_GROUP(HVI3C4), 1928 1926 ASPEED_PINCTRL_GROUP(I2C1), ··· 2162 2158 ASPEED_PINCTRL_FUNC(GPIU5), 2163 2159 ASPEED_PINCTRL_FUNC(GPIU6), 2164 2160 ASPEED_PINCTRL_FUNC(GPIU7), 2161 + ASPEED_PINCTRL_FUNC(HEARTBEAT), 2165 2162 ASPEED_PINCTRL_FUNC(I2C1), 2166 2163 ASPEED_PINCTRL_FUNC(I2C10), 2167 2164 ASPEED_PINCTRL_FUNC(I2C11),