| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 20 Oct 2014 15:25:31 +0200
From: Michal Simek <michal.simek@...inx.com>
To: linux-arm-kernel@...ts.infradead.org
Cc: monstr@...str.eu, Josh Cartwright <josh.cartwright@...com>,
Steffen Trumtrar <s.trumtrar@...gutronix.de>,
Rob Herring <robherring2@...il.com>,
Peter Crosthwaite <peter.crosthwaite@...inx.com>,
Russell King <linux@....linux.org.uk>,
linux-kernel@...r.kernel.org
Subject: [PATCH v2 1/3] ARM: zynq: Move common.h to generic location
include/soc/zynq/ is the right location for this header
to be able to share information from this header with other
drivers which require it.
Signed-off-by: Michal Simek <michal.simek@...inx.com>
---
Changes in v2:
- Update pm.c added in 3.17 too - Soren pointed on it
arch/arm/mach-zynq/common.c | 2 +-
arch/arm/mach-zynq/hotplug.c | 14 --------------
arch/arm/mach-zynq/platsmp.c | 2 +-
arch/arm/mach-zynq/pm.c | 2 +-
arch/arm/mach-zynq/slcr.c | 2 +-
{arch/arm/mach-zynq => include/soc/zynq}/common.h | 0
6 files changed, 4 insertions(+), 18 deletions(-)
delete mode 100644 arch/arm/mach-zynq/hotplug.c
rename {arch/arm/mach-zynq => include/soc/zynq}/common.h (100%)
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 26f92c28d22b..c488eb264072 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -42,7 +42,7 @@
#include <asm/system_info.h>
#include <asm/hardware/cache-l2x0.h>
-#include "common.h"
+#include <soc/zynq/common.h>
#define ZYNQ_DEVCFG_MCTRL 0x80
#define ZYNQ_DEVCFG_PS_VERSION_SHIFT 28
diff --git a/arch/arm/mach-zynq/hotplug.c b/arch/arm/mach-zynq/hotplug.c
deleted file mode 100644
index b685c89f11e4..000000000000
--- a/arch/arm/mach-zynq/hotplug.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2012-2013 Xilinx
- *
- * based on linux/arch/arm/mach-realview/hotplug.c
- *
- * Copyright (C) 2002 ARM Ltd.
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <asm/proc-fns.h>
-
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
index 52d768ff7857..bfb1315b04ea 100644
--- a/arch/arm/mach-zynq/platsmp.c
+++ b/arch/arm/mach-zynq/platsmp.c
@@ -25,7 +25,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_scu.h>
#include <linux/irqchip/arm-gic.h>
-#include "common.h"
+#include <soc/zynq/common.h>
/*
* Store number of cores in the system
diff --git a/arch/arm/mach-zynq/pm.c b/arch/arm/mach-zynq/pm.c
index 911fcf865be8..31df24ce1ce5 100644
--- a/arch/arm/mach-zynq/pm.c
+++ b/arch/arm/mach-zynq/pm.c
@@ -22,7 +22,7 @@
#include <linux/io.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
-#include "common.h"
+#include <soc/zynq/common.h>
/* register offsets */
#define DDRC_CTRL_REG1_OFFS 0x60
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index d4cb50cf97c0..22d9d54d2333 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -19,7 +19,7 @@
#include <linux/of_address.h>
#include <linux/regmap.h>
#include <linux/clk/zynq.h>
-#include "common.h"
+#include <soc/zynq/common.h>
/* register offsets */
#define SLCR_UNLOCK_OFFSET 0x8 /* SCLR unlock register */
diff --git a/arch/arm/mach-zynq/common.h b/include/soc/zynq/common.h
similarity index 100%
rename from arch/arm/mach-zynq/common.h
rename to include/soc/zynq/common.h
--
1.8.2.3
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists