All of lore.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL 1/8] ARM: tegra: cleanup
@ 2013-01-30 21:42 ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: arm-DgEjT+Ai2ygdnm+yROfE0A
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren

This pull request contains various cleanup and minor changes to core
Tegra code:
* Tegra clocksource driver is moved to drivers/clocksource.
* Various typos, warning cleanup, statics cleanup, section mismatch
  fixes, etc.
* Various small fixes/cleanups for CPU/hotplug/SMP code.

This pull request is based on a merge of v3.8-rc3 and at least part of
arm-soc's timer/cleanup branch.

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

The following changes since commit f3dab3989b4282e448cba0f0708934276dcb413a:

  Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup

are available in the git repository at:

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

for you to fetch changes up to 24e30c9417230b359bf6dfeb923e90138df7c112:

  ARM: tegra: fix compile error when disable CPU_IDLE

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

Hiroshi Doyu (2):
      clocksource: tegra: cosmetic: Fix error message
      ARM: tegra: Make variables static

Joseph Lo (7):
      ARM: tegra30: fix power up sequence for boot_secondary
      ARM: tegra: update the cache maintenance order for CPU shutdown
      ARM: tegra: moving the clock gating procedure to tegra_cpu_kill
      ARM: tegra: clean up the CPUINIT section
      ARM: tegra: make device can run on UP
      ARM: tegra30: make the wait time of CPU power up to proportional to HZ
      ARM: tegra: fix compile error when disable CPU_IDLE

Richard Zhao (1):
      ARM: tegra: cpufreq: move clk_get/put out of function tegra_cpu_init/exit

Stephen Warren (2):
      ARM: tegra: move timer.c to drivers/clocksource/
      ARM: tegra: fix Kconfig warnings when !SMP

 arch/arm/Kconfig                                |    1 +
 arch/arm/mach-tegra/Kconfig                     |    4 +-
 arch/arm/mach-tegra/Makefile                    |    6 +-
 arch/arm/mach-tegra/apbio.c                     |    2 +-
 arch/arm/mach-tegra/board-dt-tegra20.c          |   13 +-
 arch/arm/mach-tegra/board-dt-tegra30.c          |    5 +-
 arch/arm/mach-tegra/board.h                     |    1 -
 arch/arm/mach-tegra/common.c                    |    3 +
 arch/arm/mach-tegra/common.h                    |    1 +
 arch/arm/mach-tegra/cpu-tegra.c                 |   40 +--
 arch/arm/mach-tegra/cpuidle-tegra30.c           |    6 +-
 arch/arm/mach-tegra/flowctrl.c                  |    4 +-
 arch/arm/mach-tegra/headsmp.S                   |  221 ----------------
 arch/arm/mach-tegra/hotplug.c                   |   21 +-
 arch/arm/mach-tegra/platsmp.c                   |   43 +++-
 arch/arm/mach-tegra/pm.c                        |    4 +-
 arch/arm/mach-tegra/reset-handler.S             |  239 ++++++++++++++++++
 arch/arm/mach-tegra/reset.c                     |    2 +-
 arch/arm/mach-tegra/sleep-tegra20.S             |    3 -
 arch/arm/mach-tegra/sleep-tegra30.S             |    3 -
 arch/arm/mach-tegra/sleep.S                     |    4 +-
 arch/arm/mach-tegra/sleep.h                     |    1 +
 arch/arm/mach-tegra/tegra30_clocks_data.c       |    6 +-
 drivers/clocksource/Makefile                    |    1 +
 .../clocksource/tegra20_timer.c                 |    9 +-
 25 files changed, 352 insertions(+), 291 deletions(-)
 create mode 100644 arch/arm/mach-tegra/reset-handler.S
 rename arch/arm/mach-tegra/timer.c => drivers/clocksource/tegra20_timer.c (97%)

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 1/8] ARM: tegra: cleanup
@ 2013-01-30 21:42 ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: linux-arm-kernel

This pull request contains various cleanup and minor changes to core
Tegra code:
* Tegra clocksource driver is moved to drivers/clocksource.
* Various typos, warning cleanup, statics cleanup, section mismatch
  fixes, etc.
* Various small fixes/cleanups for CPU/hotplug/SMP code.

This pull request is based on a merge of v3.8-rc3 and at least part of
arm-soc's timer/cleanup branch.

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

The following changes since commit f3dab3989b4282e448cba0f0708934276dcb413a:

  Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup

are available in the git repository at:

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

for you to fetch changes up to 24e30c9417230b359bf6dfeb923e90138df7c112:

  ARM: tegra: fix compile error when disable CPU_IDLE

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

Hiroshi Doyu (2):
      clocksource: tegra: cosmetic: Fix error message
      ARM: tegra: Make variables static

Joseph Lo (7):
      ARM: tegra30: fix power up sequence for boot_secondary
      ARM: tegra: update the cache maintenance order for CPU shutdown
      ARM: tegra: moving the clock gating procedure to tegra_cpu_kill
      ARM: tegra: clean up the CPUINIT section
      ARM: tegra: make device can run on UP
      ARM: tegra30: make the wait time of CPU power up to proportional to HZ
      ARM: tegra: fix compile error when disable CPU_IDLE

Richard Zhao (1):
      ARM: tegra: cpufreq: move clk_get/put out of function tegra_cpu_init/exit

Stephen Warren (2):
      ARM: tegra: move timer.c to drivers/clocksource/
      ARM: tegra: fix Kconfig warnings when !SMP

 arch/arm/Kconfig                                |    1 +
 arch/arm/mach-tegra/Kconfig                     |    4 +-
 arch/arm/mach-tegra/Makefile                    |    6 +-
 arch/arm/mach-tegra/apbio.c                     |    2 +-
 arch/arm/mach-tegra/board-dt-tegra20.c          |   13 +-
 arch/arm/mach-tegra/board-dt-tegra30.c          |    5 +-
 arch/arm/mach-tegra/board.h                     |    1 -
 arch/arm/mach-tegra/common.c                    |    3 +
 arch/arm/mach-tegra/common.h                    |    1 +
 arch/arm/mach-tegra/cpu-tegra.c                 |   40 +--
 arch/arm/mach-tegra/cpuidle-tegra30.c           |    6 +-
 arch/arm/mach-tegra/flowctrl.c                  |    4 +-
 arch/arm/mach-tegra/headsmp.S                   |  221 ----------------
 arch/arm/mach-tegra/hotplug.c                   |   21 +-
 arch/arm/mach-tegra/platsmp.c                   |   43 +++-
 arch/arm/mach-tegra/pm.c                        |    4 +-
 arch/arm/mach-tegra/reset-handler.S             |  239 ++++++++++++++++++
 arch/arm/mach-tegra/reset.c                     |    2 +-
 arch/arm/mach-tegra/sleep-tegra20.S             |    3 -
 arch/arm/mach-tegra/sleep-tegra30.S             |    3 -
 arch/arm/mach-tegra/sleep.S                     |    4 +-
 arch/arm/mach-tegra/sleep.h                     |    1 +
 arch/arm/mach-tegra/tegra30_clocks_data.c       |    6 +-
 drivers/clocksource/Makefile                    |    1 +
 .../clocksource/tegra20_timer.c                 |    9 +-
 25 files changed, 352 insertions(+), 291 deletions(-)
 create mode 100644 arch/arm/mach-tegra/reset-handler.S
 rename arch/arm/mach-tegra/timer.c => drivers/clocksource/tegra20_timer.c (97%)

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 2/8] ARM: tegra: Common Clock Framework rework
  2013-01-30 21:42 ` Stephen Warren
@ 2013-01-30 21:42     ` Stephen Warren
  -1 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: arm-DgEjT+Ai2ygdnm+yROfE0A
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren

Tegra already supports the common clock framework, but had issues:

1) The clock driver was located in arch/arm/mach-tegra/ rather than
   drivers/clk/.

2) A single "Tegra clock" type was implemented, rather than separate
   clock types for PLL, mux, divider, ... type in HW.

3) Clock lookups by device drivers were still driven by device name
   and connection ID, rather than through device tree.

This pull request solves all three issues. This required some DT changes
to add clocks properties, and driver changes to request clocks more
"correctly". Finally, this rework allows all AUXDATA to be removed from
Tegra board files, and various duplicate clock lookup entries to be
removed from the driver.

This pull request is based on the previous pull request, with tag
tegra-for-3.9-cleanup.

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

The following changes since commit 24e30c9417230b359bf6dfeb923e90138df7c112:

  ARM: tegra: fix compile error when disable CPU_IDLE

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-ccf

for you to fetch changes up to ef3ffe5a0458606c488def757bb7f6dd013c2db5:

  clk: tegra30: remove unused TEGRA_CLK_DUPLICATE()s

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

