From: Thierry Reding treding@nvidia.com
Hi Tom, Stephen,
this in the fifth installment of this series of miscellaneous improvements for Tegra support. The main changes since the last version are:
- Add two patches from the "framebuffer carveout" series since Simon has already picked up the libfdt and fdtdec specific parts. - Fix the MAC address regression found by Stephen's test system. This is done by writing the MAC address to U-Boot's control DTB rather than storing it in the environment and thereby confusing Ethernet drivers if more than one device are present in the system. - I've also added the Jetson Nano patch to the series since it has changed slightly. The issue of the pinmux spreadsheet is still open, so this isn't quite ready to be merged, but I wanted to solicit more feedback, so that this is already reviewed by the time the pinmux spreadsheet issue is resolved.
Simon,
I've included another patch for a new fdtdec function in this series because the first user is introduced here. It'd be great if you could provide an Acked-by on the first patch so that Tom can pick it up and send out as part of the PR for the entire series once it's been reviewed and passed Stephen's test system.
The second patch is also required later in the series. There's no explicit maintainer for lib/string.c, but you show up in the output for scripts/get_maintainer.pl for the second patch, so perhaps you could also give an Acked-by on that?
Alternatively you could pick up patches 1 and 2 so that Tom can base his PR on your tree (or master, later on), if that's what you guys prefer. Actually, this might be better anyway, since there might be a tiny merge conflict between the fdtdec patch in this series and the other ones that I sent out earlier.
Thanks, Thierry
Thierry Reding (27): fdtdec: Add fdtdec_set_ethernet_mac_address() lib: Implement strndup() ARM: tegra: Fix mux type for disp1 and disp2 clocks on Tegra210 ARM: tegra: Remove disp1 clock initialization on Tegra210 ARM: tegra: Use common header for PMU declarations ARM: tegra: Guard clock code with a Kconfig symbol ARM: tegra: Guard GP pad control code with a Kconfig symbol ARM: tegra: Guard memory controller code with a Kconfig symbol ARM: tegra: Guard pin controller code with a Kconfig symbol ARM: tegra: Guard powergate code with a Kconfig symbol ARM: tegra: Fix save_boot_params() prototype ARM: tegra: Allow boards to override boot target devices ARM: tegra: Support TZ-only access to PMC ARM: tegra: Workaround UDC boot issues only if necessary ARM: tegra: Restore DRAM bank count ARM: tegra: Unify Tegra186 builds ARM: tegra: Implement cboot_save_boot_params() in C ARM: tegra: Implement cboot_get_ethaddr() ARM: tegra: Import cbootargs value from cboot DTB ARM: tegra: Enable position independent build for 64-bit p2371-2180: Pass Ethernet MAC to the kernel p2771-0000: Pass Ethernet MAC to the kernel p2371-2180: Add support for framebuffer carveouts p2771-0000: Add support for framebuffer carveouts ARM: tegra: Rename pcie-controller to pcie ARM: tegra: Mark built-in Ethernet as default on Jetson TX2 ARM: tegra: Add NVIDIA Jetson Nano Developer Kit support
arch/arm/dts/Makefile | 3 +- arch/arm/dts/tegra124-apalis.dts | 2 +- arch/arm/dts/tegra124-cei-tk1-som.dts | 2 +- arch/arm/dts/tegra124-jetson-tk1.dts | 2 +- arch/arm/dts/tegra124.dtsi | 2 +- arch/arm/dts/tegra186-p2771-0000-000.dts | 2 +- arch/arm/dts/tegra186-p2771-0000-500.dts | 2 +- arch/arm/dts/tegra186-p2771-0000.dtsi | 2 + arch/arm/dts/tegra186.dtsi | 2 +- arch/arm/dts/tegra20-harmony.dts | 2 +- arch/arm/dts/tegra20-trimslice.dts | 2 +- arch/arm/dts/tegra20.dtsi | 2 +- arch/arm/dts/tegra210-p2371-2180.dts | 2 +- arch/arm/dts/tegra210-p3450-0000.dts | 135 ++++ arch/arm/dts/tegra210.dtsi | 2 +- arch/arm/dts/tegra30-apalis.dts | 2 +- arch/arm/dts/tegra30-beaver.dts | 2 +- arch/arm/dts/tegra30-cardhu.dts | 2 +- arch/arm/dts/tegra30.dtsi | 2 +- arch/arm/include/asm/arch-tegra/cboot.h | 45 ++ arch/arm/include/asm/arch-tegra/pmc.h | 20 +- .../asm/{arch-tegra20 => arch-tegra}/pmu.h | 6 +- arch/arm/include/asm/arch-tegra/tegra.h | 6 + arch/arm/include/asm/arch-tegra114/pmu.h | 12 - arch/arm/include/asm/arch-tegra124/pmu.h | 13 - arch/arm/include/asm/arch-tegra210/pmu.h | 13 - arch/arm/include/asm/arch-tegra30/pmu.h | 12 - arch/arm/mach-tegra/Kconfig | 32 + arch/arm/mach-tegra/Makefile | 16 +- arch/arm/mach-tegra/board.c | 41 +- arch/arm/mach-tegra/board186.c | 32 - arch/arm/mach-tegra/board2.c | 37 +- arch/arm/mach-tegra/cache.c | 2 + arch/arm/mach-tegra/cboot.c | 620 ++++++++++++++++++ arch/arm/mach-tegra/clock.c | 13 +- arch/arm/mach-tegra/cmd_enterrcm.c | 6 +- arch/arm/mach-tegra/cpu.c | 20 +- arch/arm/mach-tegra/emc.c | 2 +- arch/arm/mach-tegra/lowlevel_init.S | 39 -- arch/arm/mach-tegra/pmc.c | 92 +++ arch/arm/mach-tegra/powergate.c | 11 +- arch/arm/mach-tegra/tegra186/Makefile | 4 - arch/arm/mach-tegra/tegra186/nvtboot_board.c | 332 ---------- arch/arm/mach-tegra/tegra186/nvtboot_ll.S | 20 - arch/arm/mach-tegra/tegra186/nvtboot_mem.c | 172 ----- arch/arm/mach-tegra/tegra210/Kconfig | 7 + arch/arm/mach-tegra/tegra210/clock.c | 11 +- board/nvidia/p2371-2180/p2371-2180.c | 97 +++ board/nvidia/p2771-0000/p2771-0000.c | 111 +++- board/nvidia/p3450-0000/Kconfig | 12 + board/nvidia/p3450-0000/MAINTAINERS | 6 + board/nvidia/p3450-0000/Makefile | 8 + board/nvidia/p3450-0000/p3450-0000.c | 198 ++++++ .../p3450-0000/pinmux-config-p3450-0000.h | 265 ++++++++ configs/e2220-1170_defconfig | 2 +- configs/p2371-0000_defconfig | 2 +- configs/p2371-2180_defconfig | 3 +- configs/p2571_defconfig | 2 +- configs/p2771-0000-000_defconfig | 3 +- configs/p2771-0000-500_defconfig | 3 +- configs/p3450-0000_defconfig | 55 ++ include/configs/p3450-0000.h | 34 + include/configs/tegra-common-post.h | 2 + include/fdtdec.h | 24 + include/linux/string.h | 1 + lib/fdtdec.c | 29 + lib/string.c | 23 + 67 files changed, 1964 insertions(+), 724 deletions(-) create mode 100644 arch/arm/dts/tegra210-p3450-0000.dts create mode 100644 arch/arm/include/asm/arch-tegra/cboot.h rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/pmu.h (73%) delete mode 100644 arch/arm/include/asm/arch-tegra114/pmu.h delete mode 100644 arch/arm/include/asm/arch-tegra124/pmu.h delete mode 100644 arch/arm/include/asm/arch-tegra210/pmu.h delete mode 100644 arch/arm/include/asm/arch-tegra30/pmu.h delete mode 100644 arch/arm/mach-tegra/board186.c create mode 100644 arch/arm/mach-tegra/cboot.c delete mode 100644 arch/arm/mach-tegra/lowlevel_init.S create mode 100644 arch/arm/mach-tegra/pmc.c delete mode 100644 arch/arm/mach-tegra/tegra186/nvtboot_board.c delete mode 100644 arch/arm/mach-tegra/tegra186/nvtboot_ll.S delete mode 100644 arch/arm/mach-tegra/tegra186/nvtboot_mem.c create mode 100644 board/nvidia/p3450-0000/Kconfig create mode 100644 board/nvidia/p3450-0000/MAINTAINERS create mode 100644 board/nvidia/p3450-0000/Makefile create mode 100644 board/nvidia/p3450-0000/p3450-0000.c create mode 100644 board/nvidia/p3450-0000/pinmux-config-p3450-0000.h create mode 100644 configs/p3450-0000_defconfig create mode 100644 include/configs/p3450-0000.h