From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Tue, 19 Apr 2016 14:58:40 -0600
Subject: [U-Boot] [PATCH 00/60] ARM: tegra: cleanup part 1
Message-ID: <1461099580-3866-1-git-send-email-swarren@wwwdotorg.org>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

From: Stephen Warren <swarren@nvidia.com>

This series cleans up Tegra code:
- Removes unused definitions.
- Unifies duplicate definitions and code.
- Moves Tegra headers from arch/arm/include to arch/arm/mach-tegra so
all Tegra files are located together. Headers for Tegra-specific APIs
(intended e.g. for public/driver use) are placed into <mach/>, whereas
headers intended only for use by code in arch/arm/mach-tegra are placed
into <soc/>.
- Hides as much internal Tegra information as possible, to reduce the
size of the "API" provided to Tegra boards. This will help refactoring
that "API" later; the next chip is quite different and various parts of
this API (e.g. clock, reset, GPIO, ...) will need alternative
implementations. This will hopefully be a bit easier after this series.
- Cleans up the set of functions the core Tegra "board" support calls and
which are implemented by Tegra board files.
- Replaces funcmux with pinmux functions so that pinmux is set up in as
much the same way across all Tegra SoCs as possible.
- Various other cleanup.
- Removes almost 3000 lines!

Future changes/series will likely/hopefully:
- Refactor C files in arch/arm/mach-tegra to allow Makefiles to easily
decide which parts to pull in for each chip, and avoid a mess of ifdefs
in the C files when adding support for the next chip.
- Convert Tegra to standard clock/reset APIs, since the next chipd will
use a different implementation, yet we need them to share the same API
so that drivers don't need conditional code.
- Add some new drivers for the next chip.

