[GIT PULL 01/10] ARM: tegra: fixes for 3.7

21 messages, 2 authors, 2012-09-21 · open the first message on its own page

[GIT PULL 01/10] ARM: tegra: fixes for 3.7

From: Stephen Warren <hidden>
Date: 2012-09-14 20:06:12

This branch contains a number of minor bug-fixes for Tegra.

This branch is based on v3.6-rc4.

----------------------------------------------------------------

The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:

  Linux 3.6-rc4

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-fixes

for you to fetch changes up to 4b1082ca8cd3bec99fc0ce020a8ba1fa3aa8e22a:

  ARM: enable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA

----------------------------------------------------------------

Peter De Schrijver (2):
      ARM: tegra: fix return value for debugfs init
      ARM: tegra: fix debugfs entry for Tegra30

Stephen Warren (1):
      ARM: enable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA

 arch/arm/Kconfig                |    2 +-
 arch/arm/mach-tegra/powergate.c |   43 ++++++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 8 deletions(-)

[GIT PULL 02/10] ARM: tegra: first round of cleanup

From: Stephen Warren <hidden>
Date: 2012-09-14 20:06:13

This branch contains a few early cleanups; consistent use of IO_ADDRESS,
always selecting USE_OF since we're converting to device-tree-only this
merge window, and removing includes of some header files as part of
working towards single zImage.

This branch is based on v3.6-rc4.

----------------------------------------------------------------

The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:

  Linux 3.6-rc4

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-cleanup

