* [PATCH v2 2/5] backports: Add NFC core and drivers
@ 2013-04-05 15:16 Thierry Escande
2013-04-05 15:35 ` Johannes Berg
2013-04-05 15:38 ` Hauke Mehrtens
0 siblings, 2 replies; 6+ messages in thread
From: Thierry Escande @ 2013-04-05 15:16 UTC (permalink / raw)
To: backports
This grabs NFC core and drivers files from your linux tree.
NFC build is disabled for now.
Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>
---
backport/Kconfig | 2 ++
backport/Makefile.kernel | 2 ++
copy-list | 16 ++++++++++++++++
dependencies | 4 ++++
4 files changed, 24 insertions(+)
diff --git a/backport/Kconfig b/backport/Kconfig
index d0ae17f..87e3869 100644
--- a/backport/Kconfig
+++ b/backport/Kconfig
@@ -34,3 +34,5 @@ source drivers/net/ethernet/Kconfig
source drivers/ssb/Kconfig
source drivers/bcma/Kconfig
+
+# source net/nfc/Kconfig
diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
index a599ad7..ac58225 100644
--- a/backport/Makefile.kernel
+++ b/backport/Makefile.kernel
@@ -22,3 +22,5 @@ obj-$(CPTCFG_BT) += drivers/bluetooth/
obj-$(CPTCFG_SSB) += drivers/ssb/
obj-$(CPTCFG_BCMA) += drivers/bcma/
obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
+obj-$(CPTCFG_NFC) += net/nfc/
+obj-$(CPTCFG_NFC) += drivers/nfc/
diff --git a/copy-list b/copy-list
index 4243619..82e21b1 100644
--- a/copy-list
+++ b/copy-list
@@ -114,3 +114,19 @@ drivers/net/ethernet/broadcom/Kconfig
drivers/net/ethernet/broadcom/Makefile
drivers/net/ethernet/broadcom/b44.c
drivers/net/ethernet/broadcom/b44.h
+
+# NFC
+net/nfc/
+net/nfc/hci/
+net/nfc/llcp/
+net/nfc/nci/
+include/net/nfc/
+include/linux/socket.h
+include/uapi/linux/nfc.h
+include/uapi/linux/socket.h
+
+# NFC drivers
+drivers/nfc/
+drivers/nfc/microread/
+drivers/nfc/pn544/
+include/linux/platform_data/pn544.h
diff --git a/dependencies b/dependencies
index 7c79449..e9aaa2e 100644
--- a/dependencies
+++ b/dependencies
@@ -83,3 +83,7 @@ BRCMDBG 2.6.30
# backport it, but I can't test that and this is a
# lot easier right now.
BT_HIDP 2.6.33
+
+# NFC core needs PF_NFC defined in socket.h which was
+# only introduced in kernel 3.1
+NFC 3.1
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/5] backports: Add NFC core and drivers
2013-04-05 15:16 [PATCH v2 2/5] backports: Add NFC core and drivers Thierry Escande
@ 2013-04-05 15:35 ` Johannes Berg
2013-04-05 17:21 ` Thierry Escande
2013-04-05 15:38 ` Hauke Mehrtens
1 sibling, 1 reply; 6+ messages in thread
From: Johannes Berg @ 2013-04-05 15:35 UTC (permalink / raw)
To: Thierry Escande; +Cc: backports
On Fri, 2013-04-05 at 17:16 +0200, Thierry Escande wrote:
> NFC build is disabled for now.
Why not just put all of this in after patch 3? The system will ignore
patches that can't be applied anyway :)
> +# NFC core needs PF_NFC defined in socket.h which was
> +# only introduced in kernel 3.1
> +NFC 3.1
Just PF_NFC could be defined in compat, no?
johannes
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/5] backports: Add NFC core and drivers
2013-04-05 15:16 [PATCH v2 2/5] backports: Add NFC core and drivers Thierry Escande
2013-04-05 15:35 ` Johannes Berg
@ 2013-04-05 15:38 ` Hauke Mehrtens
2013-04-05 17:53 ` Thierry Escande
1 sibling, 1 reply; 6+ messages in thread
From: Hauke Mehrtens @ 2013-04-05 15:38 UTC (permalink / raw)
To: Thierry Escande; +Cc: backports
On 04/05/2013 05:16 PM, Thierry Escande wrote:
> This grabs NFC core and drivers files from your linux tree.
> NFC build is disabled for now.
>
> Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>
> ---
> backport/Kconfig | 2 ++
> backport/Makefile.kernel | 2 ++
> copy-list | 16 ++++++++++++++++
> dependencies | 4 ++++
> 4 files changed, 24 insertions(+)
>
> diff --git a/backport/Kconfig b/backport/Kconfig
> index d0ae17f..87e3869 100644
> --- a/backport/Kconfig
> +++ b/backport/Kconfig
> @@ -34,3 +34,5 @@ source drivers/net/ethernet/Kconfig
>
> source drivers/ssb/Kconfig
> source drivers/bcma/Kconfig
> +
> +# source net/nfc/Kconfig
Instead of adding this here you should better add this Kconfig and
Makefile related changes in "build: enable NFC build" and here just the
copy-list.
> diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
> index a599ad7..ac58225 100644
> --- a/backport/Makefile.kernel
> +++ b/backport/Makefile.kernel
> @@ -22,3 +22,5 @@ obj-$(CPTCFG_BT) += drivers/bluetooth/
> obj-$(CPTCFG_SSB) += drivers/ssb/
> obj-$(CPTCFG_BCMA) += drivers/bcma/
> obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
> +obj-$(CPTCFG_NFC) += net/nfc/
> +obj-$(CPTCFG_NFC) += drivers/nfc/
> diff --git a/copy-list b/copy-list
> index 4243619..82e21b1 100644
> --- a/copy-list
> +++ b/copy-list
> @@ -114,3 +114,19 @@ drivers/net/ethernet/broadcom/Kconfig
> drivers/net/ethernet/broadcom/Makefile
> drivers/net/ethernet/broadcom/b44.c
> drivers/net/ethernet/broadcom/b44.h
> +
> +# NFC
> +net/nfc/
> +net/nfc/hci/
> +net/nfc/llcp/
> +net/nfc/nci/
> +include/net/nfc/
> +include/linux/socket.h
> +include/uapi/linux/nfc.h
> +include/uapi/linux/socket.h
include/uapi/linux/socket.h contains headers for kernel internal apis
which are not backported, do not copy the header into backports when you
do not add the implementation of the defined functions in backports,
which you probably do not want.
> +
> +# NFC drivers
> +drivers/nfc/
> +drivers/nfc/microread/
> +drivers/nfc/pn544/
> +include/linux/platform_data/pn544.h
> diff --git a/dependencies b/dependencies
> index 7c79449..e9aaa2e 100644
> --- a/dependencies
> +++ b/dependencies
> @@ -83,3 +83,7 @@ BRCMDBG 2.6.30
> # backport it, but I can't test that and this is a
> # lot easier right now.
> BT_HIDP 2.6.33
> +
> +# NFC core needs PF_NFC defined in socket.h which was
> +# only introduced in kernel 3.1
> +NFC 3.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/5] backports: Add NFC core and drivers
2013-04-05 15:35 ` Johannes Berg
@ 2013-04-05 17:21 ` Thierry Escande
2013-04-05 17:48 ` Johannes Berg
0 siblings, 1 reply; 6+ messages in thread
From: Thierry Escande @ 2013-04-05 17:21 UTC (permalink / raw)
To: Johannes Berg; +Cc: backports
On 04/05/2013 05:35 PM, Johannes Berg wrote:
>> +# NFC core needs PF_NFC defined in socket.h which was
>> +# only introduced in kernel 3.1
>> +NFC 3.1
>
> Just PF_NFC could be defined in compat, no?
That's right for compilation but sock_register for PF_NFC will fail and the module won't load.
Thierry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/5] backports: Add NFC core and drivers
2013-04-05 17:21 ` Thierry Escande
@ 2013-04-05 17:48 ` Johannes Berg
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Berg @ 2013-04-05 17:48 UTC (permalink / raw)
To: Thierry Escande; +Cc: backports
On Fri, 2013-04-05 at 19:21 +0200, Thierry Escande wrote:
> On 04/05/2013 05:35 PM, Johannes Berg wrote:
> >> +# NFC core needs PF_NFC defined in socket.h which was
> >> +# only introduced in kernel 3.1
> >> +NFC 3.1
> >
> > Just PF_NFC could be defined in compat, no?
>
> That's right for compilation but sock_register for PF_NFC will fail and the module won't load.
Ok.
johannes
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/5] backports: Add NFC core and drivers
2013-04-05 15:38 ` Hauke Mehrtens
@ 2013-04-05 17:53 ` Thierry Escande
0 siblings, 0 replies; 6+ messages in thread
From: Thierry Escande @ 2013-04-05 17:53 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: backports
On 04/05/2013 05:38 PM, Hauke Mehrtens wrote:
>
> include/uapi/linux/socket.h contains headers for kernel internal apis
> which are not backported, do not copy the header into backports when you
> do not add the implementation of the defined functions in backports,
> which you probably do not want.
include/linux/socket.h is not needed actually
Just need to add SOL_NFC definition in compat-3.10.h
Thierry
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-04-05 17:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-05 15:16 [PATCH v2 2/5] backports: Add NFC core and drivers Thierry Escande
2013-04-05 15:35 ` Johannes Berg
2013-04-05 17:21 ` Thierry Escande
2013-04-05 17:48 ` Johannes Berg
2013-04-05 15:38 ` Hauke Mehrtens
2013-04-05 17:53 ` Thierry Escande
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.