[GIT PULL] hwspinlock changes for 3.2

[GIT PULL] hwspinlock changes for 3.2

[Ohad Ben-Cohen]

Hi Linus,

Please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git for-linus

To receive hwspinlock updates for 3.2.

The only noticeable change is a new hwspinlock driver for
ST-Ericsson's u8500 platform by Mathieu; the rest of the changes are
either cleanups or trivial fixes (one of the fixes also trivially
changes a mach-omap2 file, and is Acked by Tony).

All of the patches have been tested in linux-next and currently there
are no merge conflicts, though I expect one to happen with the arm-sco
tree, as reported (and fixed) by Stephen earlier this month (see
http://www.spinics.net/lists/linux-next/msg16931.html).

I've flagged one of the fixes as stable material (the one from Juan).
Normally I would only send you stable-worthy patches during the rc
cycle and not wait until the merge window, but since the hwspinlock
tree and its upstream path have only materialized quite late in the
cycle (see https://lkml.org/lkml/2011/9/21/249), I've decided this
time to wait for the merge window.

Hope it's ok; please tell me if there are any issues.

Thanks,
Ohad.

The following changes since commit b6fd41e29dea9c6753b1843a77e50433e6123bcb:

  Linux 3.1-rc6 (2011-09-12 14:02:02 -0700)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git for-linus

Juan Gutierrez (1):
      hwspinlock/core: use a mutex to protect the radix tree

Mathieu J. Poirier (1):
      hwspinlock/u8500: add hwspinlock driver

Ohad Ben-Cohen (8):
      hwspinlock/core: simplify Kconfig
      hwspinlock/core: simplify 'owner' handling
      hwspinlock/omap: simplify allocation scheme
      hwspinlock/core/omap: fix id issues on multiple hwspinlock devices
      hwspinlock/core: remove stubs for register/unregister
      hwspinlock/core: register a bank of hwspinlocks in a single API call
      hwspinlock/omap: omap_hwspinlock_remove should be __devexit
      hwspinlock: add MAINTAINERS entries

 Documentation/hwspinlock.txt             |   74 +++++++-----
 MAINTAINERS                              |   14 ++
 arch/arm/mach-omap2/hwspinlock.c         |    8 +-
 drivers/hwspinlock/Kconfig               |   27 +++--
 drivers/hwspinlock/Makefile              |    1 +
 drivers/hwspinlock/hwspinlock_core.c     |  204 +++++++++++++++++++-----------
 drivers/hwspinlock/hwspinlock_internal.h |   40 ++++--
 drivers/hwspinlock/omap_hwspinlock.c     |  127 +++++++------------
 drivers/hwspinlock/u8500_hsem.c          |  198 +++++++++++++++++++++++++++++
 include/linux/hwspinlock.h               |   46 +++++--
 10 files changed, 514 insertions(+), 225 deletions(-)
 create mode 100644 drivers/hwspinlock/u8500_hsem.c

Re: [GIT PULL] hwspinlock changes for 3.2

[Ohad Ben-Cohen]

On Sun, Oct 30, 2011 at 10:06 PM, Ohad Ben-Cohen <ohad@wizery.com> wrote:
> Please pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git for-linus
...
> All of the patches have been tested in linux-next and currently there
> are no merge conflicts, though I expect one to happen with the arm-sco
> tree, as reported (and fixed) by Stephen earlier this month (see
> http://www.spinics.net/lists/linux-next/msg16931.html).

Now that arm-soc is merged, I fixed the conflict with the hwspinlock
tree and pushed it (just for reference) at:

git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
for-linus-merged

There also seems to be a (trivial) omap_hsmmc build issue which I've
fixed and pushed to that branch (Chris I'm also attaching it below in
case you prefer to take it through the mmc tree).

> the hwspinlock
> tree and its upstream path have only materialized quite late in the
> cycle (see https://lkml.org/lkml/2011/9/21/249)

Linus, in the aforementioned thread, Arnd, Tony and Linus W preferred
that I send you direct pull requests for hwspinlock changes, but were
also ok with other upstream paths (e.g. through the arm-soc or the
omap trees), so please express your preference :) I don't expect much
hwspinlock activity anytime soon (at least not until we'll get either
c6x support or additional u8500 functionality).

Thanks,
Ohad.

commit f6e49189a11622f8675bd386db560309a05e581a
Author: Ohad Ben-Cohen <ohad@wizery.com>
Date:   Wed Nov 2 08:57:23 2011 +0200

    mmc: omap_hsmmc: fix build

    Fix omap_hsmmc build issue that was introduced by commit a3c76eb
    "mmc: replace printk with appropriate display macro".

    Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index e8ff123..101cd31 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1270,7 +1270,7 @@ static void omap_hsmmc_protect_card(struct omap_hsmmc_host
                }
        } else {
                if (!host->protect_card) {
-                       pr_info"%s: cover is open, "
+                       pr_info("%s: cover is open, "
                                         "card is now inaccessible\n",
                                         mmc_hostname(host->mmc));
                        host->protect_card = 1;

Re: [GIT PULL] hwspinlock changes for 3.2

[Chris Ball]

Hi,

On Wed, Nov 02 2011, Ohad Ben-Cohen wrote:
> There also seems to be a (trivial) omap_hsmmc build issue which I've
> fixed and pushed to that branch (Chris I'm also attaching it below in
> case you prefer to take it through the mmc tree).

I already have it in mmc-next, but it's fine to send it through your
branch instead:

Acked-by: Chris Ball <cjb@laptop.org>

Thanks,

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child