[U-Boot] pull request: u-boot-uniphier/master

Hi Tom,
Here is a series of UniPhier SoCs updates for v2016.5-rc1. It includes ARM64 compiler warning fixes, cleanups, new SoC/board DTS, and misc changes.
The following changes since commit 0764f24ae6bc937e358990c357f7452b4d5351e3:
net: Move CONFIG_RTL8169 to Kconfig (2016-03-22 12:19:53 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-uniphier.git master
for you to fetch changes up to d085ecd61b9956cda0d37b89b5c538f54440fe58:
ARM: uniphier: switch to raw U-Boot image (2016-03-24 01:45:41 +0900)
---------------------------------------------------------------- Masahiro Yamada (18): mtd: denali: fix warning when compiled for 64bit system spl_mmc: allow to load raw image ARM: dts: uniphier: add device tree for Micro Support Card ARM: uniphier: remove commented out define ARM: uniphier: fix bogus comment ARM: uniphier: drop PH1- prefix from CONFIG options and file names ARM: uniphier: refactor SBC init code ARM: uniphier: drop ifdef in ddrphy-regs.h ARM: uniphier: add work-around to support Micro Support Card v3.6.10 ARM: uniphier: enable DDR PHY parameter dump commands by default ARM: dts: uniphier: add PH1-LD20 SoC/board device tree sources ARM: dts: uniphier: add PH1-LD11 SoC/board device tree sources ARM: uniphier: add sg_set_iectrl() function ARM: uniphier: add System Control register macros for ARMv8 SoCs ARM: uniphier: support Debug UART ARM: uniphier: fix README instruction for updating U-Boot via TFTP ARM: uniphier: add NOR boot support ARM: uniphier: switch to raw U-Boot image
arch/arm/dts/Makefile | 2 + arch/arm/dts/uniphier-ph1-ld11-ref.dts | 69 +++++++ arch/arm/dts/uniphier-ph1-ld11.dtsi | 205 +++++++++++++++++++++ arch/arm/dts/uniphier-ph1-ld20-ref.dts | 69 +++++++ arch/arm/dts/uniphier-ph1-ld20.dtsi | 241 +++++++++++++++++++++++++ arch/arm/dts/uniphier-ph1-ld4-ref.dts | 5 + arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 5 + arch/arm/dts/uniphier-ph1-pro4-ref.dts | 5 + arch/arm/dts/uniphier-ph1-sld3-ref.dts | 5 + arch/arm/dts/uniphier-ph1-sld8-ref.dts | 5 + arch/arm/dts/uniphier-pinctrl.dtsi | 5 + arch/arm/dts/uniphier-support-card.dtsi | 33 ++++ arch/arm/mach-uniphier/Kconfig | 23 +-- arch/arm/mach-uniphier/Makefile | 1 + arch/arm/mach-uniphier/arm32/debug_ll.S | 42 ++--- arch/arm/mach-uniphier/bcu/Makefile | 6 +- arch/arm/mach-uniphier/bcu/{bcu-ph1-ld4.c => bcu-ld4.c} | 0 arch/arm/mach-uniphier/bcu/{bcu-ph1-sld3.c => bcu-sld3.c} | 0 arch/arm/mach-uniphier/board_early_init_f.c | 28 +-- arch/arm/mach-uniphier/boards.c | 28 +-- arch/arm/mach-uniphier/boot-mode/Makefile | 14 +- .../boot-mode/{boot-mode-ph1-ld4.c => boot-mode-ld4.c} | 2 +- .../boot-mode/{boot-mode-ph1-pro5.c => boot-mode-pro5.c} | 0 .../boot-mode/{boot-mode-proxstream2.c => boot-mode-pxs2.c} | 0 .../boot-mode/{boot-mode-ph1-sld3.c => boot-mode-sld3.c} | 2 +- arch/arm/mach-uniphier/boot-mode/boot-mode.c | 26 ++- arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c | 26 ++- arch/arm/mach-uniphier/clk/Makefile | 14 +- arch/arm/mach-uniphier/clk/{clk-ph1-ld4.c => clk-ld4.c} | 0 arch/arm/mach-uniphier/clk/{clk-ph1-pro4.c => clk-pro4.c} | 0 arch/arm/mach-uniphier/clk/{clk-ph1-pro5.c => clk-pro5.c} | 0 .../arm/mach-uniphier/clk/{clk-proxstream2.c => clk-pxs2.c} | 0 arch/arm/mach-uniphier/debug-uart/Makefile | 17 ++ arch/arm/mach-uniphier/debug-uart/debug-uart-ld20.c | 35 ++++ arch/arm/mach-uniphier/debug-uart/debug-uart-ld4.c | 21 +++ arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c | 31 ++++ arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c | 31 ++++ arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c | 34 ++++ arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c | 32 ++++ arch/arm/mach-uniphier/debug-uart/debug-uart-sld3.c | 31 ++++ arch/arm/mach-uniphier/debug-uart/debug-uart-sld8.c | 21 +++ arch/arm/mach-uniphier/debug-uart/debug-uart.c | 85 +++++++++ arch/arm/mach-uniphier/debug-uart/debug-uart.h | 20 ++ arch/arm/mach-uniphier/dram/Makefile | 16 +- arch/arm/mach-uniphier/dram/cmd_ddrphy.c | 168 ++++++++++------- .../mach-uniphier/dram/{ddrphy-ph1-ld4.c => ddrphy-ld4.c} | 0 arch/arm/mach-uniphier/dram/ddrphy-regs.h | 11 -- arch/arm/mach-uniphier/dram/{umc-ph1-ld4.c => umc-ld4.c} | 0 arch/arm/mach-uniphier/dram/{umc-ph1-pro4.c => umc-pro4.c} | 0 .../mach-uniphier/dram/{umc-proxstream2.c => umc-pxs2.c} | 0 arch/arm/mach-uniphier/dram/{umc-ph1-sld8.c => umc-sld8.c} | 0 arch/arm/mach-uniphier/early-clk/Makefile | 14 +- .../early-clk/{early-clk-ph1-ld4.c => early-clk-ld4.c} | 0 .../early-clk/{early-clk-ph1-pro5.c => early-clk-pro5.c} | 0 .../early-clk/{early-clk-proxstream2.c => early-clk-pxs2.c} | 0 arch/arm/mach-uniphier/early-pinctrl/Makefile | 2 +- .../{early-pinctrl-ph1-sld3.c => early-pinctrl-sld3.c} | 0 arch/arm/mach-uniphier/init.h | 22 ++- arch/arm/mach-uniphier/init/Makefile | 14 +- arch/arm/mach-uniphier/init/{init-ph1-ld4.c => init-ld4.c} | 3 +- .../arm/mach-uniphier/init/{init-ph1-pro4.c => init-pro4.c} | 2 +- .../arm/mach-uniphier/init/{init-ph1-pro5.c => init-pro5.c} | 2 +- .../mach-uniphier/init/{init-proxstream2.c => init-pxs2.c} | 3 +- .../arm/mach-uniphier/init/{init-ph1-sld3.c => init-sld3.c} | 3 +- .../arm/mach-uniphier/init/{init-ph1-sld8.c => init-sld8.c} | 3 +- arch/arm/mach-uniphier/init/init.c | 32 ++-- arch/arm/mach-uniphier/memconf/Makefile | 6 +- .../memconf/{memconf-proxstream2.c => memconf-pxs2.c} | 0 .../memconf/{memconf-ph1-sld3.c => memconf-sld3.c} | 0 arch/arm/mach-uniphier/micro-support-card.c | 4 +- arch/arm/mach-uniphier/pinctrl/Makefile | 14 +- .../pinctrl/{pinctrl-ph1-ld4.c => pinctrl-ld4.c} | 0 .../pinctrl/{pinctrl-ph1-ld6b.c => pinctrl-ld6b.c} | 0 .../pinctrl/{pinctrl-ph1-pro4.c => pinctrl-pro4.c} | 0 .../pinctrl/{pinctrl-ph1-pro5.c => pinctrl-pro5.c} | 0 .../pinctrl/{pinctrl-proxstream2.c => pinctrl-pxs2.c} | 0 .../pinctrl/{pinctrl-ph1-sld3.c => pinctrl-sld3.c} | 0 .../pinctrl/{pinctrl-ph1-sld8.c => pinctrl-sld8.c} | 0 arch/arm/mach-uniphier/pll/Makefile | 12 +- .../pll/{pll-init-ph1-ld4.c => pll-init-ld4.c} | 0 .../pll/{pll-init-ph1-pro4.c => pll-init-pro4.c} | 0 .../pll/{pll-init-ph1-sld3.c => pll-init-sld3.c} | 0 .../pll/{pll-init-ph1-sld8.c => pll-init-sld8.c} | 0 .../pll/{pll-spectrum-ph1-ld4.c => pll-spectrum-ld4.c} | 0 .../pll/{pll-spectrum-ph1-sld3.c => pll-spectrum-sld3.c} | 0 arch/arm/mach-uniphier/sbc/Makefile | 14 +- .../arm/mach-uniphier/sbc/{sbc-ph1-sld3.c => sbc-admulti.c} | 14 +- arch/arm/mach-uniphier/sbc/sbc-ld4.c | 22 +++ arch/arm/mach-uniphier/sbc/sbc-ph1-pro4.c | 46 ----- arch/arm/mach-uniphier/sbc/sbc-proxstream2.c | 49 ----- arch/arm/mach-uniphier/sbc/sbc-pxs2.c | 19 ++ arch/arm/mach-uniphier/sbc/sbc-regs.h | 21 --- arch/arm/mach-uniphier/sbc/{sbc-ph1-ld4.c => sbc-savepin.c} | 24 ++- arch/arm/mach-uniphier/sbc/sbc-sld3.c | 17 ++ arch/arm/mach-uniphier/sc-regs.h | 2 +- arch/arm/mach-uniphier/sc64-regs.h | 44 +++++ arch/arm/mach-uniphier/sg-regs.h | 11 ++ arch/arm/mach-uniphier/soc-info.h | 72 ++++---- arch/arm/mach-uniphier/soc_info.c | 36 ++-- common/spl/spl_mmc.c | 18 +- configs/uniphier_sld3_defconfig | 2 +- doc/README.uniphier | 26 ++- drivers/mtd/nand/denali.c | 6 +- drivers/pinctrl/uniphier/Kconfig | 24 +-- drivers/pinctrl/uniphier/Makefile | 14 +- .../uniphier/{pinctrl-ph1-ld4.c => pinctrl-uniphier-ld4.c} | 0 .../{pinctrl-ph1-ld6b.c => pinctrl-uniphier-ld6b.c} | 0 .../{pinctrl-ph1-pro4.c => pinctrl-uniphier-pro4.c} | 0 .../{pinctrl-ph1-pro5.c => pinctrl-uniphier-pro5.c} | 0 .../{pinctrl-proxstream2.c => pinctrl-uniphier-pxs2.c} | 0 .../{pinctrl-ph1-sld8.c => pinctrl-uniphier-sld8.c} | 0 drivers/serial/Kconfig | 9 + include/configs/uniphier.h | 24 +-- 113 files changed, 1560 insertions(+), 504 deletions(-) create mode 100644 arch/arm/dts/uniphier-ph1-ld11-ref.dts create mode 100644 arch/arm/dts/uniphier-ph1-ld11.dtsi create mode 100644 arch/arm/dts/uniphier-ph1-ld20-ref.dts create mode 100644 arch/arm/dts/uniphier-ph1-ld20.dtsi create mode 100644 arch/arm/dts/uniphier-support-card.dtsi rename arch/arm/mach-uniphier/bcu/{bcu-ph1-ld4.c => bcu-ld4.c} (100%) rename arch/arm/mach-uniphier/bcu/{bcu-ph1-sld3.c => bcu-sld3.c} (100%) rename arch/arm/mach-uniphier/boot-mode/{boot-mode-ph1-ld4.c => boot-mode-ld4.c} (98%) rename arch/arm/mach-uniphier/boot-mode/{boot-mode-ph1-pro5.c => boot-mode-pro5.c} (100%) rename arch/arm/mach-uniphier/boot-mode/{boot-mode-proxstream2.c => boot-mode-pxs2.c} (100%) rename arch/arm/mach-uniphier/boot-mode/{boot-mode-ph1-sld3.c => boot-mode-sld3.c} (99%) rename arch/arm/mach-uniphier/clk/{clk-ph1-ld4.c => clk-ld4.c} (100%) rename arch/arm/mach-uniphier/clk/{clk-ph1-pro4.c => clk-pro4.c} (100%) rename arch/arm/mach-uniphier/clk/{clk-ph1-pro5.c => clk-pro5.c} (100%) rename arch/arm/mach-uniphier/clk/{clk-proxstream2.c => clk-pxs2.c} (100%) create mode 100644 arch/arm/mach-uniphier/debug-uart/Makefile create mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart-ld20.c create mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart-ld4.c create mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c create mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c create mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c create mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c create mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart-sld3.c create mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart-sld8.c create mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart.c create mode 100644 arch/arm/mach-uniphier/debug-uart/debug-uart.h rename arch/arm/mach-uniphier/dram/{ddrphy-ph1-ld4.c => ddrphy-ld4.c} (100%) rename arch/arm/mach-uniphier/dram/{umc-ph1-ld4.c => umc-ld4.c} (100%) rename arch/arm/mach-uniphier/dram/{umc-ph1-pro4.c => umc-pro4.c} (100%) rename arch/arm/mach-uniphier/dram/{umc-proxstream2.c => umc-pxs2.c} (100%) rename arch/arm/mach-uniphier/dram/{umc-ph1-sld8.c => umc-sld8.c} (100%) rename arch/arm/mach-uniphier/early-clk/{early-clk-ph1-ld4.c => early-clk-ld4.c} (100%) rename arch/arm/mach-uniphier/early-clk/{early-clk-ph1-pro5.c => early-clk-pro5.c} (100%) rename arch/arm/mach-uniphier/early-clk/{early-clk-proxstream2.c => early-clk-pxs2.c} (100%) rename arch/arm/mach-uniphier/early-pinctrl/{early-pinctrl-ph1-sld3.c => early-pinctrl-sld3.c} (100%) rename arch/arm/mach-uniphier/init/{init-ph1-ld4.c => init-ld4.c} (93%) rename arch/arm/mach-uniphier/init/{init-ph1-pro4.c => init-pro4.c} (96%) rename arch/arm/mach-uniphier/init/{init-ph1-pro5.c => init-pro5.c} (95%) rename arch/arm/mach-uniphier/init/{init-proxstream2.c => init-pxs2.c} (92%) rename arch/arm/mach-uniphier/init/{init-ph1-sld3.c => init-sld3.c} (93%) rename arch/arm/mach-uniphier/init/{init-ph1-sld8.c => init-sld8.c} (93%) rename arch/arm/mach-uniphier/memconf/{memconf-proxstream2.c => memconf-pxs2.c} (100%) rename arch/arm/mach-uniphier/memconf/{memconf-ph1-sld3.c => memconf-sld3.c} (100%) rename arch/arm/mach-uniphier/pinctrl/{pinctrl-ph1-ld4.c => pinctrl-ld4.c} (100%) rename arch/arm/mach-uniphier/pinctrl/{pinctrl-ph1-ld6b.c => pinctrl-ld6b.c} (100%) rename arch/arm/mach-uniphier/pinctrl/{pinctrl-ph1-pro4.c => pinctrl-pro4.c} (100%) rename arch/arm/mach-uniphier/pinctrl/{pinctrl-ph1-pro5.c => pinctrl-pro5.c} (100%) rename arch/arm/mach-uniphier/pinctrl/{pinctrl-proxstream2.c => pinctrl-pxs2.c} (100%) rename arch/arm/mach-uniphier/pinctrl/{pinctrl-ph1-sld3.c => pinctrl-sld3.c} (100%) rename arch/arm/mach-uniphier/pinctrl/{pinctrl-ph1-sld8.c => pinctrl-sld8.c} (100%) rename arch/arm/mach-uniphier/pll/{pll-init-ph1-ld4.c => pll-init-ld4.c} (100%) rename arch/arm/mach-uniphier/pll/{pll-init-ph1-pro4.c => pll-init-pro4.c} (100%) rename arch/arm/mach-uniphier/pll/{pll-init-ph1-sld3.c => pll-init-sld3.c} (100%) rename arch/arm/mach-uniphier/pll/{pll-init-ph1-sld8.c => pll-init-sld8.c} (100%) rename arch/arm/mach-uniphier/pll/{pll-spectrum-ph1-ld4.c => pll-spectrum-ld4.c} (100%) rename arch/arm/mach-uniphier/pll/{pll-spectrum-ph1-sld3.c => pll-spectrum-sld3.c} (100%) rename arch/arm/mach-uniphier/sbc/{sbc-ph1-sld3.c => sbc-admulti.c} (75%) create mode 100644 arch/arm/mach-uniphier/sbc/sbc-ld4.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-ph1-pro4.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-proxstream2.c create mode 100644 arch/arm/mach-uniphier/sbc/sbc-pxs2.c rename arch/arm/mach-uniphier/sbc/{sbc-ph1-ld4.c => sbc-savepin.c} (62%) create mode 100644 arch/arm/mach-uniphier/sbc/sbc-sld3.c create mode 100644 arch/arm/mach-uniphier/sc64-regs.h rename drivers/pinctrl/uniphier/{pinctrl-ph1-ld4.c => pinctrl-uniphier-ld4.c} (100%) rename drivers/pinctrl/uniphier/{pinctrl-ph1-ld6b.c => pinctrl-uniphier-ld6b.c} (100%) rename drivers/pinctrl/uniphier/{pinctrl-ph1-pro4.c => pinctrl-uniphier-pro4.c} (100%) rename drivers/pinctrl/uniphier/{pinctrl-ph1-pro5.c => pinctrl-uniphier-pro5.c} (100%) rename drivers/pinctrl/uniphier/{pinctrl-proxstream2.c => pinctrl-uniphier-pxs2.c} (100%) rename drivers/pinctrl/uniphier/{pinctrl-ph1-sld8.c => pinctrl-uniphier-sld8.c} (100%)

On Thu, Mar 24, 2016 at 01:56:11AM +0900, Masahiro Yamada wrote:
Hi Tom,
Here is a series of UniPhier SoCs updates for v2016.5-rc1. It includes ARM64 compiler warning fixes, cleanups, new SoC/board DTS, and misc changes.
The following changes since commit 0764f24ae6bc937e358990c357f7452b4d5351e3:
net: Move CONFIG_RTL8169 to Kconfig (2016-03-22 12:19:53 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-uniphier.git master
for you to fetch changes up to d085ecd61b9956cda0d37b89b5c538f54440fe58:
ARM: uniphier: switch to raw U-Boot image (2016-03-24 01:45:41 +0900)
Applied to u-boot/master, thanks!
participants (2)
-
Masahiro Yamada
-
Tom Rini