Re: [PATCH] ARM: dts: msm: Fix merge resolution

2013-06-18 Thread Olof Johansson
On Mon, Jun 17, 2013 at 01:39:38PM -0700, David Brown wrote: Commit e45600107b (Merge tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup) incorrectly resolved a merge conflict, resulting in a node address that doesn't match the

Re: [PATCH] gpio: msm-v1: Remove errant __devinit to fix compile

2013-06-18 Thread Linus Walleij
On Mon, Jun 17, 2013 at 7:14 PM, Stephen Boyd sb...@codeaurora.org wrote: On 06/16/13 22:54, Linus Walleij wrote: On Tue, Jun 4, 2013 at 9:20 PM, Stephen Boyd sb...@codeaurora.org wrote: Commit 7bce696 (gpio: Make gpio-msm-v1 into a platform driver, 2013-03-04) was based on an older kernel

Re: [PATCHv7 01/11] clockevents: Prefer CPU local devices over global devices

2013-06-18 Thread Mark Rutland
On Thu, Jun 13, 2013 at 07:39:50PM +0100, Stephen Boyd wrote: On 06/13, Thomas Gleixner wrote: On Thu, 13 Jun 2013, Daniel Lezcano wrote: I prefer Thomas to have a look at it and ack it. I changed Cc to To for Thomas. The patch does not apply on tip timers/core. The code has been

Re: [RFC 2/3] arm: mm: Define set_memory_* functions for ARM

2013-06-18 Thread Will Deacon
On Wed, Jun 12, 2013 at 06:23:29PM +0100, Laura Abbott wrote: Other architectures define various set_memory functions to allow attributes to be changed (e.g. set_memory_x, set_memory_rw, etc.) Currently, these functions are missing on ARM. Define these in an appropriate manner for ARM.

[RFC/PATCH 10/11] ARM: msm: Only build clock.c on proc_comm based platforms

2013-06-18 Thread Stephen Boyd
The functionality provided by clock.c in mach-msm is only needed on proc_comm based platforms. Only build the file if proc_comm is enabled. This prevents compile failures for platforms that are part of the multi-platform kernel. Signed-off-by: Stephen Boyd sb...@codeaurora.org --- This patch

[PATCH 09/11] ARM: msm: Only compile io.c on platforms that use it

2013-06-18 Thread Stephen Boyd
Only the non-dt based MSM platforms need to map memory from their machine descriptor. Unfortunately it is always compiled if ARCH_MSM=y and the file also has mach/ includes in it. Since dt-based MSM platforms aren't actually using anything in this file just compile io.c on the non-dt based MSM

[PATCH 00/11] MSM DT based multi-platform support

2013-06-18 Thread Stephen Boyd
This patchset allows me to compile and run the DT based MSM platforms in the multi-platform ARM kernel. This is built on top of a couple patches I've sent out already (specifically the debug_ll patch series and the clocksource_of conversion) as well a patch from Rohit that didn't seem to make it

[PATCH 07/11] ARM: msm: Remove devices-iommu.c

2013-06-18 Thread Stephen Boyd
The iommu devices are registered in software, when they should really be part of the DT. Since we don't currently have DT bindings in place for the MSM iommu driver just remove this file for the time being. This is not removing any functionality anyway because these devices aren't probing today

[PATCH 06/11] ARM: msm: Move mach/board.h contents to common.h

2013-06-18 Thread Stephen Boyd
The contents of mach/board.h are only used by files within mach-msm so there is no need to export this file outside of the mach-msm directory. Move the contents of the file to common.h to allow us to compile MSM in the multi-platform kernel. Cc: Florian Tobias Schandinat florianschandi...@gmx.de

[PATCH 08/11] iommu/msm: Move mach includes to iommu directory

2013-06-18 Thread Stephen Boyd
Two header files exist in mach-msm's include/mach directory that are only used by the MSM iommu driver. Move these files to the iommu driver directory and prefix them with msm_. This allows us to compile the MSM iommu driver on multi-platform kernels. Cc: Joerg Roedel j...@8bytes.org Cc: Stepan

[PATCH 03/11] ARM: msm: Move debug-macro.S to include/debug

