[GIT PULL] msm cleanup for 3.10

[GIT PULL] msm cleanup for 3.10

[David Brown]

The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8:

  Linux 3.9-rc1 (2013-03-03 15:11:05 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup-3.10

for you to fetch changes up to 641f71699ec96fb742cc891b9ea4f3a46c60050e:

  ARM: msm: Remove unused cpu.h header file (2013-03-05 12:05:43 -0800)

----------------------------------------------------------------
Cleanups for MSM for 3.10

These are some patches for various parts of MSM that gradually bring
us closer to being part of single zimage.

----------------------------------------------------------------
Stephen Boyd (4):
      ARM: msm: Move dma.h #defines that are private to dma.c
      mmc: msm_sdcc: Remove unnecessary include
      gpio: Make gpio-msm-v1 into a platform driver
      ARM: msm: Remove unused cpu.h header file

 arch/arm/mach-msm/board-halibut.c    |   1 +
 arch/arm/mach-msm/board-msm7x30.c    |   1 +
 arch/arm/mach-msm/board-qsd8x50.c    |   1 +
 arch/arm/mach-msm/board-trout.c      |   1 +
 arch/arm/mach-msm/devices-msm7x00.c  |  31 +++++
 arch/arm/mach-msm/devices-msm7x30.c  |  31 +++++
 arch/arm/mach-msm/devices-qsd8x50.c  |  31 +++++
 arch/arm/mach-msm/devices.h          |   4 +
 arch/arm/mach-msm/dma.c              |  26 +++++
 arch/arm/mach-msm/include/mach/cpu.h |  54 ---------
 arch/arm/mach-msm/include/mach/dma.h |  26 -----
 drivers/gpio/gpio-msm-v1.c           | 220 ++++++++++++++++++++++++-----------
 drivers/mmc/host/msm_sdcc.c          |   1 -
 13 files changed, 276 insertions(+), 152 deletions(-)
 delete mode 100644 arch/arm/mach-msm/include/mach/cpu.h

-- 
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

[GIT PULL] msm core for 3.10

[David Brown]

The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9:

  Linux 3.9-rc2 (2013-03-10 16:54:19 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-core-3.10

for you to fetch changes up to e25e3d1fef2c57e49aef64535341c15fe2b29b4a:

  ARM: msm: Wait for timer clear to complete (2013-03-22 10:46:16 -0700)

----------------------------------------------------------------
Patches for MSM core

These patches are changes to the MSM timer code that will be for
upcoming targets, including a generalization of the binding and
preventing a missing timer interrupt.

----------------------------------------------------------------
Stephen Boyd (2):
      ARM: msm: Rework timer binding to be more general
      ARM: msm: Wait for timer clear to complete

 .../devicetree/bindings/arm/msm/timer.txt          |  41 ++++----
 arch/arm/boot/dts/msm8660-surf.dts                 |  20 ++--
 arch/arm/boot/dts/msm8960-cdp.dts                  |  22 ++---
 arch/arm/mach-msm/timer.c                          | 110 ++++++++++-----------
 4 files changed, 86 insertions(+), 107 deletions(-)

-- 
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

[GIT PULL] msm defconfig for 3.10

[David Brown]

The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8:

  Linux 3.9-rc1 (2013-03-03 15:11:05 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-defconfig-3.10

for you to fetch changes up to dd465b2400a77bea6e5a95045feb6dbcf2e48a38:

  ARM: msm: enable SSBI driver in defconfig (2013-03-12 11:14:32 -0700)

----------------------------------------------------------------
Defconfig updates for MSM

The msm_defconfig is quite out of date.  This allows the targets we
are actively working on to be more easily build and run tested.

----------------------------------------------------------------
David Brown (1):
      ARM: msm: enable SSBI driver in defconfig

Stephen Boyd (1):
      ARM: msm: Concentrate defconfig on DT supported devices

 arch/arm/configs/msm_defconfig | 154 +++++++++++++++++++++++++++++------------
 1 file changed, 109 insertions(+), 45 deletions(-)

-- 
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

[GIT PULL] msm fixes for 3.10

[David Brown]

The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9:

  Linux 3.9-rc2 (2013-03-10 16:54:19 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-3.10

for you to fetch changes up to 73a8c28f167c9e7bc42eafc0bcbd298031709430:

  ARM: msm: Fix uncompess.h tx underrun check (2013-04-11 09:40:35 -0700)

----------------------------------------------------------------
Some minor fixes for MSM for 3.10

  - Fix a timer problem that causes missed ticks and hangs.

  - Fix a problem with the decompressor UART dropping characters.

----------------------------------------------------------------
Stephen Boyd (2):
      ARM: msm: Stop counting before reprogramming clockevent
      ARM: msm: Fix uncompess.h tx underrun check

 arch/arm/mach-msm/include/mach/uncompress.h | 2 +-
 arch/arm/mach-msm/timer.c                   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

-- 
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

Re: [GIT PULL] msm core for 3.10

[Olof Johansson]

Hi,

On Fri, Apr 12, 2013 at 03:43:15PM -0700, David Brown wrote:
> The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9:
> 
>   Linux 3.9-rc2 (2013-03-10 16:54:19 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-core-3.10
> 
> for you to fetch changes up to e25e3d1fef2c57e49aef64535341c15fe2b29b4a:
> 
>   ARM: msm: Wait for timer clear to complete (2013-03-22 10:46:16 -0700)
> 
> ----------------------------------------------------------------
> Patches for MSM core
> 
> These patches are changes to the MSM timer code that will be for
> upcoming targets, including a generalization of the binding and
> preventing a missing timer interrupt.
> 
> ----------------------------------------------------------------
> Stephen Boyd (2):
>       ARM: msm: Rework timer binding to be more general
>       ARM: msm: Wait for timer clear to complete
> 
>  .../devicetree/bindings/arm/msm/timer.txt          |  41 ++++----
>  arch/arm/boot/dts/msm8660-surf.dts                 |  20 ++--
>  arch/arm/boot/dts/msm8960-cdp.dts                  |  22 ++---
>  arch/arm/mach-msm/timer.c                          | 110 ++++++++++-----------
>  4 files changed, 86 insertions(+), 107 deletions(-)

I didn't see either of the device tree maintainers cc:d on the bindings
update, nor an ack from them. It looks reasonable enough to me, but I
also do know that in your private downstream tree you have a lot of new
bindings. Please make sure these go through proper review channels as
you start to upstream them; i.e. Grant Likely and Rob Herring should
either merge or ack them.

I've cc:d Rob and Grant on this reply and I'll merge it for now but to avoid
delays in getting your code merged in the future please make sure they are in
the loop from the beginning.


Thanks,

-Olof

Re: [GIT PULL] msm fixes for 3.10

[Olof Johansson]

On Fri, Apr 12, 2013 at 03:43:44PM -0700, David Brown wrote:
> The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9:
> 
>   Linux 3.9-rc2 (2013-03-10 16:54:19 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-3.10
> 
> for you to fetch changes up to 73a8c28f167c9e7bc42eafc0bcbd298031709430:
> 
>   ARM: msm: Fix uncompess.h tx underrun check (2013-04-11 09:40:35 -0700)
> 
> ----------------------------------------------------------------
> Some minor fixes for MSM for 3.10
> 
>   - Fix a timer problem that causes missed ticks and hangs.
> 
>   - Fix a problem with the decompressor UART dropping characters.
> 
> ----------------------------------------------------------------
> Stephen Boyd (2):
>       ARM: msm: Stop counting before reprogramming clockevent
>       ARM: msm: Fix uncompess.h tx underrun check
> 
>  arch/arm/mach-msm/include/mach/uncompress.h | 2 +-
>  arch/arm/mach-msm/timer.c                   | 5 ++++-
>  2 files changed, 5 insertions(+), 2 deletions(-)

Looks like the "Stop counting before reprogramming" patch has already been
merged through fixes for 3.9.

Since that was provided in a branch with the same SHA, there's no problem with
this branch and I've pulled it, but in the future it'd be nice to get a pull
request that doesn't list already merged patches since the diffstat won't match
when I compare them otherwise.



-Olof

Re: [GIT PULL] msm cleanup for 3.10

[Olof Johansson]

On Fri, Apr 12, 2013 at 03:40:42PM -0700, David Brown wrote:
> The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8:
> 
>   Linux 3.9-rc1 (2013-03-03 15:11:05 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-cleanup-3.10

Hi,

I've pulled in all 4 branches, see two comments on the individual pull requests
though.

Given the date stamps on the commits, it seems like you've been sitting on
these for a while. Please try to send them in sooner in future release
cycles, it is perfectly OK to send a newer pull request for the same
branch with a few more patches on it later on (ideally with a new tag
describing the new portions). That way we don't get all the code so
late, and you run a lower risk of us being grumpy because several other
maintainers have also been late and we're slammed with merges.

The bulk of the material for the merge window really should be in arm-soc
by -rc6, with minor updates thereafter.


-Olof

Re: [GIT PULL] msm core for 3.10

[Rob Herring]

On 04/14/2013 10:49 PM, Olof Johansson wrote:
> Hi,
> 
> On Fri, Apr 12, 2013 at 03:43:15PM -0700, David Brown wrote:
>> The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9:
>>
>>   Linux 3.9-rc2 (2013-03-10 16:54:19 -0700)
>>
>> are available in the git repository at:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-core-3.10

>>  .../devicetree/bindings/arm/msm/timer.txt          |  41 ++++----
>>  arch/arm/boot/dts/msm8660-surf.dts                 |  20 ++--
>>  arch/arm/boot/dts/msm8960-cdp.dts                  |  22 ++---
>>  arch/arm/mach-msm/timer.c                          | 110 ++++++++++-----------
>>  4 files changed, 86 insertions(+), 107 deletions(-)
> 
> I didn't see either of the device tree maintainers cc:d on the bindings
> update, nor an ack from them. It looks reasonable enough to me, but I
> also do know that in your private downstream tree you have a lot of new
> bindings. Please make sure these go through proper review channels as
> you start to upstream them; i.e. Grant Likely and Rob Herring should
> either merge or ack them.
> 
> I've cc:d Rob and Grant on this reply and I'll merge it for now but to avoid
> delays in getting your code merged in the future please make sure they are in
> the loop from the beginning.

Other than breaking the DTB-kernel ABI, looks fine to me. It's a
platform decision whether they are okay with that or not.

Rob