[linux-yocto] [PATCH 1/3] drivers/misc/lsi-ncr.c: Move the Header to the Default Path
Cristian Bercaru
cristian.bercaru at windriver.com
Thu Nov 19 05:30:53 PST 2015
From: John Jacques <john.jacques at intel.com>
Move lsi-ncr.h to include/linux as it is used in arch/arm/* and
arch/powerpc/* among other places. All source files including
lsi-ncr.h are updated as well.
Signed-off-by: John Jacques <john.jacques at intel.com>
---
arch/arm/mach-axxia/ddr_retention.c | 2 +-
arch/arm/mach-axxia/perf_event_platform.c | 2 +-
arch/arm/mach-axxia/rapidio.c | 2 +-
arch/arm/mach-axxia/smon.c | 3 +-
arch/powerpc/sysdev/lsi_pci.c | 5 ++--
drivers/edac/axxia_edac-l2_cpu.c | 2 +-
drivers/edac/axxia_edac-l3.c | 2 +-
drivers/edac/axxia_edac-mc.c | 2 +-
drivers/misc/lsi-ncr.c | 2 +-
drivers/misc/lsi-ncr.h | 44 -----------------------------
drivers/net/ethernet/lsi/lsi_acp_net.c | 3 +-
include/linux/lsi-ncr.h | 44 +++++++++++++++++++++++++++++
12 files changed, 55 insertions(+), 58 deletions(-)
delete mode 100644 drivers/misc/lsi-ncr.h
create mode 100644 include/linux/lsi-ncr.h
diff --git a/arch/arm/mach-axxia/ddr_retention.c b/arch/arm/mach-axxia/ddr_retention.c
index c897992..eb2f571 100644
--- a/arch/arm/mach-axxia/ddr_retention.c
+++ b/arch/arm/mach-axxia/ddr_retention.c
@@ -30,9 +30,9 @@
#include <linux/of.h>
#include <linux/io.h>
+#include <linux/lsi-ncr.h>
#include <asm/cacheflush.h>
#include "axxia.h"
-#include "../../../drivers/misc/lsi-ncr.h"
static void __iomem *nca;
static void __iomem *apb;
diff --git a/arch/arm/mach-axxia/perf_event_platform.c b/arch/arm/mach-axxia/perf_event_platform.c
index 538fd1a..543a71d 100644
--- a/arch/arm/mach-axxia/perf_event_platform.c
+++ b/arch/arm/mach-axxia/perf_event_platform.c
@@ -46,8 +46,8 @@
#include <linux/proc_fs.h>
#include <linux/io.h>
+#include <linux/lsi-ncr.h>
#include <asm/cacheflush.h>
-#include <../../../drivers/misc/lsi-ncr.h>
#include "perf_event_platform.h"
diff --git a/arch/arm/mach-axxia/rapidio.c b/arch/arm/mach-axxia/rapidio.c
index 1619464..ccae1ad 100644
--- a/arch/arm/mach-axxia/rapidio.c
+++ b/arch/arm/mach-axxia/rapidio.c
@@ -31,8 +31,8 @@
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/signal.h>
+#include <linux/lsi-ncr.h>
-#include "../../../drivers/misc/lsi-ncr.h"
#include <mach/rio.h>
/**
diff --git a/arch/arm/mach-axxia/smon.c b/arch/arm/mach-axxia/smon.c
index 313a3ce..4d8c4f9 100644
--- a/arch/arm/mach-axxia/smon.c
+++ b/arch/arm/mach-axxia/smon.c
@@ -21,8 +21,7 @@
*
*/
#include <linux/io.h>
-
-#include <../../../drivers/misc/lsi-ncr.h>
+#include <linux/lsi-ncr.h>
#include "smon.h"
diff --git a/arch/powerpc/sysdev/lsi_pci.c b/arch/powerpc/sysdev/lsi_pci.c
index 2c99507..2c1e435 100644
--- a/arch/powerpc/sysdev/lsi_pci.c
+++ b/arch/powerpc/sysdev/lsi_pci.c
@@ -11,8 +11,10 @@
#include <linux/bootmem.h>
#include <linux/delay.h>
#include <linux/slab.h>
+#include <linux/interrupt.h>
#include <linux/io.h>
+#include <linux/lsi-ncr.h>
#include <asm/pci-bridge.h>
#include <asm/machdep.h>
#include <asm/dcr.h>
@@ -20,9 +22,6 @@
#include <mm/mmu_decl.h>
#include "ppc4xx_pci.h"
-#include "../../../drivers/misc/lsi-ncr.h"
-
-#include <linux/interrupt.h>
static int acp_plx;
diff --git a/drivers/edac/axxia_edac-l2_cpu.c b/drivers/edac/axxia_edac-l2_cpu.c
index 2face86..1373380 100644
--- a/drivers/edac/axxia_edac-l2_cpu.c
+++ b/drivers/edac/axxia_edac-l2_cpu.c
@@ -25,8 +25,8 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/io.h>
+#include <linux/lsi-ncr.h>
#include <linux/edac.h>
-#include "../misc/lsi-ncr.h"
#include <linux/of_platform.h>
#include <linux/of.h>
#include <linux/of_address.h>
diff --git a/drivers/edac/axxia_edac-l3.c b/drivers/edac/axxia_edac-l3.c
index 73674cf..59c4056 100644
--- a/drivers/edac/axxia_edac-l3.c
+++ b/drivers/edac/axxia_edac-l3.c
@@ -25,8 +25,8 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/io.h>
+#include <linux/lsi-ncr.h>
#include <linux/edac.h>
-#include "../misc/lsi-ncr.h"
#include <linux/of_platform.h>
#include <linux/of.h>
#include <linux/of_address.h>
diff --git a/drivers/edac/axxia_edac-mc.c b/drivers/edac/axxia_edac-mc.c
index bc3b004..30c7843 100644
--- a/drivers/edac/axxia_edac-mc.c
+++ b/drivers/edac/axxia_edac-mc.c
@@ -25,8 +25,8 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/io.h>
+#include <linux/lsi-ncr.h>
#include <linux/edac.h>
-#include "../misc/lsi-ncr.h"
#include <linux/of_platform.h>
#include <linux/of.h>
#include <linux/of_address.h>
diff --git a/drivers/misc/lsi-ncr.c b/drivers/misc/lsi-ncr.c
index 3c78d1b..a00fc6c 100644
--- a/drivers/misc/lsi-ncr.c
+++ b/drivers/misc/lsi-ncr.c
@@ -22,8 +22,8 @@
#include <linux/module.h>
#include <linux/io.h>
+#include <linux/lsi-ncr.h>
#include <linux/of.h>
-#include "lsi-ncr.h"
#ifdef CONFIG_ARCH_AXXIA
#define NCA_PHYS_ADDRESS 0x002020100000ULL
diff --git a/drivers/misc/lsi-ncr.h b/drivers/misc/lsi-ncr.h
deleted file mode 100644
index db54f6b..0000000
--- a/drivers/misc/lsi-ncr.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * drivers/lsi/common/version.h
- *
- * Copyright (C) 2010 LSI
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __DRIVERS_LSI_ACP_NCR_H
-#define __DRIVERS_LSI_ACP_NCR_H
-
-#ifndef NCP_REGION_ID
-#define NCP_REGION_ID(node, target) \
-(unsigned long) ((((node) & 0xffff) << 16) | ((target) & 0xffff))
-#endif
-
-#ifndef NCP_NODE_ID
-#define NCP_NODE_ID(region) (((region) >> 16) & 0xffff)
-#endif
-
-#ifndef NCP_TARGET_ID
-#define NCP_TARGET_ID(region) ((region) & 0xffff)
-#endif
-
-unsigned long ncr_register_read(unsigned *);
-void ncr_register_write(const unsigned, unsigned *);
-int ncr_read(unsigned long, unsigned long, int, void *);
-int ncr_write(unsigned long, unsigned long, int, void *);
-int ncr_read_nolock(unsigned long, unsigned long, int, void *);
-int ncr_write_nolock(unsigned long, unsigned long, int, void *);
-
-#endif /* __DRIVERS_LSI_ACP_NCR_H */
diff --git a/drivers/net/ethernet/lsi/lsi_acp_net.c b/drivers/net/ethernet/lsi/lsi_acp_net.c
index 8ea1ca1..a3c72c9 100644
--- a/drivers/net/ethernet/lsi/lsi_acp_net.c
+++ b/drivers/net/ethernet/lsi/lsi_acp_net.c
@@ -75,11 +75,10 @@
#include <linux/dma-mapping.h>
#include <linux/uaccess.h>
#include <linux/io.h>
+#include <linux/lsi-ncr.h>
#include <asm/dma.h>
-#include "../../../misc/lsi-ncr.h"
-
#include "lsi_acp_net.h"
#define LSI_DRV_NAME "acp-femac"
diff --git a/include/linux/lsi-ncr.h b/include/linux/lsi-ncr.h
new file mode 100644
index 0000000..db54f6b
--- /dev/null
+++ b/include/linux/lsi-ncr.h
@@ -0,0 +1,44 @@
+/*
+ * drivers/lsi/common/version.h
+ *
+ * Copyright (C) 2010 LSI
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __DRIVERS_LSI_ACP_NCR_H
+#define __DRIVERS_LSI_ACP_NCR_H
+
+#ifndef NCP_REGION_ID
+#define NCP_REGION_ID(node, target) \
+(unsigned long) ((((node) & 0xffff) << 16) | ((target) & 0xffff))
+#endif
+
+#ifndef NCP_NODE_ID
+#define NCP_NODE_ID(region) (((region) >> 16) & 0xffff)
+#endif
+
+#ifndef NCP_TARGET_ID
+#define NCP_TARGET_ID(region) ((region) & 0xffff)
+#endif
+
+unsigned long ncr_register_read(unsigned *);
+void ncr_register_write(const unsigned, unsigned *);
+int ncr_read(unsigned long, unsigned long, int, void *);
+int ncr_write(unsigned long, unsigned long, int, void *);
+int ncr_read_nolock(unsigned long, unsigned long, int, void *);
+int ncr_write_nolock(unsigned long, unsigned long, int, void *);
+
+#endif /* __DRIVERS_LSI_ACP_NCR_H */
--
1.7.9.5
More information about the linux-yocto
mailing list