Prashant Gaikwad (18):
      ARM: tegra: add function to read chipid
      ARM: tegra: move tegra_cpu_car.h to linux/clk/tegra.h
      ARM: tegra: define Tegra30 CAR binding
      clk: tegra: add Tegra specific clocks
      clk: tegra: add clock support for Tegra20
      clk: tegra: add clock support for Tegra30
      ARM: tegra: migrate to new clock code
      ARM: tegra: remove legacy clock code
      spi: tegra: do not use clock name to get clock
      ARM: tegra: add clock properties to Tegra20 DT
      ARM: tegra: add clock properties to Tegra30 DT
      ARM: tegra: paz00: add clock information to DT
      staging: nvec: remove use of clk_get_sys
      ASoC: tegra: remove auxdata
      ARM: tegra20: remove auxdata
      ARM: tegra30: remove auxdata
      clk: tegra20: remove unused TEGRA_CLK_DUPLICATE()s
      clk: tegra30: remove unused TEGRA_CLK_DUPLICATE()s

Stephen Warren (1):
      ARM: tegra: define Tegra20 CAR binding

 .../bindings/clock/nvidia,tegra20-car.txt       |  205 ++
 .../bindings/clock/nvidia,tegra30-car.txt       |  262 ++
 arch/arm/boot/dts/tegra20-paz00.dts             |    2 +
 arch/arm/boot/dts/tegra20.dtsi                  |   50 +
 arch/arm/boot/dts/tegra30.dtsi                  |   62 +-
 arch/arm/mach-tegra/Makefile                    |    5 -
 arch/arm/mach-tegra/board-dt-tegra20.c          |   54 -
 arch/arm/mach-tegra/board-dt-tegra30.c          |   62 +-
 arch/arm/mach-tegra/clock.c                     |  166 --
 arch/arm/mach-tegra/clock.h                     |  153 --
 arch/arm/mach-tegra/common.c                    |   44 +-
 arch/arm/mach-tegra/cpu-tegra.c                 |    2 +-
 arch/arm/mach-tegra/cpuidle-tegra30.c           |    2 +-
 arch/arm/mach-tegra/fuse.c                      |    8 +-
 arch/arm/mach-tegra/hotplug.c                   |    2 +-
 arch/arm/mach-tegra/include/mach/clk.h          |   44 -
 arch/arm/mach-tegra/pcie.c                      |    2 +-
 arch/arm/mach-tegra/platsmp.c                   |    2 +-
 arch/arm/mach-tegra/pm.c                        |    2 +-
 arch/arm/mach-tegra/powergate.c                 |    2 +-
 arch/arm/mach-tegra/tegra20_clocks.c            | 1623 ------------
 arch/arm/mach-tegra/tegra20_clocks.h            |   42 -
 arch/arm/mach-tegra/tegra20_clocks_data.c       | 1143 --------
 arch/arm/mach-tegra/tegra30_clocks.c            | 2506 ------------------
 arch/arm/mach-tegra/tegra30_clocks.h            |   54 -
 arch/arm/mach-tegra/tegra30_clocks_data.c       | 1425 ----------
 drivers/clk/Makefile                            |    1 +
 drivers/clk/tegra/Makefile                      |   11 +
 drivers/clk/tegra/clk-audio-sync.c              |   87 +
 drivers/clk/tegra/clk-divider.c                 |  187 ++
 drivers/clk/tegra/clk-periph-gate.c             |  179 ++
 drivers/clk/tegra/clk-periph.c                  |  218 ++
 drivers/clk/tegra/clk-pll-out.c                 |  123 +
 drivers/clk/tegra/clk-pll.c                     |  648 +++++
 drivers/clk/tegra/clk-super.c                   |  154 ++
 drivers/clk/tegra/clk-tegra20.c                 | 1256 +++++++++
 drivers/clk/tegra/clk-tegra30.c                 | 1987 ++++++++++++++
 drivers/clk/tegra/clk.c                         |   85 +
 drivers/clk/tegra/clk.h                         |  502 ++++
 drivers/dma/tegra20-apb-dma.c                   |    2 +-
 drivers/gpu/drm/tegra/dc.c                      |    3 +-
 drivers/gpu/drm/tegra/drm.c                     |    1 -
 drivers/gpu/drm/tegra/hdmi.c                    |    3 +-
 drivers/i2c/busses/i2c-tegra.c                  |    3 +-
 drivers/input/keyboard/tegra-kbc.c              |    2 +-
 drivers/spi/spi-tegra20-sflash.c                |    4 +-
 drivers/spi/spi-tegra20-slink.c                 |    4 +-
 drivers/staging/nvec/TODO                       |    4 -
 drivers/staging/nvec/nvec.c                     |    5 +-
 .../linux/clk/tegra.h                           |   13 +-
 include/linux/tegra-soc.h                       |   22 +
 sound/soc/tegra/tegra30_ahub.c                  |   16 +-
 52 files changed, 6079 insertions(+), 7365 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt
 create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt
 delete mode 100644 arch/arm/mach-tegra/clock.c
 delete mode 100644 arch/arm/mach-tegra/clock.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/clk.h
 delete mode 100644 arch/arm/mach-tegra/tegra20_clocks.c
 delete mode 100644 arch/arm/mach-tegra/tegra20_clocks.h
 delete mode 100644 arch/arm/mach-tegra/tegra20_clocks_data.c
 delete mode 100644 arch/arm/mach-tegra/tegra30_clocks.c
 delete mode 100644 arch/arm/mach-tegra/tegra30_clocks.h
 delete mode 100644 arch/arm/mach-tegra/tegra30_clocks_data.c
 create mode 100644 drivers/clk/tegra/Makefile
 create mode 100644 drivers/clk/tegra/clk-audio-sync.c
 create mode 100644 drivers/clk/tegra/clk-divider.c
 create mode 100644 drivers/clk/tegra/clk-periph-gate.c
 create mode 100644 drivers/clk/tegra/clk-periph.c
 create mode 100644 drivers/clk/tegra/clk-pll-out.c
 create mode 100644 drivers/clk/tegra/clk-pll.c
 create mode 100644 drivers/clk/tegra/clk-super.c
 create mode 100644 drivers/clk/tegra/clk-tegra20.c
 create mode 100644 drivers/clk/tegra/clk-tegra30.c
 create mode 100644 drivers/clk/tegra/clk.c
 create mode 100644 drivers/clk/tegra/clk.h
 rename arch/arm/mach-tegra/tegra_cpu_car.h => include/linux/clk/tegra.h (91%)
 create mode 100644 include/linux/tegra-soc.h

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 2/8] ARM: tegra: Common Clock Framework rework
@ 2013-01-30 21:42     ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: linux-arm-kernel

Tegra already supports the common clock framework, but had issues:

1) The clock driver was located in arch/arm/mach-tegra/ rather than
   drivers/clk/.

2) A single "Tegra clock" type was implemented, rather than separate
   clock types for PLL, mux, divider, ... type in HW.

3) Clock lookups by device drivers were still driven by device name
   and connection ID, rather than through device tree.

This pull request solves all three issues. This required some DT changes
to add clocks properties, and driver changes to request clocks more
"correctly". Finally, this rework allows all AUXDATA to be removed from
Tegra board files, and various duplicate clock lookup entries to be
removed from the driver.

This pull request is based on the previous pull request, with tag
tegra-for-3.9-cleanup.

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

The following changes since commit 24e30c9417230b359bf6dfeb923e90138df7c112:

  ARM: tegra: fix compile error when disable CPU_IDLE

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-ccf

for you to fetch changes up to ef3ffe5a0458606c488def757bb7f6dd013c2db5:

  clk: tegra30: remove unused TEGRA_CLK_DUPLICATE()s

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

Prashant Gaikwad (18):
      ARM: tegra: add function to read chipid
      ARM: tegra: move tegra_cpu_car.h to linux/clk/tegra.h
      ARM: tegra: define Tegra30 CAR binding
      clk: tegra: add Tegra specific clocks
      clk: tegra: add clock support for Tegra20
      clk: tegra: add clock support for Tegra30
      ARM: tegra: migrate to new clock code
      ARM: tegra: remove legacy clock code
      spi: tegra: do not use clock name to get clock
      ARM: tegra: add clock properties to Tegra20 DT
      ARM: tegra: add clock properties to Tegra30 DT
      ARM: tegra: paz00: add clock information to DT
      staging: nvec: remove use of clk_get_sys
      ASoC: tegra: remove auxdata
      ARM: tegra20: remove auxdata
      ARM: tegra30: remove auxdata
      clk: tegra20: remove unused TEGRA_CLK_DUPLICATE()s
      clk: tegra30: remove unused TEGRA_CLK_DUPLICATE()s

