drop dt-bindings-power-add-r8a774b1-sysc-power-domain-def.patch

diff --git a/queue-4.19/dt-bindings-power-add-r8a774b1-sysc-power-domain-def.patch b/queue-4.19/dt-bindings-power-add-r8a774b1-sysc-power-domain-def.patch
deleted file mode 100644 (file)
index ece9e1a..0000000
--- a/queue-4.19/dt-bindings-power-add-r8a774b1-sysc-power-domain-def.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2e5d2f3b97c2f7f567150117cd72bddd73c9abb2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 5 Sep 2019 07:52:06 +0100
-Subject: dt-bindings: power: Add r8a774b1 SYSC power domain definitions
-
-From: Biju Das <biju.das@bp.renesas.com>
-
-[ Upstream commit be67c41781cb4c06a4acb0b92db0cbb728e955e2 ]
-
-This patch adds power domain indices for the RZ/G2N (a.k.a r8a774b1)
-SoC.
-
-Signed-off-by: Biju Das <biju.das@bp.renesas.com>
-Link: https://lore.kernel.org/r/1567666326-27373-1-git-send-email-biju.das@bp.renesas.com
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Stable-dep-of: 8a7d12d674ac ("net: usb: usbnet: fix name regression")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/dt-bindings/power/r8a774b1-sysc.h | 26 +++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
- create mode 100644 include/dt-bindings/power/r8a774b1-sysc.h
-
-diff --git a/include/dt-bindings/power/r8a774b1-sysc.h b/include/dt-bindings/power/r8a774b1-sysc.h
-new file mode 100644
-index 0000000000000..373736402f048
---- /dev/null
-+++ b/include/dt-bindings/power/r8a774b1-sysc.h
-@@ -0,0 +1,26 @@
-+/* SPDX-License-Identifier: GPL-2.0
-+ *
-+ * Copyright (C) 2019 Renesas Electronics Corp.
-+ */
-+#ifndef __DT_BINDINGS_POWER_R8A774B1_SYSC_H__
-+#define __DT_BINDINGS_POWER_R8A774B1_SYSC_H__
-+
-+/*
-+ * These power domain indices match the numbers of the interrupt bits
-+ * representing the power areas in the various Interrupt Registers
-+ * (e.g. SYSCISR, Interrupt Status Register)
-+ */
-+
-+#define R8A774B1_PD_CA57_CPU0          0
-+#define R8A774B1_PD_CA57_CPU1          1
-+#define R8A774B1_PD_A3VP               9
-+#define R8A774B1_PD_CA57_SCU          12
-+#define R8A774B1_PD_A3VC              14
-+#define R8A774B1_PD_3DG_A             17
-+#define R8A774B1_PD_3DG_B             18
-+#define R8A774B1_PD_A2VC1             26
-+
-+/* Always-on power area */
-+#define R8A774B1_PD_ALWAYS_ON         32
-+
-+#endif /* __DT_BINDINGS_POWER_R8A774B1_SYSC_H__ */
--- 
-2.43.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 40e10cfa350644f50b2fde97110cd181e0f38e23..6f032157f44601b5d0394a16b457b57141df6211 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -308,7 +308,6 @@ udf-fix-uninit-value-use-in-udf_get_fileshortad.patch
 jfs-fix-sanity-check-in-dbmount.patch
 net-sun3_82586-fix-potential-memory-leak-in-sun3_825.patch
 be2net-fix-potential-memory-leak-in-be_xmit.patch
-dt-bindings-power-add-r8a774b1-sysc-power-domain-def.patch
 net-usb-usbnet-fix-name-regression.patch
 posix-clock-posix-clock-fix-unbalanced-locking-in-pc.patch
 alsa-hda-realtek-update-default-depop-procedure.patch

diff --git a/queue-5.4/dt-bindings-power-add-r8a774b1-sysc-power-domain-def.patch b/queue-5.4/dt-bindings-power-add-r8a774b1-sysc-power-domain-def.patch
deleted file mode 100644 (file)
index 1d26e28..0000000
--- a/queue-5.4/dt-bindings-power-add-r8a774b1-sysc-power-domain-def.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 578bd0a3851ba5352f529adbee00bf943c7ba22b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 5 Sep 2019 07:52:06 +0100
-Subject: dt-bindings: power: Add r8a774b1 SYSC power domain definitions
-
-From: Biju Das <biju.das@bp.renesas.com>
-
-[ Upstream commit be67c41781cb4c06a4acb0b92db0cbb728e955e2 ]
-
-This patch adds power domain indices for the RZ/G2N (a.k.a r8a774b1)
-SoC.
-
-Signed-off-by: Biju Das <biju.das@bp.renesas.com>
-Link: https://lore.kernel.org/r/1567666326-27373-1-git-send-email-biju.das@bp.renesas.com
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Stable-dep-of: 8a7d12d674ac ("net: usb: usbnet: fix name regression")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/dt-bindings/power/r8a774b1-sysc.h | 26 +++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
- create mode 100644 include/dt-bindings/power/r8a774b1-sysc.h
-
-diff --git a/include/dt-bindings/power/r8a774b1-sysc.h b/include/dt-bindings/power/r8a774b1-sysc.h
-new file mode 100644
-index 0000000000000..373736402f048
---- /dev/null
-+++ b/include/dt-bindings/power/r8a774b1-sysc.h
-@@ -0,0 +1,26 @@
-+/* SPDX-License-Identifier: GPL-2.0
-+ *
-+ * Copyright (C) 2019 Renesas Electronics Corp.
-+ */
-+#ifndef __DT_BINDINGS_POWER_R8A774B1_SYSC_H__
-+#define __DT_BINDINGS_POWER_R8A774B1_SYSC_H__
-+
-+/*
-+ * These power domain indices match the numbers of the interrupt bits
-+ * representing the power areas in the various Interrupt Registers
-+ * (e.g. SYSCISR, Interrupt Status Register)
-+ */
-+
-+#define R8A774B1_PD_CA57_CPU0          0
-+#define R8A774B1_PD_CA57_CPU1          1
-+#define R8A774B1_PD_A3VP               9
-+#define R8A774B1_PD_CA57_SCU          12
-+#define R8A774B1_PD_A3VC              14
-+#define R8A774B1_PD_3DG_A             17
-+#define R8A774B1_PD_3DG_B             18
-+#define R8A774B1_PD_A2VC1             26
-+
-+/* Always-on power area */
-+#define R8A774B1_PD_ALWAYS_ON         32
-+
-+#endif /* __DT_BINDINGS_POWER_R8A774B1_SYSC_H__ */
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 3eb3863a1fbcd31f90049a0a17c5a32e136091bc..b09f38c8b06413953bbdda06af2b249a702419a9 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -406,7 +406,6 @@ jfs-fix-sanity-check-in-dbmount.patch
 tracing-consider-the-null-character-when-validating-.patch
 net-sun3_82586-fix-potential-memory-leak-in-sun3_825.patch
 be2net-fix-potential-memory-leak-in-be_xmit.patch
-dt-bindings-power-add-r8a774b1-sysc-power-domain-def.patch
 net-usb-usbnet-fix-name-regression.patch
 net-sched-fix-use-after-free-in-taprio_change.patch
 r8169-avoid-unsolicited-interrupts.patch