linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RESEND PATCH v2 0/3]
@ 2016-10-05 15:27 Neil Armstrong
  2016-10-05 15:27 ` [RESEND PATCH v2 1/3] reset: oxnas: Add OX820 support Neil Armstrong
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Neil Armstrong @ 2016-10-05 15:27 UTC (permalink / raw)
  To: Philipp Zabel
  Cc: linux-oxnas, Neil Armstrong, devicetree, linux-arm-kernel, linux-kernel

This is a resend of v2 with the actual changes on patch number 3.

This patchset adds support for the reset controller in the Oxford
Semiconductor OX820 SoC, big brother of the OX810SE.

Since this driver uses a regmap access, it's important to tag each
compatible SoC since the regmap offset could differ in later SoCs.

This patchet also moves the reset indices to a clean DT include file.


Changes since v1 at: http://lkml.kernel.org/r/20160909131955.27334-1-narmstrong@baylibre.com
 - Reformat bindings
 - Add reference to include files in bindings

Neil Armstrong (3):
  reset: oxnas: Add OX820 support
  dt-bindings: reset: oxnas: Add include file with reset indexes
  dt-bindings: reset: oxnas: Update for OX820

 .../devicetree/bindings/reset/oxnas,reset.txt      | 44 ++++--------------
 drivers/reset/reset-oxnas.c                        |  1 +
 include/dt-bindings/reset/oxsemi,ox810se.h         | 53 ++++++++++++++++++++++
 include/dt-bindings/reset/oxsemi,ox820.h           | 53 ++++++++++++++++++++++
 4 files changed, 116 insertions(+), 35 deletions(-)
 create mode 100644 include/dt-bindings/reset/oxsemi,ox810se.h
 create mode 100644 include/dt-bindings/reset/oxsemi,ox820.h

-- 
2.7.0

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [RESEND PATCH v2 1/3] reset: oxnas: Add OX820 support
  2016-10-05 15:27 [RESEND PATCH v2 0/3] Neil Armstrong
@ 2016-10-05 15:27 ` Neil Armstrong
  2016-10-20 10:01   ` Philipp Zabel
  2016-10-05 15:27 ` [RESEND PATCH v2 2/3] dt-bindings: reset: oxnas: Add include file with reset indexes Neil Armstrong
  2016-10-05 15:27 ` [RESEND PATCH v2 3/3] dt-bindings: reset: oxnas: Update for OX820 Neil Armstrong
  2 siblings, 1 reply; 6+ messages in thread
From: Neil Armstrong @ 2016-10-05 15:27 UTC (permalink / raw)
  To: Philipp Zabel
  Cc: linux-oxnas, Neil Armstrong, devicetree, linux-arm-kernel, linux-kernel

In order to support the Oxford Semiconductor OX820 SoC, add a new
compatible string.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/reset/reset-oxnas.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/reset/reset-oxnas.c b/drivers/reset/reset-oxnas.c
index 9449805..0d9036d 100644
--- a/drivers/reset/reset-oxnas.c
+++ b/drivers/reset/reset-oxnas.c
@@ -80,6 +80,7 @@ static const struct reset_control_ops oxnas_reset_ops = {
 
 static const struct of_device_id oxnas_reset_dt_ids[] = {
 	 { .compatible = "oxsemi,ox810se-reset", },
+	 { .compatible = "oxsemi,ox820-reset", },
 	 { /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, oxnas_reset_dt_ids);
-- 
2.7.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [RESEND PATCH v2 2/3] dt-bindings: reset: oxnas: Add include file with reset indexes
  2016-10-05 15:27 [RESEND PATCH v2 0/3] Neil Armstrong
  2016-10-05 15:27 ` [RESEND PATCH v2 1/3] reset: oxnas: Add OX820 support Neil Armstrong
@ 2016-10-05 15:27 ` Neil Armstrong
  2016-10-05 15:27 ` [RESEND PATCH v2 3/3] dt-bindings: reset: oxnas: Update for OX820 Neil Armstrong
  2 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2016-10-05 15:27 UTC (permalink / raw)
  To: Philipp Zabel
  Cc: linux-oxnas, Neil Armstrong, devicetree, linux-arm-kernel, linux-kernel

Add DT include file for Oxford Semiconductor OX810SE and OX820 reset
controller support.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 include/dt-bindings/reset/oxsemi,ox810se.h | 53 ++++++++++++++++++++++++++++++
 include/dt-bindings/reset/oxsemi,ox820.h   | 53 ++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 include/dt-bindings/reset/oxsemi,ox810se.h
 create mode 100644 include/dt-bindings/reset/oxsemi,ox820.h