Stephen Warren (1):
      ARM: tegra: define Tegra20 CAR binding

 .../bindings/clock/nvidia,tegra20-car.txt       |  205 ++
 .../bindings/clock/nvidia,tegra30-car.txt       |  262 ++
 arch/arm/boot/dts/tegra20-paz00.dts             |    2 +
 arch/arm/boot/dts/tegra20.dtsi                  |   50 +
 arch/arm/boot/dts/tegra30.dtsi                  |   62 +-
 arch/arm/mach-tegra/Makefile                    |    5 -
 arch/arm/mach-tegra/board-dt-tegra20.c          |   54 -
 arch/arm/mach-tegra/board-dt-tegra30.c          |   62 +-
 arch/arm/mach-tegra/clock.c                     |  166 --
 arch/arm/mach-tegra/clock.h                     |  153 --
 arch/arm/mach-tegra/common.c                    |   44 +-
 arch/arm/mach-tegra/cpu-tegra.c                 |    2 +-
 arch/arm/mach-tegra/cpuidle-tegra30.c           |    2 +-
 arch/arm/mach-tegra/fuse.c                      |    8 +-
 arch/arm/mach-tegra/hotplug.c                   |    2 +-
 arch/arm/mach-tegra/include/mach/clk.h          |   44 -
 arch/arm/mach-tegra/pcie.c                      |    2 +-
 arch/arm/mach-tegra/platsmp.c                   |    2 +-
 arch/arm/mach-tegra/pm.c                        |    2 +-
 arch/arm/mach-tegra/powergate.c                 |    2 +-
 arch/arm/mach-tegra/tegra20_clocks.c            | 1623 ------------
 arch/arm/mach-tegra/tegra20_clocks.h            |   42 -
 arch/arm/mach-tegra/tegra20_clocks_data.c       | 1143 --------
 arch/arm/mach-tegra/tegra30_clocks.c            | 2506 ------------------
 arch/arm/mach-tegra/tegra30_clocks.h            |   54 -
 arch/arm/mach-tegra/tegra30_clocks_data.c       | 1425 ----------
 drivers/clk/Makefile                            |    1 +
 drivers/clk/tegra/Makefile                      |   11 +
 drivers/clk/tegra/clk-audio-sync.c              |   87 +
 drivers/clk/tegra/clk-divider.c                 |  187 ++
 drivers/clk/tegra/clk-periph-gate.c             |  179 ++
 drivers/clk/tegra/clk-periph.c                  |  218 ++
 drivers/clk/tegra/clk-pll-out.c                 |  123 +
 drivers/clk/tegra/clk-pll.c                     |  648 +++++
 drivers/clk/tegra/clk-super.c                   |  154 ++
 drivers/clk/tegra/clk-tegra20.c                 | 1256 +++++++++
 drivers/clk/tegra/clk-tegra30.c                 | 1987 ++++++++++++++
 drivers/clk/tegra/clk.c                         |   85 +
 drivers/clk/tegra/clk.h                         |  502 ++++
 drivers/dma/tegra20-apb-dma.c                   |    2 +-
 drivers/gpu/drm/tegra/dc.c                      |    3 +-
 drivers/gpu/drm/tegra/drm.c                     |    1 -
 drivers/gpu/drm/tegra/hdmi.c                    |    3 +-
 drivers/i2c/busses/i2c-tegra.c                  |    3 +-
 drivers/input/keyboard/tegra-kbc.c              |    2 +-
 drivers/spi/spi-tegra20-sflash.c                |    4 +-
 drivers/spi/spi-tegra20-slink.c                 |    4 +-
 drivers/staging/nvec/TODO                       |    4 -
 drivers/staging/nvec/nvec.c                     |    5 +-
 .../linux/clk/tegra.h                           |   13 +-
 include/linux/tegra-soc.h                       |   22 +
 sound/soc/tegra/tegra30_ahub.c                  |   16 +-
 52 files changed, 6079 insertions(+), 7365 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt
 create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt
 delete mode 100644 arch/arm/mach-tegra/clock.c
 delete mode 100644 arch/arm/mach-tegra/clock.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/clk.h
 delete mode 100644 arch/arm/mach-tegra/tegra20_clocks.c
 delete mode 100644 arch/arm/mach-tegra/tegra20_clocks.h
 delete mode 100644 arch/arm/mach-tegra/tegra20_clocks_data.c
 delete mode 100644 arch/arm/mach-tegra/tegra30_clocks.c
 delete mode 100644 arch/arm/mach-tegra/tegra30_clocks.h
 delete mode 100644 arch/arm/mach-tegra/tegra30_clocks_data.c
 create mode 100644 drivers/clk/tegra/Makefile
 create mode 100644 drivers/clk/tegra/clk-audio-sync.c
 create mode 100644 drivers/clk/tegra/clk-divider.c
 create mode 100644 drivers/clk/tegra/clk-periph-gate.c
 create mode 100644 drivers/clk/tegra/clk-periph.c
 create mode 100644 drivers/clk/tegra/clk-pll-out.c
 create mode 100644 drivers/clk/tegra/clk-pll.c
 create mode 100644 drivers/clk/tegra/clk-super.c
 create mode 100644 drivers/clk/tegra/clk-tegra20.c
 create mode 100644 drivers/clk/tegra/clk-tegra30.c
 create mode 100644 drivers/clk/tegra/clk.c
 create mode 100644 drivers/clk/tegra/clk.h
 rename arch/arm/mach-tegra/tegra_cpu_car.h => include/linux/clk/tegra.h (91%)
 create mode 100644 include/linux/tegra-soc.h

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 3/8] ARM: tegra: USB driver cleanup
  2013-01-30 21:42 ` Stephen Warren
@ 2013-01-30 21:42     ` Stephen Warren
  -1 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: arm-DgEjT+Ai2ygdnm+yROfE0A
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren

The Tegra USB driver has a number of issues:

1) The PHY driver isn't a true platform device, and doesn't implement
   the standard USB PHY API.

2) struct device instance numbers were used to make decisions in the
   driver, rather than being parameterized by DT or platform data.

This pull request solves issue (2), and lays the groundwork for solving
issue (1). The work on issue (1) involved introducing new DT nodes for
the USB PHYs, which in turn interacted with the Tegra common clock
framework changes, due to the move of clock lookups into device tree.
Hence, these USB driver changes are taken through the Tegra tree with
acks from USB maintainers.

This pull request is based on the previous pull request, with tag
tegra-for-3.9-soc-ccf.

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

The following changes since commit ef3ffe5a0458606c488def757bb7f6dd013c2db5:

  clk: tegra30: remove unused TEGRA_CLK_DUPLICATE()s

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-usb

for you to fetch changes up to ab137d04db5a4b32250ce5ef1b288ce6cf06adf6:

  usb: host: tegra: make use of PHY pointer of HCD

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

Stephen Warren (2):
      ARM: tegra: add clocks properties to USB PHY nodes
      usb: host: tegra: don't touch EMC clock

Venu Byravarasu (11):
      ARM: tegra: remove USB address related macros from iomap.h
      usb: phy: use kzalloc to allocate struct tegra_usb_phy
      ARM: tegra: Add new DT property to USB node.
      usb: host: tegra: Resetting PORT0 based on information received via DT.
      usb: phy: remove unused APIs from Tegra PHY.
      ARM: tegra: add DT nodes for Tegra USB PHY
      USB: PHY: tegra: get rid of instance number to differentiate legacy controller
      USB: PHY: tegra: Get rid of instance number to differentiate PHY type
      usb: add APIs to access host registers from Tegra PHY
      ARM: tegra: Add reset GPIO information to PHY DT node
      usb: host: tegra: make use of PHY pointer of HCD

 .../bindings/usb/nvidia,tegra20-ehci.txt        |    3 +
 .../bindings/usb/nvidia,tegra20-usb-phy.txt     |   17 +++
 arch/arm/boot/dts/tegra20-harmony.dts           |    4 +
 arch/arm/boot/dts/tegra20-paz00.dts             |    4 +
 arch/arm/boot/dts/tegra20-seaboard.dts          |    4 +
 arch/arm/boot/dts/tegra20-trimslice.dts         |    4 +
 arch/arm/boot/dts/tegra20-ventana.dts           |    4 +
 arch/arm/boot/dts/tegra20.dtsi                  |   29 ++++
 arch/arm/mach-tegra/board-dt-tegra20.c          |    6 +-
 arch/arm/mach-tegra/iomap.h                     |    9 --
 drivers/usb/host/ehci-tegra.c                   |   97 ++++++++-----
 drivers/usb/phy/tegra_usb_phy.c                 |  132 ++++++------------
 include/linux/usb/tegra_usb_phy.h               |   16 ++-
 13 files changed, 191 insertions(+), 138 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 3/8] ARM: tegra: USB driver cleanup
@ 2013-01-30 21:42     ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: linux-arm-kernel

The Tegra USB driver has a number of issues:

1) The PHY driver isn't a true platform device, and doesn't implement
   the standard USB PHY API.

2) struct device instance numbers were used to make decisions in the
   driver, rather than being parameterized by DT or platform data.

This pull request solves issue (2), and lays the groundwork for solving
issue (1). The work on issue (1) involved introducing new DT nodes for
the USB PHYs, which in turn interacted with the Tegra common clock
framework changes, due to the move of clock lookups into device tree.
Hence, these USB driver changes are taken through the Tegra tree with
acks from USB maintainers.

This pull request is based on the previous pull request, with tag
tegra-for-3.9-soc-ccf.

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

The following changes since commit ef3ffe5a0458606c488def757bb7f6dd013c2db5:

  clk: tegra30: remove unused TEGRA_CLK_DUPLICATE()s

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-usb

for you to fetch changes up to ab137d04db5a4b32250ce5ef1b288ce6cf06adf6:

  usb: host: tegra: make use of PHY pointer of HCD

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

