Skip to content

Move closer to single 8660/8960 zImage

Stephen Boyd linux-arm-kernel linux-arm-msm linux-devicetree lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest9 patches 7 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9ARM: msm: Don't touch GIC registers outside of GIC codearch/arm/mach-msm/board-msm8960.c arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-msm/platsmp.c +1 more+2 -260 replies
2/9ARM: msm: Allow timer.c to compile on multiple targetsarch/arm/mach-msm/board-halibut.c arch/arm/mach-msm/board-msm7x30.c arch/arm/mach-msm/board-msm8960.c +6 more+125 -600 replies
3/9ARM: msm: Add DT support to msm_timerDocumentation/devicetree/bindings/arm/msm/timer.txt arch/arm/mach-msm/common.h arch/arm/mach-msm/timer.c+126 -01 reply
4/9ARM: msm: Move 8660 to DT timerarch/arm/boot/dts/msm8660-surf.dts arch/arm/mach-msm/board-msm8x60.c+18 -10 replies
5/9ARM: msm: Make 8660 a DT only targetarch/arm/mach-msm/Kconfig arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-msm/common.h +1 more+6 -1400 replies
6/9ARM: msm: Rename board-msm8x60 to signify its DT only statusarch/arm/mach-msm/Makefile arch/arm/mach-msm/board-dt-8660.c+1 -10 replies
7/9ARM: msm: Move io mapping prototypes to common.harch/arm/mach-msm/board-dt-8660.c arch/arm/mach-msm/common.h arch/arm/mach-msm/include/mach/board.h +6 more+12 -250 replies
8/9ARM: msm: Add DT support for 8960arch/arm/boot/dts/msm8960-cdp.dts arch/arm/mach-msm/Kconfig arch/arm/mach-msm/Makefile +2 more+93 -04 replies
9/9ARM: msm: Remove non-DT targets from 8960arch/arm/mach-msm/Kconfig arch/arm/mach-msm/Makefile arch/arm/mach-msm/board-msm8960.c +3 more+0 -2230 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/9] Move closer to single 8660/8960 zImage

The first half of this series adds devicetree support to the msm timer. The second half moves 8660 and 8960 to be devicetree only. After this patch series it should be possible to compile 8660 and 8960 together in one zImage (although Kconfig doesn't allow it right now).

This relies on the previous 8660 dt fixlets patches I sent and it also assumes that 'ARM: msm: Remove call to missing FPGA init on 8660' has been applied.

Stephen Boyd (9):
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                 |  17 ++
 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                    |   1 +
 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-msm7x30.c                  |   9 +-
 arch/arm/mach-msm/board-msm8960.c                  | 122 --------------
 arch/arm/mach-msm/board-msm8x60.c                  | 162 ------------------
 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, 404 insertions(+), 497 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
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation