July 2016 - U-Boot

[U-Boot] [U-Boot PATCH v1] keystone: k2h/e/l: Fix DMA coherency for QM PDSP
by Murali Karicheri 19 Jul '16

19 Jul '16

commit 1f807a9f32aa ("ARM: keystone2: Refactor MSMC macros to avoid left under a macro KS2_MSMC_SEGMENT_QM_PDSP which is no longer valid. This, in effect disabled DMA coherency for QM PDSP. Given that msmc_k2hkle_common_setup is valid for all K2H/K/L/E SoCs, the #ifdef should been removed in the first place. Do the same. Fixes: 1f807a9f32aa ("ARM: keystone2: Refactor MSMC macros to avoid #ifdeffery") Signed-off-by: Murali Karicheri <m-karicheri2(a)ti.com> Acked-by: Nishanth Menon <nm(a)ti.com> Reviewed-by: Tom Rini <trini(a)konsulko.com> --- - v2 - fixed the prefix - v1 - adding Fixes per comments and added Reviewed-by from Tom Rini arch/arm/mach-keystone/init.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c index 3b6d5ef..6e5a1e1 100644 --- a/arch/arm/mach-keystone/init.c +++ b/arch/arm/mach-keystone/init.c @@ -101,9 +101,7 @@ static void msmc_k2hkle_common_setup(void) msmc_share_all_segments(KS2_MSMC_SEGMENT_C6X_0); msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_ARM); msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_NETCP); -#ifdef KS2_MSMC_SEGMENT_QM_PDSP msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_QM_PDSP); -#endif msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_PCIE0); msmc_share_all_segments(KS2_MSMC_SEGMENT_DEBUG); } -- 1.9.1

1 0

[U-Boot] [PATCH v2 0/9] mx7: add Colibri iMX7S/iMX7D support
by Stefan Agner 19 Jul '16

19 Jul '16

From: Stefan Agner <stefan.agner(a)toradex.com> This patchset adds support for the Toradex i.MX 7Solo and 7Dual based computer on modules Colibri iMX7S/iMX7D. It also brings several smaller i.MX 7 related fixes/cleanups. Changes since v1: - Dropped Ricoh RN5T567 PMIC support (for now) - Use CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG for runtime variables - Convert USB OTG Power Pin Polarity to Kconfig - Use gpio_request in lcd_setup Stefan Agner (9): dm: imx: serial: Support DTE mode when using driver model usb: move CONFIG_USB_EHCI_MX7 to Kconfig usb: ehci-mx6: configure power polarity in usb_power_config usb: ehci-mx6: introduce config for high active power pin mx7: set soc environment according to exact SoC type mx7_common: Put display board info config into board file mx7_common: use Kconfig for ARMv7 non-secure mode imx_watchdog: add weak attribute to reset_cpu function colibri_imx7: add Colibri iMX7S/iMX7D module support arch/arm/cpu/armv7/mx7/Kconfig | 9 + arch/arm/cpu/armv7/mx7/soc.c | 14 + board/toradex/colibri_imx7/Kconfig | 12 + board/toradex/colibri_imx7/MAINTAINERS | 6 + board/toradex/colibri_imx7/Makefile | 6 + board/toradex/colibri_imx7/colibri_imx7.c | 420 ++++++++++++++++++++++++++++++ board/toradex/colibri_imx7/imximage.cfg | 150 +++++++++++ configs/colibri_imx7_defconfig | 40 +++ configs/mx7dsabresd_defconfig | 3 + configs/warp7_defconfig | 4 + drivers/serial/serial_mxc.c | 9 +- drivers/usb/host/Kconfig | 16 ++ drivers/usb/host/ehci-mx6.c | 14 +- drivers/watchdog/imx_watchdog.c | 2 +- include/configs/colibri_imx7.h | 248 ++++++++++++++++++ include/configs/mx7_common.h | 10 +- include/configs/mx7dsabresd.h | 4 +- include/configs/warp7.h | 4 +- include/dm/platform_data/serial_mxc.h | 1 + 19 files changed, 953 insertions(+), 19 deletions(-) create mode 100644 board/toradex/colibri_imx7/Kconfig create mode 100644 board/toradex/colibri_imx7/MAINTAINERS create mode 100644 board/toradex/colibri_imx7/Makefile create mode 100644 board/toradex/colibri_imx7/colibri_imx7.c create mode 100644 board/toradex/colibri_imx7/imximage.cfg create mode 100644 configs/colibri_imx7_defconfig create mode 100644 include/configs/colibri_imx7.h -- 2.9.0

6 26

[U-Boot] [PATCH 1/2] fs/fat/fatwrite: Local variable as buffer to store dir_slot entries
by Tien Fong Chee 19 Jul '16

19 Jul '16

fill_dir_slot use get_contents_vfatname_block as a temporary buffer for constructing a list of dir_slot entries. To save the memory and providing correct type of memory for above usage, a local buffer with accurate size declaration is introduced. The local array size 640 is used because for long file name entry, each entry use 32 bytes, one entry can store up to 13 characters. The maximum number of entry possible is 20. So, total size is 32*20=640bytes. Signed-off-by: Genevieve Chan <ccheauya(a)altera.com> Signed-off-by: Tien Fong Chee <tfchee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Dinh Nguyen <dinh.linux(a)gmail.com> Cc: ChinLiang <clsee(a)altera.com> Cc: Vagrant Cascadian <vagrant(a)debian.org> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Benoît Thébaudeau <benoit(a)wsystem.com> --- fs/fat/fat_write.c | 3 ++- include/fat.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index eb3a916..c1d48c5 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -323,7 +323,8 @@ static void flush_dir_table(fsdata *mydata, dir_entry **dentptr); static void fill_dir_slot(fsdata *mydata, dir_entry **dentptr, const char *l_name) { - dir_slot *slotptr = (dir_slot *)get_contents_vfatname_block; + __u8 temp_dir_slot_buffer[MAX_LFN_SLOT * sizeof(dir_slot)]; + dir_slot *slotptr = (dir_slot *)temp_dir_slot_buffer; __u8 counter = 0, checksum; int idx = 0, ret; char s_name[16]; diff --git a/include/fat.h b/include/fat.h index 9d053e6..90fdeba 100644 --- a/include/fat.h +++ b/include/fat.h @@ -33,6 +33,9 @@ #define FAT16BUFSIZE (FATBUFSIZE/2) #define FAT32BUFSIZE (FATBUFSIZE/4) +/* Maximum number of entry for long file name according to spec */ +#define MAX_LFN_SLOT 20 + /* Filesystem identifiers */ #define FAT12_SIGN "FAT12 " -- 1.7.7.4

4 8

[U-Boot] [tiU16.05 PATCH v1] keystone: k2h/e/l: Fix DMA coherency for QM PDSP
by Murali Karicheri 19 Jul '16

19 Jul '16

commit 1f807a9f32aa ("ARM: keystone2: Refactor MSMC macros to avoid left under a macro KS2_MSMC_SEGMENT_QM_PDSP which is no longer valid. This, in effect disabled DMA coherency for QM PDSP. Given that msmc_k2hkle_common_setup is valid for all K2H/K/L/E SoCs, the #ifdef should been removed in the first place. Do the same. Fixes: 1f807a9f32aa ("ARM: keystone2: Refactor MSMC macros to avoid #ifdeffery") Signed-off-by: Murali Karicheri <m-karicheri2(a)ti.com> Acked-by: Nishanth Menon <nm(a)ti.com> Reviewed-by: Tom Rini <trini(a)konsulko.com> --- - v2 - adding Fixes per comments arch/arm/mach-keystone/init.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c index 3b6d5ef..6e5a1e1 100644 --- a/arch/arm/mach-keystone/init.c +++ b/arch/arm/mach-keystone/init.c @@ -101,9 +101,7 @@ static void msmc_k2hkle_common_setup(void) msmc_share_all_segments(KS2_MSMC_SEGMENT_C6X_0); msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_ARM); msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_NETCP); -#ifdef KS2_MSMC_SEGMENT_QM_PDSP msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_QM_PDSP); -#endif msmc_share_all_segments(K2HKLE_MSMC_SEGMENT_PCIE0); msmc_share_all_segments(KS2_MSMC_SEGMENT_DEBUG); } -- 1.9.1

1 0

[U-Boot] [PATCH] mmc: fix the output format
by Ziyuan Xu 19 Jul '16

19 Jul '16

It's nicer to see this: => mmc list dwmmc@ff0c0000: 0 dwmmc@ff0f0000: 1 (eMMC) than this: => mmc list dwmmc@ff0c0000: 0dwmmc@ff0f0000: 1 (eMMC) With the latter, it's much clearer which mmc devices are on. Signed-off-by: Ziyuan Xu <xzy.xu(a)rock-chips.com> --- drivers/mmc/mmc-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 38ced41..beebc70 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -169,7 +169,7 @@ void print_mmc_devices(char separator) for (uclass_first_device(UCLASS_MMC, &dev); dev; - uclass_next_device(&dev)) { + uclass_next_device(&dev), first = false) { struct mmc *m = mmc_get_mmc_dev(dev); if (!first) { -- 1.9.1

2 2

[U-Boot] [PATCH v2] pico-imx6ul: Add PMIC support
by Vanessa Maegima 19 Jul '16

19 Jul '16

Add PMIC support. Tested by command "pmic PFUZE3000 dump". Signed-off-by: Vanessa Maegima <vanessa.maegima(a)nxp.com> --- Changes since v1: - Remove use of "reg" variable in function "pmic_reg_write". board/technexion/pico-imx6ul/pico-imx6ul.c | 70 ++++++++++++++++++++++++++++++ include/configs/pico-imx6ul.h | 12 +++++ 2 files changed, 82 insertions(+) diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c index b0b8f05..5cbf803 100644 --- a/board/technexion/pico-imx6ul/pico-imx6ul.c +++ b/board/technexion/pico-imx6ul/pico-imx6ul.c @@ -14,13 +14,18 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/mxc_i2c.h> #include <asm/io.h> #include <common.h> #include <miiphy.h> #include <netdev.h> #include <fsl_esdhc.h> +#include <i2c.h> #include <linux/sizes.h> #include <usb.h> +#include <power/pmic.h> +#include <power/pfuze3000_pmic.h> +#include "../../freescale/common/pfuze.h" DECLARE_GLOBAL_DATA_PTR; @@ -32,6 +37,11 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) +#define I2C_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ + PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ + PAD_CTL_ODE) + #define OTG_ID_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_LOW | \ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) @@ -47,6 +57,23 @@ DECLARE_GLOBAL_DATA_PTR; #define RMII_PHY_RESET IMX_GPIO_NR(1, 28) +#ifdef CONFIG_SYS_I2C_MXC +#define PC MUX_PAD_CTRL(I2C_PAD_CTRL) +/* I2C2 for PMIC */ +struct i2c_pads_info i2c_pad_info1 = { + .scl = { + .i2c_mode = MX6_PAD_GPIO1_IO02__I2C1_SCL | PC, + .gpio_mode = MX6_PAD_GPIO1_IO02__GPIO1_IO02 | PC, + .gp = IMX_GPIO_NR(1, 2), + }, + .sda = { + .i2c_mode = MX6_PAD_GPIO1_IO03__I2C1_SDA | PC, + .gpio_mode = MX6_PAD_GPIO1_IO03__GPIO1_IO03 | PC, + .gp = IMX_GPIO_NR(1, 3), + }, +}; +#endif + static iomux_v3_cfg_t const fec_pads[] = { MX6_PAD_ENET1_TX_EN__ENET2_MDC | MUX_PAD_CTRL(MDIO_PAD_CTRL), MX6_PAD_ENET1_TX_DATA1__ENET2_MDIO | MUX_PAD_CTRL(MDIO_PAD_CTRL), @@ -182,6 +209,45 @@ int board_early_init_f(void) return 0; } +#ifdef CONFIG_POWER +#define I2C_PMIC 0 +static struct pmic *pfuze; +int power_init_board(void) +{ + int ret; + unsigned int reg, rev_id; + + ret = power_pfuze3000_init(I2C_PMIC); + if (ret) + return ret; + + pfuze = pmic_get("PFUZE3000"); + ret = pmic_probe(pfuze); + if (ret) + return ret; + + pmic_reg_read(pfuze, PFUZE3000_DEVICEID, &reg); + pmic_reg_read(pfuze, PFUZE3000_REVID, &rev_id); + printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", reg, rev_id); + + /* disable Low Power Mode during standby mode */ + pmic_reg_read(pfuze, PFUZE3000_LDOGCTL, &reg); + reg |= 0x1; + pmic_reg_write(pfuze, PFUZE3000_LDOGCTL, reg); + + /* SW1B step ramp up time from 2us to 4us/25mV */ + pmic_reg_write(pfuze, PFUZE3000_SW1BCONF, 0x40); + + /* SW1B mode to APS/PFM */ + pmic_reg_write(pfuze, PFUZE3000_SW1BMODE, 0xc); + + /* SW1B standby voltage set to 0.975V */ + pmic_reg_write(pfuze, PFUZE3000_SW1BSTBY, 0xb); + + return 0; +} +#endif + int board_usb_phy_mode(int port) { if (port == 1) @@ -211,6 +277,10 @@ int board_init(void) /* Address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; + #ifdef CONFIG_SYS_I2C_MXC + setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); + #endif + setup_fec(); setup_usb(); diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index f9fc263..a1e5f01 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -158,6 +158,18 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) +/* I2C configs */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_MXC +#define CONFIG_SYS_I2C_MXC_I2C1 +#define CONFIG_SYS_I2C_SPEED 100000 + +/* PMIC */ +#define CONFIG_POWER +#define CONFIG_POWER_I2C +#define CONFIG_POWER_PFUZE3000 +#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 + /* FLASH and environment organization */ #define CONFIG_SYS_NO_FLASH -- 2.7.4

3 2

[U-Boot] [PATCH v4 0/4] add support for rk3399 soc and evb
by Kever Yang 19 Jul '16

19 Jul '16

This patchset add support for rk3399 with ATF based on Rockchip miniloader as secondary bootloader instead of U-Boot SPL. Rockchip miniloader init the DRAM and load the ATF and U-Boot to runing address, and then jump to ATF, the ATF do some init and switch to EL2/EL1 mode before jump to next loader which is U-Boot here. Pls reference board/rockchip/evb_rk3399/README to setup the board. Will migrate to SPL once its ready for ATF. This patch set is based on below patch: "board: move all the rockchip board in one folder" This patch set has been test on rk3399 evb board. In this version, I split the mmc driver in seperate thread, because when I enable the full-model for mmc driver, Seems bug happen in blk layer, will descript detail in mmc patch. Changes in v4: remove extra blank line in evb_rk3399.h, remove unnecessary including file in rk3399_common.h, fix base on commend from Andreas, Rebase on U-Boot ToT. move config CONFIG_SYS_NS16550 from chip common to defconfig Changes in v3: Rebase on patch from Andreas: [PATCH] rockchip: Exclude rk_timer for ARM64 [PATCH] rockchip: Clean up CPU selection Changes in v2: fix description error on board Kconfig fix a binary path error Kever Yang (4): dts: add support for Rockchip rk3399 soc ARM64: rockchip: add support for rk3399 SoC based evb config: add config file for evb-rk3399 ARM64: evb-rk3399: add a README for this board setup arch/arm/Kconfig | 2 - arch/arm/dts/Makefile | 3 +- arch/arm/dts/rk3399-evb.dts | 104 ++++ arch/arm/dts/rk3399.dtsi | 1028 ++++++++++++++++++++++++++++++++ arch/arm/mach-rockchip/Kconfig | 18 + arch/arm/mach-rockchip/rk3399/Kconfig | 18 + board/rockchip/evb_rk3399/Kconfig | 15 + board/rockchip/evb_rk3399/MAINTAINERS | 0 board/rockchip/evb_rk3399/Makefile | 7 + board/rockchip/evb_rk3399/README | 73 +++ board/rockchip/evb_rk3399/evb-rk3399.c | 40 ++ configs/evb-rk3399_defconfig | 33 + include/configs/evb_rk3399.h | 24 + include/configs/rk3399_common.h | 71 +++ include/dt-bindings/clock/rk3399-cru.h | 746 +++++++++++++++++++++++ 15 files changed, 2179 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/rk3399-evb.dts create mode 100644 arch/arm/dts/rk3399.dtsi create mode 100644 arch/arm/mach-rockchip/rk3399/Kconfig create mode 100644 board/rockchip/evb_rk3399/Kconfig create mode 100644 board/rockchip/evb_rk3399/MAINTAINERS create mode 100644 board/rockchip/evb_rk3399/Makefile create mode 100644 board/rockchip/evb_rk3399/README create mode 100644 board/rockchip/evb_rk3399/evb-rk3399.c create mode 100644 configs/evb-rk3399_defconfig create mode 100644 include/configs/evb_rk3399.h create mode 100644 include/configs/rk3399_common.h create mode 100644 include/dt-bindings/clock/rk3399-cru.h -- 1.9.1

3 14

[U-Boot] [PATCH v3 0/5] add support for rk3399 soc and evb
by Kever Yang 19 Jul '16

19 Jul '16

This patchset add support for rk3399 with ATF based on Rockchip miniloader as secondary bootloader instead of u-boot SPL. Rockchip miniloader init the DRAM and load the ATF and u-boot to runing address, and then jump to ATF, ATM do some init and switch to EL2/EL1 mode before jump to next loader which is u-boot here. Pls reference board/rockchip/evb_rk3399/README to setup the board. Will migrate to SPL once its ready for ATF. This patch set is based on below patch: "board: move all the rockchip board in one folder" This patch set has been test on rk3399 evb board. Changes in v3: Rebase on patch from Andreas: [PATCH] rockchip: Exclude rk_timer for ARM64 [PATCH] rockchip: Clean up CPU selection Changes in v2: fix description error on board Kconfig fix a binary path error Kever Yang (5): dts: add support for rkchichip rk3399 soc ARM64: rockchip: add support for rk3399 SoC based evb-board config: add config file for evb-rk3399 mmc: rockchip: add SDHCI driver support for rockchip soc ARM64: evb-rk3399: add a README for this board setup arch/arm/Kconfig | 2 - arch/arm/dts/Makefile | 3 +- arch/arm/dts/rk3399-evb.dts | 104 ++++ arch/arm/dts/rk3399.dtsi | 1028 ++++++++++++++++++++++++++++++++ arch/arm/mach-rockchip/Kconfig | 22 +- arch/arm/mach-rockchip/rk3399/Kconfig | 14 + arch/arm/mach-rockchip/rk3399/Makefile | 5 + board/rockchip/evb_rk3399/Kconfig | 15 + board/rockchip/evb_rk3399/MAINTAINERS | 0 board/rockchip/evb_rk3399/Makefile | 7 + board/rockchip/evb_rk3399/README | 73 +++ board/rockchip/evb_rk3399/evb-rk3399.c | 41 ++ configs/evb-rk3399_defconfig | 32 + drivers/mmc/Kconfig | 6 + drivers/mmc/Makefile | 1 + drivers/mmc/rockchip_sdhci.c | 58 ++ include/configs/evb_rk3399.h | 24 + include/configs/rk3399_common.h | 84 +++ include/dt-bindings/clock/rk3399-cru.h | 746 +++++++++++++++++++++++ 19 files changed, 2261 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/rk3399-evb.dts create mode 100644 arch/arm/dts/rk3399.dtsi create mode 100644 arch/arm/mach-rockchip/rk3399/Kconfig create mode 100644 arch/arm/mach-rockchip/rk3399/Makefile create mode 100644 board/rockchip/evb_rk3399/Kconfig create mode 100644 board/rockchip/evb_rk3399/MAINTAINERS create mode 100644 board/rockchip/evb_rk3399/Makefile create mode 100644 board/rockchip/evb_rk3399/README create mode 100644 board/rockchip/evb_rk3399/evb-rk3399.c create mode 100644 configs/evb-rk3399_defconfig create mode 100644 drivers/mmc/rockchip_sdhci.c create mode 100644 include/configs/evb_rk3399.h create mode 100644 include/configs/rk3399_common.h create mode 100644 include/dt-bindings/clock/rk3399-cru.h -- 1.9.1

4 18

[U-Boot] [PATCH] fixing typo error in README file. CPU15 -> CP15
by yeongjun Kim 19 Jul '16

19 Jul '16

Signed-off-by: yeongjun Kim <iam.yeongjunkim(a)gmail.com> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 3c3b699..8887cf5 100644 --- a/README +++ b/README @@ -4806,7 +4806,7 @@ Low Level (hardware related) configuration options: - CONFIG_SKIP_LOWLEVEL_INIT_ONLY [ARM926EJ-S only] This allows just the call to lowlevel_init() - to be skipped. The normal CPU15 init (such as enabling the + to be skipped. The normal CP15 init (such as enabling the instruction cache) is still performed. - CONFIG_SPL_BUILD -- 1.9.1

1 0

[U-Boot] [PATCH v2] mmc-uclass: correct the device number
by Kever Yang 19 Jul '16

19 Jul '16

Not like the mmc-legacy which the devnum starts from 1, it starts from 0 in mmc-uclass, so the device number should be (devnum + 1) in get_mmc_num(). Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- Changes in v2: - add comment for get_mmc_num() in mmc.h - update mmc_get_next_devnum() drivers/mmc/mmc-uclass.c | 4 ++-- include/mmc.h | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 38ced41..d0ca91b 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -111,7 +111,7 @@ struct mmc *find_mmc_device(int dev_num) int get_mmc_num(void) { - return max(blk_find_max_devnum(IF_TYPE_MMC), 0); + return max((blk_find_max_devnum(IF_TYPE_MMC) + 1), 0); } int mmc_get_next_devnum(void) @@ -122,7 +122,7 @@ int mmc_get_next_devnum(void) if (ret < 0) return ret; - return ret + 1; + return ret; } struct blk_desc *mmc_get_blk_desc(struct mmc *mmc) diff --git a/include/mmc.h b/include/mmc.h index 8f309f1..4288e59 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -503,6 +503,12 @@ void mmc_set_clock(struct mmc *mmc, uint clock); struct mmc *find_mmc_device(int dev_num); int mmc_set_dev(int dev_num); void print_mmc_devices(char separator); + +/** + * get_mmc_num() - get the total MMC device number + * + * @return number of MMC device + */ int get_mmc_num(void); int mmc_hwpart_config(struct mmc *mmc, const struct mmc_hwpart_conf *conf, enum mmc_hwpart_conf_mode mode); -- 1.9.1

2 1