[U-Boot] [GIT PULL] Please pull u-boot-mmc master
Dear Tom,
Could you pull these patches into u-boot/master?
The following changes since commit 156d64fa55e9914b144c5e83f2a9e13d1223a4d3:
Merge git://git.denx.de/u-boot-rockchip (2017-06-08 12:14:11 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-mmc.git master
for you to fetch changes up to abf54bf978ed9932d69ee7f937012398d0d8d08f:
Fixup bug in PMIC TPS65217 register address definition (2017-06-09 20:25:16 +0900)
---------------------------------------------------------------- Brock Zheng Techyauld Ltd (1): Fixup bug in PMIC TPS65217 register address definition
Keerthy (5): power: regulator: palmas: Add smps12 dual regulator for tps65917 power: pmic: tps65218: Add DCDC3 configuration board: ti: AM43XX: Add ddr voltage rail configuration power: pmic: lp87565: Add the basic pmic support power: regulator: lp87565: add regulator support
Kouei Abe (4): mmc: sh_sdhi: Set SD_INFOx interrupt mask before command starting mmc: sh_sdhi: Add 64-bit access to sd_buf support mmc: sh_sdhi: Add MMC version 5.0 support mmc: sh_sdhi: Add SDHI support
Marek Vasut (1): mmc: sh_sdhi: Fix Kconfig entry
Simon Glass (3): dm: blk: Add a way to obtain a block device from its parent dm: mmc: Ensure that block device is probed dm: mmc: Avoid probing block devices in find_mmc_device()
arch/arm/mach-rmobile/include/mach/sh_sdhi.h | 15 +- board/ti/am43xx/board.c | 7 + common/env_mmc.c | 7 +- drivers/block/blk-uclass.c | 26 ++++ drivers/mmc/Kconfig | 2 +- drivers/mmc/mmc-uclass.c | 6 +- drivers/mmc/sh_sdhi.c | 95 ++++++++++--- drivers/power/pmic/Kconfig | 7 + drivers/power/pmic/Makefile | 1 + drivers/power/pmic/lp87565.c | 87 ++++++++++++ drivers/power/pmic/pmic_tps65218.c | 3 +- drivers/power/regulator/Kconfig | 10 ++ drivers/power/regulator/Makefile | 1 + drivers/power/regulator/lp87565_regulator.c | 199 +++++++++++++++++++++++++++ drivers/power/regulator/palmas_regulator.c | 6 +- include/blk.h | 7 + include/power/lp87565.h | 12 ++ include/power/tps65217.h | 1 + include/power/tps65218.h | 1 + test/dm/blk.c | 18 +++ 20 files changed, 484 insertions(+), 27 deletions(-) create mode 100644 drivers/power/pmic/lp87565.c create mode 100644 drivers/power/regulator/lp87565_regulator.c create mode 100644 include/power/lp87565.h
Best Regards, Jaehoon Chung
When we don't have CONFIG_BLK defined we don't have a forward declaration of struct udevice, and thus get a warning about it on blk_get_from_parent(), which we only have when CONFIG_BLK is set. Move the declaration of blk_get_from_parent() to be with the other CONFIG_BLK parts.
Fixes 9f103b9cb5f8 ("dm: blk: Add a way to obtain a block device from ...") Signed-off-by: Tom Rini trini@konsulko.com --- include/blk.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/blk.h b/include/blk.h index 4d60987f61b4..ef29a07ee260 100644 --- a/include/blk.h +++ b/include/blk.h @@ -377,6 +377,13 @@ int blk_find_max_devnum(enum if_type if_type); */ int blk_select_hwpart(struct udevice *dev, int hwpart);
+/** + * blk_get_from_parent() - obtain a block device by looking up its parent + * + * All devices with + */ +int blk_get_from_parent(struct udevice *parent, struct udevice **devp); + #else #include <errno.h> /* @@ -616,11 +623,4 @@ ulong blk_write_devnum(enum if_type if_type, int devnum, lbaint_t start, */ int blk_select_hwpart_devnum(enum if_type if_type, int devnum, int hwpart);
-/** - * blk_get_from_parent() - obtain a block device by looking up its parent - * - * All devices with - */ -int blk_get_from_parent(struct udevice *parent, struct udevice **devp); - #endif
On Sat, Jun 10, 2017 at 10:03:26AM -0400, Tom Rini wrote:
When we don't have CONFIG_BLK defined we don't have a forward declaration of struct udevice, and thus get a warning about it on blk_get_from_parent(), which we only have when CONFIG_BLK is set. Move the declaration of blk_get_from_parent() to be with the other CONFIG_BLK parts.
Fixes 9f103b9cb5f8 ("dm: blk: Add a way to obtain a block device from ...") Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
On Fri, Jun 09, 2017 at 08:28:46PM +0900, Jaehoon Chung wrote:
Dear Tom,
Could you pull these patches into u-boot/master?
The following changes since commit 156d64fa55e9914b144c5e83f2a9e13d1223a4d3:
Merge git://git.denx.de/u-boot-rockchip (2017-06-08 12:14:11 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-mmc.git master
for you to fetch changes up to abf54bf978ed9932d69ee7f937012398d0d8d08f:
Fixup bug in PMIC TPS65217 register address definition (2017-06-09 20:25:16 +0900)
Applied to u-boot/master, thanks!
participants (2)
-
Jaehoon Chung -
Tom Rini