Hi Tom, Please find the PR for master branch targeted for v2021.07-rc1 release. Details about the PR are updated in the tag message.
There are addition of new platform in this PR. I understand it is not expected to send these this late in the release. However, these are posted sometime ago and I could not spend time on these patches due to personal reasons. Please consider this as an exception and accept this PR. I ll try not to repeat this in future PRs.
Gitlab build report: https://source.denx.de/u-boot/custodians/u-boot-ti/-/pipelines/7474
The following changes since commit b107761b817c421fb8eadee739656e1db38686c3:
Prepare v2021.07-rc2 (2021-05-10 17:03:22 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2021.07-rc3
for you to fetch changes up to bbc9da58b332bd44e51ac5579040ea984b2f963b:
ARM: dts: k3-am642-sk: Add ethernet related DT nodes (2021-05-12 16:36:39 +0530)
---------------------------------------------------------------- - Initial support for AM64 EVM and SK - K3 DDR driver unification for J7 and AM64 platforms. - Minor fixes for TI clock driver
---------------------------------------------------------------- Dario Binacchi (5): clk: ti: add custom API for memory access clk: ti: change clk_ti_latch() signature clk: ti: gate: use custom API for memory access clk: ti: am3-dpll: use custom API for memory access Revert "fdt: translate address if #size-cells = <0>"
Dave Gerlach (30): arm: mach-k3: Add basic support for AM642 SoC definition arm: mach-k3: am642: Unlock all applicable control MMR registers arm: mach-k3: am642: Store boot info from ROM arm: mach-k3: am642: Load SYSFW binary and config from boot media arm: mach-k3: am642: Use mmc start and stop callbacks mmc: sdhci_am654: Add Support for TI's AM642 SoC mailbox: k3-sec-proxy: Extend valid thread IDs board: ti: am64x: Add board support for am64x evm dt-bindings: pinctrl: k3: Introduce pinmux definitions for AM64 arm: dts: ti: Add Support for AM642 SoC arm: dts: k3-am642: Add initial support for EVM arm: dts: k3-am642: Add r5 specific dt support configs: am64x_evm_r5: Add Initial support configs: am64x_evm_a53: Add Initial support dt-bindings: memory-controller: Add K3 AM64 DDRSS compatible ram: k3-j721e: lpddr4_address_slice_0_macros: Fix indentation issues ram: k3-j721e: lpddr4_data_slice_0_macros: Fix indentation issues ram: k3-j721e: lpddr4_data_slice_1_macros: Fix indentation issues ram: k3-j721e: lpddr4_data_slice_2_macros: Fix indentation issues ram: k3-j721e: lpddr4_data_slice_3_macros: Fix indentation issues ram: k3-j721e: lpddr4_ddr_controller_macros: Fix indentation issues ram: k3-j721e: lpddr4_phy_core_macros: Fix indentation issues ram: k3-j721e: lpddr4_pi_macros: Fix indentation issues ram: k3-j721e: lpddr4_ctl_regs: Fix checkpatch issue for types ram: k3-j721e: Rename to k3-ddrss ram: k3-ddrss: Introduce top-level CONFIG_K3_DDRSS ram: k3-ddrss: Introduce common driver with J7 SoC support ram: k3-ddrss: Introduce support for AM642 SoCs arm: dts: k3-am642: Add ddr node arm: mach-k3: am642: Add support for triggering ddr init from SPL
Keerthy (2): arm: mach-k3: am642: Add support for boot device detection armv8: mach-k3: am642: Add custom MMU support
Lokesh Vutla (19): ram: k3-ddrss: Enable vtt regulator if present soc: ti: k3-socinfo: Add entry for AM64X SoC family board: ti: am64x: Add support for reading eeprom data board: ti: am64x: Enable support for reading EEPROM in R5 SPL board: ti: am64x: Add support for detecting multiple device trees arm: am64x: Add support for selecting DT based on EEPROM include: configs: am64x: Avoid overlap of BSS and stack area include: configs: am64x_evm: Optimize size of SPL BSS include: configs: Update env for selecting right dtb arm: dts: k3-am64-evm: Make chip id available before pre-reloc arm: dts: k3-am642-r5-evm: Do not use power-domains for I2C arm: dts: am642-evm: Add I2C nodes arm: dts: am642-sk: Add initial sk dts arm: dts: am642-r5-sk: Add r5 specific dts configs: am64x_evm_r5: Enable checks for spl and stack sizes configs: am64x_evm_r5: Enable support for building multiple device trees configs: am64x_evm_a53: Enable configs for printing cpuinfo configs: am64x_evm_a53: Enable support for reading eeprom configs: am64x_evm_a53: Enable support for building multiple dtbs
Nishanth Menon (3): arm: dts: k3-am64-main: Add GPIO nodes arm: dts: k3-am642-r5-evm: Add GPIO DDR VTT regulator configs: am64x_evm_r5: Enable GPIO regulator
Suman Anna (1): arm: mach-k3: am642: Shut down R5 core after ATF startup on A53
Vignesh Raghavendra (13): board: ti: am64x: Parse MAC address from board EEPROM firmware: ti_sci: Update ti_sci_cmd_rm_udmap_tx_ch_cfg() API to the latest soc: ti: k3-navss-ringacc: Add AM64 ringacc support soc: ti: k3-navss-ringacc: Remove unused ring modes dma: ti: k3-psil-am654: Drop unused PSIL EP static data dma: ti: k3-psil: Extend PSIL EP data extension for AM64 dma: ti: k3-psil-am64: Add AM64 PSIL endpoint data dma: ti: k3-udma: Add BCDMA and PKTDMA support net: ti: am65-cpsw-nuss: Prepare to support non primary ext port net: ti: am65-cpsw-nuss: Don't cache disabled port ID net: ti: am65-cpsw-nuss: Add a new compatible for AM64 ARM: dts: k3-am64-main: Add CPSW DT nodes ARM: dts: k3-am642-sk: Add ethernet related DT nodes
arch/arm/dts/Makefile | 4 + arch/arm/dts/k3-am64-ddr.dtsi | 2205 +++++ arch/arm/dts/k3-am64-evm-ddr4-1600MTs.dtsi | 2187 +++++ arch/arm/dts/k3-am64-main.dtsi | 567 ++ arch/arm/dts/k3-am64-mcu.dtsi | 76 + arch/arm/dts/k3-am64-sk-lp4-1333MTs.dtsi | 2190 +++++ arch/arm/dts/k3-am64.dtsi | 107 + arch/arm/dts/k3-am642-evm-u-boot.dtsi | 99 + arch/arm/dts/k3-am642-evm.dts | 339 + arch/arm/dts/k3-am642-r5-evm.dts | 204 + arch/arm/dts/k3-am642-r5-sk.dts | 145 + arch/arm/dts/k3-am642-sk-u-boot.dtsi | 103 + arch/arm/dts/k3-am642-sk.dts | 156 + arch/arm/dts/k3-am642.dtsi | 65 + arch/arm/mach-k3/Kconfig | 15 +- arch/arm/mach-k3/Makefile | 1 + arch/arm/mach-k3/am642_init.c | 315 + arch/arm/mach-k3/arm64-mmu.c | 41 + arch/arm/mach-k3/include/mach/am64_hardware.h | 55 + arch/arm/mach-k3/include/mach/am64_spl.h | 44 + arch/arm/mach-k3/include/mach/hardware.h | 4 + arch/arm/mach-k3/include/mach/spl.h | 4 + arch/sandbox/dts/test.dts | 21 - board/ti/am64x/Kconfig | 62 + board/ti/am64x/MAINTAINERS | 8 + board/ti/am64x/Makefile | 8 + board/ti/am64x/evm.c | 154 + board/ti/j721e/Kconfig | 4 +- common/fdt_support.c | 6 +- configs/am64x_evm_a53_defconfig | 104 + configs/am64x_evm_r5_defconfig | 107 + .../memory-controller/k3-j721e-ddrss.txt | 3 +- drivers/clk/ti/clk-am3-dpll.c | 86 +- drivers/clk/ti/clk-divider.c | 20 +- drivers/clk/ti/clk-gate.c | 23 +- drivers/clk/ti/clk-mux.c | 20 +- drivers/clk/ti/clk.c | 95 +- drivers/clk/ti/clk.h | 15 +- drivers/core/Kconfig | 12 - drivers/core/fdtaddr.c | 2 +- drivers/core/of_addr.c | 13 +- drivers/core/ofnode.c | 7 +- drivers/core/root.c | 3 - drivers/dma/ti/Makefile | 1 + drivers/dma/ti/k3-psil-am64.c | 156 + drivers/dma/ti/k3-psil-am654.c | 32 +- drivers/dma/ti/k3-psil-priv.h | 1 + drivers/dma/ti/k3-psil.c | 2 + drivers/dma/ti/k3-psil.h | 16 + drivers/dma/ti/k3-udma.c | 1003 ++- drivers/firmware/ti_sci.c | 3 + drivers/firmware/ti_sci.h | 18 + drivers/mailbox/k3-sec-proxy.c | 10 +- drivers/mmc/am654_sdhci.c | 18 + drivers/net/ti/am65-cpsw-nuss.c | 5 +- drivers/ram/Kconfig | 24 +- drivers/ram/Makefile | 2 +- drivers/ram/k3-ddrss/16bit/lpddr4_16bit_if.h | 108 + .../ram/k3-ddrss/16bit/lpddr4_16bit_obj_if.h | 14 + .../k3-ddrss/16bit/lpddr4_16bit_structs_if.h | 15 + .../16bit/lpddr4_address_slice_0_macros.h | 624 ++ .../16bit/lpddr4_address_slice_1_macros.h | 624 ++ .../16bit/lpddr4_address_slice_2_macros.h | 624 ++ drivers/ram/k3-ddrss/16bit/lpddr4_ctl_regs.h | 1306 +++ .../k3-ddrss/16bit/lpddr4_ctl_regs_rw_masks.h | 23 + .../16bit/lpddr4_data_slice_0_macros.h | 2036 +++++ .../16bit/lpddr4_data_slice_1_macros.h | 2036 +++++ .../16bit/lpddr4_ddr_controller_macros.h | 6436 ++++++++++++++ .../k3-ddrss/16bit/lpddr4_phy_core_macros.h | 1838 ++++ drivers/ram/k3-ddrss/16bit/lpddr4_pi_macros.h | 5784 ++++++++++++ drivers/ram/k3-ddrss/32bit/lpddr4_32bit_if.h | 91 + .../ram/k3-ddrss/32bit/lpddr4_32bit_obj_if.h | 14 + .../k3-ddrss/32bit/lpddr4_32bit_structs_if.h | 15 + .../32bit}/lpddr4_address_slice_0_macros.h | 343 +- drivers/ram/k3-ddrss/32bit/lpddr4_ctl_regs.h | 1545 ++++ .../k3-ddrss/32bit/lpddr4_ctl_regs_rw_masks.h | 23 + .../32bit}/lpddr4_data_slice_0_macros.h | 1443 ++- .../32bit}/lpddr4_data_slice_1_macros.h | 1363 ++- .../32bit}/lpddr4_data_slice_2_macros.h | 1363 ++- .../32bit}/lpddr4_data_slice_3_macros.h | 1363 ++- .../32bit/lpddr4_ddr_controller_macros.h | 7792 ++++++++++++++++ .../32bit}/lpddr4_phy_core_macros.h | 1397 ++- drivers/ram/k3-ddrss/32bit/lpddr4_pi_macros.h | 5396 ++++++++++++ drivers/ram/k3-ddrss/Makefile | 17 + drivers/ram/k3-ddrss/cps_drv_lpddr4.h | 102 + .../k3-j721e-ddrss.c => k3-ddrss/k3-ddrss.c} | 289 +- drivers/ram/k3-ddrss/lpddr4.c | 1079 +++ drivers/ram/k3-ddrss/lpddr4.h | 73 + drivers/ram/k3-ddrss/lpddr4_16bit.c | 396 + drivers/ram/k3-ddrss/lpddr4_16bit.h | 33 + .../k3-ddrss/lpddr4_16bit_ctl_regs_rw_masks.c | 1309 +++ drivers/ram/k3-ddrss/lpddr4_16bit_sanity.h | 257 + drivers/ram/k3-ddrss/lpddr4_32bit.c | 302 + drivers/ram/k3-ddrss/lpddr4_32bit.h | 30 + .../k3-ddrss/lpddr4_32bit_ctl_regs_rw_masks.c | 1548 ++++ drivers/ram/k3-ddrss/lpddr4_32bit_sanity.h | 223 + drivers/ram/k3-ddrss/lpddr4_if.h | 144 + drivers/ram/k3-ddrss/lpddr4_obj_if.c | 51 + drivers/ram/k3-ddrss/lpddr4_obj_if.h | 86 + .../{k3-j721e => k3-ddrss}/lpddr4_private.h | 0 drivers/ram/k3-ddrss/lpddr4_sanity.h | 445 + drivers/ram/k3-ddrss/lpddr4_structs_if.h | 51 + drivers/ram/k3-j721e/Makefile | 8 - drivers/ram/k3-j721e/cps_drv_lpddr4.h | 119 - drivers/ram/k3-j721e/lpddr4.c | 2105 ----- drivers/ram/k3-j721e/lpddr4_ctl_regs.h | 1546 ---- .../k3-j721e/lpddr4_ddr_controller_macros.h | 7793 ----------------- drivers/ram/k3-j721e/lpddr4_if.h | 578 -- drivers/ram/k3-j721e/lpddr4_obj_if.c | 55 - drivers/ram/k3-j721e/lpddr4_obj_if.h | 383 - drivers/ram/k3-j721e/lpddr4_pi_macros.h | 5397 ------------ drivers/ram/k3-j721e/lpddr4_sanity.h | 1165 --- drivers/ram/k3-j721e/lpddr4_structs_if.h | 121 - drivers/soc/soc_ti_k3.c | 4 + drivers/soc/ti/k3-navss-ringacc.c | 530 +- include/asm-generic/global_data.h | 24 - include/configs/am64x_evm.h | 113 + include/dt-bindings/pinctrl/k3.h | 5 +- include/linux/soc/ti/k3-navss-ringacc.h | 22 +- include/linux/soc/ti/ti_sci_protocol.h | 14 + test/dm/test-fdt.c | 68 - 121 files changed, 57482 insertions(+), 23609 deletions(-) create mode 100644 arch/arm/dts/k3-am64-ddr.dtsi create mode 100644 arch/arm/dts/k3-am64-evm-ddr4-1600MTs.dtsi create mode 100644 arch/arm/dts/k3-am64-main.dtsi create mode 100644 arch/arm/dts/k3-am64-mcu.dtsi create mode 100644 arch/arm/dts/k3-am64-sk-lp4-1333MTs.dtsi create mode 100644 arch/arm/dts/k3-am64.dtsi create mode 100644 arch/arm/dts/k3-am642-evm-u-boot.dtsi create mode 100644 arch/arm/dts/k3-am642-evm.dts create mode 100644 arch/arm/dts/k3-am642-r5-evm.dts create mode 100644 arch/arm/dts/k3-am642-r5-sk.dts create mode 100644 arch/arm/dts/k3-am642-sk-u-boot.dtsi create mode 100644 arch/arm/dts/k3-am642-sk.dts create mode 100644 arch/arm/dts/k3-am642.dtsi create mode 100644 arch/arm/mach-k3/am642_init.c create mode 100644 arch/arm/mach-k3/include/mach/am64_hardware.h create mode 100644 arch/arm/mach-k3/include/mach/am64_spl.h create mode 100644 board/ti/am64x/Kconfig create mode 100644 board/ti/am64x/MAINTAINERS create mode 100644 board/ti/am64x/Makefile create mode 100644 board/ti/am64x/evm.c create mode 100644 configs/am64x_evm_a53_defconfig create mode 100644 configs/am64x_evm_r5_defconfig create mode 100644 drivers/dma/ti/k3-psil-am64.c create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_16bit_if.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_16bit_obj_if.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_16bit_structs_if.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_address_slice_0_macros.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_address_slice_1_macros.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_address_slice_2_macros.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_ctl_regs.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_ctl_regs_rw_masks.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_data_slice_0_macros.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_data_slice_1_macros.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_ddr_controller_macros.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_phy_core_macros.h create mode 100644 drivers/ram/k3-ddrss/16bit/lpddr4_pi_macros.h create mode 100644 drivers/ram/k3-ddrss/32bit/lpddr4_32bit_if.h create mode 100644 drivers/ram/k3-ddrss/32bit/lpddr4_32bit_obj_if.h create mode 100644 drivers/ram/k3-ddrss/32bit/lpddr4_32bit_structs_if.h rename drivers/ram/{k3-j721e => k3-ddrss/32bit}/lpddr4_address_slice_0_macros.h (76%) create mode 100644 drivers/ram/k3-ddrss/32bit/lpddr4_ctl_regs.h create mode 100644 drivers/ram/k3-ddrss/32bit/lpddr4_ctl_regs_rw_masks.h rename drivers/ram/{k3-j721e => k3-ddrss/32bit}/lpddr4_data_slice_0_macros.h (64%) rename drivers/ram/{k3-j721e => k3-ddrss/32bit}/lpddr4_data_slice_1_macros.h (66%) rename drivers/ram/{k3-j721e => k3-ddrss/32bit}/lpddr4_data_slice_2_macros.h (66%) rename drivers/ram/{k3-j721e => k3-ddrss/32bit}/lpddr4_data_slice_3_macros.h (66%) create mode 100644 drivers/ram/k3-ddrss/32bit/lpddr4_ddr_controller_macros.h rename drivers/ram/{k3-j721e => k3-ddrss/32bit}/lpddr4_phy_core_macros.h (60%) create mode 100644 drivers/ram/k3-ddrss/32bit/lpddr4_pi_macros.h create mode 100644 drivers/ram/k3-ddrss/Makefile create mode 100644 drivers/ram/k3-ddrss/cps_drv_lpddr4.h rename drivers/ram/{k3-j721e/k3-j721e-ddrss.c => k3-ddrss/k3-ddrss.c} (51%) create mode 100644 drivers/ram/k3-ddrss/lpddr4.c create mode 100644 drivers/ram/k3-ddrss/lpddr4.h create mode 100644 drivers/ram/k3-ddrss/lpddr4_16bit.c create mode 100644 drivers/ram/k3-ddrss/lpddr4_16bit.h create mode 100644 drivers/ram/k3-ddrss/lpddr4_16bit_ctl_regs_rw_masks.c create mode 100644 drivers/ram/k3-ddrss/lpddr4_16bit_sanity.h create mode 100644 drivers/ram/k3-ddrss/lpddr4_32bit.c create mode 100644 drivers/ram/k3-ddrss/lpddr4_32bit.h create mode 100644 drivers/ram/k3-ddrss/lpddr4_32bit_ctl_regs_rw_masks.c create mode 100644 drivers/ram/k3-ddrss/lpddr4_32bit_sanity.h create mode 100644 drivers/ram/k3-ddrss/lpddr4_if.h create mode 100644 drivers/ram/k3-ddrss/lpddr4_obj_if.c create mode 100644 drivers/ram/k3-ddrss/lpddr4_obj_if.h rename drivers/ram/{k3-j721e => k3-ddrss}/lpddr4_private.h (100%) create mode 100644 drivers/ram/k3-ddrss/lpddr4_sanity.h create mode 100644 drivers/ram/k3-ddrss/lpddr4_structs_if.h delete mode 100644 drivers/ram/k3-j721e/Makefile delete mode 100644 drivers/ram/k3-j721e/cps_drv_lpddr4.h delete mode 100644 drivers/ram/k3-j721e/lpddr4.c delete mode 100644 drivers/ram/k3-j721e/lpddr4_ctl_regs.h delete mode 100644 drivers/ram/k3-j721e/lpddr4_ddr_controller_macros.h delete mode 100644 drivers/ram/k3-j721e/lpddr4_if.h delete mode 100644 drivers/ram/k3-j721e/lpddr4_obj_if.c delete mode 100644 drivers/ram/k3-j721e/lpddr4_obj_if.h delete mode 100644 drivers/ram/k3-j721e/lpddr4_pi_macros.h delete mode 100644 drivers/ram/k3-j721e/lpddr4_sanity.h delete mode 100644 drivers/ram/k3-j721e/lpddr4_structs_if.h create mode 100644 include/configs/am64x_evm.h