mbox

[U-Boot] Pull request, u-boot-tegra/master

Message ID CACih+8VmAwvNG8f-QoJ8+56qR+XM5oUqBQS6EprUpVJdvM-NGQ@mail.gmail.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-tegra.git master

Message

Tom Warren Feb. 18, 2016, 7:53 p.m. UTC
Tom,

Please pull u-boot-tegra/master into U-Boot/master. Thanks!

All tegra builds are OK (32-bit and 64-bit).

The following changes since commit 727a25b2418031e1b94ba603e0eb61657024091b:

  Prepare v2016.03-rc2 (2016-02-15 21:44:30 +0000)

are available in the git repository at:

  git://git.denx.de/u-boot-tegra.git master

for you to fetch changes up to 5589bc2770a7d7fe346f5972596f26d1ddf57bba:

  ARM: tegra: enable USB device mode port on Dalmore (2016-02-18 10:02:19
-0700)

----------------------------------------------------------------
Simon Glass (24):
      tegra: keyboard: Fix the init order
      dm: video: Flush the cache after a puts()
      tegra: mmc: Fix comments in the MMC driver init
      tegra: dts: Sync up the tegra124 device tree files with Linux
      tegra: dts: Sync up nyan-big files with Linux
      tegra: gpio: Show the GPIO value for outputs
      tegra: pwm: Add a driver for the tegra PWM
      tegra: lcd: Merge tegra124-lcd.c into display.c
      tegra: Allow driver model to be used for the PWM
      tegra: Allow CONFIG_DM_VIDEO to be used as well as CONFIG_LCD
      tegra: nyan-big: Move the LCD driver to driver model
      tegra: video: Rename CONFIG_VIDEO_TEGRA to CONFIG_VIDEO_TEGRA20
      tegra: dts: Sync tegra20.dtsi with Linux v4.4
      tegra: video: Merge the display driver into one file
      tegra: video: Move the check for CONFIG_OF_CONTROL to Kconfig
      tegra: video: Merge the two config structures together
      tegra: video: Convert tegra20 LCD driver to driver model
      tegra: video: Remove the static variables
      tegra: video: Move LCD enums into the driver
      tegra: video: Move all fdt-decoding into a single function
      tegra: Convert CONFIG_PWM_TEGRA to Kconfig
      tegra: video: Move LCD driver to use the DM PWM driver
      tegra: video: Clean up the old LCD/PWM driver code
      video: tegra: Correct a Kconfig warning with VIDCONSOLE_AS_LCD

Stephen Warren (2):
      ARM: tegra: don't set CONFIG_USB_MAX_CONTROLLER_COUNT
      ARM: tegra: enable USB device mode port on Dalmore

 arch/arm/dts/tegra114-dalmore.dts               |    9 +-
 arch/arm/dts/tegra124-jetson-tk1.dts            |   13 +
 arch/arm/dts/tegra124-nyan-big.dts              | 1676