Stephen Warren (2):
      ARM: tegra: add clocks properties to USB PHY nodes
      usb: host: tegra: don't touch EMC clock

Venu Byravarasu (11):
      ARM: tegra: remove USB address related macros from iomap.h
      usb: phy: use kzalloc to allocate struct tegra_usb_phy
      ARM: tegra: Add new DT property to USB node.
      usb: host: tegra: Resetting PORT0 based on information received via DT.
      usb: phy: remove unused APIs from Tegra PHY.
      ARM: tegra: add DT nodes for Tegra USB PHY
      USB: PHY: tegra: get rid of instance number to differentiate legacy controller
      USB: PHY: tegra: Get rid of instance number to differentiate PHY type
      usb: add APIs to access host registers from Tegra PHY
      ARM: tegra: Add reset GPIO information to PHY DT node
      usb: host: tegra: make use of PHY pointer of HCD

 .../bindings/usb/nvidia,tegra20-ehci.txt        |    3 +
 .../bindings/usb/nvidia,tegra20-usb-phy.txt     |   17 +++
 arch/arm/boot/dts/tegra20-harmony.dts           |    4 +
 arch/arm/boot/dts/tegra20-paz00.dts             |    4 +
 arch/arm/boot/dts/tegra20-seaboard.dts          |    4 +
 arch/arm/boot/dts/tegra20-trimslice.dts         |    4 +
 arch/arm/boot/dts/tegra20-ventana.dts           |    4 +
 arch/arm/boot/dts/tegra20.dtsi                  |   29 ++++
 arch/arm/mach-tegra/board-dt-tegra20.c          |    6 +-
 arch/arm/mach-tegra/iomap.h                     |    9 --
 drivers/usb/host/ehci-tegra.c                   |   97 ++++++++-----
 drivers/usb/phy/tegra_usb_phy.c                 |  132 ++++++------------
 include/linux/usb/tegra_usb_phy.h               |   16 ++-
 13 files changed, 191 insertions(+), 138 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 4/8] ARM: tegra: cpuidle enhancements
  2013-01-30 21:42 ` Stephen Warren
@ 2013-01-30 21:42     ` Stephen Warren
  -1 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: arm-DgEjT+Ai2ygdnm+yROfE0A
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren

This pull request implements a new "LP2" cpuidle state for Tegra20,
which makes use of the couple cpuidle feature.

It is based on (most of) the previous pull request, with tag
tegra-for-3.9-soc-usb.

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

The following changes since commit 9304512151b0933c454f0842cdb19bec23422bc5:

  usb: host: tegra: don't touch EMC clock

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-cpuidle

for you to fetch changes up to 1d328606c66b9bb1c0552f585943d596f37ae3b9:

  ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode

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

Joseph Lo (5):
      ARM: tegra: add pending SGI checking API
      ARM: tegra20: cpuidle: add powered-down state for secondary CPU
      clk: tegra20: Implementing CPU low-power function for tegra_cpu_car_ops
      ARM: tegra20: flowctrl: add support for cpu_suspend_enter/exit
      ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode

 arch/arm/mach-tegra/Kconfig           |    1 +
 arch/arm/mach-tegra/cpuidle-tegra20.c |  197 ++++++++++++++++++++++++++-
 arch/arm/mach-tegra/flowctrl.c        |   38 +++++-
 arch/arm/mach-tegra/flowctrl.h        |    4 +
 arch/arm/mach-tegra/irq.c             |   15 +++
 arch/arm/mach-tegra/irq.h             |   22 +++
 arch/arm/mach-tegra/pm.c              |    3 +
 arch/arm/mach-tegra/sleep-tegra20.S   |  200 ++++++++++++++++++++++++++++
 arch/arm/mach-tegra/sleep.S           |   19 +++
 arch/arm/mach-tegra/sleep.h           |   26 ++++
 drivers/clk/tegra/clk-tegra20.c       |   93 +++++++++++++
 11 files changed, 609 insertions(+), 9 deletions(-)
 create mode 100644 arch/arm/mach-tegra/irq.h

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 4/8] ARM: tegra: cpuidle enhancements
@ 2013-01-30 21:42     ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: linux-arm-kernel

This pull request implements a new "LP2" cpuidle state for Tegra20,
which makes use of the couple cpuidle feature.

It is based on (most of) the previous pull request, with tag
tegra-for-3.9-soc-usb.

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

The following changes since commit 9304512151b0933c454f0842cdb19bec23422bc5:

  usb: host: tegra: don't touch EMC clock

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-cpuidle

for you to fetch changes up to 1d328606c66b9bb1c0552f585943d596f37ae3b9:

  ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode

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

Joseph Lo (5):
      ARM: tegra: add pending SGI checking API
      ARM: tegra20: cpuidle: add powered-down state for secondary CPU
      clk: tegra20: Implementing CPU low-power function for tegra_cpu_car_ops
      ARM: tegra20: flowctrl: add support for cpu_suspend_enter/exit
      ARM: tegra20: cpuidle: apply coupled cpuidle for powered-down mode

 arch/arm/mach-tegra/Kconfig           |    1 +
 arch/arm/mach-tegra/cpuidle-tegra20.c |  197 ++++++++++++++++++++++++++-
 arch/arm/mach-tegra/flowctrl.c        |   38 +++++-
 arch/arm/mach-tegra/flowctrl.h        |    4 +
 arch/arm/mach-tegra/irq.c             |   15 +++
 arch/arm/mach-tegra/irq.h             |   22 +++
 arch/arm/mach-tegra/pm.c              |    3 +
 arch/arm/mach-tegra/sleep-tegra20.S   |  200 ++++++++++++++++++++++++++++
 arch/arm/mach-tegra/sleep.S           |   19 +++
 arch/arm/mach-tegra/sleep.h           |   26 ++++
 drivers/clk/tegra/clk-tegra20.c       |   93 +++++++++++++
 11 files changed, 609 insertions(+), 9 deletions(-)
 create mode 100644 arch/arm/mach-tegra/irq.h

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 5/8] ARM: tegra: SCU base rework
  2013-01-30 21:42 ` Stephen Warren
@ 2013-01-30 21:42     ` Stephen Warren
  -1 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: arm-DgEjT+Ai2ygdnm+yROfE0A
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren

Tegra currently relies on the SCU to determine the number of CPU
cores, and also hard-codes the SCU physical address.

This series adds a /cpus node to the Tegra device tree, and updates
the code to rely solely on that to determine the CPU count. A new
API is introduced to query for the existence of SCU registers, and the
SCU register address. Tegra and OMAP2 are converted to use these new
APIs.

This pull request is based on a merge of v3.8-rc3, and arm-soc's
depends/rmk-perf branch.

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

The following changes since commit 5681f76576af872ced97e8c58ccab3c84a6627e6:

  Merge remote-tracking branch 'korg_arm-soc/depends/rmk-perf' into for-3.9/scu-base-rework

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-scu-base-rework

for you to fetch changes up to 80d9375617f7544f7475e7f07003a08930559d43:

  ARM: OMAP: Make use of available scu_a9_get_base() interface

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

Hiroshi Doyu (5):
      ARM: tegra: Add CPU nodes to Tegra20 device tree
      ARM: tegra: Add CPU nodes to Tegra30 device tree
      ARM: tegra: Use DT /cpu node to detect number of CPU core
      ARM: Add API to detect SCU base address from CP15
      ARM: tegra: Skip scu_enable(scu_base) if not Cortex A9

Santosh Shilimkar (1):
      ARM: OMAP: Make use of available scu_a9_get_base() interface

 arch/arm/boot/dts/tegra20.dtsi |   17 +++++++++++++++++
 arch/arm/boot/dts/tegra30.dtsi |   29 +++++++++++++++++++++++++++++
 arch/arm/include/asm/smp_scu.h |   17 +++++++++++++++++
 arch/arm/mach-omap2/omap-smp.c |    2 +-
 arch/arm/mach-omap2/omap44xx.h |    1 -
 arch/arm/mach-tegra/platsmp.c  |   20 ++------------------
 6 files changed, 66 insertions(+), 20 deletions(-)

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 5/8] ARM: tegra: SCU base rework
@ 2013-01-30 21:42     ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: linux-arm-kernel

Tegra currently relies on the SCU to determine the number of CPU
cores, and also hard-codes the SCU physical address.

This series adds a /cpus node to the Tegra device tree, and updates
the code to rely solely on that to determine the CPU count. A new
API is introduced to query for the existence of SCU registers, and the
SCU register address. Tegra and OMAP2 are converted to use these new
APIs.

This pull request is based on a merge of v3.8-rc3, and arm-soc's
depends/rmk-perf branch.

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

The following changes since commit 5681f76576af872ced97e8c58ccab3c84a6627e6:

  Merge remote-tracking branch 'korg_arm-soc/depends/rmk-perf' into for-3.9/scu-base-rework

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-scu-base-rework

for you to fetch changes up to 80d9375617f7544f7475e7f07003a08930559d43:

  ARM: OMAP: Make use of available scu_a9_get_base() interface

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

