Quellcode durchsuchen

board:starfive:Modify GPIO_SD_SHIFT to GPIO_DS_SHIFT

Modify GPIO_SD_SHIFT to GPIO_DS_SHIFT.
Fix jh7110_gpio_init function.

Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com>
Jianlong Huang vor 1 Jahr
Ursprung
Commit
fb41a40982

+ 2 - 2
arch/riscv/include/asm/arch-jh7110/gpio.h

@@ -21,7 +21,7 @@ extern "C" {
 #define GPIO_DOUT_MASK	0x7f
 #define GPIO_DIN_MASK	0x7f
 #define GPIO_DS_MASK	0x06
-#define GPIO_SD_SHIFT	1
+#define GPIO_DS_SHIFT	1
 #define GPIO_PULL_MASK	0x18
 #define GPIO_PULL_SHIFT	3
 #define GPIO_PULL_UP	1
@@ -70,7 +70,7 @@ struct starfive_gpio_platdata {
 
 #define SYS_IOMUX_SET_DS(gpio, ds) \
 	clrsetbits_le32(SYS_IOMUX_BASE + GPIO_CONFIG + gpio * 4, \
-		GPIO_DS_MASK, (ds) << GPIO_SD_SHIFT)
+		GPIO_DS_MASK, (ds) << GPIO_DS_SHIFT)
 
 #define SYS_IOMUX_SET_PULL(gpio, pull) \
 	clrsetbits_le32(SYS_IOMUX_BASE + GPIO_CONFIG + gpio * 4, \

+ 1 - 1
board/starfive/visionfive2/starfive_visionfive2.c

@@ -397,7 +397,7 @@ static void get_boot_mode(void)
 	}
 }
 
-static void jh7110_gpio_init()
+static void jh7110_gpio_init(void)
 {
 	/* This is for fixing don't detect wm8960 occasionally.
 	 * Set scl/sda gpio output enable