Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965216AbaKNKwT (ORCPT ); Fri, 14 Nov 2014 05:52:19 -0500 Received: from mail-wg0-f43.google.com ([74.125.82.43]:47027 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965144AbaKNKwQ (ORCPT ); Fri, 14 Nov 2014 05:52:16 -0500 From: Michal Simek To: linux-arm-kernel@lists.infradead.org, Soren Brinkmann , Olof Johansson , Arnd Bergmann Cc: monstr@monstr.eu, Josh Cartwright , Steffen Trumtrar , Rob Herring , Peter Crosthwaite , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH v4 2/6] ARM: zynq: Extract slcr related functions out of common.h Date: Fri, 14 Nov 2014 11:52:03 +0100 Message-Id: X-Mailer: git-send-email 1.8.2.3 In-Reply-To: References: In-Reply-To: References: Content-Type: multipart/signed; boundary="=_mimegpg-monstr-desktop-14101-1415962332-0001"; micalg=pgp-sha1; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a MIME GnuPG-signed message. If you see this text, it means that your E-mail or Usenet software does not support MIME signed messages. The Internet standard for MIME PGP messages, RFC 2015, was published in 1996. To open this message correctly you will need to install E-mail or Usenet software that supports modern Internet standards. --=_mimegpg-monstr-desktop-14101-1415962332-0001 Create topic headers not to share all functions. Signed-off-by: Michal Simek --- Changes in v4: - New patch in this series Changes in v3: None Changes in v2: None arch/arm/mach-zynq/common.c | 1 + arch/arm/mach-zynq/common.h | 9 --------- arch/arm/mach-zynq/platsmp.c | 1 + arch/arm/mach-zynq/slcr.c | 1 + arch/arm/mach-zynq/slcr.h | 29 +++++++++++++++++++++++++++++ 5 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 arch/arm/mach-zynq/slcr.h diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 45cb778b344d..947e72b79496 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -43,6 +43,7 @@ #include #include "common.h" +#include "slcr.h" #include "smp.h" #define ZYNQ_DEVCFG_MCTRL 0x80 diff --git a/arch/arm/mach-zynq/common.h b/arch/arm/mach-zynq/common.h index 0667cc79f179..5557de83058a 100644 --- a/arch/arm/mach-zynq/common.h +++ b/arch/arm/mach-zynq/common.h @@ -17,15 +17,6 @@ #ifndef __MACH_ZYNQ_COMMON_H__ #define __MACH_ZYNQ_COMMON_H__ -extern int zynq_slcr_init(void); -extern int zynq_early_slcr_init(void); -extern void zynq_slcr_system_reset(void); -extern void zynq_slcr_cpu_stop(int cpu); -extern void zynq_slcr_cpu_start(int cpu); -extern bool zynq_slcr_cpu_state_read(int cpu); -extern void zynq_slcr_cpu_state_write(int cpu, bool die); -extern u32 zynq_slcr_get_device_id(void); - extern void __iomem *zynq_scu_base; void zynq_pm_late_init(void); diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index 5aa6b9ee95fc..717ba2b922b1 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c @@ -26,6 +26,7 @@ #include #include #include "common.h" +#include "slcr.h" #include "smp.h" /* diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c index d4cb50cf97c0..40f8d7420334 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/arch/arm/mach-zynq/slcr.c @@ -20,6 +20,7 @@ #include #include #include "common.h" +#include "slcr.h" /* register offsets */ #define SLCR_UNLOCK_OFFSET 0x8 /* SCLR unlock register */ diff --git a/arch/arm/mach-zynq/slcr.h b/arch/arm/mach-zynq/slcr.h new file mode 100644 index 000000000000..7b4edab666ee --- /dev/null +++ b/arch/arm/mach-zynq/slcr.h @@ -0,0 +1,29 @@ +/* + * This file contains common function prototypes to avoid externs + * in the c files. + * + * Copyright (C) 2014 Xilinx + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * 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. + */ + +#ifndef __MACH_ZYNQ_SLCR_H__ +#define __MACH_ZYNQ_SLCR_H__ + +extern int zynq_slcr_init(void); +extern int zynq_early_slcr_init(void); +extern void zynq_slcr_system_reset(void); +extern void zynq_slcr_cpu_stop(int cpu); +extern void zynq_slcr_cpu_start(int cpu); +extern bool zynq_slcr_cpu_state_read(int cpu); +extern void zynq_slcr_cpu_state_write(int cpu, bool die); +extern u32 zynq_slcr_get_device_id(void); + +#endif -- 1.8.2.3 --=_mimegpg-monstr-desktop-14101-1415962332-0001 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAlRl3twACgkQykllyylKDCH0WgCgnblV2CdqKgwq/MNvNkYIbRjW 89kAn1NYZ3uOQeWoO5QslBe/sLUTqQC2 =uWQ/ -----END PGP SIGNATURE----- --=_mimegpg-monstr-desktop-14101-1415962332-0001-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/