Hiroshi Doyu (5):
      ARM: tegra: Add CPU nodes to Tegra20 device tree
      ARM: tegra: Add CPU nodes to Tegra30 device tree
      ARM: tegra: Use DT /cpu node to detect number of CPU core
      ARM: Add API to detect SCU base address from CP15
      ARM: tegra: Skip scu_enable(scu_base) if not Cortex A9

Santosh Shilimkar (1):
      ARM: OMAP: Make use of available scu_a9_get_base() interface

 arch/arm/boot/dts/tegra20.dtsi |   17 +++++++++++++++++
 arch/arm/boot/dts/tegra30.dtsi |   29 +++++++++++++++++++++++++++++
 arch/arm/include/asm/smp_scu.h |   17 +++++++++++++++++
 arch/arm/mach-omap2/omap-smp.c |    2 +-
 arch/arm/mach-omap2/omap44xx.h |    1 -
 arch/arm/mach-tegra/platsmp.c  |   20 ++------------------
 6 files changed, 66 insertions(+), 20 deletions(-)

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 6/8] ARM: tegra: add Tegra114 SoC support
  2013-01-30 21:42 ` Stephen Warren
@ 2013-01-30 21:42     ` Stephen Warren
  -1 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: arm-DgEjT+Ai2ygdnm+yROfE0A
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren

This pull request adds initial support for the Tegra114 SoC, which
integrates a quad-core ARM Cortex-A15 CPU. I'm proud to observe that we
posted the initial versions of these patches before the final official
announcement of this chip.

These patches are enough to boot with a UART-based console, support the
Dalmore and Pluto reference/evaluation boards, instantiate the GPIO and
pinctrl drivers, and enable a cpuidle state. As yet, no clocks or
storage devices are supported, but patches for those will follow shortly.

This pull request is based on (most of) the previous pull request with
tag tegra-for-3.9-soc-cpuidle, followed by a merge of the previous pull
request with tag tegra-for-3.9-scu-base-rework.

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

The following changes since commit ee059485175b21079d3639f167980d354afb3d4b:

  Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-t114

for you to fetch changes up to 031b77afc374cf1b86dbcda5dfa6e1bbb989836c:

  ARM: DT: tegra114: add pinmux DT entry

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

Hiroshi Doyu (7):
      ARM: tegra: fuse: Add chip ID Tegra114 0x35
      ARM: dt: tegra114: Add new SoC base, Tegra114 SoC
      ARM: dt: tegra114: Add new board, Dalmore
      ARM: dt: tegra114: Add new board, Pluto
      ARM: tegra: Add initial support for Tegra114 SoC.
      ARM: tegra: add AHB entry to Tegra114 DT
      ARM: tegra: Add SMMU entry to Tegra114 DT

Joseph Lo (1):
      ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support

Laxman Dewangan (3):
      ARM: tegra114: select PINCTRL for Tegra114 SoC
      ARM: DT: tegra114: add GPIO DT entry
      ARM: DT: tegra114: add pinmux DT entry

 arch/arm/boot/dts/Makefile              |    4 +-
 arch/arm/boot/dts/tegra114-dalmore.dts  |   21 ++++
 arch/arm/boot/dts/tegra114-pluto.dts    |   21 ++++
 arch/arm/boot/dts/tegra114.dtsi         |  153 ++++++++++++++++++++++++++
 arch/arm/mach-tegra/Kconfig             |   12 ++
 arch/arm/mach-tegra/Makefile            |    4 +
 arch/arm/mach-tegra/board-dt-tegra114.c |   48 ++++++++
 arch/arm/mach-tegra/common.c            |    1 +
 arch/arm/mach-tegra/cpuidle-tegra114.c  |   61 ++++++++++
 arch/arm/mach-tegra/cpuidle.c           |    3 +
 arch/arm/mach-tegra/cpuidle.h           |    6 +
 arch/arm/mach-tegra/fuse.h              |    1 +
 12 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/tegra114-dalmore.dts
 create mode 100644 arch/arm/boot/dts/tegra114-pluto.dts
 create mode 100644 arch/arm/boot/dts/tegra114.dtsi
 create mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c
 create mode 100644 arch/arm/mach-tegra/cpuidle-tegra114.c

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 6/8] ARM: tegra: add Tegra114 SoC support
@ 2013-01-30 21:42     ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: linux-arm-kernel

This pull request adds initial support for the Tegra114 SoC, which
integrates a quad-core ARM Cortex-A15 CPU. I'm proud to observe that we
posted the initial versions of these patches before the final official
announcement of this chip.

These patches are enough to boot with a UART-based console, support the
Dalmore and Pluto reference/evaluation boards, instantiate the GPIO and
pinctrl drivers, and enable a cpuidle state. As yet, no clocks or
storage devices are supported, but patches for those will follow shortly.

This pull request is based on (most of) the previous pull request with
tag tegra-for-3.9-soc-cpuidle, followed by a merge of the previous pull
request with tag tegra-for-3.9-scu-base-rework.

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

The following changes since commit ee059485175b21079d3639f167980d354afb3d4b:

  Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-t114

for you to fetch changes up to 031b77afc374cf1b86dbcda5dfa6e1bbb989836c:

  ARM: DT: tegra114: add pinmux DT entry

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

Hiroshi Doyu (7):
      ARM: tegra: fuse: Add chip ID Tegra114 0x35
      ARM: dt: tegra114: Add new SoC base, Tegra114 SoC
      ARM: dt: tegra114: Add new board, Dalmore
      ARM: dt: tegra114: Add new board, Pluto
      ARM: tegra: Add initial support for Tegra114 SoC.
      ARM: tegra: add AHB entry to Tegra114 DT
      ARM: tegra: Add SMMU entry to Tegra114 DT

Joseph Lo (1):
      ARM: tegra: add Tegra114 ARM_CPUIDLE_WFI_STATE support

Laxman Dewangan (3):
      ARM: tegra114: select PINCTRL for Tegra114 SoC
      ARM: DT: tegra114: add GPIO DT entry
      ARM: DT: tegra114: add pinmux DT entry

 arch/arm/boot/dts/Makefile              |    4 +-
 arch/arm/boot/dts/tegra114-dalmore.dts  |   21 ++++
 arch/arm/boot/dts/tegra114-pluto.dts    |   21 ++++
 arch/arm/boot/dts/tegra114.dtsi         |  153 ++++++++++++++++++++++++++
 arch/arm/mach-tegra/Kconfig             |   12 ++
 arch/arm/mach-tegra/Makefile            |    4 +
 arch/arm/mach-tegra/board-dt-tegra114.c |   48 ++++++++
 arch/arm/mach-tegra/common.c            |    1 +
 arch/arm/mach-tegra/cpuidle-tegra114.c  |   61 ++++++++++
 arch/arm/mach-tegra/cpuidle.c           |    3 +
 arch/arm/mach-tegra/cpuidle.h           |    6 +
 arch/arm/mach-tegra/fuse.h              |    1 +
 12 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/tegra114-dalmore.dts
 create mode 100644 arch/arm/boot/dts/tegra114-pluto.dts
 create mode 100644 arch/arm/boot/dts/tegra114.dtsi
 create mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c
 create mode 100644 arch/arm/mach-tegra/cpuidle-tegra114.c

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 7/8] ARM: tegra: device tree updates
  2013-01-30 21:42 ` Stephen Warren
@ 2013-01-30 21:42     ` Stephen Warren
  -1 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: arm-DgEjT+Ai2ygdnm+yROfE0A
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren

Numerous updates to the various Tegra device trees are made:

* Addition of NVIDIA Beaver (Tegra30) and Toradex Colibri T20 and Iris
  carrier boards.
* Enablement of the HDMI connector on most boards.
* Enablement of the keyboard controller on a few boards.
* Addition of the AC'97 controller to Tegra20.
* Addition of a GPIO poweroff node for TrimSlice.
* Changes to support the new "high speed UART" (DMA-capable) driver for
  Tegra serial ports, and enablement for Cardhu's UART C.
* A few cleanups, such as compatible flag fixes, node renames, node
  ordering fixes, commonizing properties into SoC .dtsi files, etc..

This pull request is based on (most of) the previous pull request with
tag tegra-for-3.9-soc-t114.

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

The following changes since commit 5c541b884c09559723f426af2391ab07a4ca10e0:

  ARM: tegra: Add initial support for Tegra114 SoC.

are available in the git repository at:

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

for you to fetch changes up to 3fbf07d80b40f73c304624179381f9038bd03b74:

  ARM: dt: tegra30: Rename "smmu" to "iommu"

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

Bryan Wu (3):
      ARM: DT: tegra: Unify the description of Tegra20 boards
      ARM: DT: tegra: Add board level compatible properties
      ARM: DT: tegra: Add Tegra30 Beaver board support

Hiroshi Doyu (2):
      ARM: dt: tegra20: Rename "gart" to "iommu"
      ARM: dt: tegra30: Rename "smmu" to "iommu"

