From mboxrd@z Thu Jan 1 00:00:00 1970 From: Masahiro Yamada Date: Wed, 19 Oct 2016 01:00:52 +0900 Subject: [U-Boot] pull request: u-boot-uniphier/master Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom. I was a bit late for -rc2, but please pull some more for UniPhier SoCs: * rework clk driver to re-use corresponding clk data from Linux * Re-sync DT with Linux * Reset migrate from ad-hoc code to the reset driver * some fixes The following changes since commit d5a815327d2c257fbba108ff46974b1c1d12fd2a: Prepare v2016.11-rc2 (2016-10-17 20:09:33 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to 12a5ce72738a34eaa11b559778039f1051425dbd: ARM: uniphier: update doc/README.uniphier (2016-10-18 14:30:05 +0900) ---------------------------------------------------------------- Masahiro Yamada (7): pinctrl: uniphier: fix unused-const-variable warnings for GCC 6.x ARM: uniphier: fix addresses of Cortex-A72 gear setting macros ARM: uniphier: remove unneeded CONFIG_USB_MAX_CONTROLLER_COUNT define clk: uniphier: rework UniPhier clk driver ARM: dts: uniphier: sync DT with latest Linux ARM: uniphier: remove unnecessary EHCI reset deassertion ARM: uniphier: update doc/README.uniphier arch/arm/dts/Makefile | 24 ++-- arch/arm/dts/uniphier-common32.dtsi | 8 +- .../{uniphier-ph1-ld11-ref.dts => uniphier-ld11-ref.dts} | 9 +- .../dts/{uniphier-ph1-ld11.dtsi => uniphier-ld11.dtsi} | 16 ++- .../{uniphier-ph1-ld20-ref.dts => uniphier-ld20-ref.dts} | 11 +- .../dts/{uniphier-ph1-ld20.dtsi => uniphier-ld20.dtsi} | 9 +- .../{uniphier-ph1-ld4-ref.dts => uniphier-ld4-ref.dts} | 11 +- arch/arm/dts/{uniphier-ph1-ld4.dtsi => uniphier-ld4.dtsi} | 24 +++- .../{uniphier-ph1-ld6b-ref.dts => uniphier-ld6b-ref.dts} | 11 +- arch/arm/dts/uniphier-ld6b.dtsi | 32 +++++ arch/arm/dts/uniphier-ph1-ld6b.dtsi | 31 ----- .../{uniphier-ph1-pro4-ace.dts => uniphier-pro4-ace.dts} | 15 +- .../{uniphier-ph1-pro4-ref.dts => uniphier-pro4-ref.dts} | 11 +- ...niphier-ph1-pro4-sanji.dts => uniphier-pro4-sanji.dts} | 15 +- .../dts/{uniphier-ph1-pro4.dtsi => uniphier-pro4.dtsi} | 23 +++- ...niphier-ph1-pro5-4kbox.dts => uniphier-pro5-4kbox.dts} | 11 +- .../dts/{uniphier-ph1-pro5.dtsi => uniphier-pro5.dtsi} | 14 +- ...er-proxstream2-gentil.dts => uniphier-pxs2-gentil.dts} | 16 ++- ...hier-proxstream2-vodka.dts => uniphier-pxs2-vodka.dts} | 11 +- .../dts/{uniphier-proxstream2.dtsi => uniphier-pxs2.dtsi} | 16 ++- .../{uniphier-ph1-sld3-ref.dts => uniphier-sld3-ref.dts} | 11 +- .../dts/{uniphier-ph1-sld3.dtsi => uniphier-sld3.dtsi} | 48 +++++-- .../{uniphier-ph1-sld8-ref.dts => uniphier-sld8-ref.dts} | 11 +- .../dts/{uniphier-ph1-sld8.dtsi => uniphier-sld8.dtsi} | 24 +++- arch/arm/mach-uniphier/boards.c | 26 ++-- arch/arm/mach-uniphier/clk/clk-ld4.c | 7 +- arch/arm/mach-uniphier/clk/clk-pro4.c | 7 +- arch/arm/mach-uniphier/sc64-regs.h | 6 +- configs/uniphier_ld11_defconfig | 2 +- configs/uniphier_ld20_defconfig | 2 +- configs/uniphier_ld4_sld8_defconfig | 2 +- configs/uniphier_pro4_defconfig | 2 +- configs/uniphier_pxs2_ld6b_defconfig | 2 +- configs/uniphier_sld3_defconfig | 2 +- doc/README.uniphier | 78 +++++------ drivers/clk/uniphier/Kconfig | 15 +- drivers/clk/uniphier/Makefile | 5 +- drivers/clk/uniphier/clk-uniphier-core.c | 170 +++++++++++------------ drivers/clk/uniphier/clk-uniphier-mio.c | 183 +++++++++---------------- drivers/clk/uniphier/clk-uniphier.h | 46 ++++--- drivers/pinctrl/uniphier/pinctrl-uniphier.h | 7 +- include/configs/uniphier.h | 1 - 42 files changed, 511 insertions(+), 464 deletions(-) rename arch/arm/dts/{uniphier-ph1-ld11-ref.dts => uniphier-ld11-ref.dts} (78%) rename arch/arm/dts/{uniphier-ph1-ld11.dtsi => uniphier-ld11.dtsi} (93%) rename arch/arm/dts/{uniphier-ph1-ld20-ref.dts => uniphier-ld20-ref.dts} (70%) rename arch/arm/dts/{uniphier-ph1-ld20.dtsi => uniphier-ld20.dtsi} (96%) rename arch/arm/dts/{uniphier-ph1-ld4-ref.dts => uniphier-ld4-ref.dts} (72%) rename arch/arm/dts/{uniphier-ph1-ld4.dtsi => uniphier-ld4.dtsi} (89%) rename arch/arm/dts/{uniphier-ph1-ld6b-ref.dts => uniphier-ld6b-ref.dts} (73%) create mode 100644 arch/arm/dts/uniphier-ld6b.dtsi delete mode 100644 arch/arm/dts/uniphier-ph1-ld6b.dtsi rename arch/arm/dts/{uniphier-ph1-pro4-ace.dts => uniphier-pro4-ace.dts} (72%) rename arch/arm/dts/{uniphier-ph1-pro4-ref.dts => uniphier-pro4-ref.dts} (74%) rename arch/arm/dts/{uniphier-ph1-pro4-sanji.dts => uniphier-pro4-sanji.dts} (73%) rename arch/arm/dts/{uniphier-ph1-pro4.dtsi => uniphier-pro4.dtsi} (93%) rename arch/arm/dts/{uniphier-ph1-pro5-4kbox.dts => uniphier-pro5-4kbox.dts} (64%) rename arch/arm/dts/{uniphier-ph1-pro5.dtsi => uniphier-pro5.dtsi} (96%) rename arch/arm/dts/{uniphier-proxstream2-gentil.dts => uniphier-pxs2-gentil.dts} (69%) rename arch/arm/dts/{uniphier-proxstream2-vodka.dts => uniphier-pxs2-vodka.dts} (69%) rename arch/arm/dts/{uniphier-proxstream2.dtsi => uniphier-pxs2.dtsi} (95%) rename arch/arm/dts/{uniphier-ph1-sld3-ref.dts => uniphier-sld3-ref.dts} (76%) rename arch/arm/dts/{uniphier-ph1-sld3.dtsi => uniphier-sld3.dtsi} (87%) rename arch/arm/dts/{uniphier-ph1-sld8-ref.dts => uniphier-sld8-ref.dts} (73%) rename arch/arm/dts/{uniphier-ph1-sld8.dtsi => uniphier-sld8.dtsi} (89%) -- Best Regards Masahiro Yamada