mbox

[U-Boot] Please pull u-boot-dm

Message ID CAPnjgZ2CP5JspkA5gL4pfg0p_D+5_KY1pih2T7dVDHb6kMOcDw@mail.gmail.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-dm.git

Message

Simon Glass May 27, 2016, 4:28 p.m. UTC
Hi Tom,

This improves the driver-model block support in MMC, brings in a
mailbox uclass and fixes/improves a few minor things in the rockchip
support.


The following changes since commit 6523dbf7cce8d8c903346f756e0e41e46ce6d6b9:

  Merge branch 'master' of git://git.denx.de/u-boot-mips (2016-05-25
20:22:48 -0400)

are available in the git repository at:

  git://git.denx.de/u-boot-dm.git

for you to fetch changes up to 3c27b6ad540828c44a62d209030df5ba86896df0:

  dm: rockchip: Enable CONFIG_BLK (2016-05-27 10:23:10 -0600)

----------------------------------------------------------------
Simon Glass (20):
      arm: rpi: Define CONFIG_TFTP_TSIZE to show tftp size info
      tiny-printf: Tidy up a few nits
      tiny-printf: Support snprintf()
      reset: Drop the reset failure message
      mmc: Drop mmc_register()
      mmc: Drop dead mmc code for non-generic MMC
      mmc: Use byte array for multipliers
      rockchip: Check image name for the rksd image
      rockchip: Drop unnecessary SPL properties
      rockchip: video: Flush the cache when the display is updated
      rockchip: Drop SPL GPIO support for rk3288
      dm: env: mmc: Convert env_mmc to support CONFIG_BLK
      dm: mmc: Convert sdhci to support CONFIG_BLK
      dm: efi: Update for CONFIG_BLK
      dm: mmc: spl: Add support for CONFIG_BLK
      dm: mmc: dwmmc: Support CONFIG_BLK
      dm: rockchip: mmc: Allow use of CONFIG_BLK
      dm: mmc: Fix up mmc_bread/bwrite() prototypes for SPL
      dm: mmc: Use cfg directly in mmc_bind()
      dm: rockchip: Enable CONFIG_BLK

Stephen Warren (5):
      dm: allow setting driver_data before/during bind
      sunxi: gpio: convert bind() to use driver data
      Rename reset to sysreset
      Add a mailbox driver framework/uclass
      mailbox: implement a sandbox test

 arch/arm/lib/Makefile                              |   2 +-
 arch/arm/mach-rockchip/Kconfig                     |   3 ++
 arch/arm/mach-rockchip/rk3036/reset_rk3036.c       |  20 ++++-----
 arch/arm/mach-rockchip/rk3288/reset_rk3288.c       |  20 ++++-----
 arch/arm/mach-snapdragon/reset.c                   |  18 ++++----
 arch/sandbox/cpu/state.c                           |   4 +-
 arch/sandbox/dts/test.dts                          |  11 +++++
 arch/sandbox/include/asm/mbox.h                    |  21 +++++++++
 arch/sandbox/include/asm/state.h                   |   6 +--
 cmd/mmc.c                                          |  62
-------------------------
 common/env_mmc.c                                   |   8 ++--
 common/spl/spl_mmc.c                               |   9 ++--
 configs/chromebook_jerry_defconfig                 |   2 +-
 configs/dragonboard410c_defconfig                  |   2 +-
 configs/evb-rk3036_defconfig                       |   2 +-
 configs/firefly-rk3288_defconfig                   |   4 +-
 configs/kylin-rk3036_defconfig                     |   2 +-
 configs/rock2_defconfig                            |   2 +-
 configs/sandbox_defconfig                          |   5 ++-
 configs/sandbox_noblk_defconfig                    |   2 +-
 doc/device-tree-bindings/mailbox/mailbox.txt       |  32 +++++++++++++
 doc/driver-model/README.txt                        |  23 ++++++----
 drivers/Kconfig                                    |   2 +
 drivers/Makefile                                   |   1 +
 drivers/clk/clk_rk3036.c                           |   2 +-
 drivers/clk/clk_rk3288.c                           |   2 +-
 drivers/core/device.c                              |  25 +++++++++--
 drivers/core/lists.c                               |   4 +-
 drivers/gpio/sunxi_gpio.c                          |  90