diff --git a/include/dt-bindings/reset/oxsemi,ox810se.h b/include/dt-bindings/reset/oxsemi,ox810se.h
new file mode 100644
index 0000000..960c26e
--- /dev/null
+++ b/include/dt-bindings/reset/oxsemi,ox810se.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DT_RESET_OXSEMI_OX810SE_H
+#define DT_RESET_OXSEMI_OX810SE_H
+
+#define RESET_ARM	0
+#define RESET_COPRO	1
+/* Reserved		2 */
+/* Reserved		3 */
+#define RESET_USBHS	4
+#define RESET_USBHSPHY	5
+#define RESET_MAC	6
+#define RESET_PCI	7
+#define RESET_DMA	8
+#define RESET_DPE	9
+#define RESET_DDR	10
+#define RESET_SATA	11
+#define RESET_SATA_LINK	12
+#define RESET_SATA_PHY	13
+ /* Reserved		14 */
+#define RESET_NAND	15
+#define RESET_GPIO	16
+#define RESET_UART1	17
+#define RESET_UART2	18
+#define RESET_MISC	19
+#define RESET_I2S	20
+#define RESET_AHB_MON	21
+#define RESET_UART3	22
+#define RESET_UART4	23
+#define RESET_SGDMA	24
+/* Reserved		25 */
+/* Reserved		26 */
+/* Reserved		27 */
+/* Reserved		28 */
+/* Reserved		29 */
+/* Reserved		30 */
+#define RESET_BUS	31
+
+#endif /* DT_RESET_OXSEMI_OX810SE_H */
diff --git a/include/dt-bindings/reset/oxsemi,ox820.h b/include/dt-bindings/reset/oxsemi,ox820.h
new file mode 100644
index 0000000..cc6797b
--- /dev/null
+++ b/include/dt-bindings/reset/oxsemi,ox820.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DT_RESET_OXSEMI_OX820_H
+#define DT_RESET_OXSEMI_OX820_H
+
+#define RESET_SCU	0
+#define RESET_LEON	1
+#define RESET_ARM0	2
+#define RESET_ARM1	3
+#define RESET_USBHS	4
+#define RESET_USBPHYA	5
+#define RESET_MAC	6
+#define RESET_PCIEA	7
+#define RESET_SGDMA	8
+#define RESET_CIPHER	9
+#define RESET_DDR	10
+#define RESET_SATA	11
+#define RESET_SATA_LINK	12
+#define RESET_SATA_PHY	13
+#define RESET_PCIEPHY	14
+#define RESET_NAND	15
+#define RESET_GPIO	16
+#define RESET_UART1	17
+#define RESET_UART2	18
+#define RESET_MISC	19
+#define RESET_I2S	20
+#define RESET_SD	21
+#define RESET_MAC_2	22
+#define RESET_PCIEB	23
+#define RESET_VIDEO	24
+#define RESET_DDR_PHY	25
+#define RESET_USBPHYB	26
+#define RESET_USBDEV	27
+/* Reserved		29 */
+#define RESET_ARMDBG	29
+#define RESET_PLLA	30
+#define RESET_PLLB	31
+
+#endif /* DT_RESET_OXSEMI_OX820_H */
-- 
2.7.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [RESEND PATCH v2 3/3] dt-bindings: reset: oxnas: Update for OX820
  2016-10-05 15:27 [RESEND PATCH v2 0/3] Neil Armstrong
  2016-10-05 15:27 ` [RESEND PATCH v2 1/3] reset: oxnas: Add OX820 support Neil Armstrong
  2016-10-05 15:27 ` [RESEND PATCH v2 2/3] dt-bindings: reset: oxnas: Add include file with reset indexes Neil Armstrong
@ 2016-10-05 15:27 ` Neil Armstrong
  2016-10-10 12:59   ` Rob Herring
  2 siblings, 1 reply; 6+ messages in thread
From: Neil Armstrong @ 2016-10-05 15:27 UTC (permalink / raw)
  To: Philipp Zabel
  Cc: linux-oxnas, Neil Armstrong, devicetree, linux-arm-kernel, linux-kernel

Add new compatible string for reset and sys-ctrl for the Oxford
Semiconductor OX820 Support.
Drop the OX810SE indices since they moved in a dedicated include file.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 .../devicetree/bindings/reset/oxnas,reset.txt      | 44 +++++-----------------
 1 file changed, 9 insertions(+), 35 deletions(-)

diff --git a/Documentation/devicetree/bindings/reset/oxnas,reset.txt b/Documentation/devicetree/bindings/reset/oxnas,reset.txt
index 6f06db9..d27ccb5 100644
--- a/Documentation/devicetree/bindings/reset/oxnas,reset.txt
+++ b/Documentation/devicetree/bindings/reset/oxnas,reset.txt
@@ -5,45 +5,19 @@ Please also refer to reset.txt in this directory for common reset
 controller binding usage.
 
 Required properties:
-- compatible: Should be "oxsemi,ox810se-reset"
+- compatible: For OX810SE, should be "oxsemi,ox810se-reset"
+	      For OX820, should be "oxsemi,ox820-reset"
 - #reset-cells: 1, see below
 
 Parent node should have the following properties :
