[U-Boot] Pull request: u-boot-tegra/master
Tom Warren
tcwarren3959 at gmail.com
Wed May 13 21:23:01 CEST 2015
OK, Tom. Ready to be pulled into U-Boot/master. Thanks!
./MAKEALL -s tegra is OK, nyan-big boots to console OK.
The following changes since commit bd328eb38274ffaf04caaa8a6ecc09b7e19a650e:
Clean all defconfigs with savedefconfig (2015-05-12 18:10:26 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-tegra.git master
for you to fetch changes up to 237c36379c76f7f6647bb11c03aa9c5cb9a4972f:
ARM: tegra: move NVIDIA common files to arch/arm/mach-tegra (2015-05-13
09:46:19 -0700)
----------------------------------------------------------------
Ian Campbell (3):
tegra124: Add more registers to struct mc_ctlr
tegra124: Reserve secure RAM using MC_SECURITY_CFG{0, 1}_0
jetson-tk1: Add PSCI configuration options and reserve secure code
Jan Kiszka (12):
ARM: Clean up CONFIG_ARMV7_NONSEC/VIRT/PSCI conditions
ARM: Factor out common psci_get_cpu_id
ARM: Factor out reusable psci_cpu_off_common
ARM: Factor out reusable psci_cpu_entry
ARM: Factor out reusable psci_get_cpu_stack_top
ARM: Put target PC for PSCI CPU_ON on per-CPU stack
virt-dt: Allow reservation of secure region when in a RAM carveout
tegra: Make tegra_powergate_power_on public
ARM: Add board-specific initialization hook for PSCI
tegra124: Add PSCI support for Tegra124
tegra: Set CNTFRQ for secondary CPUs
tegra: Boot in non-secure mode by default
Masahiro Yamada (1):
ARM: tegra: move NVIDIA common files to arch/arm/mach-tegra
Simon Glass (26):
dm: core: Sort the uclasses
dm: gpio: Add error handling and a function to claim vector GPIOs
fdt: Add binding decode function for display-timings
tegra: Move the pwm into tegra-common
tegra: pwm: Allow the clock rate to be left as is
tegra: Move checkboard() into the board code
tegra: Add a board ID function
power: Export register access functions from as3722
tegra: Provide a function to allow LCD PMIC setup
tegra: Add support for setting up a as3722 PMIC
tegra: nyan-big: Add LCD PMIC init and board ID
tegra124: dts: Add host1x node to provide display information
tegra: config: Use CONFIG_LCD to detect LCD presence
tegra: clock: Add checking for invalid clock IDs
tegra: clock: Split the clock source code into a separate function
tegra124: clock: Add display clocks and functions
tegra: Move display controller header into common
video: Add drm_dp_helper.h
edid: Add a function to read detailed monitor timings
dm: video: Add a uclass for display port
tegra: dts: nyan-big: Add definitions for eDP display
tegra: video: Support serial output resource (SOR) on tegra124
tegra: video: Add Embedded DisplayPort driver
tegra: video: support eDP displays on Tegra124 devices
tegra: config: nyan-big: Enable LCD
tegra124: video: Add full link training for eDP
Stephen Warren (2):
ARM: tegra: CONFIG_{SYS_, }LOAD{_, }ADDR rationalization
ARM: tegra: enable STDIO deregistration
Thierry Reding (1):
ARM: tegra: Enable SMMU when going non-secure
arch/arm/cpu/armv7/Kconfig | 2 +-
arch/arm/cpu/armv7/Makefile | 2 +-
arch/arm/cpu/armv7/ls102xa/cpu.c | 2 +-
arch/arm/cpu/armv7/psci.S | 121 ++
arch/arm/cpu/armv7/sunxi/psci.S | 111 +-
arch/arm/cpu/armv7/virt-dt.c | 31 +-
arch/arm/cpu/armv7/virt-v7.c | 11 +
arch/arm/cpu/u-boot.lds | 2 +-
arch/arm/dts/tegra124-nyan-big.dts | 47 +
arch/arm/dts/tegra124.dtsi | 84 +
arch/arm/include/asm/arch-tegra/clk_rst.h | 15 +-
arch/arm/include/asm/arch-tegra/clock.h | 14 +
.../include/asm/{arch-tegra20 => arch-tegra}/dc.h | 67 +-
arch/arm/include/asm/arch-tegra/powergate.h | 1 +
arch/arm/include/asm/arch-tegra/pwm.h | 60 +
arch/arm/include/asm/arch-tegra/sys_proto.h | 19 +-
arch/arm/include/asm/arch-tegra124/clock-tables.h | 3 +-
arch/arm/include/asm/arch-tegra124/clock.h | 21 +
arch/arm/include/asm/arch-tegra124/display.h | 58 +
arch/arm/include/asm/arch-tegra124/flow.h | 6 +
arch/arm/include/asm/arch-tegra124/mc.h | 37 +-
arch/arm/include/asm/arch-tegra124/pwm.h | 14 +
arch/arm/include/asm/arch-tegra20/display.h | 2 +-
arch/arm/include/asm/arch-tegra20/pwm.h | 54 +-
arch/arm/include/asm/armv7.h | 5 +-
arch/arm/include/asm/psci.h | 1 +
arch/arm/include/asm/system.h | 1 +
arch/arm/lib/bootm-fdt.c | 8 +-
arch/arm/lib/bootm.c | 6 +-
arch/arm/mach-tegra/Makefile | 8 +-
arch/arm/mach-tegra/ap.c | 55 +
arch/arm/mach-tegra/board.c | 8 -
.../common/board.c => arch/arm/mach-tegra/board2.c | 40 +-
arch/arm/mach-tegra/clock.c | 83 +-
{board/nvidia/common => arch/arm/mach-tegra}/emc.c | 0
{board/nvidia/common => arch/arm/mach-tegra}/emc.h | 0
arch/arm/mach-tegra/powergate.c | 2 +-
arch/arm/mach-tegra/psci.S | 114 ++
arch/arm/mach-tegra/{tegra20 => }/pwm.c | 7 +-
arch/arm/mach-tegra/tegra124/Kconfig | 2 +
arch/arm/mach-tegra/tegra124/Makefile | 4 +
arch/arm/mach-tegra/tegra124/clock.c | 141 +-
arch/arm/mach-tegra/tegra124/psci.c | 59 +
arch/arm/mach-tegra/tegra20/Makefile | 1 -
arch/arm/mach-tegra/tegra20/display.c | 2 +-
board/armltd/vexpress/vexpress_common.c | 2 +-
board/avionic-design/medcom-wide/Makefile | 2 -
board/avionic-design/plutux/Makefile | 2 -
board/avionic-design/tec-ng/Makefile | 2 -
board/avionic-design/tec/Makefile | 2 -
board/broadcom/bcm_ep/board.c | 2 +-
board/compal/paz00/Makefile | 2 -
board/compulab/trimslice/Makefile | 2 -
board/freescale/common/arm_sleep.c | 2 +-
board/nvidia/common/Makefile | 4 -
board/nvidia/common/common.mk | 3 -
board/nvidia/nyan-big/nyan-big.c | 34 +-
board/toradex/apalis_t30/Makefile | 2 -
board/toradex/colibri_t20/Makefile | 2 -
board/toradex/colibri_t30/Makefile | 2 -
common/edid.c | 105 ++
configs/nyan-big_defconfig | 2 +
.../gpu/nvidia,tegra20-host1x.txt | 372 +++++
doc/device-tree-bindings/video/display-timing.txt | 110 ++
drivers/gpio/gpio-uclass.c | 38 +-
drivers/power/as3722.c | 16 +-
drivers/video/Kconfig | 15 +
drivers/video/Makefile | 6 +
drivers/video/dp-uclass.c | 34 +
drivers/video/tegra124/Makefile | 10 +
drivers/video/tegra124/display.c | 472 ++++++
drivers/video/tegra124/displayport.h | 412 +++++
drivers/video/tegra124/dp.c | 1607
++++++++++++++++++++
drivers/video/tegra124/sor.c | 1024 +++++++++++++
drivers/video/tegra124/sor.h | 922 +++++++++++
drivers/video/tegra124/tegra124-lcd.c | 97 ++
include/asm-generic/gpio.h | 15 +-
include/configs/jetson-tk1.h | 5 +
include/configs/nyan-big.h | 14 +
include/configs/tegra-common-post.h | 4 +-
include/configs/tegra-common.h | 3 +
include/configs/tegra114-common.h | 7 +-
include/configs/tegra124-common.h | 7 +-
include/configs/tegra20-common.h | 7 +-
include/configs/tegra30-common.h | 7 +-
include/displayport.h | 60 +
include/dm/uclass-id.h | 33 +-
include/edid.h | 19 +
include/fdtdec.h | 80 +
include/linux/drm_dp_helper.h | 406 +++++
include/power/as3722.h | 3 +
lib/fdtdec.c | 95 ++
92 files changed, 7102 insertions(+), 301 deletions(-)
rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/dc.h (89%)
create mode 100644 arch/arm/include/asm/arch-tegra/pwm.h
create mode 100644 arch/arm/include/asm/arch-tegra124/display.h
create mode 100644 arch/arm/include/asm/arch-tegra124/pwm.h
rename board/nvidia/common/board.c => arch/arm/mach-tegra/board2.c (88%)
rename {board/nvidia/common => arch/arm/mach-tegra}/emc.c (100%)
rename {board/nvidia/common => arch/arm/mach-tegra}/emc.h (100%)
create mode 100644 arch/arm/mach-tegra/psci.S
rename arch/arm/mach-tegra/{tegra20 => }/pwm.c (93%)
create mode 100644 arch/arm/mach-tegra/tegra124/psci.c
delete mode 100644 board/nvidia/common/Makefile
delete mode 100644 board/nvidia/common/common.mk
create mode 100644 doc/device-tree-bindings/gpu/nvidia,tegra20-host1x.txt
create mode 100644 doc/device-tree-bindings/video/display-timing.txt
create mode 100644 drivers/video/dp-uclass.c
create mode 100644 drivers/video/tegra124/Makefile
create mode 100644 drivers/video/tegra124/display.c
create mode 100644 drivers/video/tegra124/displayport.h
create mode 100644 drivers/video/tegra124/dp.c
create mode 100644 drivers/video/tegra124/sor.c
create mode 100644 drivers/video/tegra124/sor.h
create mode 100644 drivers/video/tegra124/tegra124-lcd.c
create mode 100644 include/displayport.h
create mode 100644 include/linux/drm_dp_helper.h
On Wed, May 13, 2015 at 9:38 AM, Tom Warren <tcwarren3959 at gmail.com> wrote:
> Sorry, Masahiro. Missed that one. I'll apply it and send a new PR if
> everything builds OK.
>
> Tom - note that I screwed up and didn't push my rebase of
> u-boot-tegra/master against u-boot/master (it's still rebased against
> ARM/master). I'll fix that before the next PR later today, so you can
> ignore the above PR.
>
> Tom
>
> On Tue, May 12, 2015 at 6:45 PM, Masahiro Yamada <
> yamada.masahiro at socionext.com> wrote:
>
>> Hi Tom Warren,
>>
>> 2015-05-13 6:49 GMT+09:00 Tom Warren <tcwarren3959 at gmail.com>:
>> > Tom,
>> >
>> > Please pull u-boot-tegra/master into u-boot/master. ./MAKEALL -s tegra
>> is
>> > clean. Thanks.
>> >
>> > The following changes since commit
>> b939689c7b87773c44275a578ffc8674a867e39d:
>> >
>> > Merge branch 'u-boot/master' into 'u-boot-arm/master' (2015-05-05
>> > 10:09:06 +0200)
>> >
>> > are available in the git repository at:
>> >
>> >
>> > git://git.denx.de/u-boot-tegra.git master
>> >
>> > for you to fetch changes up to 5168604f3b7e5b8ea077a69fe9acb7c14a36adf7:
>> >
>> > jetson-tk1: Add PSCI configuration options and reserve secure code
>> > (2015-05-11 08:35:13 -0700)
>> >
>>
>>
>>
>> What about my patch (http://patchwork.ozlabs.org/patch/460596/)?
>> Has it been rejected or deferred?
>>
>>
>>
>> --
>> Best Regards
>> Masahiro Yamada
>>
>
>
More information about the U-Boot
mailing list