++++++++++++++++++++-----------------
 drivers/mailbox/Kconfig                            |  20 +++++++++
 drivers/mailbox/Makefile                           |   7 +++
 drivers/mailbox/mailbox-uclass.c                   | 145
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/mailbox/sandbox-mbox-test.c                |  54 ++++++++++++++++++++++
 drivers/mailbox/sandbox-mbox.c                     | 104
++++++++++++++++++++++++++++++++++++++++++
 drivers/misc/Kconfig                               |  10 ++---
 drivers/misc/Makefile                              |   4 +-
 drivers/misc/reset_sandbox.c                       | 100
-----------------------------------------
 drivers/misc/{reset-uclass.c => sysreset-uclass.c} |  32 ++++++-------
 drivers/misc/sysreset_sandbox.c                    | 101
+++++++++++++++++++++++++++++++++++++++++
 drivers/mmc/dw_mmc.c                               |  42 +++++++++++------
 drivers/mmc/mmc.c                                  |  13 +-----
 drivers/mmc/mmc_private.h                          |  14 ++++++
 drivers/mmc/rockchip_dw_mmc.c                      |  31 +++++++++++++
 drivers/mmc/sdhci.c                                |   2 +-
 drivers/video/rockchip/rk_vop.c                    |   1 +
 include/configs/rk3288_common.h                    |   1 -
 include/configs/rpi.h                              |   1 +
 include/dm/device-internal.h                       |  24 ++++++++++
 include/dm/uclass-id.h                             |   3 +-
 include/dwmmc.h                                    |   7 ++-
 include/efi_loader.h                               |   2 +-
 include/mailbox_client.h                           | 149
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/mailbox_uclass.h                           |  83
++++++++++++++++++++++++++++++++++
 include/mmc.h                                      |   5 ---
 include/reset.h                                    |  71
-----------------------------
 include/sysreset.h                                 |  71
+++++++++++++++++++++++++++++
 lib/efi_loader/efi_disk.c                          |  61
++++++++++++++++++-------
 lib/tiny-printf.c                                  |  43 +++++++++++++-----
 test/dm/Makefile                                   |   3 +-
 test/dm/mailbox.c                                  |  31 +++++++++++++
 test/dm/reset.c                                    |  74
------------------------------
 test/dm/sysreset.c                                 |  74
++++++++++++++++++++++++++++++
 tools/rkimage.c                                    |   7 +--
 63 files changed, 1270 insertions(+), 506 deletions(-)
 create mode 100644 arch/sandbox/include/asm/mbox.h
 create mode 100644 doc/device-tree-bindings/mailbox/mailbox.txt
 create mode 100644 drivers/mailbox/Kconfig
 create mode 100644 drivers/mailbox/Makefile
 create mode 100644 drivers/mailbox/mailbox-uclass.c
 create mode 100644 drivers/mailbox/sandbox-mbox-test.c
 create mode 100644 drivers/mailbox/sandbox-mbox.c
 delete mode 100644 drivers/misc/reset_sandbox.c
 rename drivers/misc/{reset-uclass.c => sysreset-uclass.c} (55%)
 create mode 100644 drivers/misc/sysreset_sandbox.c
 create mode 100644 include/mailbox_client.h
 create mode 100644 include/mailbox_uclass.h
 delete mode 100644 include/reset.h
 create mode 100644 include/sysreset.h
 create mode 100644 test/dm/mailbox.c
 delete mode 100644 test/dm/reset.c
 create mode 100644 test/dm/sysreset.c

Regards,
Simon

Comments

Tom Rini May 30, 2016, 6:06 p.m. UTC | #1
On Fri, May 27, 2016 at 10:28:37AM -0600, Simon Glass wrote:

> Hi Tom,
> 
> This improves the driver-model block support in MMC, brings in a
> mailbox uclass and fixes/improves a few minor things in the rockchip
> support.
> 
> 
> The following changes since commit 6523dbf7cce8d8c903346f756e0e41e46ce6d6b9:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-mips (2016-05-25
> 20:22:48 -0400)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-dm.git
> 
> for you to fetch changes up to 3c27b6ad540828c44a62d209030df5ba86896df0:
> 
>   dm: rockchip: Enable CONFIG_BLK (2016-05-27 10:23:10 -0600)
> 

Applied to u-boot/master, thanks!