Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: aspeed: Allow changing SPI mode from hardware strap defaults

Browse Source 
Some platforms unfortunately have their SPI mode selection bits
strapped incorrectly (such as being configured for passthrough mode
when master mode is in fact the only useful configuration for it) and
thus require correction in software.  Add the SPI mode bits to the
GPIO passthrough bits as the exceptions to the read-only rule for the
hardware strap register so that the pinctrl subsystem can be used for
such corrections.

Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Reviewed-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Link: https://lore.kernel.org/r/20231005030849.11352-2-zev@bewilderbeest.net
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Zev Weiss 2023-10-04 20:08:50 -07:00 committed by Linus Walleij
parent 54a33423f2
commit d875d6ccd3
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c
View File

@ -2563,15 +2563,20 @@ static int aspeed_g4_sig_expr_set(struct aspeed_pinmux_data *ctx,
* deconfigured and is the reason we re-evaluate after writing
* all descriptor bits.
*
* Port D and port E GPIO loopback modes are the only exception
* as those are commonly used with front-panel buttons to allow
* normal operation of the host when the BMC is powered off or
* fails to boot. Once the BMC has booted, the loopback mode
* must be disabled for the BMC to control host power-on and
* reset.
* We make two exceptions to the read-only rule:
*
* - The passthrough mode of GPIO ports D and E are commonly
* used with front-panel buttons to allow normal operation
* of the host if the BMC is powered off or fails to boot.
* Once the BMC has booted, the loopback mode must be
* disabled for the BMC to control host power-on and reset.
*
* - The operating mode of the SPI1 interface is simply
* strapped incorrectly on some systems and requires a
* software fixup, which we allow to be done via pinctrl.
*/
if (desc->ip == ASPEED_IP_SCU && desc->reg == HW_STRAP1 &&
!(desc->mask & (BIT(21) | BIT(22))))
!(desc->mask & (BIT(22) | BIT(21) | BIT(13) | BIT(12))))
continue;
if (desc->ip == ASPEED_IP_SCU && desc->reg == HW_STRAP2)

19
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
View File

@ -2742,15 +2742,20 @@ static int aspeed_g5_sig_expr_set(struct aspeed_pinmux_data *ctx,
* deconfigured and is the reason we re-evaluate after writing
* all descriptor bits.
*
* Port D and port E GPIO loopback modes are the only exception
* as those are commonly used with front-panel buttons to allow
* normal operation of the host when the BMC is powered off or
* fails to boot. Once the BMC has booted, the loopback mode
* must be disabled for the BMC to control host power-on and
* reset.
* We make two exceptions to the read-only rule:
*
* - The passthrough mode of GPIO ports D and E are commonly
* used with front-panel buttons to allow normal operation
* of the host if the BMC is powered off or fails to boot.
* Once the BMC has booted, the loopback mode must be
* disabled for the BMC to control host power-on and reset.
*
* - The operating mode of the SPI1 interface is simply
* strapped incorrectly on some systems and requires a
* software fixup, which we allow to be done via pinctrl.
*/
if (desc->ip == ASPEED_IP_SCU && desc->reg == HW_STRAP1 &&
!(desc->mask & (BIT(21) | BIT(22))))
!(desc->mask & (BIT(22) | BIT(21) | BIT(13) | BIT(12))))
continue;
if (desc->ip == ASPEED_IP_SCU && desc->reg == HW_STRAP2)