* [GIT PULL] msm cleanups for v3.12
@ 2013-08-07 20:58 David Brown
2013-08-07 21:52 ` David Brown
2013-08-07 23:06 ` [GIT PULL v2] " David Brown
0 siblings, 2 replies; 5+ messages in thread
From: David Brown @ 2013-08-07 20:58 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.12/msm-cleanup2
for you to fetch changes up to b80a0dc53df68c6862b8985ecc12856edb080248:
ARM: msm: fix compilation error in gpiomux (2013-08-07 10:39:31 -0700)
----------------------------------------------------------------
General cleanups for MSM for 3.12
This is a series of cleanups to the MSM code. These are a healthy
start to bringing the MSM code closer to the state of current ARM code
and getting more of it ready for conversion to devicetree.
----------------------------------------------------------------
This is missing an Ack for the "Move debug-macro.S to include/debug".
Stephen incorporated feedback from RMK, which I folded into the patch.
There are conflicts in arch/arm/Kconfig.debug which are resolved in
the linux-next tree.
Krzysztof Kozlowski (1):
ARM: msm: fix compilation error in gpiomux
Rohit Vaswani (1):
ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60
Stephen Boyd (8):
ARM: msm: Don't compile __msm_ioremap_caller() unless used
ARM: msm: Move debug-macro.S to include/debug
ARM: msm: Remove TMR and TMR0 static mappings
ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
ARM: msm: Move mach/board.h contents to common.h
ARM: msm: Remove devices-iommu.c
iommu/msm: Move mach includes to iommu directory
ARM: msm: Only compile io.c on platforms that use it
arch/arm/Kconfig | 1 +
arch/arm/Kconfig.debug | 9 +-
.../mach/debug-macro.S => include/debug/msm.S} | 32 +-
arch/arm/mach-msm/Makefile | 9 +-
arch/arm/mach-msm/board-dt-8660.c | 4 +-
arch/arm/mach-msm/board-dt-8960.c | 3 +-
arch/arm/mach-msm/board-halibut.c | 1 -
arch/arm/mach-msm/board-mahimahi.c | 2 +-
arch/arm/mach-msm/board-msm7x30.c | 1 -
arch/arm/mach-msm/board-qsd8x50.c | 1 -
arch/arm/mach-msm/board-sapphire.c | 2 +-
arch/arm/mach-msm/board-trout.c | 1 -
arch/arm/mach-msm/board-trout.h | 2 +-
arch/arm/mach-msm/common.h | 18 +-
arch/arm/mach-msm/devices-iommu.c | 912 ---------------------
arch/arm/mach-msm/devices-msm7x30.c | 2 +-
arch/arm/mach-msm/devices-qsd8x50.c | 2 +-
arch/arm/mach-msm/gpiomux.c | 2 +-
arch/arm/mach-msm/include/mach/board.h | 38 -
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 46 --
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 53 --
arch/arm/mach-msm/include/mach/msm_iomap.h | 17 -
arch/arm/mach-msm/include/mach/uncompress.h | 63 --
arch/arm/mach-msm/io.c | 67 +-
arch/arm/mach-msm/timer.c | 17 +-
drivers/iommu/msm_iommu.c | 4 +-
.../mach/iommu.h => drivers/iommu/msm_iommu.h | 0
drivers/iommu/msm_iommu_dev.c | 4 +-
.../iommu/msm_iommu_hw-8xxx.h | 0
drivers/video/msm/msm_fb.c | 1 -
30 files changed, 94 insertions(+), 1220 deletions(-)
rename arch/arm/{mach-msm/include/mach/debug-macro.S => include/debug/msm.S} (61%)
delete mode 100644 arch/arm/mach-msm/devices-iommu.c
delete mode 100644 arch/arm/mach-msm/include/mach/board.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8960.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
delete mode 100644 arch/arm/mach-msm/include/mach/uncompress.h
rename arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h (100%)
rename arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h => drivers/iommu/msm_iommu_hw-8xxx.h (100%)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] msm cleanups for v3.12
2013-08-07 20:58 [GIT PULL] msm cleanups for v3.12 David Brown
@ 2013-08-07 21:52 ` David Brown
2013-08-07 22:14 ` David Brown
2013-08-07 23:06 ` [GIT PULL v2] " David Brown
1 sibling, 1 reply; 5+ messages in thread
From: David Brown @ 2013-08-07 21:52 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 07, 2013 at 01:58:16PM -0700, David Brown wrote:
>The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
>
> Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
>
>are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.12/msm-cleanup2
>
>for you to fetch changes up to b80a0dc53df68c6862b8985ecc12856edb080248:
>
> ARM: msm: fix compilation error in gpiomux (2013-08-07 10:39:31 -0700)
Sigh, it looks like this fixes code that was removed in last-week's
fix patches. I can either regenerate the pull request, or feel free
to "resolve" this by just using the removal of the code.
David
--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] msm cleanups for v3.12
2013-08-07 21:52 ` David Brown
@ 2013-08-07 22:14 ` David Brown
0 siblings, 0 replies; 5+ messages in thread
From: David Brown @ 2013-08-07 22:14 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 07, 2013 at 02:52:59PM -0700, David Brown wrote:
>On Wed, Aug 07, 2013 at 01:58:16PM -0700, David Brown wrote:
>>The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
>>
>> Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
>>
>>are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.12/msm-cleanup2
>>
>>for you to fetch changes up to b80a0dc53df68c6862b8985ecc12856edb080248:
>>
>> ARM: msm: fix compilation error in gpiomux (2013-08-07 10:39:31 -0700)
>
>Sigh, it looks like this fixes code that was removed in last-week's
>fix patches. I can either regenerate the pull request, or feel free
>to "resolve" this by just using the removal of the code.
Sorry, this patch doesn't actually conflict with the fixes, but is
incorrect in light of them. I will resend the pull request without
this patch.
David
--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL v2] msm cleanups for v3.12
2013-08-07 20:58 [GIT PULL] msm cleanups for v3.12 David Brown
2013-08-07 21:52 ` David Brown
@ 2013-08-07 23:06 ` David Brown
2013-08-13 22:17 ` Kevin Hilman
1 sibling, 1 reply; 5+ messages in thread
From: David Brown @ 2013-08-07 23:06 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup3-for-3.12
for you to fetch changes up to 3294a7e7c3a55bb4eb9d98b0af5643a7ea44afe1:
ARM: msm: Only compile io.c on platforms that use it (2013-08-06 11:18:04 -0700)
----------------------------------------------------------------
General cleanups for MSM for 3.12
This is a series of cleanups to the MSM code. These are a healthy
start to bringing the MSM code closer to the state of current ARM code
and getting more of it ready for conversion to devicetree.
----------------------------------------------------------------
Otherwise, same as last pull with head commit dropped.
Rohit Vaswani (1):
ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60
Stephen Boyd (8):
ARM: msm: Don't compile __msm_ioremap_caller() unless used
ARM: msm: Move debug-macro.S to include/debug
ARM: msm: Remove TMR and TMR0 static mappings
ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
ARM: msm: Move mach/board.h contents to common.h
ARM: msm: Remove devices-iommu.c
iommu/msm: Move mach includes to iommu directory
ARM: msm: Only compile io.c on platforms that use it
arch/arm/Kconfig | 1 +
arch/arm/Kconfig.debug | 9 +-
.../mach/debug-macro.S => include/debug/msm.S} | 32 +-
arch/arm/mach-msm/Makefile | 9 +-
arch/arm/mach-msm/board-dt-8660.c | 4 +-
arch/arm/mach-msm/board-dt-8960.c | 3 +-
arch/arm/mach-msm/board-halibut.c | 1 -
arch/arm/mach-msm/board-mahimahi.c | 2 +-
arch/arm/mach-msm/board-msm7x30.c | 1 -
arch/arm/mach-msm/board-qsd8x50.c | 1 -
arch/arm/mach-msm/board-sapphire.c | 2 +-
arch/arm/mach-msm/board-trout.c | 1 -
arch/arm/mach-msm/board-trout.h | 2 +-
arch/arm/mach-msm/common.h | 18 +-
arch/arm/mach-msm/devices-iommu.c | 912 ---------------------
arch/arm/mach-msm/devices-msm7x30.c | 2 +-
arch/arm/mach-msm/devices-qsd8x50.c | 2 +-
arch/arm/mach-msm/include/mach/board.h | 38 -
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 46 --
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 53 --
arch/arm/mach-msm/include/mach/msm_iomap.h | 17 -
arch/arm/mach-msm/include/mach/uncompress.h | 63 --
arch/arm/mach-msm/io.c | 67 +-
arch/arm/mach-msm/timer.c | 17 +-
drivers/iommu/msm_iommu.c | 4 +-
.../mach/iommu.h => drivers/iommu/msm_iommu.h | 0
drivers/iommu/msm_iommu_dev.c | 4 +-
.../iommu/msm_iommu_hw-8xxx.h | 0
drivers/video/msm/msm_fb.c | 1 -
29 files changed, 93 insertions(+), 1219 deletions(-)
rename arch/arm/{mach-msm/include/mach/debug-macro.S => include/debug/msm.S} (61%)
delete mode 100644 arch/arm/mach-msm/devices-iommu.c
delete mode 100644 arch/arm/mach-msm/include/mach/board.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8960.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
delete mode 100644 arch/arm/mach-msm/include/mach/uncompress.h
rename arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h (100%)
rename arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h => drivers/iommu/msm_iommu_hw-8xxx.h (100%)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL v2] msm cleanups for v3.12
2013-08-07 23:06 ` [GIT PULL v2] " David Brown
@ 2013-08-13 22:17 ` Kevin Hilman
0 siblings, 0 replies; 5+ messages in thread
From: Kevin Hilman @ 2013-08-13 22:17 UTC (permalink / raw)
To: linux-arm-kernel
David Brown <davidb@codeaurora.org> writes:
> The following changes since commit 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b:
>
> Linux 3.11-rc2 (2013-07-21 12:05:29 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup3-for-3.12
>
> for you to fetch changes up to 3294a7e7c3a55bb4eb9d98b0af5643a7ea44afe1:
>
> ARM: msm: Only compile io.c on platforms that use it (2013-08-06 11:18:04 -0700)
>
> ----------------------------------------------------------------
> General cleanups for MSM for 3.12
>
> This is a series of cleanups to the MSM code. These are a healthy
> start to bringing the MSM code closer to the state of current ARM code
> and getting more of it ready for conversion to devicetree.
Pulled.
Thanks for the nice cleanups and getting closer to multi-platform
support.
Kevin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-08-13 22:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-07 20:58 [GIT PULL] msm cleanups for v3.12 David Brown
2013-08-07 21:52 ` David Brown
2013-08-07 22:14 ` David Brown
2013-08-07 23:06 ` [GIT PULL v2] " David Brown
2013-08-13 22:17 ` Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).