Dear Tom,

I fixed the buildman error, and pushed them by force. - checked the mips, arm and the other things with buildman. - And rebased on latest u-boot/master

Sorry for not checking in more detail

Could you pull these patches on your master branch?

The following changes since commit 04770e6e917b0f766a9496e3f37bcdf2ebb1beb4:

Merge git://git.denx.de/u-boot-dm (2017-01-10 08:19:33 -0500)

are available in the git repository at:

http://git.denx.de/u-boot-mmc.git master

for you to fetch changes up to f401e907fcbc94adff1a8e8097c8f0a5b0aee580:

ARM: sunxi: remove bare default for CONFIG_MMC (2017-01-11 19:40:15 +0900)

---------------------------------------------------------------- Jaehoon Chung (12): mmc: sdhci: disable the 8bit mode when host doesn't support it mmc: sdhci: add the get_cd callback function in sdhci_ops mmc: sdhci: remove the unused code about testing Card detect mmc: pic32_sdhci: move the code to pic32_sdhci.c mmc: sdhci: remove the SDHCI_QUIRK_NO_CD mmc: change the set_ios return type from void to int mmc: s5p_sdhci: add the s5p_set_clock function mmc: sdhci: move the callback function into sdhci_ops mmc: sdhci: use the bitops APIs in sdhci.h mmc: sdhci: remove the SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER mmc: sdhci: combine the Host controller v3.0 feature into one condition power: change from meaningless value to error number

Masahiro Yamada (9): mmc: sdhci-cadence: add Cadence SD4HC support mmc: uniphier-sd: fix Kconfig dependency ARM: socfpga: remove unused CONFIG option and cleanup README.socfpga mmc: rename CONFIG_ROCKCHIP_DWMMC to CONFIG_MMC_DW_ROCKCHIP mmc: move CONFIG_DWMMC to Kconfig, renaming to CONFIG_MMC_DW mmc: move DesignWare-based drivers to Kconfig ARM: davinci: remove unused CONFIG_DAVINCI_MMC_SD1 mmc: move more driver config options to Kconfig ARM: sunxi: remove bare default for CONFIG_MMC

