ARM: imx: vining2000: Clean up uSDHC4 setup
PATCH 1/3 ARM: imx: vining2000: Clean up uSDHC4 setup
Simplify the uSDHC4 eMMC controller setup. This is the only eMMC present on the system and only controller that is used, so drop the extra logic.
--- board/softing/vining_2000/vining_2000.c | 27 ++++--------------------- 1 file changed, 4 insertions(+), 23 deletions(-)
board/softing/vining_2000/vining_2000.c +4 -23
@@ -427,8 +427,6 @@ void board_preboot_os(void)#include <spl.h> #include <asm/arch/mx6-ddr.h> -static struct fsl_esdhc_cfg usdhc_cfg = {USDHC4_BASE_ADDR }; -static iomux_v3_cfg_t const pcie_pads[] = {MX6_PAD_NAND_DATA02__GPIO4_IO_6 |MUX_PAD_CTRL (GPIO_PAD_CTRL ), };
@@ -461,30 +459,13 @@ static void vining2000_spl_setup_iomux_uart(void)imx_iomux_v3_setup_multiple_pads (uart_pads,ARRAY_SIZE (uart_pads)); } +static struct fsl_esdhc_cfg usdhc_cfg = {USDHC4_BASE_ADDR }; +int board_mmc_init (bd_t *bis) { -struct src *src_regs = (struct src *)SRC_BASE_ADDR ; -u32 val; -u32 port; - - val =readl (&src_regs->sbmr1); - -if ((val &0xc0 ) !=0x40 ) { -printf ("Not boot from USDHC!\n" ); -return -EINVAL ; - } - - port = (val >>11 ) &0x3 ; -printf ("port %d\n" , port); -switch (port) { -case 3 : -imx_iomux_v3_setup_multiple_pads ( - usdhc4_pads,ARRAY_SIZE (usdhc4_pads)); - usdhc_cfg.sdhc_clk =mxc_get_clock (MXC_ESDHC4_CLK ); - usdhc_cfg.esdhc_base =USDHC4_BASE_ADDR ; -break ; - } +imx_iomux_v3_setup_multiple_pads (usdhc4_pads,ARRAY_SIZE (usdhc4_pads)); + usdhc_cfg.sdhc_clk =mxc_get_clock (MXC_ESDHC4_CLK ); gd->arch.sdhc_clk = usdhc_cfg.sdhc_clk;return fsl_esdhc_initialize (bis, &usdhc_cfg); }
Signature · 1 line
2.24.1
PATCH 2/3 ARM: imx: vining2000: Properly discern PFUZE100 and PFUZE200
The PFUZE100 and PFUZE200 PMICs can be discerned by bit 0 in DeviceID register. Print the correct identification of the PMICs.
--- board/softing/vining_2000/vining_2000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/softing/vining_2000/vining_2000.c +1 -1
@@ -146,7 +146,7 @@ static struct pmic *pfuze_init(unsigned char i2cbus)return NULL ;pmic_reg_read (p,PFUZE100_DEVICEID , ®); -printf ("PMIC: PFUZE100 ID=0x%02x\n" , reg); +printf ("PMIC: PFUZE%i00 ID=0x%02x\n" , (reg &1 ) ?2 :1 , reg);/* Set SW1AB stanby volage to 0.975V */ pmic_reg_read (p,PFUZE100_SW1ABSTBY , ®);
Signature · 1 line
2.24.1
PATCH 2/3 ARM: imx: vining2000: Properly discern PFUZE100 and PFUZE200
Quoted 6 lines
The PFUZE100 and PFUZE200 PMICs can be discerned by bit 0 in DeviceID register. Print the correct identification of the PMICs.
Signed-off-by Marek Vasut <[email protected]>Cc Fabio Estevam <[email protected]>Cc Silvio Fricke <[email protected]>Cc Stefano Babic <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 3/3 ARM: imx: vining2000: Enable SPL SDP by default
In reply to Marek VasutEnable SPL SDP fallback boot option in default build.
--- configs/vining_2000_defconfig | 9 +++++++++ include/configs/vining_2000.h | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-)
configs/vining_2000_defconfig +9 -0
@@ -26,6 +26,9 @@ CONFIG_BOUNCE_BUFFER=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_FS_EXT4=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET=y +CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y
@@ -74,5 +77,11 @@ CONFIG_MXC_UART=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Softing" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
include/configs/vining_2000.h +0 -2
@@ -66,12 +66,10 @@#define CONFIG_PHY_ATHEROS -#ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#endif #ifdef CONFIG_CMD_PCI #define CONFIG_PCI_SCAN_SHOW
Signature · 1 line
2.24.1
PATCH 3/3 ARM: imx: vining2000: Enable SPL SDP by default
Quoted 5 lines
Enable SPL SDP fallback boot option in default build.
Signed-off-by Marek Vasut <[email protected]>Cc Fabio Estevam <[email protected]>Cc Silvio Fricke <[email protected]>Cc Stefano Babic <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/3 ARM: imx: vining2000: Clean up uSDHC4 setup
In reply to Marek VasutQuoted 51 lines · Marek Vasut
Simplify the uSDHC4 eMMC controller setup. This is the only eMMC present on the system and only controller that is used, so drop the extra logic.
Signed-off-by Marek Vasut <[email protected]>Cc Fabio Estevam <[email protected]>Cc Silvio Fricke <[email protected]>Cc Stefano Babic <[email protected]>--- board/softing/vining_2000/vining_2000.c | 27 ++++--------------------- 1 file changed, 4 insertions(+), 23 deletions(-)board/softing/vining_2000/vining_2000.c +2
-19@@ -427,8 +427,6 @@ void board_preboot_os(void)#include <spl.h> #include <asm/arch/mx6-ddr.h> -static struct fsl_esdhc_cfg usdhc_cfg = {USDHC4_BASE_ADDR }; -static iomux_v3_cfg_t const pcie_pads[] = {MX6_PAD_NAND_DATA02__GPIO4_IO_6 |MUX_PAD_CTRL (GPIO_PAD_CTRL ), };@@ -461,30 +459,13 @@ static void vining2000_spl_setup_iomux_uart(void)imx_iomux_v3_setup_multiple_pads (uart_pads,ARRAY_SIZE (uart_pads)); } +static struct fsl_esdhc_cfg usdhc_cfg = {USDHC4_BASE_ADDR }; +int board_mmc_init (bd_t *bis) { -struct src *src_regs = (struct src *)SRC_BASE_ADDR ; -u32 val; -u32 port; - - val =readl (&src_regs->sbmr1); - -if ((val &0xc0 ) !=0x40 ) { -printf ("Not boot from USDHC!\n" ); -return -EINVAL ; - } - - port = (val >>11 ) &0x3 ; -printf ("port %d\n" , port); -switch (port) { -case 3 : -imx_iomux_v3_setup_multiple_pads ( - usdhc4_pads,ARRAY_SIZE (usdhc4_pads));
board/softing/vining_2000/vining_2000.c static void vining2000_spl_setup_iomux_uart(void) · line 471
Quoted 10 lines
board/softing/vining_2000/vining_2000.c +2
-4- usdhc_cfg.sdhc_clk =mxc_get_clock (MXC_ESDHC4_CLK ); - usdhc_cfg.esdhc_base =USDHC4_BASE_ADDR ; -break ; - } +imx_iomux_v3_setup_multiple_pads (usdhc4_pads,ARRAY_SIZE (usdhc4_pads)); + usdhc_cfg.sdhc_clk =mxc_get_clock (MXC_ESDHC4_CLK ); gd->arch.sdhc_clk = usdhc_cfg.sdhc_clk;return fsl_esdhc_initialize (bis, &usdhc_cfg); }
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/3 ARM: imx: vining2000: Clean up uSDHC4 setup
In reply to Marek VasutQuoted 8 lines
Simplify the uSDHC4 eMMC controller setup. This is the only eMMC present on the system and only controller that is used, so drop the extra logic.
Signed-off-by Marek Vasut <[email protected]>Cc Fabio Estevam <[email protected]>Cc Silvio Fricke <[email protected]>Cc Stefano Babic <[email protected]>Reviewed-by Stefano Babic <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================