Laxman Dewangan (7):
      ARM: tegra30: tegra30 gpio is not compatible with tegra20 gpio
      ARM: tegra: dts: add aliases and DMA requestor for serial controller
      ARM: tegra: add DT entry for KBC controller
      ARM: tegra: seaboard: enable keyboard in DT
      ARM: tegra: cardhu: register UARTC
      ARM: tegra: whistler: enable keyboard in DT
      ARM: tegra: harmony: enable keyboard in DT

Lucas Stach (4):
      ASoC: tegra: add ac97 host controller to device tree
      ARM: tegra: move serial clock-frequency attr into the Tegra20 dtsi
      ARM: tegra: Add Colibri T20 512MB COM device tree
      ARM: tegra: Add Toradex Iris carrier board DT with T20 512MB COM

Stephen Warren (6):
      ARM: tegra: trimslice: add gpio-poweroff node to DT
      ARM: tegra: seaboard: enable HDMI port
      ARM: tegra: ventana: enable HDMI port
      ARM: tegra: paz00: enable HDMI port
      ARM: tegra: swap cache-/interrupt-ctrlr nodes in DT
      ARM: tegra: move serial clock-frequency attr into the Tegra30 dtsi

 Documentation/devicetree/bindings/arm/tegra.txt |   32 +-
 arch/arm/boot/dts/Makefile                      |    2 +
 arch/arm/boot/dts/tegra20-colibri-512.dtsi      |  491 ++++++++++++++++++
 arch/arm/boot/dts/tegra20-harmony.dts           |  120 ++++-
 arch/arm/boot/dts/tegra20-iris-512.dts          |   89 ++++
 arch/arm/boot/dts/tegra20-paz00.dts             |   22 +-
 arch/arm/boot/dts/tegra20-seaboard.dts          |  158 +++++-
 arch/arm/boot/dts/tegra20-tamonten.dtsi         |    1 -
 arch/arm/boot/dts/tegra20-trimslice.dts         |   11 +-
 arch/arm/boot/dts/tegra20-ventana.dts           |   23 +-
 arch/arm/boot/dts/tegra20-whistler.dts          |   15 +-
 arch/arm/boot/dts/tegra20.dtsi                  |   72 ++-
 arch/arm/boot/dts/tegra30-beaver.dts            |  373 +++++++++++++
 arch/arm/boot/dts/tegra30-cardhu.dtsi           |   15 +-
 arch/arm/boot/dts/tegra30.dtsi                  |   66 ++-
 15 files changed, 1430 insertions(+), 60 deletions(-)
 create mode 100644 arch/arm/boot/dts/tegra20-colibri-512.dtsi
 create mode 100644 arch/arm/boot/dts/tegra20-iris-512.dts
 create mode 100644 arch/arm/boot/dts/tegra30-beaver.dts

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 7/8] ARM: tegra: device tree updates
@ 2013-01-30 21:42     ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: linux-arm-kernel

Numerous updates to the various Tegra device trees are made:

* Addition of NVIDIA Beaver (Tegra30) and Toradex Colibri T20 and Iris
  carrier boards.
* Enablement of the HDMI connector on most boards.
* Enablement of the keyboard controller on a few boards.
* Addition of the AC'97 controller to Tegra20.
* Addition of a GPIO poweroff node for TrimSlice.
* Changes to support the new "high speed UART" (DMA-capable) driver for
  Tegra serial ports, and enablement for Cardhu's UART C.
* A few cleanups, such as compatible flag fixes, node renames, node
  ordering fixes, commonizing properties into SoC .dtsi files, etc..

This pull request is based on (most of) the previous pull request with
tag tegra-for-3.9-soc-t114.

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

The following changes since commit 5c541b884c09559723f426af2391ab07a4ca10e0:

  ARM: tegra: Add initial support for Tegra114 SoC.

are available in the git repository at:

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

for you to fetch changes up to 3fbf07d80b40f73c304624179381f9038bd03b74:

  ARM: dt: tegra30: Rename "smmu" to "iommu"

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

Bryan Wu (3):
      ARM: DT: tegra: Unify the description of Tegra20 boards
      ARM: DT: tegra: Add board level compatible properties
      ARM: DT: tegra: Add Tegra30 Beaver board support

Hiroshi Doyu (2):
      ARM: dt: tegra20: Rename "gart" to "iommu"
      ARM: dt: tegra30: Rename "smmu" to "iommu"

Laxman Dewangan (7):
      ARM: tegra30: tegra30 gpio is not compatible with tegra20 gpio
      ARM: tegra: dts: add aliases and DMA requestor for serial controller
      ARM: tegra: add DT entry for KBC controller
      ARM: tegra: seaboard: enable keyboard in DT
      ARM: tegra: cardhu: register UARTC
      ARM: tegra: whistler: enable keyboard in DT
      ARM: tegra: harmony: enable keyboard in DT

Lucas Stach (4):
      ASoC: tegra: add ac97 host controller to device tree
      ARM: tegra: move serial clock-frequency attr into the Tegra20 dtsi
      ARM: tegra: Add Colibri T20 512MB COM device tree
      ARM: tegra: Add Toradex Iris carrier board DT with T20 512MB COM

Stephen Warren (6):
      ARM: tegra: trimslice: add gpio-poweroff node to DT
      ARM: tegra: seaboard: enable HDMI port
      ARM: tegra: ventana: enable HDMI port
      ARM: tegra: paz00: enable HDMI port
      ARM: tegra: swap cache-/interrupt-ctrlr nodes in DT
      ARM: tegra: move serial clock-frequency attr into the Tegra30 dtsi

 Documentation/devicetree/bindings/arm/tegra.txt |   32 +-
 arch/arm/boot/dts/Makefile                      |    2 +
 arch/arm/boot/dts/tegra20-colibri-512.dtsi      |  491 ++++++++++++++++++
 arch/arm/boot/dts/tegra20-harmony.dts           |  120 ++++-
 arch/arm/boot/dts/tegra20-iris-512.dts          |   89 ++++
 arch/arm/boot/dts/tegra20-paz00.dts             |   22 +-
 arch/arm/boot/dts/tegra20-seaboard.dts          |  158 +++++-
 arch/arm/boot/dts/tegra20-tamonten.dtsi         |    1 -
 arch/arm/boot/dts/tegra20-trimslice.dts         |   11 +-
 arch/arm/boot/dts/tegra20-ventana.dts           |   23 +-
 arch/arm/boot/dts/tegra20-whistler.dts          |   15 +-
 arch/arm/boot/dts/tegra20.dtsi                  |   72 ++-
 arch/arm/boot/dts/tegra30-beaver.dts            |  373 +++++++++++++
 arch/arm/boot/dts/tegra30-cardhu.dtsi           |   15 +-
 arch/arm/boot/dts/tegra30.dtsi                  |   66 ++-
 15 files changed, 1430 insertions(+), 60 deletions(-)
 create mode 100644 arch/arm/boot/dts/tegra20-colibri-512.dtsi
 create mode 100644 arch/arm/boot/dts/tegra20-iris-512.dts
 create mode 100644 arch/arm/boot/dts/tegra30-beaver.dts

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 8/8] ARM: tegra: defconfig update
  2013-01-30 21:42 ` Stephen Warren
@ 2013-01-30 21:42     ` Stephen Warren
  -1 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: arm-DgEjT+Ai2ygdnm+yROfE0A
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren

Various new features are enabled on Tegra:
* RTC_DRV_TPS6586X to enable the RTC on many boards, such as Harmony
  and Ventana.
* POWER_RESET_GPIO to provide a power off driver for TrimSlice.
* Tegra KBC controller support, for Seaboard, Harmony, and Whistler.
* Tegra high-speed UART driver, for Cardhu Bluetooth.
* kexec support.

This pull request is based on v3.8-rc3.

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

The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20:

  Linux 3.8-rc3

are available in the git repository at:

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

for you to fetch changes up to a05b0d505e76161b485db360f5eac5436e2fc2c6:

  ARM: tegra: defconfig updates

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

Laxman Dewangan (1):
      ARM: tegra: defconfig updates

 arch/arm/configs/tegra_defconfig |    6 ++++++
 1 file changed, 6 insertions(+)

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 8/8] ARM: tegra: defconfig update
@ 2013-01-30 21:42     ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-01-30 21:42 UTC (permalink / raw)
  To: linux-arm-kernel

Various new features are enabled on Tegra:
* RTC_DRV_TPS6586X to enable the RTC on many boards, such as Harmony
  and Ventana.
* POWER_RESET_GPIO to provide a power off driver for TrimSlice.
* Tegra KBC controller support, for Seaboard, Harmony, and Whistler.
* Tegra high-speed UART driver, for Cardhu Bluetooth.
* kexec support.

This pull request is based on v3.8-rc3.

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

The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20:

  Linux 3.8-rc3

are available in the git repository at:

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

for you to fetch changes up to a05b0d505e76161b485db360f5eac5436e2fc2c6:

  ARM: tegra: defconfig updates

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

Laxman Dewangan (1):
      ARM: tegra: defconfig updates

 arch/arm/configs/tegra_defconfig |    6 ++++++
 1 file changed, 6 insertions(+)

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [GIT PULL 5/8] ARM: tegra: SCU base rework
  2013-01-30 21:42     ` Stephen Warren
@ 2013-02-01  4:32         ` Olof Johansson
  -1 siblings, 0 replies; 28+ messages in thread
