| Message ID | CA+m5__LBi=CtS-YqG1SWTibfK8mzjA-6W5cA9b7Cke70wxBGLA@mail.gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Tom, On Fri, 15 Mar 2013 08:25:11 -0700, Tom Warren <twarren.nvidia@gmail.com> wrote: > Albert, > > Please pull u-boot-tegra/master into ARM/master. Thanks! > > ./MAKEALL for all the Tegra boards is OK, running a ./MAKEALL -a arm > now. Checkpatch.pl is clean. > > The following changes since commit ef123c525370463254a6f8e67563fdb0b0b46412: > Albert ARIBAUD (1): > Refactor linker-generated arrays > > are available in the git repository at: > > git://git.denx.de/u-boot-tegra master > > Lucas Stach (7): > tegra: usb: set USB_PORTS_MAX to correct value > tegra: usb: make controller init functions more self contained > tegra: usb: remove unneeded function parameter > tegra: usb: move controller init into start_port > tegra: usb: various small cleanups > tegra: usb: move implementation into right directory > tegra: usb: move [start|stop]_port into ehci_hcd_[init|stop] > > Stephen Warren (5): > ARM: tegra: implement WAR for Tegra114 CPU reset vector > ARM: tegra: make bounce buffer option common > disk: define HAVE_BLOCK_DEVICE in a common place > disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART > ARM: tegra: enable a common set of disk-related commands everywhere > > Tom Warren (27): > Tegra114: I2C: Take DVFS out of reset to allow I2C5 (PWR_I2C) to work > Tegra: I2C: Add T114 clock support to tegra_i2c driver > Tegra114: fdt: Update DT files with I2C info for T114/Dalmore > Tegra114: I2C: Enable I2C driver on Dalmore E1611 eval board > Tegra: fdt: Change /include/ to #include for C preprocessor > Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux > Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files > Tegra: MMC: Add DT support to MMC driver for all T20 boards > Tegra: fdt: Remove memreserve line from Cardhu/Seaboard DT files > Tegra30: fdt: Sync DT nodes with kernel DT files (I2C, SPI, GPIO, clock) > Tegra: Add twarren as maintainer for Tegra30 and Tegra114 SoCs > Tegra: Remove unused CONFIG_SYS_CPU_OSC_FREQUENCY define > Tegra114: fdt: Sync DT nodes with kernel DT files (GPIO, tegra_car) > Tegra30: Cardhu: Remove unneeded cardhu.c.mmc file > Tegra114: pinmux: Update pinmux tables & code, fix a bug w/SDMMC3 init > Tegra30: Cardhu: Add pad config tables/code based on pinmux code > Tegra30: fdt: Add SDMMC (sdhci) nodes for T30 boards (Cardhu for now) > Tegra: MMC: Added/update SDMMC registers/base addresses for T20/T30 > Tegra30: MMC: Add SD bus power-rail and SDMMC pad init routines > mmc: Tegra: Add SD bus power/voltage function and MMC pad init call. > Tegra30: mmc: Add Tegra30 SDMMC compatible entry to fdtdec & driver > Tegra30: MMC: Enable DT MMC driver support for Tegra30 Cardhu boards > Tegra114: pinmux: Fix bad CAM_MCLK func 3 table entry > Tegra114: Fix/update GP padcfg register struct > Tegra114: Dalmore: Always use DEFAULT instead of DISABLE for lock bits > Tegra114: fdt: Move aliases from dtsi to dts file as per other Tegras > Tegra114: Dalmore: Add pad config tables/code based on pinmux code > > MAINTAINERS | 2 + > arch/arm/cpu/arm720t/tegra114/cpu.c | 37 ++- > arch/arm/cpu/armv7/tegra20/Makefile | 1 - > arch/arm/cpu/armv7/tegra20/usb.c | 567 -------------------- > arch/arm/cpu/tegra114-common/pinmux.c | 410 +++++++++++--- > arch/arm/cpu/tegra30-common/pinmux.c | 190 +++++++- > arch/arm/dts/tegra114.dtsi | 75 +++- > arch/arm/dts/tegra20.dtsi | 18 +- > arch/arm/dts/tegra30.dtsi | 124 +++-- > arch/arm/include/asm/arch-tegra/mmc.h | 2 +- > arch/arm/include/asm/arch-tegra/tegra_i2c.h | 6 + > arch/arm/include/asm/arch-tegra/tegra_mmc.h | 48 ++- > .../include/asm/{arch-tegra20 => arch-tegra}/usb.h | 22 - > arch/arm/include/asm/arch-tegra114/gp_padctrl.h | 34 +- > arch/arm/include/asm/arch-tegra114/pinmux.h | 246 +++++----- > arch/arm/include/asm/arch-tegra20/tegra.h | 1 - > arch/arm/include/asm/arch-tegra30/gp_padctrl.h | 6 + > arch/arm/include/asm/arch-tegra30/pinmux.h | 67 +++- > arch/arm/include/asm/arch-tegra30/tegra.h | 2 + > board/avionic-design/common/tamonten.c | 19 +- > board/avionic-design/dts/tegra20-medcom-wide.dts | 3 +- > board/avionic-design/dts/tegra20-plutux.dts | 3 +- > board/avionic-design/dts/tegra20-tamonten.dtsi | 489 +++++++++++++++++ > board/avionic-design/dts/tegra20-tec.dts | 3 +- > board/compal/dts/tegra20-paz00.dts | 21 +- > board/compal/paz00/paz00.c | 26 +- > board/compulab/dts/tegra20-trimslice.dts | 16 +- > board/compulab/trimslice/trimslice.c | 23 +- > board/nvidia/cardhu/cardhu.c | 57 ++- > board/nvidia/cardhu/cardhu.c.mmc | 151 ------ > board/nvidia/cardhu/pinmux-config-cardhu.h | 21 +- > board/nvidia/common/board.c | 56 ++- > board/nvidia/dalmore/dalmore.c | 3 + > board/nvidia/dalmore/pinmux-config-dalmore.h | 475 ++++++++++------- > board/nvidia/dts/tegra114-dalmore.dts | 35 ++- > board/nvidia/dts/tegra20-harmony.dts | 20 +- > board/nvidia/dts/tegra20-seaboard.dts | 15 +- > board/nvidia/dts/tegra20-ventana.dts | 17 +- > board/nvidia/dts/tegra20-whistler.dts | 15 +- > board/nvidia/dts/tegra30-cardhu.dts | 23 +- > board/nvidia/harmony/harmony.c | 26 +- > board/nvidia/seaboard/seaboard.c | 25 +- > board/nvidia/whistler/whistler.c | 30 +- > board/toradex/colibri_t20_iris/colibri_t20_iris.c | 11 +- > board/toradex/dts/tegra20-colibri_t20_iris.dts | 9 +- > disk/part.c | 10 - > disk/part_amiga.c | 6 +- > disk/part_dos.c | 7 +- > disk/part_efi.c | 8 +- > disk/part_iso.c | 7 +- > disk/part_mac.c | 7 +- > drivers/i2c/tegra_i2c.c | 42 ++- > drivers/mmc/tegra_mmc.c | 226 ++++++-- > drivers/usb/host/ehci-tegra.c | 546 ++++++++++++++++++- > dts/Makefile | 3 +- > include/config_fallbacks.h | 11 + > include/configs/cardhu.h | 12 +- > include/configs/colibri_t20_iris.h | 6 - > include/configs/dalmore.h | 9 + > include/configs/harmony.h | 8 - > include/configs/medcom-wide.h | 5 - > include/configs/paz00.h | 8 - > include/configs/plutux.h | 5 - > include/configs/seaboard.h | 8 - > include/configs/tec.h | 5 - > include/configs/tegra-common.h | 23 +- > include/configs/tegra114-common.h | 3 + > include/configs/tegra20-common.h | 6 - > include/configs/trimslice.h | 8 - > include/configs/ventana.h | 8 - > include/configs/whistler.h | 8 - > include/fdtdec.h | 3 + > lib/fdtdec.c | 3 + > 73 files changed, 2881 insertions(+), 1570 deletions(-) > delete mode 100644 arch/arm/cpu/armv7/tegra20/usb.c > rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/usb.h (89%) > create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi > delete mode 100644 board/nvidia/cardhu/cardhu.c.mmc Applied to u-boot-arm/master, thanks! Amicalement,
Albert, Please pull u-boot-tegra/master into ARM/master. Thanks! ./MAKEALL for all the Tegra boards is OK, running a ./MAKEALL -a arm now. Checkpatch.pl is clean. The following changes since commit ef123c525370463254a6f8e67563fdb0b0b46412: Albert ARIBAUD (1): Refactor linker-generated arrays are available in the git repository at: git://git.denx.de/u-boot-tegra master Lucas Stach (7): tegra: usb: set USB_PORTS_MAX to correct value tegra: usb: make controller init functions more self contained tegra: usb: remove unneeded function parameter tegra: usb: move controller init into start_port tegra: usb: various small cleanups tegra: usb: move implementation into right directory tegra: usb: move [start|stop]_port into ehci_hcd_[init|stop] Stephen Warren (5): ARM: tegra: implement WAR for Tegra114 CPU reset vector ARM: tegra: make bounce buffer option common disk: define HAVE_BLOCK_DEVICE in a common place disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART ARM: tegra: enable a common set of disk-related commands everywhere Tom Warren (27): Tegra114: I2C: Take DVFS out of reset to allow I2C5 (PWR_I2C) to work Tegra: I2C: Add T114 clock support to tegra_i2c driver Tegra114: fdt: Update DT files with I2C info for T114/Dalmore Tegra114: I2C: Enable I2C driver on Dalmore E1611 eval board Tegra: fdt: Change /include/ to #include for C preprocessor Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files Tegra: MMC: Add DT support to MMC driver for all T20 boards Tegra: fdt: Remove memreserve line from Cardhu/Seaboard DT files Tegra30: fdt: Sync DT nodes with kernel DT files (I2C, SPI, GPIO, clock) Tegra: Add twarren as maintainer for Tegra30 and Tegra114 SoCs Tegra: Remove unused CONFIG_SYS_CPU_OSC_FREQUENCY define Tegra114: fdt: Sync DT nodes with kernel DT files (GPIO, tegra_car) Tegra30: Cardhu: Remove unneeded cardhu.c.mmc file Tegra114: pinmux: Update pinmux tables & code, fix a bug w/SDMMC3 init Tegra30: Cardhu: Add pad config tables/code based on pinmux code Tegra30: fdt: Add SDMMC (sdhci) nodes for T30 boards (Cardhu for now) Tegra: MMC: Added/update SDMMC registers/base addresses for T20/T30 Tegra30: MMC: Add SD bus power-rail and SDMMC pad init routines mmc: Tegra: Add SD bus power/voltage function and MMC pad init call. Tegra30: mmc: Add Tegra30 SDMMC compatible entry to fdtdec & driver Tegra30: MMC: Enable DT MMC driver support for Tegra30 Cardhu boards Tegra114: pinmux: Fix bad CAM_MCLK func 3 table entry Tegra114: Fix/update GP padcfg register struct Tegra114: Dalmore: Always use DEFAULT instead of DISABLE for lock bits Tegra114: fdt: Move aliases from dtsi to dts file as per other Tegras Tegra114: Dalmore: Add pad config tables/code based on pinmux code MAINTAINERS | 2 + arch/arm/cpu/arm720t/tegra114/cpu.c | 37 ++- arch/arm/cpu/armv7/tegra20/Makefile | 1 - arch/arm/cpu/armv7/tegra20/usb.c | 567 -------------------- arch/arm/cpu/tegra114-common/pinmux.c | 410 +++++++++++--- arch/arm/cpu/tegra30-common/pinmux.c | 190 +++++++- arch/arm/dts/tegra114.dtsi | 75 +++- arch/arm/dts/tegra20.dtsi | 18 +- arch/arm/dts/tegra30.dtsi | 124 +++-- arch/arm/include/asm/arch-tegra/mmc.h | 2 +- arch/arm/include/asm/arch-tegra/tegra_i2c.h | 6 + arch/arm/include/asm/arch-tegra/tegra_mmc.h | 48 ++- .../include/asm/{arch-tegra20 => arch-tegra}/usb.h | 22 - arch/arm/include/asm/arch-tegra114/gp_padctrl.h | 34 +- arch/arm/include/asm/arch-tegra114/pinmux.h | 246 +++++----- arch/arm/include/asm/arch-tegra20/tegra.h | 1 - arch/arm/include/asm/arch-tegra30/gp_padctrl.h | 6 + arch/arm/include/asm/arch-tegra30/pinmux.h | 67 +++- arch/arm/include/asm/arch-tegra30/tegra.h | 2 + board/avionic-design/common/tamonten.c | 19 +- board/avionic-design/dts/tegra20-medcom-wide.dts | 3 +- board/avionic-design/dts/tegra20-plutux.dts | 3 +- board/avionic-design/dts/tegra20-tamonten.dtsi | 489 +++++++++++++++++ board/avionic-design/dts/tegra20-tec.dts | 3 +- board/compal/dts/tegra20-paz00.dts | 21 +- board/compal/paz00/paz00.c | 26 +- board/compulab/dts/tegra20-trimslice.dts | 16 +- board/compulab/trimslice/trimslice.c | 23 +- board/nvidia/cardhu/cardhu.c | 57 ++- board/nvidia/cardhu/cardhu.c.mmc | 151 ------ board/nvidia/cardhu/pinmux-config-cardhu.h | 21 +- board/nvidia/common/board.c | 56 ++- board/nvidia/dalmore/dalmore.c | 3 + board/nvidia/dalmore/pinmux-config-dalmore.h | 475 ++++++++++------- board/nvidia/dts/tegra114-dalmore.dts | 35 ++- board/nvidia/dts/tegra20-harmony.dts | 20 +- board/nvidia/dts/tegra20-seaboard.dts | 15 +- board/nvidia/dts/tegra20-ventana.dts | 17 +- board/nvidia/dts/tegra20-whistler.dts | 15 +- board/nvidia/dts/tegra30-cardhu.dts | 23 +- board/nvidia/harmony/harmony.c | 26 +- board/nvidia/seaboard/seaboard.c | 25 +- board/nvidia/whistler/whistler.c | 30 +- board/toradex/colibri_t20_iris/colibri_t20_iris.c | 11 +- board/toradex/dts/tegra20-colibri_t20_iris.dts | 9 +- disk/part.c | 10 - disk/part_amiga.c | 6 +- disk/part_dos.c | 7 +- disk/part_efi.c | 8 +- disk/part_iso.c | 7 +- disk/part_mac.c | 7 +- drivers/i2c/tegra_i2c.c | 42 ++- drivers/mmc/tegra_mmc.c | 226 ++++++-- drivers/usb/host/ehci-tegra.c | 546 ++++++++++++++++++- dts/Makefile | 3 +- include/config_fallbacks.h | 11 + include/configs/cardhu.h | 12 +- include/configs/colibri_t20_iris.h | 6 - include/configs/dalmore.h | 9 + include/configs/harmony.h | 8 - include/configs/medcom-wide.h | 5 - include/configs/paz00.h | 8 - include/configs/plutux.h | 5 - include/configs/seaboard.h | 8 - include/configs/tec.h | 5 - include/configs/tegra-common.h | 23 +- include/configs/tegra114-common.h | 3 + include/configs/tegra20-common.h | 6 - include/configs/trimslice.h | 8 - include/configs/ventana.h | 8 - include/configs/whistler.h | 8 - include/fdtdec.h | 3 + lib/fdtdec.c | 3 + 73 files changed, 2881 insertions(+), 1570 deletions(-) delete mode 100644 arch/arm/cpu/armv7/tegra20/usb.c rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/usb.h (89%) create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi delete mode 100644 board/nvidia/cardhu/cardhu.c.mmc