Stephen Warren (60):
  ARM: tegra: remove unused definitions in headers
  mmc: tegra: move pad init into MMC driver
  mmc: tegra: move header file to driver directory
  mmc: tegra: move public header to arch/arm/mach-tegra/include
  pwm: tegra: move header file to driver directory
  i2c: tegra: move header file to driver directory
  usb: tegra: move header file to driver directory
  video: tegra: move header file to driver directory
  ARM: tegra: correct 64-bit DT unit addresses
  ARM: tegra: sort DT /aliases entries
  ARM: tegra: add DT alias for GPIO controller
  gpio: tegra: remove duplicate define
  ARM: tegra: sort some board file include directives
  ARM: tegra: use DT bindings for GPIO naming
  gpio: tegra: header file split
  ARM: tegra: migrate TEGRA_GPIO to Kconfig
  ARM: tegra: move apb_misc.h
  ARM: tegra: move fuse.h
  ARM: tegra: move gpu.h
  ARM: tegra: move pmc.h
  ARM: tegra: move scu.h
  ARM: tegra: move warmboot.h
  ARM: tegra: move xusb-padctl.h to <mach/>
  ARM: tegra: unify+move {board,sys_proto}.h to <mach/>
  ARM: tegra: use consistently named include guards
  ARM: tegra: delete unused headers
  ARM: tegra: move emc.h
  ARM: tegra: move sdram_param.h
  ARM: tegra: move sysctr.h
  ARM: tegra: remove pmu.h
  ARM: tegra: move powergate.h to <mach/>
  ARM: tegra: add SoC-specific include directory
  ARM: tegra: fix bug in Tegra20 flow.h
  ARM: tegra: move flow.h
  nyan-big: remove direct MC register access
  ARM: tegra: move mc.h
  ARM: tegra: move SDIOCFG_DRV* to pinmux.h
  ARM: tegra: remove tegra_get_chip()
  ARM: tegra: remove get_num_cpus()
  ARM: tegra: remove gp_padctrl.h
  ARM: tegra: remove tegra_get_sku_info()
  ARM: tegra: move EMC code to tegra20/ directory
  ARM: tegra: move PLLX configuration into SoC directories
  ARM: tegra: remove tegra_get_chip_sku()
  ARM: tegra: move custom pinmux.h to <mach/>
  ARM: tegra: add pinmux APIs to replace funcmux
  ARM: tegra: provide API for SPL code to init UART
  ARM: tegra: lay groundwork for board hook cleanup
  ARM: tegra: convert boards to new hooks
  ARM: tegra: remove unused includes
  ARM: tegra: move SPL-specific GPIO device to spl.c
  ARM: tegra: convert pin_mux_*() to new hooks
  tegra: keyboard: move pinmux setup to board files
  video: tegra: move pinmux setup to board files
  i2c: tegra: move pinmux setup to board files
  ARM: tegra: remove funcmux API
  ARM: tegra: don't access Boot Info Table from board code
  ARM: tegra: clean up board include statements
  ARM: tegra: unify+move tegra.h to mach-tegra/
  ARM: tegra: move clock headers

 arch/arm/dts/tegra114.dtsi                         |   4 +
 arch/arm/dts/tegra124-nyan-big.dts                 |  10 +-
 arch/arm/dts/tegra124-nyan.dtsi                    |   4 +-
 arch/arm/dts/tegra20-colibri.dts                   |   2 +-
 arch/arm/dts/tegra20-harmony.dts                   |   4 +-
 arch/arm/dts/tegra20-medcom-wide.dts               |   2 +-
 arch/arm/dts/tegra20-paz00.dts                     |   2 +-
 arch/arm/dts/tegra20-plutux.dts                    |   2 +-
 arch/arm/dts/tegra20-seaboard.dts                  |   4 +-
 arch/arm/dts/tegra20-tec.dts                       |   2 +-
 arch/arm/dts/tegra20-trimslice.dts                 |   4 +-
 arch/arm/dts/tegra20-ventana.dts                   |   2 +-
 arch/arm/dts/tegra20-whistler.dts                  |   2 +-
 arch/arm/dts/tegra20.dtsi                          |   4 +
 arch/arm/dts/tegra210-e2220-1170.dts               |  16 +-
 arch/arm/dts/tegra210-p2371-0000.dts               |  16 +-
 arch/arm/dts/tegra210-p2371-2180.dts               |  20 +-
 arch/arm/dts/tegra210-p2571.dts                    |  48 ++--
 arch/arm/dts/tegra210.dtsi                         |  56 ++--
 arch/arm/dts/tegra30.dtsi                          |   4 +
 arch/arm/include/asm/arch-tegra/ap.h               |  69 -----
 arch/arm/include/asm/arch-tegra/board.h            |  34 ---
 arch/arm/include/asm/arch-tegra/funcmux.h          |  29 --
 arch/arm/include/asm/arch-tegra/gp_padctrl.h       |  26 --
 arch/arm/include/asm/arch-tegra/tegra.h            | 104 -------
 arch/arm/include/asm/arch-tegra/timer.h            |  15 -
 arch/arm/include/asm/arch-tegra/uart.h             |  31 ---
 arch/arm/include/asm/arch-tegra114/funcmux.h       |  21 --
 arch/arm/include/asm/arch-tegra114/gp_padctrl.h    |  73 -----
 arch/arm/include/asm/arch-tegra114/gpio.h          |  20 --
 arch/arm/include/asm/arch-tegra114/pmu.h           |  13 -
 arch/arm/include/asm/arch-tegra114/powergate.h     |   6 -
 arch/arm/include/asm/arch-tegra114/tegra.h         |  25 --
 arch/arm/include/asm/arch-tegra124/ahb.h           |  91 -------
 arch/arm/include/asm/arch-tegra124/display.h       |  58 ----
 arch/arm/include/asm/arch-tegra124/funcmux.h       |  23 --
 arch/arm/include/asm/arch-tegra124/gp_padctrl.h    |  74 -----
 arch/arm/include/asm/arch-tegra124/gpio.h          | 303 ---------------------
 arch/arm/include/asm/arch-tegra124/pmu.h           |  14 -
 arch/arm/include/asm/arch-tegra124/powergate.h     |   6 -
 arch/arm/include/asm/arch-tegra124/pwm.h           |  14 -
 arch/arm/include/asm/arch-tegra124/sysctr.h        |  26 --
 arch/arm/include/asm/arch-tegra124/tegra.h         |  30 --
 arch/arm/include/asm/arch-tegra20/display.h        |  29 --
 arch/arm/include/asm/arch-tegra20/funcmux.h        |  52 ----
 arch/arm/include/asm/arch-tegra20/gpio.h           | 263 ------------------
 arch/arm/include/asm/arch-tegra20/pmu.h            |  14 -
 arch/arm/include/asm/arch-tegra20/powergate.h      |   6 -
 arch/arm/include/asm/arch-tegra20/pwm.h            |  14 -
 arch/arm/include/asm/arch-tegra20/tegra.h          |  22 --
 arch/arm/include/asm/arch-tegra210/ahb.h           |  91 -------
 arch/arm/include/asm/arch-tegra210/funcmux.h       |  23 --
 arch/arm/include/asm/arch-tegra210/gp_padctrl.h    |  74 -----
 arch/arm/include/asm/arch-tegra210/gpio.h          | 303 ---------------------
 arch/arm/include/asm/arch-tegra210/pmu.h           |  14 -
 arch/arm/include/asm/arch-tegra210/powergate.h     |  12 -
 arch/arm/include/asm/arch-tegra210/sysctr.h        |  26 --
 arch/arm/include/asm/arch-tegra210/tegra.h         |  32 ---
 arch/arm/include/asm/arch-tegra30/funcmux.h        |  21 --
 arch/arm/include/asm/arch-tegra30/gp_padctrl.h     |  55 ----
 arch/arm/include/asm/arch-tegra30/gpio.h           | 294 --------------------
 arch/arm/include/asm/arch-tegra30/pmu.h            |  13 -
 arch/arm/include/asm/arch-tegra30/powergate.h      |   6 -
 arch/arm/include/asm/arch-tegra30/tegra.h          |  21 --
 arch/arm/include/asm/gpio.h                        |   2 +-
 arch/arm/mach-tegra/Kconfig                        |   5 +
 arch/arm/mach-tegra/Makefile                       |   5 +-
 arch/arm/mach-tegra/ap.c                           | 117 +-------
 .../asm/arch-tegra => mach-tegra}/apb_misc.h       |   5 +-
 arch/arm/mach-tegra/board.c                        | 138 +---------
 arch/arm/mach-tegra/board2.c                       | 155 +++--------
 arch/arm/mach-tegra/cache.c                        |  24 +-
 arch/arm/mach-tegra/clock.c                        |  12 +-
 arch/arm/mach-tegra/cmd_enterrcm.c                 |   6 +-
 arch/arm/mach-tegra/config.mk                      |  13 +
 arch/arm/mach-tegra/cpu.c                          | 185 ++-----------
 arch/arm/mach-tegra/cpu.h                          |  37 +--
 arch/arm/mach-tegra/emc.c                          |  38 ---
 arch/arm/mach-tegra/gpu.c                          |  11 +-
 .../{include/asm/arch-tegra => mach-tegra}/gpu.h   |   8 +-
 arch/arm/mach-tegra/i2c_early.c                    |  29 ++
 .../include/mach/board.h}                          |  21 +-
 arch/arm/mach-tegra/include/mach/board_init.h      |  15 +
 .../include/mach}/clk_rst.h                        |  89 +-----
 .../include/mach/clock_common.h}                   |  10 +-
 .../include/mach/pinmux_common.h}                  |  11 +-
 .../include/mach}/powergate.h                      |  12 +-
 arch/arm/mach-tegra/include/mach/spl_uart.h        |  20 ++
 .../include/mach/tegra_gpio.h}                     |  18 +-
 arch/arm/mach-tegra/include/mach/tegra_i2c.h       |  25 ++
 .../mmc.h => mach-tegra/include/mach/tegra_mmc.h}  |   7 +-
 .../include/mach}/xusb-padctl.h                    |   4 +-
 arch/arm/mach-tegra/lowlevel_init.S                |   3 +-
 arch/arm/mach-tegra/pinmux-common.c                |   5 +-
 arch/arm/mach-tegra/pllx.h                         |  20 ++
 .../{include/asm/arch-tegra => mach-tegra}/pmc.h   |  25 +-
 arch/arm/mach-tegra/powergate.c                    |   8 +-
 .../{include/asm/arch-tegra => mach-tegra}/scu.h   |   8 +-
 arch/arm/mach-tegra/spl.c                          |  26 +-
 arch/arm/mach-tegra/spl_uart.c                     |  40 +++
 .../asm/arch-tegra114 => mach-tegra}/sysctr.h      |   8 +-
 arch/arm/mach-tegra/tegra.h                        |  76 ++++++
 arch/arm/mach-tegra/tegra114/Makefile              |   5 +-
 arch/arm/mach-tegra/tegra114/clock.c               |  11 +-
 arch/arm/mach-tegra/tegra114/cpu.c                 |  14 +-
 arch/arm/mach-tegra/tegra114/funcmux.c             |  57 ----
 .../tegra114/include/mach}/clock-tables.h          |   8 +-
 .../tegra114/include/mach}/clock.h                 |  10 +-
 .../tegra114/include/mach}/pinmux.h                |  18 +-
 .../tegra114/include/soc}/flow.h                   |   8 +-
 .../tegra114/include/soc}/mc.h                     |   2 +-
 arch/arm/mach-tegra/tegra114/pinmux.c              |  22 +-
 arch/arm/mach-tegra/tegra114/pllx.c                |  33 +++
 arch/arm/mach-tegra/tegra124/Makefile              |   4 +-
 arch/arm/mach-tegra/tegra124/clock.c               |  11 +-
 arch/arm/mach-tegra/tegra124/cpu.c                 |  16 +-
 arch/arm/mach-tegra/tegra124/funcmux.c             |  71 -----
 .../tegra124/include/mach}/clock-tables.h          |   8 +-
 .../tegra124/include/mach}/clock.h                 |  10 +-
 .../tegra124/include/mach}/pinmux.h                |  19 +-
 .../tegra124/include/soc}/flow.h                   |  14 +-
 .../tegra124/include/soc}/mc.h                     |   3 +-
 arch/arm/mach-tegra/tegra124/pinmux.c              |  34 ++-
 arch/arm/mach-tegra/tegra124/pllx.c                |  33 +++
 arch/arm/mach-tegra/tegra124/psci.c                |  10 +-
 arch/arm/mach-tegra/tegra20/Makefile               |   8 +-
 arch/arm/mach-tegra/tegra20/clock.c                |   9 +-
 arch/arm/mach-tegra/tegra20/cpu.c                  |   6 +-
 arch/arm/mach-tegra/tegra20/crypto.h               |   6 +-
 arch/arm/mach-tegra/tegra20/display.c              |  16 --
 arch/arm/mach-tegra/tegra20/emc.c                  |  40 ++-
 arch/arm/mach-tegra/{ => tegra20}/emc.h            |   5 +-
 .../emc.h => mach-tegra/tegra20/emc_priv.h}        |  17 +-
 arch/arm/mach-tegra/tegra20/funcmux.c              | 298 --------------------
 .../asm/arch-tegra => mach-tegra/tegra20}/fuse.h   |   8 +-
 .../tegra20}/gp_padctrl.h                          |  13 +-
 .../tegra20/include/mach}/clock-tables.h           |   8 +-
 .../tegra20/include/mach}/clock.h                  |   5 +-
 .../tegra20/include/mach}/pinmux.h                 |  32 ++-
 .../tegra20/include/soc}/flow.h                    |   7 +-
 .../tegra20/include/soc}/mc.h                      |   2 +-
 arch/arm/mach-tegra/tegra20/pinmux.c               | 211 +++++++++++++-
 arch/arm/mach-tegra/tegra20/pllx.c                 |  56 ++++
 arch/arm/mach-tegra/tegra20/pmu.c                  |  23 +-
 .../tegra20}/sdram_param.h                         |   6 +-
 arch/arm/mach-tegra/tegra20/sku.c                  |  44 +++
 arch/arm/mach-tegra/tegra20/sku.h                  |  12 +
 arch/arm/mach-tegra/tegra20/warmboot.c             |  50 ++--
 .../arch-tegra => mach-tegra/tegra20}/warmboot.h   |   7 +-
 arch/arm/mach-tegra/tegra20/warmboot_avp.c         |  21 +-
 arch/arm/mach-tegra/tegra20/warmboot_avp.h         |  10 +-
 arch/arm/mach-tegra/tegra210/Makefile              |   4 +-
 arch/arm/mach-tegra/tegra210/clock.c               |  11 +-
 arch/arm/mach-tegra/tegra210/funcmux.c             |  40 ---
 .../tegra210/include/mach}/clock-tables.h          |   8 +-
 .../tegra210/include/mach}/clock.h                 |  11 +-
 .../tegra210/include/mach}/pinmux.h                |  16 +-
 .../tegra210/include/soc}/flow.h                   |  22 +-
 .../tegra210/include/soc}/mc.h                     |   5 +-
 arch/arm/mach-tegra/tegra210/pinmux.c              |   4 +-
 arch/arm/mach-tegra/tegra210/pllx.c                |  33 +++
 arch/arm/mach-tegra/tegra210/xusb-padctl.c         |   9 +-
 arch/arm/mach-tegra/tegra30/Makefile               |   5 +-
 arch/arm/mach-tegra/tegra30/clock.c                |   9 +-
 arch/arm/mach-tegra/tegra30/cpu.c                  |  29 +-
 arch/arm/mach-tegra/tegra30/funcmux.c              |  51 ----
 .../tegra30/include/mach}/clock-tables.h           |   8 +-
 .../tegra30/include/mach}/clock.h                  |  10 +-
 .../tegra30/include/mach}/pinmux.h                 |  18 +-
 .../tegra30/include/soc}/flow.h                    |   8 +-
 .../tegra30/include/soc}/mc.h                      |   2 +-
 arch/arm/mach-tegra/tegra30/pinmux.c               |  16 +-
 arch/arm/mach-tegra/tegra30/pllx.c                 |  34 +++
 arch/arm/mach-tegra/xusb-padctl-common.c           |   6 +-
 arch/arm/mach-tegra/xusb-padctl-common.h           |   9 +-
 arch/arm/mach-tegra/xusb-padctl-dummy.c            |   4 +-
 board/avionic-design/common/tamonten-ng.c          |  53 ++--
 board/avionic-design/common/tamonten.c             |  50 ++--
 board/compal/paz00/paz00.c                         |  41 +--
 board/compulab/trimslice/trimslice.c               |  38 +--
 board/nvidia/cardhu/cardhu.c                       |  47 ++--
 board/nvidia/dalmore/dalmore.c                     |  42 ++-
 board/nvidia/e2220-1170/e2220-1170.c               |  42 ++-
 board/nvidia/e2220-1170/pinmux-config-e2220-1170.h | 122 ++++-----
 board/nvidia/harmony/harmony.c                     |  54 ++--
 board/nvidia/jetson-tk1/jetson-tk1.c               |  29 +-
 board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 106 +++----
 board/nvidia/nyan-big/nyan-big.c                   |  48 ++--
 board/nvidia/nyan-big/pinmux-config-nyan-big.h     |  98 +++----
 board/nvidia/p2371-0000/p2371-0000.c               |  42 ++-
 board/nvidia/p2371-0000/pinmux-config-p2371-0000.h | 104 +++----
 board/nvidia/p2371-2180/p2371-2180.c               |  42 ++-
 board/nvidia/p2371-2180/pinmux-config-p2371-2180.h | 126 ++++-----
 board/nvidia/p2571/p2571.c                         |  52 ++--
 board/nvidia/p2571/pinmux-config-p2571.h           |  54 ++--
 board/nvidia/seaboard/seaboard.c                   |  55 ++--
 board/nvidia/venice2/as3722_init.c                 |  21 +-
 board/nvidia/venice2/pinmux-config-venice2.h       | 120 ++++----
 board/nvidia/venice2/venice2.c                     |  22 +-
 board/nvidia/whistler/whistler.c                   |  78 +++---
 board/toradex/apalis_t30/apalis_t30.c              |  32 +--
 board/toradex/colibri_t20/colibri_t20.c            | 144 ++++------
 board/toradex/colibri_t30/colibri_t30.c            |  44 ++-
 drivers/gpio/Kconfig                               |   8 +
 drivers/gpio/tegra_gpio.c                          |  11 +-
 drivers/gpio/tegra_gpio_priv.h                     |  76 ++++++
 drivers/i2c/tegra_i2c.c                            |  34 +--
 .../tegra_i2c.h => drivers/i2c/tegra_i2c_priv.h    |  24 +-
 drivers/input/tegra-kbc.c                          |  10 +-
 drivers/mmc/tegra_mmc.c                            |  43 ++-
 .../tegra_mmc.h => drivers/mmc/tegra_mmc_priv.h    |  13 +-
 drivers/mtd/nand/tegra_nand.c                      |   7 +-
 drivers/pci/pci_tegra.c                            |   9 +-
 drivers/pwm/tegra_pwm.c                            |   5 +-
 .../pwm.h => drivers/pwm/tegra_pwm_priv.h          |   9 +-
 drivers/spi/tegra114_spi.c                         |   6 +-
 drivers/spi/tegra20_sflash.c                       |   8 +-
 drivers/spi/tegra20_slink.c                        |   6 +-
 drivers/spi/tegra210_qspi.c                        |   6 +-
 .../usb.h => drivers/usb/host/ehci-tegra-priv.h    |  11 +-
 drivers/usb/host/ehci-tegra.c                      |   9 +-
 drivers/video/tegra.c                              |  14 +-
 drivers/video/tegra124/display.c                   |   6 +-
 drivers/video/tegra124/dp.c                        |   4 +-
 drivers/video/tegra124/sor.c                       |   6 +-
 .../arch-tegra/dc.h => drivers/video/tegra_dc.h    |  30 +-
 include/configs/apalis_t30.h                       |   7 +-
 include/configs/cardhu.h                           |   6 +-
 include/configs/colibri_t20.h                      |   6 +-
 include/configs/colibri_t30.h                      |   7 +-
 include/configs/dalmore.h                          |   6 +-
 include/configs/e2220-1170.h                       |   5 +-
 include/configs/harmony.h                          |  12 +-
 include/configs/jetson-tk1.h                       |   6 +-
 include/configs/nyan-big.h                         |   6 +-
 include/configs/p2371-0000.h                       |   5 +-
 include/configs/p2371-2180.h                       |   5 +-
 include/configs/p2571.h                            |   6 +-
 include/configs/paz00.h                            |   6 +-
 include/configs/seaboard.h                         |   8 +-
 include/configs/tec-ng.h                           |   5 +-
 include/configs/tec.h                              |   6 +-
 include/configs/tegra-common.h                     |  25 +-
 include/configs/trimslice.h                        |   7 +-
 include/configs/venice2.h                          |   6 +-
 include/configs/whistler.h                         |   7 +-
 246 files changed, 2460 insertions(+), 5400 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-tegra/ap.h
 delete mode 100644 arch/arm/include/asm/arch-tegra/board.h
 delete mode 100644 arch/arm/include/asm/arch-tegra/funcmux.h
 delete mode 100644 arch/arm/include/asm/arch-tegra/gp_padctrl.h
 delete mode 100644 arch/arm/include/asm/arch-tegra/tegra.h
 delete mode 100644 arch/arm/include/asm/arch-tegra/timer.h
 delete mode 100644 arch/arm/include/asm/arch-tegra/uart.h
 delete mode 100644 arch/arm/include/asm/arch-tegra114/funcmux.h
 delete mode 100644 arch/arm/include/asm/arch-tegra114/gp_padctrl.h
 delete mode 100644 arch/arm/include/asm/arch-tegra114/gpio.h
 delete mode 100644 arch/arm/include/asm/arch-tegra114/pmu.h
 delete mode 100644 arch/arm/include/asm/arch-tegra114/powergate.h
 delete mode 100644 arch/arm/include/asm/arch-tegra114/tegra.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/ahb.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/display.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/funcmux.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/gp_padctrl.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/gpio.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/pmu.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/powergate.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/pwm.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/sysctr.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/tegra.h
 delete mode 100644 arch/arm/include/asm/arch-tegra20/display.h
 delete mode 100644 arch/arm/include/asm/arch-tegra20/funcmux.h
 delete mode 100644 arch/arm/include/asm/arch-tegra20/gpio.h
 delete mode 100644 arch/arm/include/asm/arch-tegra20/pmu.h
 delete mode 100644 arch/arm/include/asm/arch-tegra20/powergate.h
 delete mode 100644 arch/arm/include/asm/arch-tegra20/pwm.h
 delete mode 100644 arch/arm/include/asm/arch-tegra20/tegra.h
 delete mode 100644 arch/arm/include/asm/arch-tegra210/ahb.h
 delete mode 100644 arch/arm/include/asm/arch-tegra210/funcmux.h
 delete mode 100644 arch/arm/include/asm/arch-tegra210/gp_padctrl.h
 delete mode 100644 arch/arm/include/asm/arch-tegra210/gpio.h
 delete mode 100644 arch/arm/include/asm/arch-tegra210/pmu.h
 delete mode 100644 arch/arm/include/asm/arch-tegra210/powergate.h
 delete mode 100644 arch/arm/include/asm/arch-tegra210/sysctr.h
 delete mode 100644 arch/arm/include/asm/arch-tegra210/tegra.h
 delete mode 100644 arch/arm/include/asm/arch-tegra30/funcmux.h
 delete mode 100644 arch/arm/include/asm/arch-tegra30/gp_padctrl.h
 delete mode 100644 arch/arm/include/asm/arch-tegra30/gpio.h
 delete mode 100644 arch/arm/include/asm/arch-tegra30/pmu.h
 delete mode 100644 arch/arm/include/asm/arch-tegra30/powergate.h
 delete mode 100644 arch/arm/include/asm/arch-tegra30/tegra.h
 rename arch/arm/{include/asm/arch-tegra => mach-tegra}/apb_misc.h (79%)
 create mode 100644 arch/arm/mach-tegra/config.mk
 delete mode 100644 arch/arm/mach-tegra/emc.c
 rename arch/arm/{include/asm/arch-tegra => mach-tegra}/gpu.h (80%)
 create mode 100644 arch/arm/mach-tegra/i2c_early.c
 rename arch/arm/{include/asm/arch-tegra/sys_proto.h => mach-tegra/include/mach/board.h} (63%)
 create mode 100644 arch/arm/mach-tegra/include/mach/board_init.h
 rename arch/arm/{include/asm/arch-tegra => mach-tegra/include/mach}/clk_rst.h (85%)
 rename arch/arm/{include/asm/arch-tegra/clock.h => mach-tegra/include/mach/clock_common.h} (98%)
 rename arch/arm/{include/asm/arch-tegra/pinmux.h => mach-tegra/include/mach/pinmux_common.h} (97%)
 rename arch/arm/{include/asm/arch-tegra => mach-tegra/include/mach}/powergate.h (81%)
 create mode 100644 arch/arm/mach-tegra/include/mach/spl_uart.h
 rename arch/arm/{include/asm/arch-tegra/gpio.h => mach-tegra/include/mach/tegra_gpio.h} (52%)
 create mode 100644 arch/arm/mach-tegra/include/mach/tegra_i2c.h
 rename arch/arm/{include/asm/arch-tegra/mmc.h => mach-tegra/include/mach/tegra_mmc.h} (50%)
 rename arch/arm/{include/asm/arch-tegra => mach-tegra/include/mach}/xusb-padctl.h (92%)
 create mode 100644 arch/arm/mach-tegra/pllx.h
 rename arch/arm/{include/asm/arch-tegra => mach-tegra}/pmc.h (96%)
 rename arch/arm/{include/asm/arch-tegra => mach-tegra}/scu.h (91%)
 create mode 100644 arch/arm/mach-tegra/spl_uart.c
 rename arch/arm/{include/asm/arch-tegra114 => mach-tegra}/sysctr.h (81%)
 create mode 100644 arch/arm/mach-tegra/tegra.h
 delete mode 100644 arch/arm/mach-tegra/tegra114/funcmux.c
 rename arch/arm/{include/asm/arch-tegra114 => mach-tegra/tegra114/include/mach}/clock-tables.h (97%)
 rename arch/arm/{include/asm/arch-tegra114 => mach-tegra/tegra114/include/mach}/clock.h (61%)
 rename arch/arm/{include/asm/arch-tegra114 => mach-tegra/tegra114/include/mach}/pinmux.h (95%)
 rename arch/arm/{include/asm/arch-tegra30 => mach-tegra/tegra114/include/soc}/flow.h (67%)
 rename arch/arm/{include/asm/arch-tegra114 => mach-tegra/tegra114/include/soc}/mc.h (97%)
 create mode 100644 arch/arm/mach-tegra/tegra114/pllx.c
 delete mode 100644 arch/arm/mach-tegra/tegra124/funcmux.c
 rename arch/arm/{include/asm/arch-tegra124 => mach-tegra/tegra124/include/mach}/clock-tables.h (98%)
 rename arch/arm/{include/asm/arch-tegra124 => mach-tegra/tegra124/include/mach}/clock.h (85%)
 rename arch/arm/{include/asm/arch-tegra124 => mach-tegra/tegra124/include/mach}/pinmux.h (95%)
 rename arch/arm/{include/asm/arch-tegra124 => mach-tegra/tegra124/include/soc}/flow.h (82%)
 rename arch/arm/{include/asm/arch-tegra124 => mach-tegra/tegra124/include/soc}/mc.h (95%)
 create mode 100644 arch/arm/mach-tegra/tegra124/pllx.c
 delete mode 100644 arch/arm/mach-tegra/tegra20/display.c
 rename arch/arm/mach-tegra/{ => tegra20}/emc.h (62%)
 rename arch/arm/{include/asm/arch-tegra20/emc.h => mach-tegra/tegra20/emc_priv.h} (83%)
 delete mode 100644 arch/arm/mach-tegra/tegra20/funcmux.c
 rename arch/arm/{include/asm/arch-tegra => mach-tegra/tegra20}/fuse.h (83%)
 rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20}/gp_padctrl.h (88%)
 rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20/include/mach}/clock-tables.h (95%)
 rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20/include/mach}/clock.h (77%)
 rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20/include/mach}/pinmux.h (81%)
 rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20/include/soc}/flow.h (71%)
 rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20/include/soc}/mc.h (97%)
 create mode 100644 arch/arm/mach-tegra/tegra20/pllx.c
 rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20}/sdram_param.h (96%)
 create mode 100644 arch/arm/mach-tegra/tegra20/sku.c
 create mode 100644 arch/arm/mach-tegra/tegra20/sku.h
 rename arch/arm/{include/asm/arch-tegra => mach-tegra/tegra20}/warmboot.h (95%)
 delete mode 100644 arch/arm/mach-tegra/tegra210/funcmux.c
 rename arch/arm/{include/asm/arch-tegra210 => mach-tegra/tegra210/include/mach}/clock-tables.h (98%)
 rename arch/arm/{include/asm/arch-tegra210 => mach-tegra/tegra210/include/mach}/clock.h (70%)
 rename arch/arm/{include/asm/arch-tegra210 => mach-tegra/tegra210/include/mach}/pinmux.h (96%)
 rename arch/arm/{include/asm/arch-tegra210 => mach-tegra/tegra210/include/soc}/flow.h (62%)
 rename arch/arm/{include/asm/arch-tegra210 => mach-tegra/tegra210/include/soc}/mc.h (93%)
 create mode 100644 arch/arm/mach-tegra/tegra210/pllx.c
 delete mode 100644 arch/arm/mach-tegra/tegra30/funcmux.c
 rename arch/arm/{include/asm/arch-tegra30 => mach-tegra/tegra30/include/mach}/clock-tables.h (97%)
 rename arch/arm/{include/asm/arch-tegra30 => mach-tegra/tegra30/include/mach}/clock.h (58%)
 rename arch/arm/{include/asm/arch-tegra30 => mach-tegra/tegra30/include/mach}/pinmux.h (96%)
 rename arch/arm/{include/asm/arch-tegra114 => mach-tegra/tegra30/include/soc}/flow.h (67%)
 rename arch/arm/{include/asm/arch-tegra30 => mach-tegra/tegra30/include/soc}/mc.h (97%)
 create mode 100644 arch/arm/mach-tegra/tegra30/pllx.c
 create mode 100644 drivers/gpio/tegra_gpio_priv.h
 rename arch/arm/include/asm/arch-tegra/tegra_i2c.h => drivers/i2c/tegra_i2c_priv.h (87%)
 rename arch/arm/include/asm/arch-tegra/tegra_mmc.h => drivers/mmc/tegra_mmc_priv.h (96%)
 rename arch/arm/include/asm/arch-tegra/pwm.h => drivers/pwm/tegra_pwm_priv.h (81%)
 rename arch/arm/include/asm/arch-tegra/usb.h => drivers/usb/host/ehci-tegra-priv.h (97%)
 rename arch/arm/include/asm/arch-tegra/dc.h => drivers/video/tegra_dc.h (94%)

-- 
2.8.1