From: Olof Johansson @ 2013-02-01  4:32 UTC (permalink / raw)
  To: Stephen Warren
  Cc: arm-DgEjT+Ai2ygdnm+yROfE0A,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA

On Wed, Jan 30, 2013 at 02:42:36PM -0700, Stephen Warren wrote:
> Tegra currently relies on the SCU to determine the number of CPU
> cores, and also hard-codes the SCU physical address.
> 
> This series adds a /cpus node to the Tegra device tree, and updates
> the code to rely solely on that to determine the CPU count. A new
> API is introduced to query for the existence of SCU registers, and the
> SCU register address. Tegra and OMAP2 are converted to use these new
> APIs.
> 
> This pull request is based on a merge of v3.8-rc3, and arm-soc's
> depends/rmk-perf branch.

This one looks like it should also be based on your cleanup, since it has
conflicts with it. Please rebase accordingly.


-Olof

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 5/8] ARM: tegra: SCU base rework
@ 2013-02-01  4:32         ` Olof Johansson
  0 siblings, 0 replies; 28+ messages in thread
From: Olof Johansson @ 2013-02-01  4:32 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jan 30, 2013 at 02:42:36PM -0700, Stephen Warren wrote:
> Tegra currently relies on the SCU to determine the number of CPU
> cores, and also hard-codes the SCU physical address.
> 
> This series adds a /cpus node to the Tegra device tree, and updates
> the code to rely solely on that to determine the CPU count. A new
> API is introduced to query for the existence of SCU registers, and the
> SCU register address. Tegra and OMAP2 are converted to use these new
> APIs.
> 
> This pull request is based on a merge of v3.8-rc3, and arm-soc's
> depends/rmk-perf branch.

This one looks like it should also be based on your cleanup, since it has
conflicts with it. Please rebase accordingly.


-Olof

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [GIT PULL 5/8] ARM: tegra: SCU base rework
  2013-02-01  4:32         ` Olof Johansson
@ 2013-02-01  4:35             ` Olof Johansson
  -1 siblings, 0 replies; 28+ messages in thread
From: Olof Johansson @ 2013-02-01  4:35 UTC (permalink / raw)
  To: Stephen Warren
  Cc: arm-DgEjT+Ai2ygdnm+yROfE0A,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA

On Thu, Jan 31, 2013 at 8:32 PM, Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org> wrote:
> On Wed, Jan 30, 2013 at 02:42:36PM -0700, Stephen Warren wrote:
>> Tegra currently relies on the SCU to determine the number of CPU
>> cores, and also hard-codes the SCU physical address.
>>
>> This series adds a /cpus node to the Tegra device tree, and updates
>> the code to rely solely on that to determine the CPU count. A new
>> API is introduced to query for the existence of SCU registers, and the
>> SCU register address. Tegra and OMAP2 are converted to use these new
>> APIs.
>>
>> This pull request is based on a merge of v3.8-rc3, and arm-soc's
>> depends/rmk-perf branch.
>
> This one looks like it should also be based on your cleanup, since it has
> conflicts with it. Please rebase accordingly.

By the way, just in case this looks like a random request...

A few merge conflicts between independent topic branches is not a big
deal; we can deal with those.

What's somewhat annoying though, is when a previous cleanup branch
conflicts with later features. So, please base features on top of
cleanups accordingly.


Thanks,

-Olof

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 5/8] ARM: tegra: SCU base rework
@ 2013-02-01  4:35             ` Olof Johansson
  0 siblings, 0 replies; 28+ messages in thread
From: Olof Johansson @ 2013-02-01  4:35 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Jan 31, 2013 at 8:32 PM, Olof Johansson <olof@lixom.net> wrote:
> On Wed, Jan 30, 2013 at 02:42:36PM -0700, Stephen Warren wrote:
>> Tegra currently relies on the SCU to determine the number of CPU
>> cores, and also hard-codes the SCU physical address.
>>
>> This series adds a /cpus node to the Tegra device tree, and updates
>> the code to rely solely on that to determine the CPU count. A new
>> API is introduced to query for the existence of SCU registers, and the
>> SCU register address. Tegra and OMAP2 are converted to use these new
>> APIs.
>>
>> This pull request is based on a merge of v3.8-rc3, and arm-soc's
>> depends/rmk-perf branch.
>
> This one looks like it should also be based on your cleanup, since it has
> conflicts with it. Please rebase accordingly.

By the way, just in case this looks like a random request...

A few merge conflicts between independent topic branches is not a big
deal; we can deal with those.

What's somewhat annoying though, is when a previous cleanup branch
conflicts with later features. So, please base features on top of
cleanups accordingly.


Thanks,

-Olof

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [GIT PULL 5/8] ARM: tegra: SCU base rework
  2013-02-01  4:35             ` Olof Johansson
@ 2013-02-01  4:46                 ` Stephen Warren
  -1 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-02-01  4:46 UTC (permalink / raw)
  To: Olof Johansson
  Cc: arm-DgEjT+Ai2ygdnm+yROfE0A,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA

On 01/31/2013 09:35 PM, Olof Johansson wrote:
> On Thu, Jan 31, 2013 at 8:32 PM, Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org> wrote:
>> On Wed, Jan 30, 2013 at 02:42:36PM -0700, Stephen Warren wrote:
>>> Tegra currently relies on the SCU to determine the number of CPU
>>> cores, and also hard-codes the SCU physical address.
>>>
>>> This series adds a /cpus node to the Tegra device tree, and updates
>>> the code to rely solely on that to determine the CPU count. A new
>>> API is introduced to query for the existence of SCU registers, and the
>>> SCU register address. Tegra and OMAP2 are converted to use these new
>>> APIs.
>>>
>>> This pull request is based on a merge of v3.8-rc3, and arm-soc's
>>> depends/rmk-perf branch.
>>
>> This one looks like it should also be based on your cleanup, since it has
>> conflicts with it. Please rebase accordingly.
> 
> By the way, just in case this looks like a random request...
> 
> A few merge conflicts between independent topic branches is not a big
> deal; we can deal with those.
> 
> What's somewhat annoying though, is when a previous cleanup branch
> conflicts with later features. So, please base features on top of
> cleanups accordingly.

Hmm. And here I was thinking that I was basing branches on top of
each-other too much given your previous comments about merge conflicts
being OK!

In case it helps, the following commit in linux-next shows the conflict
resolution:

ee05948 Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114

I guess I missed this because I didn't merge for-3.9/scu-base-rework
into my for-next on its own, but only as part of for-3.9/soc-t114,
within which I had resolved the conflict as above.

So, you could just skip this pull request, and it'll be pulled in when
you merge for-3.9/soc-t114.

It that doesn't work for you, I can do the rebase tomorrow morning.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 5/8] ARM: tegra: SCU base rework
@ 2013-02-01  4:46                 ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-02-01  4:46 UTC (permalink / raw)
  To: linux-arm-kernel

On 01/31/2013 09:35 PM, Olof Johansson wrote:
> On Thu, Jan 31, 2013 at 8:32 PM, Olof Johansson <olof@lixom.net> wrote:
>> On Wed, Jan 30, 2013 at 02:42:36PM -0700, Stephen Warren wrote:
>>> Tegra currently relies on the SCU to determine the number of CPU
>>> cores, and also hard-codes the SCU physical address.
>>>
>>> This series adds a /cpus node to the Tegra device tree, and updates
>>> the code to rely solely on that to determine the CPU count. A new
>>> API is introduced to query for the existence of SCU registers, and the
>>> SCU register address. Tegra and OMAP2 are converted to use these new
>>> APIs.
>>>
>>> This pull request is based on a merge of v3.8-rc3, and arm-soc's
>>> depends/rmk-perf branch.
>>
>> This one looks like it should also be based on your cleanup, since it has
>> conflicts with it. Please rebase accordingly.
> 
> By the way, just in case this looks like a random request...
> 
> A few merge conflicts between independent topic branches is not a big
> deal; we can deal with those.
> 
> What's somewhat annoying though, is when a previous cleanup branch
> conflicts with later features. So, please base features on top of
> cleanups accordingly.

Hmm. And here I was thinking that I was basing branches on top of
each-other too much given your previous comments about merge conflicts
being OK!

In case it helps, the following commit in linux-next shows the conflict
resolution:

ee05948 Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114

I guess I missed this because I didn't merge for-3.9/scu-base-rework
into my for-next on its own, but only as part of for-3.9/soc-t114,
within which I had resolved the conflict as above.

So, you could just skip this pull request, and it'll be pulled in when
you merge for-3.9/soc-t114.

It that doesn't work for you, I can do the rebase tomorrow morning.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [GIT PULL 5/8] ARM: tegra: SCU base rework
  2013-02-01  4:46                 ` Stephen Warren
@ 2013-02-01 15:51                     ` Arnd Bergmann
  -1 siblings, 0 replies; 28+ messages in thread
From: Arnd Bergmann @ 2013-02-01 15:51 UTC (permalink / raw)
  To: Stephen Warren
  Cc: Olof Johansson, arm-DgEjT+Ai2ygdnm+yROfE0A,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA

