From patchwork Thu Dec 13 12:33:57 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philipp Zabel
X-Patchwork-Id: 10728595
Return-Path:
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
[172.30.200.125])
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BFEE76C5
for ;
Thu, 13 Dec 2018 12:34:57 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B033C28AB8
for ;
Thu, 13 Dec 2018 12:34:57 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
id AE6AB2C094; Thu, 13 Dec 2018 12:34:57 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
pdx-wl-mail.web.codeaurora.org
X-Spam-Level:
X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1
Received: from bombadil.infradead.org (bombadil.infradead.org
[198.137.202.133])
(using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2EF382C0AF
for ;
Thu, 13 Dec 2018 12:34:57 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=lists.infradead.org; s=bombadil.20170209; h=Sender:
Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:
List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
List-Owner; bh=BBP1FADATfc8vklaHY7Z2v7VmYFO2CVPZLARYEVdEq0=; b=nCAP2W85KB+ctR
ubx9vJ3/KVUFoFbAs7ItL4s07aSb+Ap1RKK9DJltrJrXF1AdgsEEelELDSaCJ0nZ91d4ZvpwARDCU
o1tFuP/22iem7+NwHyfHp+T2y9LHO8JI4HvKO1ArvMBKQUmAh6ZQ1LKzZG8VYQRrC0f7kLHQRnzk/
bQIlpFCcyjRH8K/d91wsND6QU5+CpSYPekesZRJmoQghGBCxxbNtDhxBgH4lxzeaTIG2r0Am/7Wh6
VaVy0qxGGKDT+dvf4limyxb10rb0GxXwVIifa2yvx6fgEZGF21Vx5tWuaZz66CTtfB2nR/NBqn4uy
bsIf+mKDrLgv+98B2t9Q==;
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))
id 1gXQCa-0001ez-Rk; Thu, 13 Dec 2018 12:34:52 +0000
Received: from metis.ext.pengutronix.de
([2001:67c:670:201:290:27ff:fe1d:cc33])
by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
id 1gXQCI-0001G7-95
for linux-arm-kernel@lists.infradead.org; Thu, 13 Dec 2018 12:34:36 +0000
Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]
helo=dude.pengutronix.de.)
by metis.ext.pengutronix.de with esmtp (Exim 4.89)
(envelope-from )
id 1gXQBv-0005iT-FJ; Thu, 13 Dec 2018 13:34:11 +0100
From: Philipp Zabel
To: Dinh Nguyen ,
Maxime Ripard , Chen-Yu Tsai
Subject: [PATCH 1/2] reset: sunxi: declare sun6i_reset_init in a header file
Date: Thu, 13 Dec 2018 13:33:57 +0100
Message-Id: <20181213123358.24391-2-p.zabel@pengutronix.de>
X-Mailer: git-send-email 2.19.1
In-Reply-To: <20181213123358.24391-1-p.zabel@pengutronix.de>
References: <20181213123358.24391-1-p.zabel@pengutronix.de>
MIME-Version: 1.0
X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de);
SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
X-CRM114-CacheID: sfid-20181213_043434_477036_620C0446
X-CRM114-Status: GOOD ( 13.73 )
X-BeenThere: linux-arm-kernel@lists.infradead.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe:
,
List-Archive:
List-Post:
List-Help:
List-Subscribe:
,
Cc: Olof Johansson , Stephen Rothwell ,
linux-kernel@vger.kernel.org, Arnd Bergmann ,
linux-arm-kernel@lists.infradead.org
Sender: "linux-arm-kernel"
Errors-To:
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
X-Virus-Scanned: ClamAV using ClamSMTP
Avoid declaring extern functions in c files. To make sure function
definition and usage don't get out of sync, declare sun6i_reset_init
in a common header.
Suggested-by: Stephen Rothwell
Signed-off-by: Philipp Zabel
---
arch/arm/mach-sunxi/sunxi.c | 2 +-
drivers/reset/reset-sunxi.c | 1 +
include/linux/reset/sunxi.h | 7 +++++++
3 files changed, 9 insertions(+), 1 deletion(-)
create mode 100644 include/linux/reset/sunxi.h
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index de4b0e932f22..88680e80c166 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
@@ -37,7 +38,6 @@ static const char * const sun6i_board_dt_compat[] = {
NULL,
};
-extern void __init sun6i_reset_init(void);
static void __init sun6i_timer_init(void)
{
of_clk_init(NULL);
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index db9a1a75523f..b06d724d8f21 100644
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -18,6 +18,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/include/linux/reset/sunxi.h b/include/linux/reset/sunxi.h
new file mode 100644
index 000000000000..1ad7fffb413e
--- /dev/null
+++ b/include/linux/reset/sunxi.h
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __LINUX_RESET_SUNXI_H__
+#define __LINUX_RESET_SUNXI_H__
+
+void __init sun6i_reset_init(void);
+
+#endif /* __LINUX_RESET_SUNXI_H__ */
From patchwork Thu Dec 13 12:33:58 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philipp Zabel
X-Patchwork-Id: 10728597
Return-Path:
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
[172.30.200.125])
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EEA2516B1
for ;
Thu, 13 Dec 2018 12:35:10 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF0AE2C05C
for ;
Thu, 13 Dec 2018 12:35:10 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
id D17D52A734; Thu, 13 Dec 2018 12:35:10 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
pdx-wl-mail.web.codeaurora.org
X-Spam-Level:
X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1
Received: from bombadil.infradead.org (bombadil.infradead.org
[198.137.202.133])
(using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6F88E2A734
for ;
Thu, 13 Dec 2018 12:35:10 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=lists.infradead.org; s=bombadil.20170209; h=Sender:
Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:
List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
List-Owner; bh=t42JAE1x7qvdevjdu6wpFq3T6jR30xeXhdynxZ7nAJ4=; b=c4E+MSLU941bsL
WfOJHrycYje3mjL/3sfPl/7SCfYELtYUyVAcN9ZC1eRJ5r8bvAQFx/yHoy7Fb3nnCwMLwY1I/veH5
oJpMw6ZlC0EwGCjhvrRuHS1wq5aLEHgVQv5/Bpy9NbBI+1IANFW4Il4U+mxSnXJ4HCK5Zc+8UpFgW
VRshfRksxV/fShaXeAds/Lz9A3qQ/gqcpm0/jzpmEVGOCh+ULHs4YkQFj8VrEWVg3teVefyAjyJsS
XXwUc50txYGyprKid4KF7hqbH5BUNHVoZ5XmyHLjD2UvFs+z90vYuswKELd40UzncdhOJV0LkaBpN
ybQ+HtgVmKYgh/44mC9A==;
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))
id 1gXQCq-00024C-Jv; Thu, 13 Dec 2018 12:35:08 +0000
Received: from metis.ext.pengutronix.de
([2001:67c:670:201:290:27ff:fe1d:cc33])
by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
id 1gXQCI-0001G8-8y
for linux-arm-kernel@lists.infradead.org; Thu, 13 Dec 2018 12:34:37 +0000
Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]
helo=dude.pengutronix.de.)
by metis.ext.pengutronix.de with esmtp (Exim 4.89)
(envelope-from )
id 1gXQBv-0005iT-Hb; Thu, 13 Dec 2018 13:34:11 +0100
From: Philipp Zabel
To: Dinh Nguyen ,
Maxime Ripard , Chen-Yu Tsai
Subject: [PATCH 2/2] reset: socfpga: declare socfpga_reset_init in a header
file
Date: Thu, 13 Dec 2018 13:33:58 +0100
Message-Id: <20181213123358.24391-3-p.zabel@pengutronix.de>
X-Mailer: git-send-email 2.19.1
In-Reply-To: <20181213123358.24391-1-p.zabel@pengutronix.de>
References: <20181213123358.24391-1-p.zabel@pengutronix.de>
MIME-Version: 1.0
X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de);
SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
X-CRM114-CacheID: sfid-20181213_043434_479102_3498D63C
X-CRM114-Status: GOOD ( 13.25 )
X-BeenThere: linux-arm-kernel@lists.infradead.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe:
,
List-Archive:
List-Post:
List-Help:
List-Subscribe:
,
Cc: Olof Johansson , Stephen Rothwell ,
linux-kernel@vger.kernel.org, Arnd Bergmann ,
linux-arm-kernel@lists.infradead.org
Sender: "linux-arm-kernel"
Errors-To:
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
X-Virus-Scanned: ClamAV using ClamSMTP
Avoid declaring extern functions in c files. To make sure function
definition and usage don't get out of sync, declare socfpga_reset_init
in a common header.
Suggested-by: Stephen Rothwell
Signed-off-by: Philipp Zabel
Acked-by: Dinh Nguyen
---
arch/arm/mach-socfpga/socfpga.c | 3 +--
drivers/reset/reset-socfpga.c | 2 +-
include/linux/reset/socfpga.h | 7 +++++++
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 include/linux/reset/socfpga.h
diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c
index cc64576c102b..685272fa9eb6 100644
--- a/arch/arm/mach-socfpga/socfpga.c
+++ b/arch/arm/mach-socfpga/socfpga.c
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
#include
@@ -32,8 +33,6 @@ void __iomem *rst_manager_base_addr;
void __iomem *sdr_ctl_base_addr;
unsigned long socfpga_cpu1start_addr;
-extern void __init socfpga_reset_init(void);
-
void __init socfpga_sysmgr_init(void)
{
struct device_node *np;
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 318cfc51c441..96953992c2bb 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -18,7 +19,6 @@
#include "reset-simple.h"
#define SOCFPGA_NR_BANKS 8
-void __init socfpga_reset_init(void);
static int a10_reset_init(struct device_node *np)
{
diff --git a/include/linux/reset/socfpga.h b/include/linux/reset/socfpga.h
new file mode 100644
index 000000000000..b11a2047c342
--- /dev/null
+++ b/include/linux/reset/socfpga.h
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __LINUX_RESET_SOCFPGA_H__
+#define __LINUX_RESET_SOCFPGA_H__
+
+void __init socfpga_reset_init(void);
+
+#endif /* __LINUX_RESET_SOCFPGA_H__ */