[GIT,PULL] u-boot-uniphier/master

Message ID CAK7LNARsinw64A1mNoRu52Z5jN0MkvcDs+ZS3sXGhFvUBfDNuA@mail.gmail.com
State New
Headers show

Pull-request

git://git.denx.de/u-boot-uniphier.git master

Message

Masahiro Yamada Aug. 20, 2017, 2:18 p.m.
Hi Tom,

Please pull some more UniPhier SoC changes.

 - Fix unmet direct dependencies warning
 - Remove old sLD3 SoC support
 - Update reset data
 - Add dr_mode DT property to avoid warning


The following changes since commit 2629a21e209d91cdb778f43612235ed1f3029488:

  Merge git://git.denx.de/u-boot-video (2017-08-19 22:11:05 -0400)

are available in the git repository at:

  git://git.denx.de/u-boot-uniphier.git master

for you to fetch changes up to 3444d1d40e9ee42ba7423f4fa6651703a8666bc1:

  ARM: dts: uniphier: add dr_mode property to dwc3 node (2017-08-20
23:07:02 +0900)

----------------------------------------------------------------
Masahiro Yamada (6):
      clk: uniphier: fix unmet direct dependencies warning
      ARM: uniphier: remove sLD3 SoC support
      Revert "ARM: uniphier: move lowlevel debug init code after page
table switch"
      Revert "ARM: uniphier: fix ROM boot mode for PH1-sLD3"
      reset: uniphier: refactor reset data and add NAND/eMMC reset lines
      ARM: dts: uniphier: add dr_mode property to dwc3 node

 arch/arm/Kconfig                                     |   1 -
 arch/arm/dts/Makefile                                |   2 -
 arch/arm/dts/uniphier-ld20.dtsi                      |   1 +
 arch/arm/dts/uniphier-pro4.dtsi                      |   2 +
 arch/arm/dts/uniphier-pro5.dtsi                      |   2 +
 arch/arm/dts/uniphier-pxs2.dtsi                      |   2 +
 arch/arm/dts/uniphier-sld3-ref.dts                   | 100 -----
 arch/arm/dts/uniphier-sld3.dtsi                      | 458
----------------------
 arch/arm/mach-uniphier/Kconfig                       |   4 -
 arch/arm/mach-uniphier/arm32/cache-uniphier.c        |   3 -
 arch/arm/mach-uniphier/arm32/debug_ll.S              |  21 -
 arch/arm/mach-uniphier/arm32/lowlevel_init.S         |  18 +-
 arch/arm/mach-uniphier/arm32/psci.c                  |   1 -
 arch/arm/mach-uniphier/bcu/Makefile                  |   1 -
 arch/arm/mach-uniphier/bcu/bcu-sld3.c                |  39 --
 arch/arm/mach-uniphier/board_init.c                  |   9 -
 arch/arm/mach-uniphier/boards.c                      |  22 --
 arch/arm/mach-uniphier/boot-device/Makefile          |   1 -
 .../arm/mach-uniphier/boot-device/boot-device-sld3.c |  84 ----
 arch/arm/mach-uniphier/boot-device/boot-device.c     |   9 -
 arch/arm/mach-uniphier/boot-device/boot-device.h     |   2 -
 arch/arm/mach-uniphier/clk/Makefile                  |  14 +-
 .../clk/{clk-dram-sld3.c => clk-dram-ld4.c}          |   2 +-
 .../clk/{clk-early-sld3.c => clk-early-ld4.c}        |   2 +-
 arch/arm/mach-uniphier/clk/dpll-sld3.c               |  13 -
 arch/arm/mach-uniphier/clk/pll-sld3.c                |  14 -
 arch/arm/mach-uniphier/cpu-info.c                    |   4 -
 arch/arm/mach-uniphier/debug-uart/Makefile           |   1 -
 arch/arm/mach-uniphier/debug-uart/debug-uart-sld3.c  |  31 --
 arch/arm/mach-uniphier/debug-uart/debug-uart.c       |   5 -
 arch/arm/mach-uniphier/debug-uart/debug-uart.h       |   1 -
 arch/arm/mach-uniphier/dram/Makefile                 |   1 -
 arch/arm/mach-uniphier/dram/umc-sld3.c               |   6 -
 arch/arm/mach-uniphier/dram_init.c                   |   9 -
 arch/arm/mach-uniphier/init.h                        |  10 +-
 arch/arm/mach-uniphier/memconf.c                     |  14 +-
 arch/arm/mach-uniphier/mmc-boot-mode.c               |   2 +-
 arch/arm/mach-uniphier/sc-regs.h                     |   4 -
 arch/arm/mach-uniphier/soc-info.h                    |   1 -
 arch/arm/mach-uniphier/spl_board_init.c              |  29 +-
 configs/uniphier_sld3_defconfig                      |  46 ---
 doc/README.uniphier                                  |   1 -
 drivers/clk/uniphier/Kconfig                         |   5 +-
 drivers/clk/uniphier/clk-uniphier-core.c             |   4 -
 drivers/clk/uniphier/clk-uniphier-mio.c              |   2 -
 drivers/pinctrl/uniphier/Kconfig                     |   6 -
 drivers/pinctrl/uniphier/Makefile                    |   1 -
 drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c     | 129 ------
 drivers/reset/reset-uniphier.c                       |  71 +---
 include/configs/uniphier.h                           |   8 +-
 50 files changed, 57 insertions(+), 1161 deletions(-)
 delete mode 100644 arch/arm/dts/uniphier-sld3-ref.dts
 delete mode 100644 arch/arm/dts/uniphier-sld3.dtsi
 delete mode 100644 arch/arm/mach-uniphier/bcu/bcu-sld3.c
 delete mode 100644 arch/arm/mach-uniphier/boot-device/boot-device-sld3.c
 rename arch/arm/mach-uniphier/clk/{clk-dram-sld3.c => clk-dram-ld4.c} (93%)
 rename arch/arm/mach-uniphier/clk/{clk-early-sld3.c => clk-early-ld4.c} (93%)
 delete mode 100644 arch/arm/mach-uniphier/clk/dpll-sld3.c
 delete mode 100644 arch/arm/mach-uniphier/clk/pll-sld3.c
 delete mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart-sld3.c
 delete mode 100644 arch/arm/mach-uniphier/dram/umc-sld3.c
 delete mode 100644 configs/uniphier_sld3_defconfig
 delete mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c

Comments

Tom Rini Aug. 22, 2017, 8:53 p.m. | #1
On Sun, Aug 20, 2017 at 11:18:59PM +0900, Masahiro Yamada wrote:

> Hi Tom,

> 

> Please pull some more UniPhier SoC changes.

> 


Applied to u-boot/master, thanks!

-- 
Tom