On Friday 01 February 2013, Stephen Warren wrote:
> Hmm. And here I was thinking that I was basing branches on top of
> each-other too much given your previous comments about merge conflicts
> being OK!

IMHO the cleanup branches are special in this regard because they
are primarily meant as a way to resolve the merge conflicts.
If you are able to put all the conflicts between the normal branches
into cleanup patches, you can put them all in one branch and
base your other branches on top of that. Of course that doesn't
always work, but it would solve this particular instance.

	Arnd

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 5/8] ARM: tegra: SCU base rework
@ 2013-02-01 15:51                     ` Arnd Bergmann
  0 siblings, 0 replies; 28+ messages in thread
From: Arnd Bergmann @ 2013-02-01 15:51 UTC (permalink / raw)
  To: linux-arm-kernel

On Friday 01 February 2013, Stephen Warren wrote:
> Hmm. And here I was thinking that I was basing branches on top of
> each-other too much given your previous comments about merge conflicts
> being OK!

IMHO the cleanup branches are special in this regard because they
are primarily meant as a way to resolve the merge conflicts.
If you are able to put all the conflicts between the normal branches
into cleanup patches, you can put them all in one branch and
base your other branches on top of that. Of course that doesn't
always work, but it would solve this particular instance.

	Arnd

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [GIT PULL 8/8] ARM: tegra: defconfig update
  2013-01-30 21:42     ` Stephen Warren
@ 2013-02-05 21:26         ` Olof Johansson
  -1 siblings, 0 replies; 28+ messages in thread
From: Olof Johansson @ 2013-02-05 21:26 UTC (permalink / raw)
  To: Stephen Warren
  Cc: arm-DgEjT+Ai2ygdnm+yROfE0A,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA

On Wed, Jan 30, 2013 at 02:42:39PM -0700, Stephen Warren wrote:
> Various new features are enabled on Tegra:
> * RTC_DRV_TPS6586X to enable the RTC on many boards, such as Harmony
>   and Ventana.
> * POWER_RESET_GPIO to provide a power off driver for TrimSlice.
> * Tegra KBC controller support, for Seaboard, Harmony, and Whistler.
> * Tegra high-speed UART driver, for Cardhu Bluetooth.
> * kexec support.
> 
> This pull request is based on v3.8-rc3.
> 
> ----------------------------------------------------------------
> 
> The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20:
> 
>   Linux 3.8-rc3
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-defconfig

Pulled in 1-4,6-8 (since 6 contains 5 and saved some conflicts).

There were a handful of conflicts during merge, please sanity-check the
contents in arm-soc.

Thanks!


-Olof

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 8/8] ARM: tegra: defconfig update
@ 2013-02-05 21:26         ` Olof Johansson
  0 siblings, 0 replies; 28+ messages in thread
From: Olof Johansson @ 2013-02-05 21:26 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jan 30, 2013 at 02:42:39PM -0700, Stephen Warren wrote:
> Various new features are enabled on Tegra:
> * RTC_DRV_TPS6586X to enable the RTC on many boards, such as Harmony
>   and Ventana.
> * POWER_RESET_GPIO to provide a power off driver for TrimSlice.
> * Tegra KBC controller support, for Seaboard, Harmony, and Whistler.
> * Tegra high-speed UART driver, for Cardhu Bluetooth.
> * kexec support.
> 
> This pull request is based on v3.8-rc3.
> 
> ----------------------------------------------------------------
> 
> The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20:
> 
>   Linux 3.8-rc3
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-defconfig

Pulled in 1-4,6-8 (since 6 contains 5 and saved some conflicts).

There were a handful of conflicts during merge, please sanity-check the
contents in arm-soc.

Thanks!


-Olof

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [GIT PULL 8/8] ARM: tegra: defconfig update
  2013-02-05 21:26         ` Olof Johansson
@ 2013-02-06  0:26             ` Stephen Warren
  -1 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-02-06  0:26 UTC (permalink / raw)
  To: Olof Johansson
  Cc: arm-DgEjT+Ai2ygdnm+yROfE0A,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA

On 02/05/2013 02:26 PM, Olof Johansson wrote:
> On Wed, Jan 30, 2013 at 02:42:39PM -0700, Stephen Warren wrote:
>> Various new features are enabled on Tegra:
>> * RTC_DRV_TPS6586X to enable the RTC on many boards, such as Harmony
>>   and Ventana.
>> * POWER_RESET_GPIO to provide a power off driver for TrimSlice.
>> * Tegra KBC controller support, for Seaboard, Harmony, and Whistler.
>> * Tegra high-speed UART driver, for Cardhu Bluetooth.
>> * kexec support.
>>
>> This pull request is based on v3.8-rc3.
>>
>> ----------------------------------------------------------------
>>
>> The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20:
>>
>>   Linux 3.8-rc3
>>
>> are available in the git repository at:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-defconfig
> 
> Pulled in 1-4,6-8 (since 6 contains 5 and saved some conflicts).

Thanks.

> There were a handful of conflicts during merge, please sanity-check the
> contents in arm-soc.

The merges look good, and the resultant arm-soc for-next branch works
fine on Tegra20 at least.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* [GIT PULL 8/8] ARM: tegra: defconfig update
@ 2013-02-06  0:26             ` Stephen Warren
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Warren @ 2013-02-06  0:26 UTC (permalink / raw)
  To: linux-arm-kernel

On 02/05/2013 02:26 PM, Olof Johansson wrote:
> On Wed, Jan 30, 2013 at 02:42:39PM -0700, Stephen Warren wrote:
>> Various new features are enabled on Tegra:
>> * RTC_DRV_TPS6586X to enable the RTC on many boards, such as Harmony
>>   and Ventana.
>> * POWER_RESET_GPIO to provide a power off driver for TrimSlice.
>> * Tegra KBC controller support, for Seaboard, Harmony, and Whistler.
>> * Tegra high-speed UART driver, for Cardhu Bluetooth.
>> * kexec support.
>>
>> This pull request is based on v3.8-rc3.
>>
>> ----------------------------------------------------------------
>>
>> The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20:
>>
>>   Linux 3.8-rc3
>>
>> are available in the git repository at:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-defconfig
> 
> Pulled in 1-4,6-8 (since 6 contains 5 and saved some conflicts).

Thanks.

> There were a handful of conflicts during merge, please sanity-check the
> contents in arm-soc.

The merges look good, and the resultant arm-soc for-next branch works
fine on Tegra20 at least.

^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2013-02-06  0:26 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-30 21:42 [GIT PULL 1/8] ARM: tegra: cleanup Stephen Warren
2013-01-30 21:42 ` Stephen Warren
     [not found] ` <1359582159-28816-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-01-30 21:42   ` [GIT PULL 2/8] ARM: tegra: Common Clock Framework rework Stephen Warren
2013-01-30 21:42     ` Stephen Warren
2013-01-30 21:42   ` [GIT PULL 3/8] ARM: tegra: USB driver cleanup Stephen Warren
2013-01-30 21:42     ` Stephen Warren
2013-01-30 21:42   ` [GIT PULL 4/8] ARM: tegra: cpuidle enhancements Stephen Warren
2013-01-30 21:42     ` Stephen Warren
2013-01-30 21:42   ` [GIT PULL 5/8] ARM: tegra: SCU base rework Stephen Warren
2013-01-30 21:42     ` Stephen Warren
     [not found]     ` <1359582159-28816-5-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-02-01  4:32       ` Olof Johansson
2013-02-01  4:32         ` Olof Johansson
     [not found]         ` <20130201043222.GC5844-O5ziIzlqnXUVNXGz7ipsyg@public.gmane.org>
2013-02-01  4:35           ` Olof Johansson
2013-02-01  4:35             ` Olof Johansson
     [not found]             ` <CAOesGMjjgz7Am7-D_fQHqgLX=G+Wc_LKL-GYMHd1-NzVC-DUfA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-02-01  4:46               ` Stephen Warren
2013-02-01  4:46                 ` Stephen Warren
     [not found]                 ` <510B4892.3050900-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-02-01 15:51                   ` Arnd Bergmann
2013-02-01 15:51                     ` Arnd Bergmann
2013-01-30 21:42   ` [GIT PULL 6/8] ARM: tegra: add Tegra114 SoC support Stephen Warren
2013-01-30 21:42     ` Stephen Warren
2013-01-30 21:42   ` [GIT PULL 7/8] ARM: tegra: device tree updates Stephen Warren
2013-01-30 21:42     ` Stephen Warren
2013-01-30 21:42   ` [GIT PULL 8/8] ARM: tegra: defconfig update Stephen Warren
2013-01-30 21:42     ` Stephen Warren
     [not found]     ` <1359582159-28816-8-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-02-05 21:26       ` Olof Johansson
2013-02-05 21:26         ` Olof Johansson
     [not found]         ` <20130205212604.GA30719-O5ziIzlqnXUVNXGz7ipsyg@public.gmane.org>
2013-02-06  0:26           ` Stephen Warren
2013-02-06  0:26             ` Stephen Warren

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.