2013-06-18 Thread Stephen Boyd
One more step to allowing MSM to participate in the multi-platform defconfig. Signed-off-by: Stephen Boyd sb...@codeaurora.org --- Unchanged from previous sends. arch/arm/Kconfig.debug | 9 +++- .../mach/debug-macro.S = include/debug/msm.S} | 32 ++-

[PATCH 05/11] ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE

2013-06-18 Thread Stephen Boyd
This allows us to remove the init_time callback in the DT machine descriptors, shrinking the code. Signed-off-by: Stephen Boyd sb...@codeaurora.org --- Unchanged from previous sends. arch/arm/Kconfig | 1 + arch/arm/mach-msm/board-dt-8660.c | 1 -

[PATCH 0/4] ARM: MSM: Consolidate GPIOMUX for 7x30 and 8x50

2013-06-18 Thread Rohit Vaswani
The previous gpio clean up series left some room for consolidation and required a few fixes. Rohit Vaswani (4): ARM: msm: dts: Fix the gpio register address for msm8960 drivers: gpio: msm: Fix the error condition for reading ngpio ARM: msm: Consolidate gpiomux for older architectures

[PATCH 1/4] ARM: msm: dts: Fix the gpio register address for msm8960

2013-06-18 Thread Rohit Vaswani
Fix the the gpio reg address for the device tree entry. Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org --- arch/arm/boot/dts/msm8960-cdp.dts |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts

[PATCH 2/4] drivers: gpio: msm: Fix the error condition for reading ngpio

2013-06-18 Thread Rohit Vaswani
of_property_read_u32 return 0 on success. The check was using a ! to return error. Fix the if condition. Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org --- drivers/gpio/gpio-msm-v2.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpio/gpio-msm-v2.c

[PATCH 3/4] ARM: msm: Consolidate gpiomux for older architectures

2013-06-18 Thread Rohit Vaswani
Msm gpiomux can be used only for 7x30 and 8x50. Prevent compilation and fix build issues on 7X00, 8X60 and 8960. Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org --- arch/arm/mach-msm/Kconfig |3 +-- arch/arm/mach-msm/gpiomux-v1.c | 33 -

Re: [PATCH 0/4] ARM: MSM: Consolidate GPIOMUX for 7x30 and 8x50

2013-06-18 Thread Rohit Vaswani
**Please ignore this 4 patch series** Sorry for the inconvenience. On 6/18/2013 6:02 PM, Rohit Vaswani wrote: The previous gpio clean up series left some room for consolidation and required a few fixes. Rohit Vaswani (4): ARM: msm: dts: Fix the gpio register address for msm8960 drivers:

Re: [RFC 2/3] arm: mm: Define set_memory_* functions for ARM

2013-06-18 Thread Laura Abbott
On 6/18/2013 4:09 AM, Will Deacon wrote: On Wed, Jun 12, 2013 at 06:23:29PM +0100, Laura Abbott wrote: Other architectures define various set_memory functions to allow attributes to be changed (e.g. set_memory_x, set_memory_rw, etc.) Currently, these functions are missing on ARM. Define these

[PATCH 2/3] drivers: gpio: msm: Fix the error condition for reading ngpio

2013-06-18 Thread Rohit Vaswani
of_property_read_u32 return 0 on success. The check was using a ! to return error. Fix the if condition. Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org --- drivers/gpio/gpio-msm-v2.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpio/gpio-msm-v2.c

[PATCH 1/3] ARM: msm: dts: Fix the gpio register address for msm8960

2013-06-18 Thread Rohit Vaswani
Fix the the gpio reg address for the device tree entry. Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org --- arch/arm/boot/dts/msm8960-cdp.dts |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts

[PATCH 3/3] ARM: msm: Consolidate gpiomux for older architectures

2013-06-18 Thread Rohit Vaswani
Msm gpiomux can be used only for 7x30 and 8x50. Prevent compilation and fix build issues on 7X00, 8X60 and 8960. Signed-off-by: Rohit Vaswani rvasw...@codeaurora.org --- arch/arm/mach-msm/Kconfig |3 +-- arch/arm/mach-msm/gpiomux-v1.c | 33 -