2013-02-08 13:23:39

by Samuel Ortiz

[permalink] [raw]
Subject: [GIT] [3.9] NFC pull request

Hi John,

This is the second NFC pull request for 3.9.

We have:

- A few pn533 fixes on top of Waldemar refactorization of the driver, one of
them fixes target mode.

- A new driver for Inside Secure microread chipset. It supports two
physical layers: i2c and MEI. The MEI one depends on a patchset that's
been sent to Greg Kroah-Hartman for inclusion into the 3.9 kernel [1]. The
dependency is a KConfig one which means this code is not buildable as long
as the MEI API is not usptream.

Thanks in advance for pulling them in.

[1] https://lkml.org/lkml/2013/2/8/165


The following changes since commit 9ebea3829fac7505e0cd2642fbd13cfa9c038831:

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-01-28 13:54:03 -0500)

are available in the git repository at:


git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.9-2

for you to fetch changes up to 52f2eaeec11c16c219f0e99b8496fbba86889830:

NFC: pn533: Fix target polling mode (2013-02-08 12:18:48 +0100)

----------------------------------------------------------------
This is the 2nd NFC pull request.

With this one we have a new NFC driver for Inside Secure microread and a few
pn533 fixes.
Microread is an HCI based NFC IP and the driver we're pushing supports tags
R/W, and NFC p2p. It's supported over the i2c and MEI busses.

----------------------------------------------------------------
Eric Lapuyade (1):
NFC: Initial support for Inside Secure microread

Samuel Ortiz (2):
NFC: microread: Add i2c physical layer
NFC: microread: Add MEI physical layer

Thierry Escande (1):
NFC: pn533: Fix target polling mode

Waldemar Rymarkiewicz (2):
nfc: pn533: Use static poll_mod and std_frame_ops
nfc: pn533: Remove unreachable code

drivers/nfc/Kconfig | 1 +
drivers/nfc/Makefile | 1 +
drivers/nfc/microread/Kconfig | 35 ++
drivers/nfc/microread/Makefile | 10 +
drivers/nfc/microread/i2c.c | 340 +++++++++++++++
drivers/nfc/microread/mei.c | 241 ++++++++++
drivers/nfc/microread/microread.c | 728 +++++++++++++++++++++++++++++++
drivers/nfc/microread/microread.h | 33 ++
drivers/nfc/pn533.c | 8 +-
include/linux/platform_data/microread.h | 35 ++
10 files changed, 1427 insertions(+), 5 deletions(-)
create mode 100644 drivers/nfc/microread/Kconfig
create mode 100644 drivers/nfc/microread/Makefile
create mode 100644 drivers/nfc/microread/i2c.c
create mode 100644 drivers/nfc/microread/mei.c
create mode 100644 drivers/nfc/microread/microread.c
create mode 100644 drivers/nfc/microread/microread.h
create mode 100644 include/linux/platform_data/microread.h

--
Intel Open Source Technology Centre
http://oss.intel.com/


2013-02-11 20:45:32

by John W. Linville

[permalink] [raw]
Subject: Re: [GIT] [3.9] NFC pull request

On Mon, Feb 11, 2013 at 07:01:59PM +0100, Samuel Ortiz wrote:
> Hi John,
>
> On Fri, Feb 08, 2013 at 02:43:25PM -0500, John W. Linville wrote:
> > On Fri, Feb 08, 2013 at 02:23:35PM +0100, Samuel Ortiz wrote:
> > > Hi John,
> > >
> > > This is the second NFC pull request for 3.9.
> > >
> > > We have:
> > >
> > > - A few pn533 fixes on top of Waldemar refactorization of the driver, one of
> > > them fixes target mode.
> > >
> > > - A new driver for Inside Secure microread chipset. It supports two
> > > physical layers: i2c and MEI. The MEI one depends on a patchset that's
> > > been sent to Greg Kroah-Hartman for inclusion into the 3.9 kernel [1]. The
> > > dependency is a KConfig one which means this code is not buildable as long
> > > as the MEI API is not usptream.
> > >
> > > Thanks in advance for pulling them in.
> > >
> > > [1] https://lkml.org/lkml/2013/2/8/165
> > >
> > >
> > > The following changes since commit 9ebea3829fac7505e0cd2642fbd13cfa9c038831:
> > >
> > > Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-01-28 13:54:03 -0500)
> > >
> > > are available in the git repository at:
> > >
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.9-2
> > >
> > > for you to fetch changes up to 52f2eaeec11c16c219f0e99b8496fbba86889830:
> > >
> > > NFC: pn533: Fix target polling mode (2013-02-08 12:18:48 +0100)
> >
> > Pulling now...
> The MEI bus API got some more comments from Greg Kroah-Hartman and got
> slightly changed. I fixed it up in my tree, and below is a pull request for
> getting this single patch. Please let me know if you want me to send the patch
> through email instead.
>
>
> The following changes since commit 8708aac79e4572ba673d7a21e94ddca9f3abb7fc:
>
> rtlwifi: rtl8192cu: Add new USB ID (2013-02-08 14:51:43 -0500)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.9-3
>
> for you to fetch changes up to cd48d8ba149484c4723a2b75159deeb83f3d2273:
>
> NFC: microread: Fix mei physical layer (2013-02-11 18:35:36 +0100)
>
> ----------------------------------------------------------------
> This 3rd NFC pull request for 3.9 contains a fix for the microread MEI
> physical layer support, as the MEI bus API changed.
>
> From the MEI code, we now pass the MEI id back to the driver probe routine,
> and we also pass a name and a MEI id table through the mei_bus_driver
> structure. A few renames as well like e.g. mei_bus_driver to mei_driver or
> mei_bus_client to mei_device in order to be closer to the driver model
> practices.
>
> ----------------------------------------------------------------
> Samuel Ortiz (1):
> NFC: microread: Fix mei physical layer
>
> drivers/nfc/microread/mei.c | 43 ++++++++++++++++++++++++-------------------
> 1 file changed, 24 insertions(+), 19 deletions(-)

