ayufan: rock64: add board_init_sdmmc_pwr_en to configure iomux in SPL mode

Author: ayufan

arch/arm/mach-rockchip/rk3328-board-spl.c

@@ -18,12 +18,46 @@
 #include <asm/arch/periph.h>
 #include <asm/arch/timer.h>
 
+#define GRF_BASE		0xFF100000
+
 DECLARE_GLOBAL_DATA_PTR;
 
 void board_debug_uart_init(void)
 {
 }
 
+void board_init_sdmmc_pwr_en(void)
+{
+	struct rk3328_grf_regs * const grf = (void *)GRF_BASE;
+
+	printf("board_init_sdmmc_pwr_en\n");
+
+	/* uart2 select m1, sdcard select m1*/
+	rk_clrsetreg(&grf->com_iomux,
+		     IOMUX_SEL_UART2_MASK | IOMUX_SEL_SDMMC_MASK,
+		     IOMUX_SEL_UART2_M1 << IOMUX_SEL_UART2_SHIFT |
+		     IOMUX_SEL_SDMMC_M1 << IOMUX_SEL_SDMMC_SHIFT);
+	
+	u32 com_iomux = readl(&grf->com_iomux);
+
+	if (com_iomux & IOMUX_SEL_SDMMC_MASK) {
+		rk_clrsetreg(&grf->gpio0d_iomux,
+						GPIO0D6_SEL_MASK,
+						GPIO0D6_GPIO << GPIO0D6_SEL_SHIFT);
+		printf("GPIO0D6_GPIO\n");
+	} else {
+		rk_clrsetreg(&grf->gpio2a_iomux,
+						GPIO2A7_SEL_MASK,
+						GPIO2A7_GPIO << GPIO2A7_SEL_SHIFT);
+		printf("GPIO2A7_GPIO\n");
+	}
+	rk_clrsetreg(&grf->gpio1a_iomux,
+					GPIO1A0_SEL_MASK,
+					GPIO1A0_CARD_DATA_CLK_CMD_DETN
+					<< GPIO1A0_SEL_SHIFT);
+		printf("GPIO1A0_CARD_DATA_CLK_CMD_DETN\n");
+}
+
 void board_init_f(ulong dummy)
 {
 	struct udevice *dev;
@@ -36,6 +70,7 @@ void board_init_f(ulong dummy)
 	}
 
 	preloader_console_init();
+	board_init_sdmmc_pwr_en();
 
 	ret = uclass_get_device(UCLASS_RAM, 0, &dev);
 	if (ret) {

arch/arm/mach-rockchip/rk3328/rk3328.c

@@ -96,11 +96,13 @@ int board_init(void)
 #define GRF_BASE	0xff100000
 	struct rk3328_grf_regs * const grf = (void *)GRF_BASE;
 
+	printf("board_init\n");
+
 	/* uart2 select m1, sdcard select m1*/
 	rk_clrsetreg(&grf->com_iomux,
 		     IOMUX_SEL_UART2_MASK | IOMUX_SEL_SDMMC_MASK,
 		     IOMUX_SEL_UART2_M1 << IOMUX_SEL_UART2_SHIFT |
-		     IOMUX_SEL_SDMMC_M1 << IOMUX_SEL_SDMMC_SHIFT);
+		     IOMUX_SEL_SDMMC_M0 << IOMUX_SEL_SDMMC_SHIFT);
 
 	ret = regulators_enable_boot_on(false);
 	if (ret)

dev-ayufan/rockchip.mk

@@ -8,6 +8,7 @@ loader-boot: $(UBOOT_LOADERS) $(UBOOT_TPL) $(UBOOT_SPL)
 	./dev-make loader-download-mode
 	rkdeveloptool rid
 	dd if=/dev/zero of=$(UBOOT_OUTPUT_DIR)/clear.img count=1
+	sleep 3s
 	rkdeveloptool wl 64 $(UBOOT_OUTPUT_DIR)/clear.img
 	rkdeveloptool wl 512 $(UBOOT_OUTPUT_DIR)/u-boot.itb
 

drivers/pinctrl/rockchip/pinctrl_rk3328.c

@@ -166,6 +166,7 @@ static void pinctrl_rk3328_sdmmc_config(struct rk3328_grf_regs *grf,
 {
 	u32 com_iomux = readl(&grf->com_iomux);
 
+		printf("pinctrl_rk3328_sdmmc_config\n");
 	switch (mmc_id) {
 	case PERIPH_ID_EMMC:
 		rk_clrsetreg(&grf->gpio0a_iomux,
@@ -180,6 +181,7 @@ static void pinctrl_rk3328_sdmmc_config(struct rk3328_grf_regs *grf,
 			     << GPIO3C0_SEL_SHIFT);
 		break;
 	case PERIPH_ID_SDCARD:
+		printf("PERIPH_ID_SDCARD\n");
 		/* SDMMC_PWREN use GPIO and init as regulator-fiexed  */
 		if (com_iomux & IOMUX_SEL_SDMMC_MASK)
 			rk_clrsetreg(&grf->gpio0d_iomux,