++++++++++++++++++-----
 arch/arm/dts/tegra124-nyan.dtsi                 |  718 ++++++++++
 arch/arm/dts/tegra124-venice2.dts               |   14 +
 arch/arm/dts/tegra124.dtsi                      |  693 ++++++++--
 arch/arm/dts/tegra20-colibri.dts                |   22 +-
 arch/arm/dts/tegra20-harmony.dts                |   44 +-
 arch/arm/dts/tegra20-medcom-wide.dts            |   26 +-
 arch/arm/dts/tegra20-paz00.dts                  |   43 +-
 arch/arm/dts/tegra20-plutux.dts                 |    8 -
 arch/arm/dts/tegra20-seaboard.dts               |   36 +-
 arch/arm/dts/tegra20-tamonten.dtsi              |   15 +-
 arch/arm/dts/tegra20-tec.dts                    |   10 +-
 arch/arm/dts/tegra20-trimslice.dts              |   34 +-
 arch/arm/dts/tegra20-ventana.dts                |   43 +-
 arch/arm/dts/tegra20-whistler.dts               |   35 +-
 arch/arm/dts/tegra20.dtsi                       |  541 ++++++--
 arch/arm/include/asm/arch-tegra/dc.h            |    5 -
 arch/arm/include/asm/arch-tegra/pwm.h           |   30 -
 arch/arm/include/asm/arch-tegra20/display.h     |  108 --
 arch/arm/mach-tegra/Kconfig                     |    3 +-
 arch/arm/mach-tegra/Makefile                    |    1 -
 arch/arm/mach-tegra/board2.c                    |   24 +-
 arch/arm/mach-tegra/pwm.c                       |   89 --
 arch/arm/mach-tegra/tegra20/Makefile            |    2 -
 arch/arm/mach-tegra/tegra20/display.c           |  378 -----
 board/compal/paz00/paz00.c                      |    2 +-
 board/toradex/colibri_t20/colibri_t20.c         |    2 +-
 configs/colibri_t20_defconfig                   |    6 +
 configs/harmony_defconfig                       |    6 +
 configs/medcom-wide_defconfig                   |    6 +
 configs/nyan-big_defconfig                      |   10 +
 configs/paz00_defconfig                         |    6 +
 configs/seaboard_defconfig                      |    6 +
 configs/tec_defconfig                           |    6 +
 configs/ventana_defconfig                       |    6 +
 drivers/gpio/tegra_gpio.c                       |    5 +-
 drivers/input/tegra-kbc.c                       |    2 +-
 drivers/mmc/tegra_mmc.c                         |    4 +-
 drivers/pwm/Kconfig                             |    9 +
 drivers/pwm/Makefile                            |    3 +
 drivers/pwm/tegra_pwm.c                         |   85 ++
 drivers/video/Kconfig                           |   10 +
 drivers/video/Makefile                          |    2 +-
 drivers/video/simple_panel.c                    |    1 +
 drivers/video/tegra.c                           |  658 +++++++--
 drivers/video/tegra124/Makefile                 |    1 -
 drivers/video/tegra124/display.c                |  184 ++-
 drivers/video/tegra124/dp.c                     |   53 +-
 drivers/video/tegra124/sor.c                    |  162 ++-
 drivers/video/tegra124/sor.h                    |   45 +-
 drivers/video/tegra124/tegra124-lcd.c           |   95 --
 drivers/video/vidconsole-uclass.c               |    1 +
 include/configs/apalis_t30.h                    |    1 -
 include/configs/beaver.h                        |    1 -
 include/configs/colibri_t20.h                   |    5 -
 include/configs/colibri_t30.h                   |    1 -
 include/configs/dalmore.h                       |    1 +
 include/configs/e2220-1170.h                    |    1 -
 include/configs/harmony.h                       |    5 -
 include/configs/jetson-tk1.h                    |    1 -
 include/configs/medcom-wide.h                   |    4 -
 include/configs/nyan-big.h                      |    4 -
 include/configs/p2371-0000.h                    |    1 -
 include/configs/p2371-2180.h                    |    1 -
 include/configs/p2571.h                         |    1 -
 include/configs/paz00.h                         |    4 -
 include/configs/seaboard.h                      |    5 -
 include/configs/tec.h                           |    4 -
 include/configs/tegra-common-post.h             |   10 +-
 include/configs/trimslice.h                     |    1 -
 include/configs/venice2.h                       |    1 -
 include/configs/ventana.h                       |    4 -
 include/dt-bindings/clock/tegra124-car-common.h |  345 +++++
 include/dt-bindings/clock/tegra124-car.h        |  341 +----
 include/dt-bindings/memory/tegra124-mc.h        |   31 +
 include/dt-bindings/reset/tegra124-car.h        |   12 +
 include/dt-bindings/thermal/tegra124-soctherm.h |   13 +
 include/fdtdec.h                                |    1 -
 lib/fdtdec.c                                    |    1 -
 81 files changed, 4606 insertions(+), 2190 deletions(-)
 create mode 100644 arch/arm/dts/tegra124-nyan.dtsi
 delete mode 100644 arch/arm/mach-tegra/pwm.c
 create mode 100644 drivers/pwm/tegra_pwm.c
 delete mode 100644 drivers/video/tegra124/tegra124-lcd.c
 create mode 100644 include/dt-bindings/clock/tegra124-car-common.h
 create mode 100644 include/dt-bindings/memory/tegra124-mc.h
 create mode 100644 include/dt-bindings/reset/tegra124-car.h
 create mode 100644 include/dt-bindings/thermal/tegra124-soctherm.h

Comments

Tom Rini Feb. 20, 2016, 12:54 a.m. UTC | #1
On Thu, Feb 18, 2016 at 12:53:42PM -0700, Tom Warren wrote:

> Tom,
> 
> Please pull u-boot-tegra/master into U-Boot/master. Thanks!
> 
> All tegra builds are OK (32-bit and 64-bit).
> 
> The following changes since commit 727a25b2418031e1b94ba603e0eb61657024091b:
> 
>   Prepare v2016.03-rc2 (2016-02-15 21:44:30 +0000)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-tegra.git master
> 
> for you to fetch changes up to 5589bc2770a7d7fe346f5972596f26d1ddf57bba:
> 
>   ARM: tegra: enable USB device mode port on Dalmore (2016-02-18 10:02:19
> -0700)
> 

Applied to u-boot/master, thanks!