sn220: Rename from pn8xT and build as modules.

Pega put this in the kernel drivers tree, but we want to keep
out-of-tree modules separate, so refactor to build two modules:
p73.ko (eSE over SPI) and pn553_i2c.ko (NFC).

Bug: 206483603
Change-Id: I20c098c0687a093ef2f60e48fe7e1aab420a29af
Signed-off-by: Andrew Evans <andrewevans@google.com>

14 files changed, 25 insertions, 29 deletions

diff --git a/nxp/Makefile b/nxp/Makefile
deleted file mode 100755
index 3f79a52..0000000
--- a/nxp/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Makefile for nfc devices
-#
-
-
-obj-y				+= pn8xT/
diff --git a/nxp/pn8xT/Makefile b/nxp/pn8xT/Makefile
deleted file mode 100755
index 34d5fc8..0000000
--- a/nxp/pn8xT/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Makefile for nfc devices
-#
-
-
-obj-y				+= NXPESE_SPIDriver/ NXPNFC_I2CDriver/
diff --git a/nxp/pn8xT/NXPESE_SPIDriver/Makefile b/nxp/pn8xT/NXPESE_SPIDriver/Makefile
deleted file mode 100755
index 4a49d26..0000000
--- a/nxp/pn8xT/NXPESE_SPIDriver/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for embedded secure element devices
-#
-
-obj-$(CONFIG_NXP_ESE_P73)	+= p73.o
-#ccflags-y 			:= -DDEBUG
-
diff --git a/nxp/pn8xT/NXPNFC_I2CDriver/Makefile b/nxp/pn8xT/NXPNFC_I2CDriver/Makefile
deleted file mode 100755
index 16c4774..0000000
--- a/nxp/pn8xT/NXPNFC_I2CDriver/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for nfc devices
-#
-obj-$(CONFIG_NXP_NFC_I2C)		+= pn553_i2c.o
-pn553_i2c-objs				:= common.o common_ese.o i2c_drv.o
-#ccflags-y                      += -DDEBUG
-
diff --git a/nxp/sn220/Kbuild b/nxp/sn220/Kbuild
new file mode 100755
index 0000000..dbe94d8
--- /dev/null
+++ b/nxp/sn220/Kbuild
@@ -0,0 +1,6 @@
+obj-m		+= pn553_i2c.o
+pn553_i2c-objs	:= common.o common_ese.o i2c_drv.o
+
+obj-m		+= p73.o
+
+#ccflags-y	:= -DDEBUG
diff --git a/nxp/sn220/Makefile b/nxp/sn220/Makefile
new file mode 100644
index 0000000..0eb0d42
--- /dev/null
+++ b/nxp/sn220/Makefile
@@ -0,0 +1,17 @@
+#
+# Makefile for NXP NFC PN553 driver
+#
+
+default: all
+
+KBUILD_OPTIONS +=
+
+all:
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS)
+
+modules_install:
+	$(MAKE) INSTALL_MOD_STRIP=1 M=$(M) -C $(KERNEL_SRC) modules_install
+
+clean::
+	rm -f *.o *.ko *.mod.c *.mod.o *~ .*.cmd Module.symvers
+	rm -rf .tmp_versions
diff --git a/nxp/pn8xT/NXPNFC_I2CDriver/common.c b/nxp/sn220/common.c
index 094eb40..094eb40 100755
--- a/nxp/pn8xT/NXPNFC_I2CDriver/common.c
+++ b/nxp/sn220/common.c
diff --git a/nxp/pn8xT/NXPNFC_I2CDriver/common.h b/nxp/sn220/common.h
index c4f3388..c4f3388 100755
--- a/nxp/pn8xT/NXPNFC_I2CDriver/common.h
+++ b/nxp/sn220/common.h
diff --git a/nxp/pn8xT/NXPNFC_I2CDriver/common_ese.c b/nxp/sn220/common_ese.c
index 0abfc1a..0abfc1a 100755
--- a/nxp/pn8xT/NXPNFC_I2CDriver/common_ese.c
+++ b/nxp/sn220/common_ese.c
diff --git a/nxp/pn8xT/NXPNFC_I2CDriver/common_ese.h b/nxp/sn220/common_ese.h
index c8d5637..c8d5637 100755
--- a/nxp/pn8xT/NXPNFC_I2CDriver/common_ese.h
+++ b/nxp/sn220/common_ese.h
diff --git a/nxp/pn8xT/NXPNFC_I2CDriver/i2c_drv.c b/nxp/sn220/i2c_drv.c
index 381ae38..381ae38 100755
--- a/nxp/pn8xT/NXPNFC_I2CDriver/i2c_drv.c
+++ b/nxp/sn220/i2c_drv.c
diff --git a/nxp/pn8xT/NXPNFC_I2CDriver/i2c_drv.h b/nxp/sn220/i2c_drv.h
index 1508fd4..1508fd4 100755
--- a/nxp/pn8xT/NXPNFC_I2CDriver/i2c_drv.h
+++ b/nxp/sn220/i2c_drv.h
diff --git a/nxp/pn8xT/NXPESE_SPIDriver/p73.c b/nxp/sn220/p73.c
index 964f36d..857609a 100755
--- a/nxp/pn8xT/NXPESE_SPIDriver/p73.c
+++ b/nxp/sn220/p73.c
@@ -45,8 +45,9 @@
 #include <linux/poll.h>
 #include <linux/ktime.h>
 #include <linux/regulator/consumer.h>
+
 #include "p73.h"
-#include "../NXPNFC_I2CDriver/common_ese.h"
+#include "common_ese.h"
 
 #define DRAGON_P61 1
 
diff --git a/nxp/pn8xT/NXPESE_SPIDriver/p73.h b/nxp/sn220/p73.h
index 9d5558b..9d5558b 100755
--- a/nxp/pn8xT/NXPESE_SPIDriver/p73.h
+++ b/nxp/sn220/p73.h