* [GIT PULL 0/5] MSM changes for 3.7 merge window
@ 2012-09-13 18:53 ` David Brown
0 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:53 UTC (permalink / raw)
To: linux-arm-kernel
Following are 5 pull requests for the MSM SoC. The first 5 are
cleanups, fixes, devicetree, and some board changes that finally allow
us to build more than one SoC into a single kernel image.
The fifth patch is my merge, which can be used as a reference to the
intended merge resolution.
David
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 2/5] msm non-critical fixes
2012-09-13 18:53 ` David Brown
@ 2012-09-13 18:56 ` David Brown
-1 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:56 UTC (permalink / raw)
To: arm
Cc: Arnd Bergmann, Olof Johansson, Nicolas Pitre, Thomas Gleixner,
Russell King, linux-arm-msm, linux-arm-kernel, linux-kernel
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-noncrit-for-3.7
for you to fetch changes up to 10717e04d3502cf4a8aa6408d59093e2bbb4645b:
ARM: msm: Fix early debug uart mapping on some memory configs (2012-09-13 10:48:35 -0700)
----------------------------------------------------------------
Some non-critical fixes for msm platforms. The missing FPGA init call
fix is necessary to compile the 8660 target. The iomapping calls are
needed to prevent duplicate mappings with differing attributes. And,
the debug UART change keeps the debug UART working on targets with
more than 512MB of memory.
----------------------------------------------------------------
David Brown (1):
ARM: msm: Remove call to missing FPGA init on 8660
Rohit Vaswani (2):
ARM: msm: io: Remove 7x30 iomap region from 7x00
ARM: msm: io: Change the default static iomappings to be shared
Stephen Boyd (1):
ARM: msm: Fix early debug uart mapping on some memory configs
arch/arm/mach-msm/board-msm8x60.c | 5 -----
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 2 +-
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 2 +-
arch/arm/mach-msm/io.c | 25 +++++++++++++------------
4 files changed, 15 insertions(+), 19 deletions(-)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread* [GIT PULL 2/5] msm non-critical fixes
@ 2012-09-13 18:56 ` David Brown
0 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:56 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-noncrit-for-3.7
for you to fetch changes up to 10717e04d3502cf4a8aa6408d59093e2bbb4645b:
ARM: msm: Fix early debug uart mapping on some memory configs (2012-09-13 10:48:35 -0700)
----------------------------------------------------------------
Some non-critical fixes for msm platforms. The missing FPGA init call
fix is necessary to compile the 8660 target. The iomapping calls are
needed to prevent duplicate mappings with differing attributes. And,
the debug UART change keeps the debug UART working on targets with
more than 512MB of memory.
----------------------------------------------------------------
David Brown (1):
ARM: msm: Remove call to missing FPGA init on 8660
Rohit Vaswani (2):
ARM: msm: io: Remove 7x30 iomap region from 7x00
ARM: msm: io: Change the default static iomappings to be shared
Stephen Boyd (1):
ARM: msm: Fix early debug uart mapping on some memory configs
arch/arm/mach-msm/board-msm8x60.c | 5 -----
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 2 +-
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 2 +-
arch/arm/mach-msm/io.c | 25 +++++++++++++------------
4 files changed, 15 insertions(+), 19 deletions(-)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 3/5] msm devicetree changes
2012-09-13 18:53 ` David Brown
@ 2012-09-13 18:56 ` David Brown
-1 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:56 UTC (permalink / raw)
To: arm
Cc: Arnd Bergmann, Olof Johansson, Nicolas Pitre, Thomas Gleixner,
Russell King, linux-arm-msm, linux-arm-kernel, linux-kernel
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-dt-for-3.7
for you to fetch changes up to 0607fa5884f1759b396a0e1c07be561515daddc8:
ARM: msm: Remove non-DT targets from 8960 (2012-09-13 11:17:01 -0700)
----------------------------------------------------------------
These patches migrate both the 8660 and 8960 targets on msm to be
devicetree only. This also sets most of the frame in place necessary
to build both targets into the same image.
There's a couple of cleanups in here that are kept in this series
because they are intimately tied to the changes necessary to support
the devicetree conversions.
----------------------------------------------------------------
Stephen Boyd (11):
ARM: msm: Add handle_irq handler for 8660 DT machine
ARM: msm: Add msm8660-surf.dts to Makefile.boot
ARM: msm: Don't touch GIC registers outside of GIC code
ARM: msm: Allow timer.c to compile on multiple targets
ARM: msm: Add DT support to msm_timer
ARM: msm: Move 8660 to DT timer
ARM: msm: Make 8660 a DT only target
ARM: msm: Rename board-msm8x60 to signify its DT only status
ARM: msm: Move io mapping prototypes to common.h
ARM: msm: Add DT support for 8960
ARM: msm: Remove non-DT targets from 8960
.../devicetree/bindings/arm/msm/timer.txt | 38 +++++
arch/arm/boot/dts/msm8660-surf.dts | 19 ++-
arch/arm/boot/dts/msm8960-cdp.dts | 41 +++++
arch/arm/mach-msm/Kconfig | 41 +----
arch/arm/mach-msm/Makefile | 4 +-
arch/arm/mach-msm/Makefile.boot | 3 +
arch/arm/mach-msm/board-dt-8660.c | 68 ++++++++
arch/arm/mach-msm/board-dt-8960.c | 49 ++++++
arch/arm/mach-msm/board-halibut.c | 5 +-
arch/arm/mach-msm/board-msm7x30.c | 9 +-
arch/arm/mach-msm/board-msm8960.c | 122 --------------
arch/arm/mach-msm/board-msm8x60.c | 166 ------------------
arch/arm/mach-msm/board-qsd8x50.c | 7 +-
arch/arm/mach-msm/board-trout.c | 5 +-
arch/arm/mach-msm/common.h | 30 ++++
arch/arm/mach-msm/devices-msm8960.c | 85 ----------
arch/arm/mach-msm/include/mach/board.h | 3 -
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 7 -
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 4 -
arch/arm/mach-msm/io.c | 2 +
arch/arm/mach-msm/platsmp.c | 8 -
arch/arm/mach-msm/timer.c | 186 ++++++++++++++++-----
25 files changed, 412 insertions(+), 502 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
create mode 100644 arch/arm/mach-msm/board-dt-8660.c
create mode 100644 arch/arm/mach-msm/board-dt-8960.c
delete mode 100644 arch/arm/mach-msm/board-msm8960.c
delete mode 100644 arch/arm/mach-msm/board-msm8x60.c
create mode 100644 arch/arm/mach-msm/common.h
delete mode 100644 arch/arm/mach-msm/devices-msm8960.c
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread* [GIT PULL 3/5] msm devicetree changes
@ 2012-09-13 18:56 ` David Brown
0 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:56 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-dt-for-3.7
for you to fetch changes up to 0607fa5884f1759b396a0e1c07be561515daddc8:
ARM: msm: Remove non-DT targets from 8960 (2012-09-13 11:17:01 -0700)
----------------------------------------------------------------
These patches migrate both the 8660 and 8960 targets on msm to be
devicetree only. This also sets most of the frame in place necessary
to build both targets into the same image.
There's a couple of cleanups in here that are kept in this series
because they are intimately tied to the changes necessary to support
the devicetree conversions.
----------------------------------------------------------------
Stephen Boyd (11):
ARM: msm: Add handle_irq handler for 8660 DT machine
ARM: msm: Add msm8660-surf.dts to Makefile.boot
ARM: msm: Don't touch GIC registers outside of GIC code
ARM: msm: Allow timer.c to compile on multiple targets
ARM: msm: Add DT support to msm_timer
ARM: msm: Move 8660 to DT timer
ARM: msm: Make 8660 a DT only target
ARM: msm: Rename board-msm8x60 to signify its DT only status
ARM: msm: Move io mapping prototypes to common.h
ARM: msm: Add DT support for 8960
ARM: msm: Remove non-DT targets from 8960
.../devicetree/bindings/arm/msm/timer.txt | 38 +++++
arch/arm/boot/dts/msm8660-surf.dts | 19 ++-
arch/arm/boot/dts/msm8960-cdp.dts | 41 +++++
arch/arm/mach-msm/Kconfig | 41 +----
arch/arm/mach-msm/Makefile | 4 +-
arch/arm/mach-msm/Makefile.boot | 3 +
arch/arm/mach-msm/board-dt-8660.c | 68 ++++++++
arch/arm/mach-msm/board-dt-8960.c | 49 ++++++
arch/arm/mach-msm/board-halibut.c | 5 +-
arch/arm/mach-msm/board-msm7x30.c | 9 +-
arch/arm/mach-msm/board-msm8960.c | 122 --------------
arch/arm/mach-msm/board-msm8x60.c | 166 ------------------
arch/arm/mach-msm/board-qsd8x50.c | 7 +-
arch/arm/mach-msm/board-trout.c | 5 +-
arch/arm/mach-msm/common.h | 30 ++++
arch/arm/mach-msm/devices-msm8960.c | 85 ----------
arch/arm/mach-msm/include/mach/board.h | 3 -
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 7 -
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 4 -
arch/arm/mach-msm/io.c | 2 +
arch/arm/mach-msm/platsmp.c | 8 -
arch/arm/mach-msm/timer.c | 186 ++++++++++++++++-----
25 files changed, 412 insertions(+), 502 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
create mode 100644 arch/arm/mach-msm/board-dt-8660.c
create mode 100644 arch/arm/mach-msm/board-dt-8960.c
delete mode 100644 arch/arm/mach-msm/board-msm8960.c
delete mode 100644 arch/arm/mach-msm/board-msm8x60.c
create mode 100644 arch/arm/mach-msm/common.h
delete mode 100644 arch/arm/mach-msm/devices-msm8960.c
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 4/5] msm board changes
2012-09-13 18:53 ` David Brown
@ 2012-09-13 18:57 ` David Brown
-1 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:57 UTC (permalink / raw)
To: arm
Cc: Arnd Bergmann, Olof Johansson, Nicolas Pitre, Thomas Gleixner,
Russell King, linux-arm-msm, linux-arm-kernel, linux-kernel
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-board-for-3.7
for you to fetch changes up to 33fcb13dc543af610c7c930dbfeeed6e6ed02376:
ARM: msm: Allow 8960 and 8660 to compile together (2012-09-13 11:17:47 -0700)
----------------------------------------------------------------
Final parts to allow msm8660 and msm8960 to build into the same
kernel. This won't work without the changes from msm-dt-for-3.7.
----------------------------------------------------------------
Stephen Boyd (2):
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
ARM: msm: Allow 8960 and 8660 to compile together
arch/arm/mach-msm/Kconfig | 8 ++++++--
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 11 -----------
arch/arm/mach-msm/include/mach/msm_iomap.h | 3 +--
arch/arm/mach-msm/io.c | 2 --
4 files changed, 7 insertions(+), 17 deletions(-)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread* [GIT PULL 4/5] msm board changes
@ 2012-09-13 18:57 ` David Brown
0 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:57 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-board-for-3.7
for you to fetch changes up to 33fcb13dc543af610c7c930dbfeeed6e6ed02376:
ARM: msm: Allow 8960 and 8660 to compile together (2012-09-13 11:17:47 -0700)
----------------------------------------------------------------
Final parts to allow msm8660 and msm8960 to build into the same
kernel. This won't work without the changes from msm-dt-for-3.7.
----------------------------------------------------------------
Stephen Boyd (2):
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
ARM: msm: Allow 8960 and 8660 to compile together
arch/arm/mach-msm/Kconfig | 8 ++++++--
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 11 -----------
arch/arm/mach-msm/include/mach/msm_iomap.h | 3 +--
arch/arm/mach-msm/io.c | 2 --
4 files changed, 7 insertions(+), 17 deletions(-)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 5/5] msm all changes
2012-09-13 18:53 ` David Brown
@ 2012-09-13 18:58 ` David Brown
-1 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:58 UTC (permalink / raw)
To: arm
Cc: Arnd Bergmann, Olof Johansson, Nicolas Pitre, Thomas Gleixner,
Russell King, linux-arm-msm, linux-arm-kernel, linux-kernel
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-merged-for-3.7
for you to fetch changes up to 9b9b5ed018ac77127140d41fbfbe0224fad1d088:
Merge branch '36/board' into 36/merged (2012-09-13 11:23:22 -0700)
----------------------------------------------------------------
This is a merge of the following tags:
msm-board-for-3.7
msm-cleanup-for-3.7
msm-dt-for-3.7
msm-fix-noncrit-for-3.7
mostly to show the correct merge resolution. There's a trivial merge
resolve in arch/arm/mach-msm/io.c.
The rename of arch/arm/mach-msm/board-msm8x60.c to
arch/arm/mach-msm/board-dt-8660.c seems to have confused git, causing
it to drop
ARM: msm: Remove call to missing FPGA init on 8660
so this merge resolution fixes that.
----------------------------------------------------------------
David Brown (5):
ARM: msm: Remove call to missing FPGA init on 8660
Merge branch '36/cleanup' into 36/merged
Merge branch '36/fix-noncrit' into 36/merged
Merge branch '36/dt' into 36/merged
Merge branch '36/board' into 36/merged
Rohit Vaswani (2):
ARM: msm: io: Remove 7x30 iomap region from 7x00
ARM: msm: io: Change the default static iomappings to be shared
Stephen Boyd (20):
ARM: msm: Remove msm_hw_reset_hook
ARM: msm: clock-pcom: Mark functions static
ARM: msm: Remove unused idle.c
ARM: msm: Fix early debug uart mapping on some memory configs
ARM: msm: Add handle_irq handler for 8660 DT machine
ARM: msm: Add msm8660-surf.dts to Makefile.boot
ARM: msm: Fix sparse warnings due to incorrect type
ARM: msm: Remove unused acpuclock-arm11
ARM: msm: Remove uncompiled board-msm7x27
ARM: msm: Don't touch GIC registers outside of GIC code
ARM: msm: Allow timer.c to compile on multiple targets
ARM: msm: Add DT support to msm_timer
ARM: msm: Move 8660 to DT timer
ARM: msm: Make 8660 a DT only target
ARM: msm: Rename board-msm8x60 to signify its DT only status
ARM: msm: Move io mapping prototypes to common.h
ARM: msm: Add DT support for 8960
ARM: msm: Remove non-DT targets from 8960
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
ARM: msm: Allow 8960 and 8660 to compile together
Wei Yongjun (1):
ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail
.../devicetree/bindings/arm/msm/timer.txt | 38 ++
arch/arm/boot/dts/msm8660-surf.dts | 19 +-
arch/arm/boot/dts/msm8960-cdp.dts | 41 ++
arch/arm/mach-msm/Kconfig | 49 +-
arch/arm/mach-msm/Makefile | 8 +-
arch/arm/mach-msm/Makefile.boot | 3 +
arch/arm/mach-msm/acpuclock-arm11.c | 525 ---------------------
arch/arm/mach-msm/acpuclock.h | 32 --
arch/arm/mach-msm/board-dt-8660.c | 63 +++
arch/arm/mach-msm/board-dt-8960.c | 49 ++
arch/arm/mach-msm/board-halibut.c | 5 +-
arch/arm/mach-msm/board-mahimahi.c | 1 -
arch/arm/mach-msm/board-msm7x27.c | 170 -------
arch/arm/mach-msm/board-msm7x30.c | 9 +-
arch/arm/mach-msm/board-msm8960.c | 122 -----
arch/arm/mach-msm/board-msm8x60.c | 166 -------
arch/arm/mach-msm/board-qsd8x50.c | 7 +-
arch/arm/mach-msm/board-sapphire.c | 1 -
arch/arm/mach-msm/board-trout.c | 5 +-
arch/arm/mach-msm/clock-pcom.c | 18 +-
arch/arm/mach-msm/common.h | 30 ++
arch/arm/mach-msm/devices-msm8960.c | 85 ----
arch/arm/mach-msm/dma.c | 3 +-
arch/arm/mach-msm/idle.c | 49 --
arch/arm/mach-msm/include/mach/board.h | 13 -
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 7 -
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 6 +-
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 17 +-
arch/arm/mach-msm/include/mach/msm_iomap.h | 3 +-
arch/arm/mach-msm/include/mach/system.h | 19 -
arch/arm/mach-msm/io.c | 32 +-
arch/arm/mach-msm/platsmp.c | 8 -
arch/arm/mach-msm/proc_comm.c | 1 -
arch/arm/mach-msm/smd.c | 7 -
arch/arm/mach-msm/timer.c | 188 ++++++--
37 files changed, 443 insertions(+), 1364 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
delete mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
delete mode 100644 arch/arm/mach-msm/acpuclock.h
create mode 100644 arch/arm/mach-msm/board-dt-8660.c
create mode 100644 arch/arm/mach-msm/board-dt-8960.c
delete mode 100644 arch/arm/mach-msm/board-msm7x27.c
delete mode 100644 arch/arm/mach-msm/board-msm8960.c
delete mode 100644 arch/arm/mach-msm/board-msm8x60.c
create mode 100644 arch/arm/mach-msm/common.h
delete mode 100644 arch/arm/mach-msm/devices-msm8960.c
delete mode 100644 arch/arm/mach-msm/idle.c
delete mode 100644 arch/arm/mach-msm/include/mach/system.h
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread* [GIT PULL 5/5] msm all changes
@ 2012-09-13 18:58 ` David Brown
0 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:58 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-merged-for-3.7
for you to fetch changes up to 9b9b5ed018ac77127140d41fbfbe0224fad1d088:
Merge branch '36/board' into 36/merged (2012-09-13 11:23:22 -0700)
----------------------------------------------------------------
This is a merge of the following tags:
msm-board-for-3.7
msm-cleanup-for-3.7
msm-dt-for-3.7
msm-fix-noncrit-for-3.7
mostly to show the correct merge resolution. There's a trivial merge
resolve in arch/arm/mach-msm/io.c.
The rename of arch/arm/mach-msm/board-msm8x60.c to
arch/arm/mach-msm/board-dt-8660.c seems to have confused git, causing
it to drop
ARM: msm: Remove call to missing FPGA init on 8660
so this merge resolution fixes that.
----------------------------------------------------------------
David Brown (5):
ARM: msm: Remove call to missing FPGA init on 8660
Merge branch '36/cleanup' into 36/merged
Merge branch '36/fix-noncrit' into 36/merged
Merge branch '36/dt' into 36/merged
Merge branch '36/board' into 36/merged
Rohit Vaswani (2):
ARM: msm: io: Remove 7x30 iomap region from 7x00
ARM: msm: io: Change the default static iomappings to be shared
Stephen Boyd (20):
ARM: msm: Remove msm_hw_reset_hook
ARM: msm: clock-pcom: Mark functions static
ARM: msm: Remove unused idle.c
ARM: msm: Fix early debug uart mapping on some memory configs
ARM: msm: Add handle_irq handler for 8660 DT machine
ARM: msm: Add msm8660-surf.dts to Makefile.boot
ARM: msm: Fix sparse warnings due to incorrect type
ARM: msm: Remove unused acpuclock-arm11
ARM: msm: Remove uncompiled board-msm7x27
ARM: msm: Don't touch GIC registers outside of GIC code
ARM: msm: Allow timer.c to compile on multiple targets
ARM: msm: Add DT support to msm_timer
ARM: msm: Move 8660 to DT timer
ARM: msm: Make 8660 a DT only target
ARM: msm: Rename board-msm8x60 to signify its DT only status
ARM: msm: Move io mapping prototypes to common.h
ARM: msm: Add DT support for 8960
ARM: msm: Remove non-DT targets from 8960
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
ARM: msm: Allow 8960 and 8660 to compile together
Wei Yongjun (1):
ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail
.../devicetree/bindings/arm/msm/timer.txt | 38 ++
arch/arm/boot/dts/msm8660-surf.dts | 19 +-
arch/arm/boot/dts/msm8960-cdp.dts | 41 ++
arch/arm/mach-msm/Kconfig | 49 +-
arch/arm/mach-msm/Makefile | 8 +-
arch/arm/mach-msm/Makefile.boot | 3 +
arch/arm/mach-msm/acpuclock-arm11.c | 525 ---------------------
arch/arm/mach-msm/acpuclock.h | 32 --
arch/arm/mach-msm/board-dt-8660.c | 63 +++
arch/arm/mach-msm/board-dt-8960.c | 49 ++
arch/arm/mach-msm/board-halibut.c | 5 +-
arch/arm/mach-msm/board-mahimahi.c | 1 -
arch/arm/mach-msm/board-msm7x27.c | 170 -------
arch/arm/mach-msm/board-msm7x30.c | 9 +-
arch/arm/mach-msm/board-msm8960.c | 122 -----
arch/arm/mach-msm/board-msm8x60.c | 166 -------
arch/arm/mach-msm/board-qsd8x50.c | 7 +-
arch/arm/mach-msm/board-sapphire.c | 1 -
arch/arm/mach-msm/board-trout.c | 5 +-
arch/arm/mach-msm/clock-pcom.c | 18 +-
arch/arm/mach-msm/common.h | 30 ++
arch/arm/mach-msm/devices-msm8960.c | 85 ----
arch/arm/mach-msm/dma.c | 3 +-
arch/arm/mach-msm/idle.c | 49 --
arch/arm/mach-msm/include/mach/board.h | 13 -
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 7 -
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 6 +-
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 -
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 17 +-
arch/arm/mach-msm/include/mach/msm_iomap.h | 3 +-
arch/arm/mach-msm/include/mach/system.h | 19 -
arch/arm/mach-msm/io.c | 32 +-
arch/arm/mach-msm/platsmp.c | 8 -
arch/arm/mach-msm/proc_comm.c | 1 -
arch/arm/mach-msm/smd.c | 7 -
arch/arm/mach-msm/timer.c | 188 ++++++--
37 files changed, 443 insertions(+), 1364 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/msm/timer.txt
create mode 100644 arch/arm/boot/dts/msm8960-cdp.dts
delete mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
delete mode 100644 arch/arm/mach-msm/acpuclock.h
create mode 100644 arch/arm/mach-msm/board-dt-8660.c
create mode 100644 arch/arm/mach-msm/board-dt-8960.c
delete mode 100644 arch/arm/mach-msm/board-msm7x27.c
delete mode 100644 arch/arm/mach-msm/board-msm8960.c
delete mode 100644 arch/arm/mach-msm/board-msm8x60.c
create mode 100644 arch/arm/mach-msm/common.h
delete mode 100644 arch/arm/mach-msm/devices-msm8960.c
delete mode 100644 arch/arm/mach-msm/idle.c
delete mode 100644 arch/arm/mach-msm/include/mach/system.h
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 1/5] msm cleanups (resend)
2012-09-13 18:53 ` David Brown
@ 2012-09-13 18:59 ` David Brown
-1 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:59 UTC (permalink / raw)
To: arm
Cc: Arnd Bergmann, Olof Johansson, Nicolas Pitre, Thomas Gleixner,
Russell King, linux-arm-msm, linux-arm-kernel, linux-kernel
[resending to proper In-Reply-To]
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup-for-3.7
for you to fetch changes up to e63770acb3c1e7334885ed4673aed1375f93484a:
ARM: msm: Remove uncompiled board-msm7x27 (2012-09-13 11:13:08 -0700)
----------------------------------------------------------------
Various cleanups for the msm targets. Most of this is removing dead
code, along with a fix of a sparse warning, a list fix from a semantic
patch, and marking some functions as static.
----------------------------------------------------------------
Stephen Boyd (6):
ARM: msm: Remove msm_hw_reset_hook
ARM: msm: clock-pcom: Mark functions static
ARM: msm: Remove unused idle.c
ARM: msm: Fix sparse warnings due to incorrect type
ARM: msm: Remove unused acpuclock-arm11
ARM: msm: Remove uncompiled board-msm7x27
Wei Yongjun (1):
ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail
arch/arm/mach-msm/Makefile | 4 +-
arch/arm/mach-msm/acpuclock-arm11.c | 525 --------------------------------
arch/arm/mach-msm/acpuclock.h | 32 --
arch/arm/mach-msm/board-mahimahi.c | 1 -
arch/arm/mach-msm/board-msm7x27.c | 170 -----------
arch/arm/mach-msm/board-sapphire.c | 1 -
arch/arm/mach-msm/clock-pcom.c | 18 +-
arch/arm/mach-msm/dma.c | 3 +-
arch/arm/mach-msm/idle.c | 49 ---
arch/arm/mach-msm/include/mach/board.h | 10 -
arch/arm/mach-msm/include/mach/system.h | 19 --
arch/arm/mach-msm/io.c | 3 +-
arch/arm/mach-msm/proc_comm.c | 1 -
arch/arm/mach-msm/smd.c | 7 -
arch/arm/mach-msm/timer.c | 2 +-
15 files changed, 14 insertions(+), 831 deletions(-)
delete mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
delete mode 100644 arch/arm/mach-msm/acpuclock.h
delete mode 100644 arch/arm/mach-msm/board-msm7x27.c
delete mode 100644 arch/arm/mach-msm/idle.c
delete mode 100644 arch/arm/mach-msm/include/mach/system.h
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread* [GIT PULL 1/5] msm cleanups (resend)
@ 2012-09-13 18:59 ` David Brown
0 siblings, 0 replies; 14+ messages in thread
From: David Brown @ 2012-09-13 18:59 UTC (permalink / raw)
To: linux-arm-kernel
[resending to proper In-Reply-To]
The following changes since commit 28a33cbc24e4256c143dce96c7d93bf423229f92:
Linux 3.5 (2012-07-21 13:58:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup-for-3.7
for you to fetch changes up to e63770acb3c1e7334885ed4673aed1375f93484a:
ARM: msm: Remove uncompiled board-msm7x27 (2012-09-13 11:13:08 -0700)
----------------------------------------------------------------
Various cleanups for the msm targets. Most of this is removing dead
code, along with a fix of a sparse warning, a list fix from a semantic
patch, and marking some functions as static.
----------------------------------------------------------------
Stephen Boyd (6):
ARM: msm: Remove msm_hw_reset_hook
ARM: msm: clock-pcom: Mark functions static
ARM: msm: Remove unused idle.c
ARM: msm: Fix sparse warnings due to incorrect type
ARM: msm: Remove unused acpuclock-arm11
ARM: msm: Remove uncompiled board-msm7x27
Wei Yongjun (1):
ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail
arch/arm/mach-msm/Makefile | 4 +-
arch/arm/mach-msm/acpuclock-arm11.c | 525 --------------------------------
arch/arm/mach-msm/acpuclock.h | 32 --
arch/arm/mach-msm/board-mahimahi.c | 1 -
arch/arm/mach-msm/board-msm7x27.c | 170 -----------
arch/arm/mach-msm/board-sapphire.c | 1 -
arch/arm/mach-msm/clock-pcom.c | 18 +-
arch/arm/mach-msm/dma.c | 3 +-
arch/arm/mach-msm/idle.c | 49 ---
arch/arm/mach-msm/include/mach/board.h | 10 -
arch/arm/mach-msm/include/mach/system.h | 19 --
arch/arm/mach-msm/io.c | 3 +-
arch/arm/mach-msm/proc_comm.c | 1 -
arch/arm/mach-msm/smd.c | 7 -
arch/arm/mach-msm/timer.c | 2 +-
15 files changed, 14 insertions(+), 831 deletions(-)
delete mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
delete mode 100644 arch/arm/mach-msm/acpuclock.h
delete mode 100644 arch/arm/mach-msm/board-msm7x27.c
delete mode 100644 arch/arm/mach-msm/idle.c
delete mode 100644 arch/arm/mach-msm/include/mach/system.h
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [GIT PULL 0/5] MSM changes for 3.7 merge window
2012-09-13 18:53 ` David Brown
@ 2012-09-17 1:06 ` Olof Johansson
-1 siblings, 0 replies; 14+ messages in thread
From: Olof Johansson @ 2012-09-17 1:06 UTC (permalink / raw)
To: David Brown
Cc: arm, Arnd Bergmann, Nicolas Pitre, Thomas Gleixner, Russell King,
linux-arm-msm, linux-arm-kernel, linux-kernel
Hi,
On Thu, Sep 13, 2012 at 11:53:42AM -0700, David Brown wrote:
> Following are 5 pull requests for the MSM SoC. The first 5 are
> cleanups, fixes, devicetree, and some board changes that finally allow
> us to build more than one SoC into a single kernel image.
>
> The fifth patch is my merge, which can be used as a reference to the
> intended merge resolution.
Nice cleanups, looking forward to seeing more of them together with
consolidation work in the next releases!
Pulled all 4, and verified the merge resolution.
-Olof
^ permalink raw reply [flat|nested] 14+ messages in thread
* [GIT PULL 0/5] MSM changes for 3.7 merge window
@ 2012-09-17 1:06 ` Olof Johansson
0 siblings, 0 replies; 14+ messages in thread
From: Olof Johansson @ 2012-09-17 1:06 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Thu, Sep 13, 2012 at 11:53:42AM -0700, David Brown wrote:
> Following are 5 pull requests for the MSM SoC. The first 5 are
> cleanups, fixes, devicetree, and some board changes that finally allow
> us to build more than one SoC into a single kernel image.
>
> The fifth patch is my merge, which can be used as a reference to the
> intended merge resolution.
Nice cleanups, looking forward to seeing more of them together with
consolidation work in the next releases!
Pulled all 4, and verified the merge resolution.
-Olof
^ permalink raw reply [flat|nested] 14+ messages in thread