-- compatible: Should be "oxsemi,ox810se-sys-ctrl", "syscon", "simple-mfd"
+- compatible: For OX810SE, should be :
+			"oxsemi,ox810se-sys-ctrl", "syscon", "simple-mfd"
+	      For OX820, should be :
+			"oxsemi,ox820-sys-ctrl", "syscon", "simple-mfd"
 
-For OX810SE, the indices are :
- - 0 : ARM
- - 1 : COPRO
- - 2 : Reserved
- - 3 : Reserved
- - 4 : USBHS
- - 5 : USBHSPHY
- - 6 : MAC
- - 7 : PCI
- - 8 : DMA
- - 9 : DPE
- - 10 : DDR
- - 11 : SATA
- - 12 : SATA_LINK
- - 13 : SATA_PHY
- - 14 : Reserved
- - 15 : NAND
- - 16 : GPIO
- - 17 : UART1
- - 18 : UART2
- - 19 : MISC
- - 20 : I2S
- - 21 : AHB_MON
- - 22 : UART3
- - 23 : UART4
- - 24 : SGDMA
- - 25 : Reserved
- - 26 : Reserved
- - 27 : Reserved
- - 28 : Reserved
- - 29 : Reserved
- - 30 : Reserved
- - 31 : BUS
+Reset indices are in dt-bindings include files :
+- For OX810SE: include/dt-bindings/reset/oxsemi,ox810se.h
+- For OX820: include/dt-bindings/reset/oxsemi,ox820.h
 
 example:
 
-- 
2.7.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [RESEND PATCH v2 3/3] dt-bindings: reset: oxnas: Update for OX820
  2016-10-05 15:27 ` [RESEND PATCH v2 3/3] dt-bindings: reset: oxnas: Update for OX820 Neil Armstrong
@ 2016-10-10 12:59   ` Rob Herring
  0 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2016-10-10 12:59 UTC (permalink / raw)
  To: Neil Armstrong
  Cc: Philipp Zabel, linux-oxnas, devicetree, linux-arm-kernel, linux-kernel

On Wed, Oct 05, 2016 at 05:27:10PM +0200, Neil Armstrong wrote:
> Add new compatible string for reset and sys-ctrl for the Oxford
> Semiconductor OX820 Support.
> Drop the OX810SE indices since they moved in a dedicated include file.
> 
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  .../devicetree/bindings/reset/oxnas,reset.txt      | 44 +++++-----------------
>  1 file changed, 9 insertions(+), 35 deletions(-)

Acked-by: Rob Herring <robh@kernel.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [RESEND PATCH v2 1/3] reset: oxnas: Add OX820 support
  2016-10-05 15:27 ` [RESEND PATCH v2 1/3] reset: oxnas: Add OX820 support Neil Armstrong
@ 2016-10-20 10:01   ` Philipp Zabel
  0 siblings, 0 replies; 6+ messages in thread
From: Philipp Zabel @ 2016-10-20 10:01 UTC (permalink / raw)
  To: Neil Armstrong; +Cc: linux-oxnas, devicetree, linux-arm-kernel, linux-kernel

Am Mittwoch, den 05.10.2016, 17:27 +0200 schrieb Neil Armstrong:
> In order to support the Oxford Semiconductor OX820 SoC, add a new
> compatible string.
> 
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  drivers/reset/reset-oxnas.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/reset/reset-oxnas.c b/drivers/reset/reset-oxnas.c
> index 9449805..0d9036d 100644
> --- a/drivers/reset/reset-oxnas.c
> +++ b/drivers/reset/reset-oxnas.c
> @@ -80,6 +80,7 @@ static const struct reset_control_ops oxnas_reset_ops = {
>  
>  static const struct of_device_id oxnas_reset_dt_ids[] = {
>  	 { .compatible = "oxsemi,ox810se-reset", },
> +	 { .compatible = "oxsemi,ox820-reset", },
>  	 { /* sentinel */ },
>  };
>  MODULE_DEVICE_TABLE(of, oxnas_reset_dt_ids);

Applied all three, thanks.

regards
Philipp

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-10-20 10:01 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-05 15:27 [RESEND PATCH v2 0/3] Neil Armstrong
2016-10-05 15:27 ` [RESEND PATCH v2 1/3] reset: oxnas: Add OX820 support Neil Armstrong
2016-10-20 10:01   ` Philipp Zabel
2016-10-05 15:27 ` [RESEND PATCH v2 2/3] dt-bindings: reset: oxnas: Add include file with reset indexes Neil Armstrong
2016-10-05 15:27 ` [RESEND PATCH v2 3/3] dt-bindings: reset: oxnas: Update for OX820 Neil Armstrong
2016-10-10 12:59   ` Rob Herring

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).