Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (esa4.microchip.iphmx.com: domain of
  Claudiu.Beznea@microchip.com designates 198.175.253.82 as
  permitted sender) identity=mailfrom;
  client-ip=198.175.253.82; receiver=esa4.microchip.iphmx.com;
  envelope-from="Claudiu.Beznea@microchip.com";
  x-sender="Claudiu.Beznea@microchip.com";
  x-conformance=spf_only; x-record-type="v=spf1";
  x-record-text="v=spf1 mx a:ushub1.microchip.com
  a:smtpout.microchip.com -exists:%{i}.spf.microchip.iphmx.com
  include:servers.mcsv.net include:mktomail.com
  include:spf.protection.outlook.com ~all"
Received-SPF: None (esa4.microchip.iphmx.com: no sender
  authenticity information available from domain of
  postmaster@email.microchip.com) identity=helo;
  client-ip=198.175.253.82; receiver=esa4.microchip.iphmx.com;
  envelope-from="Claudiu.Beznea@microchip.com";
  x-sender="postmaster@email.microchip.com";
  x-conformance=spf_only
IronPort-SDR: J1+w2o8MqAUS4S8EsN9alMK6lCGE9jPr3vJ5fiv/J2JmCuD9528wewRIz37rAR4nuSMo9NDlWf
 yxmzR+zwNlhe9sWtX8604oykesS9VEi2mDYanp3Z5mvDmUB6qYCDDIDutLXnNpsGJVkbV/Aq2k
 2xa/Vop5QuTNTG5w/hf/O5Cbi1VXbtWpbHKRy0eDxDf+fYqwuSuaP5U4Nw2n6R/kZuI35YCCfs
 HQM92fLsvMuxtFFA5busOhblcTNwVgkRp5vRkN9z2rZ81O82cUeBgBMexDL7FRrVkUKCCvCJaH
 etk=
From:   <Claudiu.Beznea@microchip.com>
To:     <sre@kernel.org>, <Nicolas.Ferre@microchip.com>,
        <alexandre.belloni@bootlin.com>, <Ludovic.Desroches@microchip.com>
CC:     <linux-pm@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>,
        <linux-kernel@vger.kernel.org>, <Claudiu.Beznea@microchip.com>
Subject: [PATCH 09/15] power: reset: at91-reset: introduce args member in
 at91_reset_data
Thread-Topic: [PATCH 09/15] power: reset: at91-reset: introduce args member in
 at91_reset_data
Thread-Index: AQHV0EIKKlAxzgdug0mON1UVGCeEBw==
Date:   Tue, 21 Jan 2020 10:03:33 +0000
Message-ID: <1579601001-5711-10-git-send-email-claudiu.beznea@microchip.com>
References: <1579601001-5711-1-git-send-email-claudiu.beznea@microchip.com>
In-Reply-To: <1579601001-5711-1-git-send-email-claudiu.beznea@microchip.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microchip.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: cfb40eed-4995-4cff-075b-08d79e592cdb
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2020 10:03:33.4836
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: Up9dmCCfhm66RZ2GMEQpQlRpFCGMiy7+c1wC9IBSdm/bqMeIuvOiBXLntr7TvXDbH41Q/vAz/zHC0Cw3Jk7WdYE8AB0Fi4oy8sStd/dO0+0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3195
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Introduce args member in struct at91_reset_data. It stores the value
that needs to be written in mode register so that the reboot actions
to happen. With these changes samx7_restart() could be removed.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
 drivers/power/reset/at91-reset.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-re=
set.c
index c653bd7ac29a..dc48f6850796 100644
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -52,6 +52,7 @@ enum reset_type {
 struct at91_reset_data {
 	int (*notifier_call)(struct notifier_block *this, unsigned long mode,
 			     void *cmd);
+	u32 args;
 };
=20
 struct at91_reset {
@@ -59,6 +60,7 @@ struct at91_reset {
 	void __iomem *ramc_base[2];
 	struct clk *sclk;
 	struct notifier_block nb;
+	u32 args;
 };
=20
 /*
@@ -90,7 +92,7 @@ static int at91sam9260_restart(struct notifier_block *thi=
s, unsigned long mode,
 		  "r" (reset->rstc_base),
 		  "r" (1),
 		  "r" cpu_to_le32(AT91_SDRAMC_LPCB_POWER_DOWN),
-		  "r" cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST))=
;
+		  "r" (reset->args));
=20
 	return NOTIFY_DONE;
 }
@@ -135,7 +137,7 @@ static int at91sam9g45_restart(struct notifier_block *t=
his, unsigned long mode,
 		  "r" (reset->rstc_base),
 		  "r" (1),
 		  "r" cpu_to_le32(AT91_DDRSDRC_LPCB_POWER_DOWN),
-		  "r" cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST)
+		  "r" (reset->args)
 		: "r0");
=20
 	return NOTIFY_DONE;
@@ -146,19 +148,7 @@ static int sama5d3_restart(struct notifier_block *this=
, unsigned long mode,
 {
 	struct at91_reset *reset =3D container_of(this, struct at91_reset, nb);
=20
-	writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST),
-	       reset->rstc_base);
-
-	return NOTIFY_DONE;
-}
-
-static int samx7_restart(struct notifier_block *this, unsigned long mode,
-			 void *cmd)
-{
-	struct at91_reset *reset =3D container_of(this, struct at91_reset, nb);
-
-	writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PROCRST),
-	       reset->rstc_base);
+	writel(reset->args, reset->rstc_base);
=20
 	return NOTIFY_DONE;
 }
@@ -210,18 +200,22 @@ static const struct of_device_id at91_ramc_of_match[]=
 =3D {
=20
 static const struct at91_reset_data at91sam9260_reset_data =3D {
 	.notifier_call =3D at91sam9260_restart,
+	.args =3D AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST,
 };
=20
 static const struct at91_reset_data at91sam9g45_reset_data =3D {
 	.notifier_call =3D at91sam9g45_restart,
+	.args =3D AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST,
 };
=20
 static const struct at91_reset_data sama5d3_reset_data =3D {
 	.notifier_call =3D sama5d3_restart,
+	.args =3D AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST,
 };
=20
 static const struct at91_reset_data samx7_reset_data =3D {
-	.notifier_call =3D samx7_restart,
+	.notifier_call =3D sama5d3_restart,
+	.args =3D AT91_RSTC_KEY | AT91_RSTC_PROCRST,
 };
=20
 static const struct of_device_id at91_reset_of_match[] =3D {
@@ -284,6 +278,7 @@ static int __init at91_reset_probe(struct platform_devi=
ce *pdev)
 	reset_data =3D match->data;
 	reset->nb.notifier_call =3D reset_data->notifier_call;
 	reset->nb.priority =3D 192;
+	reset->args =3D reset_data->args;
=20
 	reset->sclk =3D devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(reset->sclk))
--=20
2.7.4