Pulling now...

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2013-02-11 18:02:05

by Samuel Ortiz

[permalink] [raw]
Subject: Re: [GIT] [3.9] NFC pull request

Hi John,

On Fri, Feb 08, 2013 at 02:43:25PM -0500, John W. Linville wrote:
> On Fri, Feb 08, 2013 at 02:23:35PM +0100, Samuel Ortiz wrote:
> > Hi John,
> >
> > This is the second NFC pull request for 3.9.
> >
> > We have:
> >
> > - A few pn533 fixes on top of Waldemar refactorization of the driver, one of
> > them fixes target mode.
> >
> > - A new driver for Inside Secure microread chipset. It supports two
> > physical layers: i2c and MEI. The MEI one depends on a patchset that's
> > been sent to Greg Kroah-Hartman for inclusion into the 3.9 kernel [1]. The
> > dependency is a KConfig one which means this code is not buildable as long
> > as the MEI API is not usptream.
> >
> > Thanks in advance for pulling them in.
> >
> > [1] https://lkml.org/lkml/2013/2/8/165
> >
> >
> > The following changes since commit 9ebea3829fac7505e0cd2642fbd13cfa9c038831:
> >
> > Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-01-28 13:54:03 -0500)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.9-2
> >
> > for you to fetch changes up to 52f2eaeec11c16c219f0e99b8496fbba86889830:
> >
> > NFC: pn533: Fix target polling mode (2013-02-08 12:18:48 +0100)
>
> Pulling now...
The MEI bus API got some more comments from Greg Kroah-Hartman and got
slightly changed. I fixed it up in my tree, and below is a pull request for
getting this single patch. Please let me know if you want me to send the patch
through email instead.


The following changes since commit 8708aac79e4572ba673d7a21e94ddca9f3abb7fc:

rtlwifi: rtl8192cu: Add new USB ID (2013-02-08 14:51:43 -0500)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.9-3

for you to fetch changes up to cd48d8ba149484c4723a2b75159deeb83f3d2273:

NFC: microread: Fix mei physical layer (2013-02-11 18:35:36 +0100)

----------------------------------------------------------------
This 3rd NFC pull request for 3.9 contains a fix for the microread MEI
physical layer support, as the MEI bus API changed.

>From the MEI code, we now pass the MEI id back to the driver probe routine,
and we also pass a name and a MEI id table through the mei_bus_driver
structure. A few renames as well like e.g. mei_bus_driver to mei_driver or
mei_bus_client to mei_device in order to be closer to the driver model
practices.

----------------------------------------------------------------
Samuel Ortiz (1):
NFC: microread: Fix mei physical layer

drivers/nfc/microread/mei.c | 43 ++++++++++++++++++++++++-------------------
1 file changed, 24 insertions(+), 19 deletions(-)

--
Intel Open Source Technology Centre
http://oss.intel.com/

2013-02-08 19:45:29

by John W. Linville

[permalink] [raw]
Subject: Re: [GIT] [3.9] NFC pull request

On Fri, Feb 08, 2013 at 02:23:35PM +0100, Samuel Ortiz wrote:
> Hi John,
>
> This is the second NFC pull request for 3.9.
>
> We have:
>
> - A few pn533 fixes on top of Waldemar refactorization of the driver, one of
> them fixes target mode.
>
> - A new driver for Inside Secure microread chipset. It supports two
> physical layers: i2c and MEI. The MEI one depends on a patchset that's
> been sent to Greg Kroah-Hartman for inclusion into the 3.9 kernel [1]. The
> dependency is a KConfig one which means this code is not buildable as long
> as the MEI API is not usptream.
>
> Thanks in advance for pulling them in.
>
> [1] https://lkml.org/lkml/2013/2/8/165
>
>
> The following changes since commit 9ebea3829fac7505e0cd2642fbd13cfa9c038831:
>
> Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-01-28 13:54:03 -0500)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.9-2
>
> for you to fetch changes up to 52f2eaeec11c16c219f0e99b8496fbba86889830:
>
> NFC: pn533: Fix target polling mode (2013-02-08 12:18:48 +0100)

Pulling now...

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.