leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: k210: Fix inverted IE and OE for I2C

Browse Source 
I2C and SCCB previously shared defaults. However, SCCB needs OE_INV and
IE_INV set, but I2C cannot have those bits set. This adds a separate
default for SCCB.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reported-by: Damien Le Moal <Damien.LeMoal@wdc.com>
This commit is contained in:
Sean Anderson 2020-11-13 08:43:39 -05:00 committed by Andes
parent f0b1831864
commit 82b838f8dd
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/pinctrl/pinctrl-kendryte.c
View File

@ -55,8 +55,9 @@
#define K210_PC_MODE_IN (K210_PC_IE | K210_PC_ST) #define K210_PC_MODE_IN (K210_PC_IE | K210_PC_ST)
#define K210_PC_MODE_OUT (K210_PC_DRIVE_7 | K210_PC_OE) #define K210_PC_MODE_OUT (K210_PC_DRIVE_7 | K210_PC_OE)
#define K210_PC_MODE_I2C (K210_PC_MODE_IN | K210_PC_IE_INV | K210_PC_SL | \ #define K210_PC_MODE_I2C (K210_PC_MODE_IN | K210_PC_SL | K210_PC_OE | \
K210_PC_OE | K210_PC_OE_INV | K210_PC_PU) K210_PC_PU)
#define K210_PC_MODE_SCCB (K210_PC_MODE_I2C | K210_PC_OE_INV | K210_PC_IE_INV)
#define K210_PC_MODE_SPI (K210_PC_MODE_IN | K210_PC_IE_INV | \ #define K210_PC_MODE_SPI (K210_PC_MODE_IN | K210_PC_IE_INV | \
K210_PC_MODE_OUT | K210_PC_OE_INV) K210_PC_MODE_OUT | K210_PC_OE_INV)
#define K210_PC_MODE_GPIO (K210_PC_MODE_IN | K210_PC_MODE_OUT) #define K210_PC_MODE_GPIO (K210_PC_MODE_IN | K210_PC_MODE_OUT)
@ -176,6 +177,7 @@ enum k210_pc_mode_id {
K210_PC_DEFAULT_IN_TIE, K210_PC_DEFAULT_IN_TIE,
K210_PC_DEFAULT_OUT, K210_PC_DEFAULT_OUT,
K210_PC_DEFAULT_I2C, K210_PC_DEFAULT_I2C,
K210_PC_DEFAULT_SCCB,
K210_PC_DEFAULT_SPI, K210_PC_DEFAULT_SPI,
K210_PC_DEFAULT_GPIO, K210_PC_DEFAULT_GPIO,
K210_PC_DEFAULT_INT13, K210_PC_DEFAULT_INT13,
@ -189,6 +191,7 @@ static const u32 k210_pc_mode_id_to_mode[] = {
[K210_PC_DEFAULT_IN_TIE] = K210_PC_MODE_IN, [K210_PC_DEFAULT_IN_TIE] = K210_PC_MODE_IN,
DEFAULT(OUT), DEFAULT(OUT),
DEFAULT(I2C), DEFAULT(I2C),
DEFAULT(SCCB),
DEFAULT(SPI), DEFAULT(SPI),
DEFAULT(GPIO), DEFAULT(GPIO),
[K210_PC_DEFAULT_INT13] = K210_PC_MODE_IN | K210_PC_PU, [K210_PC_DEFAULT_INT13] = K210_PC_MODE_IN | K210_PC_PU,
@ -362,8 +365,8 @@ static const struct k210_pcf_info k210_pcf_infos[] = {
FUNC(DVP_D5, IN), FUNC(DVP_D5, IN),
FUNC(DVP_D6, IN), FUNC(DVP_D6, IN),
FUNC(DVP_D7, IN), FUNC(DVP_D7, IN),
FUNC(SCCB_SCLK, I2C), FUNC(SCCB_SCLK, SCCB),
FUNC(SCCB_SDA, I2C), FUNC(SCCB_SDA, SCCB),
FUNC(UART1_CTS, IN), FUNC(UART1_CTS, IN),
FUNC(UART1_DSR, IN), FUNC(UART1_DSR, IN),
FUNC(UART1_DCD, IN), FUNC(UART1_DCD, IN),