arch/arm/cpu/arm926ejs/mx27/generic.c | 8 +- arch/arm/include/asm/arch-mx27/imx-regs.h | 4 +- arch/arm/mach-davinci/da830_pinmux.c | 2 +- arch/arm/mach-omap2/am33xx/board.c | 2 +- arch/arm/mach-tegra/board2.c | 2 +- board/armadeus/apf27/apf27.c | 2 +- board/avionic-design/common/tamonten.c | 2 +- board/compal/paz00/paz00.c | 2 +- board/davinci/da8xxevm/da850evm.c | 12 +-- board/davinci/da8xxevm/omapl138_lcdk.c | 10 +-- board/hisilicon/hikey/hikey.c | 2 +- board/htkw/mcx/mcx.c | 2 +- board/lego/ev3/legoev3.c | 4 +- board/nvidia/cardhu/cardhu.c | 2 +- board/nvidia/dalmore/dalmore.c | 2 +- board/nvidia/harmony/harmony.c | 2 +- board/nvidia/seaboard/seaboard.c | 2 +- board/nvidia/whistler/whistler.c | 2 +- board/samsung/common/board.c | 2 +- board/sunxi/Kconfig | 4 - board/technexion/twister/twister.c | 2 +- board/teejet/mt_ventoux/mt_ventoux.c | 2 +- board/toradex/colibri_t20/colibri_t20.c | 2 +- configs/am335x_baltos_defconfig | 1 + configs/am335x_boneblack_defconfig | 1 + configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_norboot_defconfig | 1 + configs/am335x_evm_spiboot_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_igep0033_defconfig | 1 + configs/am335x_shc_defconfig | 1 + configs/am335x_shc_ict_defconfig | 1 + configs/am335x_shc_netboot_defconfig | 1 + configs/am335x_shc_prompt_defconfig | 1 + configs/am335x_shc_sdboot_defconfig | 1 + configs/am335x_shc_sdboot_prompt_defconfig | 1 + configs/am335x_sl50_defconfig | 1 + configs/am3517_crane_defconfig | 1 + configs/am3517_evm_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_qspiboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am43xx_hs_evm_defconfig | 1 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_evm_nodt_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/apf27_defconfig | 1 + configs/apx4devkit_defconfig | 1 + configs/arndale_defconfig | 1 + configs/axs101_defconfig | 1 + configs/axs103_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/brppt1_mmc_defconfig | 1 + configs/brppt1_spi_defconfig | 1 + configs/brxre1_defconfig | 1 + configs/cairo_defconfig | 1 + configs/chromebit_mickey_defconfig | 3 +- configs/chromebook_jerry_defconfig | 3 +- configs/chromebook_minnie_defconfig | 3 +- configs/cl-som-am57x_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/cm_t3517_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/cm_t43_defconfig | 1 + configs/cm_t54_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + configs/draco_defconfig | 1 + configs/duovero_defconfig | 1 + configs/eco5pk_defconfig | 1 + configs/etamin_defconfig | 1 + configs/evb-rk3036_defconfig | 3 +- configs/evb-rk3288_defconfig | 3 +- configs/evb-rk3399_defconfig | 3 +- configs/fennec-rk3288_defconfig | 3 +- configs/firefly-rk3288_defconfig | 3 +- configs/hikey_defconfig | 2 + configs/igep0020_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/k2g_evm_defconfig | 1 + configs/kc1_defconfig | 1 + configs/kylin-rk3036_defconfig | 3 +- configs/m28evk_defconfig | 1 + configs/mcx_defconfig | 1 + configs/miniarm-rk3288_defconfig | 3 +- configs/mt_ventoux_defconfig | 1 + configs/mx23_olinuxino_defconfig | 1 + configs/mx23evk_defconfig | 1 + configs/mx28evk_auart_console_defconfig | 1 + configs/mx28evk_defconfig | 1 + configs/mx28evk_nand_defconfig | 1 + configs/mx28evk_spi_defconfig | 1 + configs/nokia_rx51_defconfig | 1 + configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_evm_defconfig | 1 + configs/omap3_ha_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/omap4_panda_defconfig | 1 + configs/omap4_sdp4430_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/origen_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/peach-pi_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/pepper_defconfig | 1 + configs/popmetal-rk3288_defconfig | 3 +- configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rock2_defconfig | 3 +- configs/rut_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/sansa_fuze_plus_defconfig | 1 + configs/sc_sps_1_defconfig | 1 + configs/smdk5250_defconfig | 1 + configs/smdk5420_defconfig | 1 + configs/smdkv310_defconfig | 1 + configs/sniper_defconfig | 1 + configs/snow_defconfig | 1 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + configs/spring_defconfig | 1 + configs/tao3530_defconfig | 1 + configs/thuban_defconfig | 1 + configs/ti814x_evm_defconfig | 1 + configs/ti816x_evm_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + configs/tricorder_defconfig | 1 + configs/tricorder_flash_defconfig | 1 + configs/ts4600_defconfig | 1 + configs/twister_defconfig | 1 + configs/xfi3_defconfig | 1 + doc/README.socfpga | 32 ------- drivers/mmc/Kconfig | 107 ++++++++++++++++++++++- drivers/mmc/Makefile | 27 +++--- drivers/mmc/arm_pl180_mmci.c | 4 +- drivers/mmc/bfin_sdh.c | 4 +- drivers/mmc/davinci_mmc.c | 4 +- drivers/mmc/dw_mmc.c | 5 +- drivers/mmc/fsl_esdhc.c | 3 +- drivers/mmc/ftsdc010_mci.c | 4 +- drivers/mmc/gen_atmel_mci.c | 4 +- drivers/mmc/mmc_spi.c | 3 +- drivers/mmc/mvebu_mmc.c | 4 +- drivers/mmc/mxcmmc.c | 4 +- drivers/mmc/mxsmmc.c | 4 +- drivers/mmc/omap_hsmmc.c | 6 +- drivers/mmc/pic32_sdhci.c | 17 +++- drivers/mmc/pxa_mmc_gen.c | 8 +- drivers/mmc/s3c_sdi.c | 6 +- drivers/mmc/s5p_sdhci.c | 15 +++- drivers/mmc/sdhci-cadence.c | 125 +++++++++++++++++++++++++++ drivers/mmc/sdhci.c | 59 ++++--------- drivers/mmc/sh_mmcif.c | 4 +- drivers/mmc/sh_sdhi.c | 6 +- drivers/mmc/sunxi_mmc.c | 6 +- drivers/mmc/tegra_mmc.c | 4 +- drivers/power/axp152.c | 2 +- drivers/power/axp209.c | 2 +- drivers/power/battery/bat_trats2.c | 2 +- drivers/power/exynos-tmu.c | 8 +- drivers/power/fuel_gauge/fg_max17042.c | 4 +- drivers/power/mfd/fg_max77693.c | 4 +- drivers/power/mfd/pmic_max77693.c | 8 +- drivers/power/palmas.c | 11 ++- drivers/power/pmic/pmic_hi6553.c | 4 +- drivers/power/pmic/pmic_max77686.c | 18 ++-- drivers/power/pmic/pmic_max8997.c | 8 +- drivers/power/power_core.c | 8 +- drivers/power/power_i2c.c | 22 ++--- drivers/power/power_spi.c | 18 ++-- drivers/power/tps6586x.c | 12 +-- include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/apalis_t30.h | 1 - include/configs/apf27.h | 1 - include/configs/axs10x.h | 1 - include/configs/beaver.h | 1 - include/configs/brppt1.h | 1 - include/configs/brxre1.h | 1 - include/configs/cardhu.h | 1 - include/configs/cei-tk1-som.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/colibri_t20.h | 1 - include/configs/colibri_t30.h | 1 - include/configs/da850evm.h | 2 - include/configs/dalmore.h | 1 - include/configs/e2220-1170.h | 1 - include/configs/exynos-common.h | 2 - include/configs/harmony.h | 1 - include/configs/hikey.h | 2 - include/configs/imx27lite-common.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/k2g_evm.h | 1 - include/configs/kc1.h | 1 - include/configs/legoev3.h | 2 - include/configs/mcx.h | 1 - include/configs/medcom-wide.h | 1 - include/configs/mxs.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/nyan-big.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/p2371-0000.h | 1 - include/configs/p2371-2180.h | 1 - include/configs/p2571.h | 1 - include/configs/p2771-0000.h | 1 - include/configs/paz00.h | 1 - include/configs/plutux.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/seaboard.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/sniper.h | 1 - include/configs/socfpga_common.h | 3 - include/configs/sunxi-common.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/tec-ng.h | 1 - include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 3 - include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 1 - include/configs/ti_armv7_omap.h | 3 - include/configs/tricorder.h | 1 - include/configs/trimslice.h | 1 - include/configs/venice2.h | 1 - include/configs/ventana.h | 1 - include/configs/whistler.h | 1 - include/mmc.h | 2 +- include/sdhci.h | 131 ++++++++++++++--------------- 253 files changed, 654 insertions(+), 374 deletions(-) create mode 100644 drivers/mmc/sdhci-cadence.c

Best Regards, Jaehoon Chung

On Wed, Jan 11, 2017 at 09:17:31AM -0500, Tom Rini wrote:

The variable ret was added but never set as we did not make calls to other functions that we needed to check the return value on.

Fixes: 505cf4750ae5 ("power: change from meaningless value to error number") Signed-off-by: Tom Rini trini@konsulko.com

Applied to u-boot/master, thanks!