From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Roese Date: Mon, 14 May 2018 13:58:59 +0200 Subject: [U-Boot] Please pull u-boot-marvell/master Message-ID: <305106bd-4be6-f5b3-ed86-3cb3570cf76c@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de Hi Tom, please pull the following MVEBU related patches from Marek and Chris. Thanks, Stefan The following changes since commit 62d77cea31216cad526e5f45c88e8377efc6fcae: mmc: Improve tinification (2018-05-13 07:57:32 -0400) are available in the Git repository at: git://www.denx.de/git/u-boot-marvell.git=20 for you to fetch changes up to ca734a875dec089c3978663a0ce303d776365b20: phy: marvell: a3700: Fix compatible string for ehci (2018-05-14 10:01:56 = +0200) ---------------------------------------------------------------- Chris Packham (6): ARM: mvebu: a38x: move definition of PEX_CFG_DIRECT_ACCESS ARM: mvebu: a38x: move sys_env_device_rev_get ARM: mvebu: a38x: remove some unused code ARM: mvebu: a38x: sync ddr training code with upstream ARM: mvebu: a38x: restore support for setting timing ARM: mvebu: a38x: use non-zero size for ddr scrubbing Marek Beh=C3=BAn (20): phy: marvell: a3700: Change return type of macro MVEBU_REG phy: marvell: a3700: Use reg_set16 instead of phy_write16 phy: marvell: a3700: Don't create functional macro for each register phy: marvell: a3700: Use same timeout for all register polling phy: marvell: a3700: Use (!ret) instead of (ret =3D=3D 0) phy: marvell: a3700: Use reg_set_indirect istead of 2 reg_sets phy: marvell: a3700: Access USB3 register indirectly on lane 2 phy: marvell: a3700: Set USB3 RX wait depending on ref clock phy: marvell: mux: Support nontrivial node order in selector register phy: marvell: a3700: Fix SGMII cfg and stat register addresses phy: marvell: a3700: Use comphy_mux on Armada 37xx. phy: marvell: a3700: Save/restore selector reg in SGMII init driver: clk: Add support for clocks on Armada 37xx spi: mvebu_a3700_spi: Use Armada 37xx clk driver for SPI clock freque= ncy clk: armada-37xx: Support soc_clk_dump phy: marvell: core: Cosmetic fixes net: mvneta: Fix fault when wrong device tree watchdog: Add support for Armada 37xx CPU watchdog arm64: mvebu: Add basic support for the Turris Mox board phy: marvell: a3700: Fix compatible string for ehci zachary (1): phy: marvell: a3700: revise the USB3 comphy setting during power on arch/arm/dts/Makefile | 1 + arch/arm/dts/armada-3720-turris-mox.dts | 132 ++ arch/arm/dts/armada-37xx.dtsi | 35 +- arch/arm/mach-mvebu/Kconfig | 7 + arch/arm/mach-mvebu/Makefile | 2 +- arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h | 1 + arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c | 26 +- arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h | 1 - board/CZ.NIC/turris_mox/MAINTAINERS | 6 + board/CZ.NIC/turris_mox/Makefile | 5 + board/CZ.NIC/turris_mox/turris_mox.c | 127 ++ board/CZ.NIC/turris_omnia/turris_omnia.c | 38 +- board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 21 +- board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 21 +- board/gdsys/a38x/controlcenterdc.c | 22 +- board/solidrun/clearfog/clearfog.c | 21 +- configs/mvebu_db-88f3720_defconfig | 3 + configs/mvebu_espressobin-88f3720_defconfig | 3 + configs/turris_mox_defconfig | 76 + drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/mvebu/Kconfig | 11 + drivers/clk/mvebu/Makefile | 1 + drivers/clk/mvebu/armada-37xx-periph.c | 499 +++++++ drivers/clk/mvebu/armada-37xx-tbg.c | 154 ++ drivers/ddr/marvell/a38x/Makefile | 10 +- drivers/ddr/marvell/a38x/ddr3_a38x.c | 736 ---------- drivers/ddr/marvell/a38x/ddr3_a38x.h | 92 -- drivers/ddr/marvell/a38x/ddr3_a38x_mc_static.h | 225 --- drivers/ddr/marvell/a38x/ddr3_a38x_topology.h | 21 - drivers/ddr/marvell/a38x/ddr3_a38x_training.c | 39 - drivers/ddr/marvell/a38x/ddr3_debug.c | 742 ++++++---- drivers/ddr/marvell/a38x/ddr3_hws_hw_training.c | 147 -- drivers/ddr/marvell/a38x/ddr3_hws_hw_training.h | 48 - .../ddr/marvell/a38x/ddr3_hws_hw_training_def.h | 463 ------ drivers/ddr/marvell/a38x/ddr3_hws_sil_training.h | 16 - drivers/ddr/marvell/a38x/ddr3_init.c | 798 ++--------- drivers/ddr/marvell/a38x/ddr3_init.h | 300 +--- drivers/ddr/marvell/a38x/ddr3_logging_def.h | 10 +- drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h | 1 + drivers/ddr/marvell/a38x/ddr3_topology_def.h | 6 +- drivers/ddr/marvell/a38x/ddr3_training.c | 1491 +++++++++++-----= ---- drivers/ddr/marvell/a38x/ddr3_training_bist.c | 548 +++++-- .../marvell/a38x/ddr3_training_centralization.c | 108 +- drivers/ddr/marvell/a38x/ddr3_training_db.c | 267 +++- drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | 98 +- drivers/ddr/marvell/a38x/ddr3_training_ip.h | 19 +- drivers/ddr/marvell/a38x/ddr3_training_ip_bist.h | 6 +- drivers/ddr/marvell/a38x/ddr3_training_ip_db.h | 71 +- drivers/ddr/marvell/a38x/ddr3_training_ip_def.h | 34 +- drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c | 1134 +++++++++------ drivers/ddr/marvell/a38x/ddr3_training_ip_engine.h | 9 +- drivers/ddr/marvell/a38x/ddr3_training_ip_flow.h | 305 +--- drivers/ddr/marvell/a38x/ddr3_training_ip_prv_if.h | 17 +- drivers/ddr/marvell/a38x/ddr3_training_ip_static.h | 30 - drivers/ddr/marvell/a38x/ddr3_training_leveling.c | 1347 ++++++++++------= -- drivers/ddr/marvell/a38x/ddr3_training_leveling.h | 2 +- drivers/ddr/marvell/a38x/ddr3_training_pbs.c | 201 +-- drivers/ddr/marvell/a38x/ddr3_training_static.c | 538 ------- drivers/ddr/marvell/a38x/ddr_ml_wrapper.h | 148 ++ drivers/ddr/marvell/a38x/ddr_topology_def.h | 82 +- drivers/ddr/marvell/a38x/mv_ddr_build_message.c | 1 + drivers/ddr/marvell/a38x/mv_ddr_common.c | 47 + drivers/ddr/marvell/a38x/mv_ddr_common.h | 20 + drivers/ddr/marvell/a38x/mv_ddr_plat.c | 1450 ++++++++++++++++= +++ drivers/ddr/marvell/a38x/mv_ddr_plat.h | 236 ++++ drivers/ddr/marvell/a38x/mv_ddr_regs.h | 446 ++++++ drivers/ddr/marvell/a38x/mv_ddr_spd.c | 377 +++++ drivers/ddr/marvell/a38x/mv_ddr_spd.h | 289 ++++ drivers/ddr/marvell/a38x/mv_ddr_sys_env_lib.c | 102 ++ drivers/ddr/marvell/a38x/mv_ddr_sys_env_lib.h | 117 ++ drivers/ddr/marvell/a38x/mv_ddr_topology.c | 197 +++ drivers/ddr/marvell/a38x/mv_ddr_topology.h | 129 ++ drivers/ddr/marvell/a38x/seq_exec.h | 64 + drivers/ddr/marvell/a38x/silicon_if.h | 16 - drivers/ddr/marvell/a38x/xor.c | 185 ++- drivers/ddr/marvell/a38x/xor.h | 3 +- drivers/net/mvneta.c | 4 + drivers/phy/marvell/comphy.h | 42 +- drivers/phy/marvell/comphy_a3700.c | 415 +++--- drivers/phy/marvell/comphy_a3700.h | 122 +- drivers/phy/marvell/comphy_core.c | 68 +- drivers/phy/marvell/comphy_mux.c | 17 +- drivers/spi/Kconfig | 1 + drivers/spi/mvebu_a3700_spi.c | 52 +- drivers/watchdog/Kconfig | 9 + drivers/watchdog/Makefile | 1 + drivers/watchdog/armada-37xx-wdt.c | 175 +++ include/configs/turris_mox.h | 108 ++ 89 files changed, 9734 insertions(+), 6283 deletions(-) create mode 100644 arch/arm/dts/armada-3720-turris-mox.dts create mode 100644 board/CZ.NIC/turris_mox/MAINTAINERS create mode 100644 board/CZ.NIC/turris_mox/Makefile create mode 100644 board/CZ.NIC/turris_mox/turris_mox.c create mode 100644 configs/turris_mox_defconfig create mode 100644 drivers/clk/mvebu/Kconfig create mode 100644 drivers/clk/mvebu/Makefile create mode 100644 drivers/clk/mvebu/armada-37xx-periph.c create mode 100644 drivers/clk/mvebu/armada-37xx-tbg.c delete mode 100644 drivers/ddr/marvell/a38x/ddr3_a38x.c delete mode 100644 drivers/ddr/marvell/a38x/ddr3_a38x.h delete mode 100644 drivers/ddr/marvell/a38x/ddr3_a38x_mc_static.h delete mode 100644 drivers/ddr/marvell/a38x/ddr3_a38x_topology.h delete mode 100644 drivers/ddr/marvell/a38x/ddr3_a38x_training.c delete mode 100644 drivers/ddr/marvell/a38x/ddr3_hws_hw_training.c delete mode 100644 drivers/ddr/marvell/a38x/ddr3_hws_hw_training.h delete mode 100644 drivers/ddr/marvell/a38x/ddr3_hws_hw_training_def.h delete mode 100644 drivers/ddr/marvell/a38x/ddr3_hws_sil_training.h delete mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_static.h delete mode 100644 drivers/ddr/marvell/a38x/ddr3_training_static.c create mode 100644 drivers/ddr/marvell/a38x/ddr_ml_wrapper.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_build_message.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_common.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_common.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_plat.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_plat.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_regs.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_spd.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_spd.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_sys_env_lib.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_sys_env_lib.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_topology.c create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_topology.h create mode 100644 drivers/ddr/marvell/a38x/seq_exec.h delete mode 100644 drivers/ddr/marvell/a38x/silicon_if.h create mode 100644 drivers/watchdog/armada-37xx-wdt.c create mode 100644 include/configs/turris_mox.h