for you to fetch changes up to a5b64ce64d6bdceecd45a07893affbf88d7bb7d2:

  mmc: tegra: remove useless include of <mach/*.h>

----------------------------------------------------------------

Laxman Dewangan (1):
      ARM: tegra: use IO_ADDRESS for getting virtual address

Stephen Warren (3):
      ARM: tegra: remove duplicate select USE_OF
      gpio: tegra: remove useless includes of <mach/*.h>
      mmc: tegra: remove useless include of <mach/*.h>

 arch/arm/mach-tegra/Kconfig    |    1 -
 arch/arm/mach-tegra/apbio.c    |    4 ++--
 arch/arm/mach-tegra/fuse.c     |    4 ++--
 drivers/gpio/gpio-tegra.c      |    3 ---
 drivers/mmc/host/sdhci-tegra.c |    1 -
 5 files changed, 4 insertions(+), 9 deletions(-)

[GIT PULL 03/10] ARM: tegra: remove board files

From: Stephen Warren <hidden>
Date: 2012-09-14 20:06:14

This branch removes all remaining board files for Tegra; booting is
now through device tree only.

Related, the Harmony DT is augmented with regulators, since this allows
removal of board-harmony-power.c; no other boards had regulator support.
This change depends on an enhancement to the TPS6586x regulator driver,
hence the dependency mentioned below.

This branch is based on v3.6-rc4, followed by a merge of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git tps6589x-dt

This branch is a dependency the cleanup2 branch.

----------------------------------------------------------------

The following changes since commit 1ab710fe61b91a2448de9843c746555f9725b9cc:

  Merge commit 'tps6589x-dt' into for-3.7/board-removal

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-board-removal

for you to fetch changes up to be972c3272c354b323afcb7e9552a9b04e675a8b:

  ARM: dt: tegra: harmony: configure power off

----------------------------------------------------------------

Laxman Dewangan (1):
      ARM: dt: tegra: harmony: add regulators

Stephen Warren (4):
      ARM: tegra: remove board (but not DT) support for TrimSlice
      ARM: tegra: remove board (but not DT) support for Paz00
      ARM: tegra: remove board (but not DT) support for Harmony
      ARM: dt: tegra: harmony: configure power off

 arch/arm/boot/dts/tegra20-harmony.dts        |  220 +++++++++++++++++++++
 arch/arm/mach-tegra/Kconfig                  |   19 --
 arch/arm/mach-tegra/Makefile                 |   11 +-
 arch/arm/mach-tegra/board-dt-tegra20.c       |   23 +--
 arch/arm/mach-tegra/board-harmony-pcie.c     |   49 +++--
 arch/arm/mach-tegra/board-harmony-pinmux.c   |  156 ---------------
 arch/arm/mach-tegra/board-harmony-power.c    |  156 ---------------
 arch/arm/mach-tegra/board-harmony.c          |  197 ------------------
 arch/arm/mach-tegra/board-harmony.h          |   41 ----
 arch/arm/mach-tegra/board-paz00-pinmux.c     |  156 ---------------
 arch/arm/mach-tegra/board-paz00.c            |  192 ------------------
 arch/arm/mach-tegra/board-paz00.h            |   17 +--
 arch/arm/mach-tegra/board-trimslice-pinmux.c |  155 ---------------
 arch/arm/mach-tegra/board-trimslice.c        |  183 -----------------
 arch/arm/mach-tegra/board-trimslice.h        |   30 ---
 15 files changed, 257 insertions(+), 1348 deletions(-)
 delete mode 100644 arch/arm/mach-tegra/board-harmony-pinmux.c
 delete mode 100644 arch/arm/mach-tegra/board-harmony-power.c
 delete mode 100644 arch/arm/mach-tegra/board-harmony.c
 delete mode 100644 arch/arm/mach-tegra/board-harmony.h
 delete mode 100644 arch/arm/mach-tegra/board-paz00-pinmux.c
 delete mode 100644 arch/arm/mach-tegra/board-trimslice-pinmux.c
 delete mode 100644 arch/arm/mach-tegra/board-trimslice.c
 delete mode 100644 arch/arm/mach-tegra/board-trimslice.h

[GIT PULL 04/10] ARM: tegra: switch to the common clock framework

From: Stephen Warren <hidden>
Date: 2012-09-14 20:06:15

This branch contains a few bug-fixes, followed by a conversion of Tegra's
clock driver to the common clock framework, followed by various bug fixes
found after the conversion.

This branch depends on v3.6-rc4.

This branch is a dependency for a few later pull requests.

----------------------------------------------------------------

The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:

  Linux 3.6-rc4

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-common-clk

for you to fetch changes up to b4350f40f73b75efdceae3d9e04266979acabd8c:

  ARM: Tegra: Add smp_twd clock for Tegra20

----------------------------------------------------------------

Joseph Lo (2):
      ARM: tegra: clocks: separate tegra_clk_32k_ops from Tegra20 and Tegra30
      ARM: tegra30: clocks: fix the wrong tegra_audio_sync_clk_ops name

Prashant Gaikwad (8):
      ARM: tegra30: Separate out clk ops and clk data
      ARM: tegra20: Separate out clk ops and clk data
      ARM: tegra: Rename tegra20 clock file
      ARM: tegra: Add clk_tegra structure and helper functions
      ARM: tegra: Port tegra to generic clock framework
      ARM: tegra: Remove duplicate code
      ARM: tegra: Fix data type for io address
      ARM: Tegra: Add smp_twd clock for Tegra20

Stephen Warren (5):
      ARM: tegra: turn on UART A clock at boot
      ARM: tegra: fix U16 divider range check
      ARM: tegra: remove tegra_timer from tegra_list_clks
      ARM: tegra: fix overflow in tegra20_pll_clk_round_rate()
      ARM: tegra: cpu-tegra: explicitly manage re-parenting

 arch/arm/Kconfig                          |    1 +
 arch/arm/mach-tegra/Makefile              |    4 +-
 arch/arm/mach-tegra/board-dt-tegra20.c    |    1 +
 arch/arm/mach-tegra/clock.c               |  570 +-----
 arch/arm/mach-tegra/clock.h               |   40 +-
 arch/arm/mach-tegra/common.c              |    1 -
 arch/arm/mach-tegra/cpu-tegra.c           |   48 +-
 arch/arm/mach-tegra/include/mach/clk.h    |    3 +
 arch/arm/mach-tegra/tegra20_clocks.c      | 1555 +++++++++++++++
 arch/arm/mach-tegra/tegra20_clocks.h      |   42 +
 arch/arm/mach-tegra/tegra20_clocks_data.c | 1142 +++++++++++
 arch/arm/mach-tegra/tegra2_clocks.c       | 2484 ------------------------
 arch/arm/mach-tegra/tegra30_clocks.c      | 2475 ++++++++----------------
 arch/arm/mach-tegra/tegra30_clocks.h      |   53 +
 arch/arm/mach-tegra/tegra30_clocks_data.c | 1369 +++++++++++++
 15 files changed, 5055 insertions(+), 4733 deletions(-)
 create mode 100644 arch/arm/mach-tegra/tegra20_clocks.c
 create mode 100644 arch/arm/mach-tegra/tegra20_clocks.h
 create mode 100644 arch/arm/mach-tegra/tegra20_clocks_data.c
 delete mode 100644 arch/arm/mach-tegra/tegra2_clocks.c
 create mode 100644 arch/arm/mach-tegra/tegra30_clocks.h
 create mode 100644 arch/arm/mach-tegra/tegra30_clocks_data.c

[GIT PULL 05/10] ARM: tegra: i2c driver enhancements mostly related to clocking

From: Stephen Warren <hidden>
Date: 2012-09-14 20:06:16

This branch contains a number of fixes and cleanups to the Tegra I2C
driver related to clocks. These are based on the common clock conversion
in order to avoid duplicating the clock driver changes before and after
the conversion. Finally, a bug-fix related to I2C_M_NOSTART is included.

This branch is based on previous pull request tegra-for-3.7-common-clk.

----------------------------------------------------------------

The following changes since commit b4350f40f73b75efdceae3d9e04266979acabd8c:

  ARM: Tegra: Add smp_twd clock for Tegra20

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-drivers-i2c

for you to fetch changes up to fd301cc4e5ba839050be135a178031bcd0d363a5:

  i2c: tegra: dynamically control fast clk

----------------------------------------------------------------

Laxman Dewangan (6):
      ARM: tegra: clock: add i2c fast clock entry in clock table
      i2c: tegra: pass proper name for getting clock
      ARM: tegra: clock: add connection name in i2c clock entry
      ARM: tegra: clock: remove unused clock entry for i2c
      i2c: tegra: I2_M_NOSTART functionality not supported in Tegra20
      i2c: tegra: dynamically control fast clk

 arch/arm/mach-tegra/tegra20_clocks_data.c |   20 ++--
 arch/arm/mach-tegra/tegra30_clocks_data.c |   15 ++-
 drivers/i2c/busses/i2c-tegra.c            |  130 +++++++++++++++++-------
 3 files changed, 110 insertions(+), 55 deletions(-)

[GIT PULL 06/10] ARM: tegra: implement CPU hotplug

From: Stephen Warren <hidden>
Date: 2012-09-14 20:06:17

This branch implements CPU hot-plugging support for both Tegra20 and
Tegra30. Portions of the implementation are contained in the clock
driver, hence this branch is based on the common clock conversion in
order to avoid duplicating work.

This branch is based on previous pull request tegra-for-3.7-common-clk.

----------------------------------------------------------------

The following changes since commit b4350f40f73b75efdceae3d9e04266979acabd8c:

  ARM: Tegra: Add smp_twd clock for Tegra20

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-cpu-hotplug

for you to fetch changes up to 453689e407f2b7c0a72a2e6fb2ef84c20475773b:

  ARM: tegra20: add CPU hotplug support

----------------------------------------------------------------

Joseph Lo (5):
      ARM: tegra: introduce tegra_cpu_car_ops structures
      ARM: tegra: replace the CPU CAR access code by tegra_cpu_car_ops
      ARM: tegra: clean up the common assembly macros into sleep.h
      ARM: tegra30: add CPU hotplug support
      ARM: tegra20: add CPU hotplug support

 arch/arm/mach-tegra/Makefile              |    2 +
 arch/arm/mach-tegra/clock.c               |    4 +
 arch/arm/mach-tegra/common.c              |    3 +
 arch/arm/mach-tegra/headsmp.S             |    6 +-
 arch/arm/mach-tegra/hotplug.c             |  118 +++++++-----------------
 arch/arm/mach-tegra/platsmp.c             |   29 +-----
 arch/arm/mach-tegra/sleep-t20.S           |   82 ++++++++++++++++
 arch/arm/mach-tegra/sleep-t30.S           |  107 +++++++++++++++++++++
 arch/arm/mach-tegra/sleep.S               |   33 +-------
 arch/arm/mach-tegra/sleep.h               |   85 +++++++++++++++++
 arch/arm/mach-tegra/tegra20_clocks.c      |   70 ++++++++++++++
 arch/arm/mach-tegra/tegra20_clocks_data.c |    2 +
 arch/arm/mach-tegra/tegra30_clocks.c      |   72 ++++++++++++++
 arch/arm/mach-tegra/tegra30_clocks_data.c |    3 +
 arch/arm/mach-tegra/tegra_cpu_car.h       |   87 +++++++++++++++++
 15 files changed, 556 insertions(+), 147 deletions(-)
 create mode 100644 arch/arm/mach-tegra/sleep-t20.S
 create mode 100644 arch/arm/mach-tegra/sleep-t30.S
 create mode 100644 arch/arm/mach-tegra/sleep.h
 create mode 100644 arch/arm/mach-tegra/tegra_cpu_car.h

[GIT PULL 07/10] ARM: tegra: device tree changes

From: Stephen Warren <hidden>
Date: 2012-09-14 20:06:18

This branch adds two main features to Tegra boards, simply by amending
device tree files: regulator support and the ability to turn off system
power when executing "shutdown".

As part of these changes, the board file for Cardhu is split into two
versions, since different revisions have different hardware in some
areas, especially related to regulators.

This branch is based on v3.6-rc4.

----------------------------------------------------------------

The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:

  Linux 3.6-rc4

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-dt

for you to fetch changes up to 44b12ef78106141574f038852d013fd3207acb23:

  ARM: dt: tegra: configure power off for some boards

----------------------------------------------------------------

Laxman Dewangan (3):
      ARM: dt: tegra: cardhu: add entry for PMIC TPS65911.
      ARM: dt: tegra: cardhu: split dts file for support multiple board versions
      ARM: tegra: cardhu: add dt entry for fixed regulators

Stephen Warren (5):
      ARM: dt: tegra: seaboard: add regulators
      ARM: dt: tegra: ventana: add regulators
      ARM: dt: tegra: paz00: add regulators
      ARM: dt: tegra: whistler: add regulators
      ARM: dt: tegra: configure power off for some boards

 arch/arm/boot/dts/tegra20-paz00.dts      |  173 +++++++++
 arch/arm/boot/dts/tegra20-seaboard.dts   |  186 ++++++++++
 arch/arm/boot/dts/tegra20-ventana.dts    |  206 +++++++++++
 arch/arm/boot/dts/tegra20-whistler.dts   |  293 +++++++++++++++
 arch/arm/boot/dts/tegra30-cardhu-a02.dts |   87 +++++
 arch/arm/boot/dts/tegra30-cardhu-a04.dts |   98 +++++
 arch/arm/boot/dts/tegra30-cardhu.dts     |  171 ---------
 arch/arm/boot/dts/tegra30-cardhu.dtsi    |  475 +++++++++++++++++++++++++
 arch/arm/mach-tegra/Makefile.boot        |    3 +-
 9 files changed, 1520 insertions(+), 172 deletions(-)
 create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a02.dts
 create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a04.dts
 delete mode 100644 arch/arm/boot/dts/tegra30-cardhu.dts
 create mode 100644 arch/arm/boot/dts/tegra30-cardhu.dtsi

[GIT PULL 08/10] ARM: tegra: second round of cleanups

From: Stephen Warren <hidden>
Date: 2012-09-14 20:06:19

This branch mainly removes dead code following the removal of all board
files. The removals depend on various changes in other branches, so they
are all merged together and form the basis of this branch, as enumerated
below.

Finally, there are no remaining users of pinconf-tegra.h outside the
pinctrl subsystem, so that header is incorporated into an existing file
there. This reduces the number of headers in mach-tegra/include, and so
helps move towards single zImage.

This branch is based on tegra-for-3.7-cleanup, followed by a merge of
tegra-for-3.7-board-removal, followed by a merge of
tegra-for-3.7-common-clk, followed by a merge of:

git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git xceiv-for-v3.7

----------------------------------------------------------------

The following changes since commit fef40b2369a4ececa16b4d02b625e45252fe5d0a:

  Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-cleanup2

for you to fetch changes up to 3b2f9412962d2baaa8bf8297103c2ae46b6f929d:

  pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl

----------------------------------------------------------------

Stephen Warren (4):
      ARM: tegra: remove dead code
      ARM: tegra: remove useless includes of <mach/*.h>
      ARM: tegra: delete unused headers
      pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl

 arch/arm/mach-tegra/Makefile                     |    2 -
 arch/arm/mach-tegra/board-dt-tegra20.c           |   27 +-
 arch/arm/mach-tegra/board-pinmux.c               |   87 --
 arch/arm/mach-tegra/board-pinmux.h               |   54 --
 arch/arm/mach-tegra/devices.c                    |  702 -----------------
 arch/arm/mach-tegra/devices.h                    |   60 --
 arch/arm/mach-tegra/dma.c                        |    1 -
 arch/arm/mach-tegra/include/mach/gpio-tegra.h    |   28 -
 arch/arm/mach-tegra/include/mach/pinconf-tegra.h |   63 --
 arch/arm/mach-tegra/include/mach/suspend.h       |   38 -
 arch/arm/mach-tegra/tegra20_clocks.c             |    1 -
 arch/arm/mach-tegra/tegra20_clocks_data.c        |    1 -
 arch/arm/mach-tegra/timer.c                      |    1 -
 drivers/pinctrl/pinctrl-tegra.c                  |    2 -
 drivers/pinctrl/pinctrl-tegra.h                  |   44 +
 drivers/usb/phy/tegra_usb_phy.c                  |    1 -
 16 files changed, 70 insertions(+), 1042 deletions(-)
 delete mode 100644 arch/arm/mach-tegra/board-pinmux.c
 delete mode 100644 arch/arm/mach-tegra/board-pinmux.h
 delete mode 100644 arch/arm/mach-tegra/devices.c
 delete mode 100644 arch/arm/mach-tegra/devices.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/gpio-tegra.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/pinconf-tegra.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/suspend.h

[GIT PULL 09/10] ARM: tegra: defconfig updates

From: Stephen Warren <hidden>
Date: 2012-09-14 20:06:20

This branch updates tegra_defconfig mainly to enable new features that
were either implemented in this kernel release, previously missing, or
recently determined to be useful.

The config entries for explicit board support are now removed, since
Tegra now only supports booting from device tree.

This branch is based on v3.6-rc4.

----------------------------------------------------------------

The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:

  Linux 3.6-rc4

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-defconfig

for you to fetch changes up to 9df25ccc937525206906c2b546998e5e3062c59b:

  ARM: tegra: defconfig updates

----------------------------------------------------------------

Stephen Warren (1):
      ARM: tegra: defconfig updates

 arch/arm/configs/tegra_defconfig |   51 +++++++++++++++++++++++++++------
 1 files changed, 42 insertions(+), 9 deletions(-)

[GIT PULL 10/10] ARM: tegra: MAINTAINERS updates

From: Stephen Warren <hidden>
Date: 2012-09-14 20:06:21

Two changes are made to MAINTAINERS: addition of an entry for
tegra_defconfig, and removal of Olof and Colin from the Tegra entry. I'd
like to take this opportunity again to thank both Olof and Colin for all
the work they have put into Tegra support.

This branch is based on v3.6-rc4.

----------------------------------------------------------------

The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:

  Linux 3.6-rc4

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.7-maintainers

for you to fetch changes up to d5703bd35a4c76b0717ea51e2e8aabce341828a1:

  MAINTAINERS: tegra: remove Olof/Colin, add device tree files

----------------------------------------------------------------

Stephen Warren (1):
      MAINTAINERS: tegra: remove Olof/Colin, add device tree files

Uwe Kleine-K??nig (1):
      MAINTAINERS: add defconfig file to TEGRA section

 MAINTAINERS |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)