[PATCH 0/3] reset: uniphier: Introduce some features and NX1 support

devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 0/3] reset: uniphier: Introduce some features and NX1 support
@ 2021-10-05  2:10 Kunihiko Hayashi
  2021-10-05  2:10 ` [PATCH 1/3] reset: uniphier: Add audio system and video input reset control for PXs3 Kunihiko Hayashi
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Kunihiko Hayashi @ 2021-10-05  2:10 UTC (permalink / raw)
  To: Philipp Zabel, Rob Herring, Masami Hiramatsu
  Cc: devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi

This series includes the patches to add audio/video reset lines for PXs3 SoC
and basic reset lines for new UniPhier NX1 SoC. NX1 SoC also has the same
kinds of reset lines as the other UniPhier SoCs.

Kunihiko Hayashi (3):
  reset: uniphier: Add audio system and video input reset control for
    PXs3
  dt-bindings: reset: uniphier: Add NX1 reset control binding
  reset: uniphier: Add NX1 reset support

 .../reset/socionext,uniphier-glue-reset.yaml       |  1 +
 .../bindings/reset/socionext,uniphier-reset.yaml   |  3 +++
 drivers/reset/reset-uniphier-glue.c                |  4 ++++
 drivers/reset/reset-uniphier.c                     | 27 ++++++++++++++++++++++
 4 files changed, 35 insertions(+)

-- 
2.7.4


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/3] reset: uniphier: Add audio system and video input reset control for PXs3
  2021-10-05  2:10 [PATCH 0/3] reset: uniphier: Introduce some features and NX1 support Kunihiko Hayashi
@ 2021-10-05  2:10 ` Kunihiko Hayashi
  2021-10-05  2:10 ` [PATCH 2/3] dt-bindings: reset: uniphier: Add NX1 reset control binding Kunihiko Hayashi
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Kunihiko Hayashi @ 2021-10-05  2:10 UTC (permalink / raw)
  To: Philipp Zabel, Rob Herring, Masami Hiramatsu
  Cc: devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi

Add reset lines for audio subsystem (AIO) and video input subsystem (EXIV)
on UniPhier PXs3 SoC.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 drivers/reset/reset-uniphier.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index 5f75783f..4a6cfd8 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -136,6 +136,8 @@ static const struct uniphier_reset_data uniphier_pxs3_sys_reset_data[] = {
 	UNIPHIER_RESETX(28, 0x200c, 7),		/* SATA0 */
 	UNIPHIER_RESETX(29, 0x200c, 8),		/* SATA1 */
 	UNIPHIER_RESETX(30, 0x200c, 21),	/* SATA-PHY */
+	UNIPHIER_RESETX(40, 0x2008, 0),		/* AIO */
+	UNIPHIER_RESETX(42, 0x2010, 2),		/* EXIV */
 	UNIPHIER_RESET_END,
 };
 
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/3] dt-bindings: reset: uniphier: Add NX1 reset control binding
  2021-10-05  2:10 [PATCH 0/3] reset: uniphier: Introduce some features and NX1 support Kunihiko Hayashi
  2021-10-05  2:10 ` [PATCH 1/3] reset: uniphier: Add audio system and video input reset control for PXs3 Kunihiko Hayashi
@ 2021-10-05  2:10 ` Kunihiko Hayashi
  2021-10-05 12:26   ` Rob Herring
  2021-10-05  2:10 ` [PATCH 3/3] reset: uniphier: Add NX1 reset support Kunihiko Hayashi
  2021-10-05  9:59 ` [PATCH 0/3] reset: uniphier: Introduce some features and NX1 support Philipp Zabel
  3 siblings, 1 reply; 6+ messages in thread
From: Kunihiko Hayashi @ 2021-10-05  2:10 UTC (permalink / raw)
  To: Philipp Zabel, Rob Herring, Masami Hiramatsu
  Cc: devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi

Update reset controller binding document for UniPhier NX1 SoC.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 .../devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml       | 1 +
 Documentation/devicetree/bindings/reset/socionext,uniphier-reset.yaml  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml b/Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml
index 29e4a90..bfbd3e9 100644
--- a/Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml
+++ b/Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml
@@ -23,6 +23,7 @@ properties:
       - socionext,uniphier-pxs2-usb3-reset
       - socionext,uniphier-ld20-usb3-reset
       - socionext,uniphier-pxs3-usb3-reset
+      - socionext,uniphier-nx1-usb3-reset
       - socionext,uniphier-pro4-ahci-reset
       - socionext,uniphier-pxs2-ahci-reset
       - socionext,uniphier-pxs3-ahci-reset
diff --git a/Documentation/devicetree/bindings/reset/socionext,uniphier-reset.yaml b/Documentation/devicetree/bindings/reset/socionext,uniphier-reset.yaml
index 4c9b0eb..377a7d2 100644
--- a/Documentation/devicetree/bindings/reset/socionext,uniphier-reset.yaml
+++ b/Documentation/devicetree/bindings/reset/socionext,uniphier-reset.yaml
@@ -23,6 +23,7 @@ properties:
           - socionext,uniphier-ld11-reset
           - socionext,uniphier-ld20-reset
           - socionext,uniphier-pxs3-reset
+          - socionext,uniphier-nx1-reset
       - description: Media I/O (MIO) reset, SD reset
         enum:
           - socionext,uniphier-ld4-mio-reset
@@ -34,6 +35,7 @@ properties:
           - socionext,uniphier-ld11-sd-reset
           - socionext,uniphier-ld20-sd-reset
           - socionext,uniphier-pxs3-sd-reset
+          - socionext,uniphier-nx1-sd-reset
       - description: Peripheral reset
         enum:
           - socionext,uniphier-ld4-peri-reset
@@ -44,6 +46,7 @@ properties:
           - socionext,uniphier-ld11-peri-reset
           - socionext,uniphier-ld20-peri-reset
           - socionext,uniphier-pxs3-peri-reset
+          - socionext,uniphier-nx1-peri-reset
       - description: Analog signal amplifier reset
         enum:
           - socionext,uniphier-ld11-adamv-reset
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/3] dt-bindings: reset: uniphier: Add NX1 reset control binding
  2021-10-05  2:10 ` [PATCH 2/3] dt-bindings: reset: uniphier: Add NX1 reset control binding Kunihiko Hayashi
@ 2021-10-05 12:26   ` Rob Herring
  0 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2021-10-05 12:26 UTC (permalink / raw)
  To: Kunihiko Hayashi
  Cc: Rob Herring, Philipp Zabel, linux-arm-kernel, devicetree,
	Masami Hiramatsu, linux-kernel

On Tue, 05 Oct 2021 11:10:41 +0900, Kunihiko Hayashi wrote:
> Update reset controller binding document for UniPhier NX1 SoC.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
>  .../devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml       | 1 +
>  Documentation/devicetree/bindings/reset/socionext,uniphier-reset.yaml  | 3 +++
>  2 files changed, 4 insertions(+)
> 

Running 'make dtbs_check' with the schema in this patch gives the
following warnings. Consider if they are expected or the schema is
incorrect. These may not be new warnings.

Note that it is not yet a requirement to have 0 warnings for dtbs_check.
This will change in the future.

Full log is available here: https://patchwork.ozlabs.org/patch/1536452


reset: 'resets' does not match any of the regexes: 'pinctrl-[0-9]+'
	arch/arm64/boot/dts/socionext/uniphier-ld11-global.dt.yaml
	arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dt.yaml


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 3/3] reset: uniphier: Add NX1 reset support
  2021-10-05  2:10 [PATCH 0/3] reset: uniphier: Introduce some features and NX1 support Kunihiko Hayashi
  2021-10-05  2:10 ` [PATCH 1/3] reset: uniphier: Add audio system and video input reset control for PXs3 Kunihiko Hayashi
  2021-10-05  2:10 ` [PATCH 2/3] dt-bindings: reset: uniphier: Add NX1 reset control binding Kunihiko Hayashi
@ 2021-10-05  2:10 ` Kunihiko Hayashi
  2021-10-05  9:59 ` [PATCH 0/3] reset: uniphier: Introduce some features and NX1 support Philipp Zabel
  3 siblings, 0 replies; 6+ messages in thread
From: Kunihiko Hayashi @ 2021-10-05  2:10 UTC (permalink / raw)
  To: Philipp Zabel, Rob Herring, Masami Hiramatsu
  Cc: devicetree, linux-arm-kernel, linux-kernel, Kunihiko Hayashi

Add basic reset data for UniPhier NX1 SoC.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 drivers/reset/reset-uniphier-glue.c |  4 ++++
 drivers/reset/reset-uniphier.c      | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/drivers/reset/reset-uniphier-glue.c b/drivers/reset/reset-uniphier-glue.c
index 027990b..908c1d5 100644
--- a/drivers/reset/reset-uniphier-glue.c
+++ b/drivers/reset/reset-uniphier-glue.c
@@ -156,6 +156,10 @@ static const struct of_device_id uniphier_glue_reset_match[] = {
 		.data = &uniphier_pxs2_data,
 	},
 	{
+		.compatible = "socionext,uniphier-nx1-usb3-reset",
+		.data = &uniphier_pxs2_data,
+	},
+	{
 		.compatible = "socionext,uniphier-pro4-ahci-reset",
 		.data = &uniphier_pro4_data,
 	},
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index 4a6cfd8..ff7580f 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -141,6 +141,19 @@ static const struct uniphier_reset_data uniphier_pxs3_sys_reset_data[] = {
 	UNIPHIER_RESET_END,
 };
 
+static const struct uniphier_reset_data uniphier_nx1_sys_reset_data[] = {
+	UNIPHIER_RESETX(4, 0x2008, 8),		/* eMMC */
+	UNIPHIER_RESETX(6, 0x200c, 0),		/* Ether */
+	UNIPHIER_RESETX(12, 0x200c, 16),        /* USB30 link */
+	UNIPHIER_RESETX(16, 0x200c, 24),        /* USB30-PHY0 */
+	UNIPHIER_RESETX(17, 0x200c, 25),        /* USB30-PHY1 */
+	UNIPHIER_RESETX(18, 0x200c, 26),        /* USB30-PHY2 */
+	UNIPHIER_RESETX(24, 0x200c, 8),         /* PCIe */
+	UNIPHIER_RESETX(52, 0x2010, 0),         /* VOC */
+	UNIPHIER_RESETX(58, 0x2010, 8),         /* HDMI-Tx */
+	UNIPHIER_RESET_END,
+};
+
 /* Media I/O reset data */
 #define UNIPHIER_MIO_RESET_SD(id, ch)			\
 	UNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0)
@@ -402,6 +415,10 @@ static const struct of_device_id uniphier_reset_match[] = {
 		.compatible = "socionext,uniphier-pxs3-reset",
 		.data = uniphier_pxs3_sys_reset_data,
 	},
+	{
+		.compatible = "socionext,uniphier-nx1-reset",
+		.data = uniphier_nx1_sys_reset_data,
+	},
 	/* Media I/O reset, SD reset */
 	{
 		.compatible = "socionext,uniphier-ld4-mio-reset",
@@ -439,6 +456,10 @@ static const struct of_device_id uniphier_reset_match[] = {
 		.compatible = "socionext,uniphier-pxs3-sd-reset",
 		.data = uniphier_pro5_sd_reset_data,
 	},
+	{
+		.compatible = "socionext,uniphier-nx1-sd-reset",
+		.data = uniphier_pro5_sd_reset_data,
+	},
 	/* Peripheral reset */
 	{
 		.compatible = "socionext,uniphier-ld4-peri-reset",
@@ -472,6 +493,10 @@ static const struct of_device_id uniphier_reset_match[] = {
 		.compatible = "socionext,uniphier-pxs3-peri-reset",
 		.data = uniphier_pro4_peri_reset_data,
 	},
+	{
+		.compatible = "socionext,uniphier-nx1-peri-reset",
+		.data = uniphier_pro4_peri_reset_data,
+	},
 	/* Analog signal amplifiers reset */
 	{
 		.compatible = "socionext,uniphier-ld11-adamv-reset",
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 0/3] reset: uniphier: Introduce some features and NX1 support
  2021-10-05  2:10 [PATCH 0/3] reset: uniphier: Introduce some features and NX1 support Kunihiko Hayashi
                   ` (2 preceding siblings ...)
  2021-10-05  2:10 ` [PATCH 3/3] reset: uniphier: Add NX1 reset support Kunihiko Hayashi
@ 2021-10-05  9:59 ` Philipp Zabel
  3 siblings, 0 replies; 6+ messages in thread
From: Philipp Zabel @ 2021-10-05  9:59 UTC (permalink / raw)
  To: Kunihiko Hayashi, Rob Herring, Masami Hiramatsu
  Cc: devicetree, linux-arm-kernel, linux-kernel

On Tue, 2021-10-05 at 11:10 +0900, Kunihiko Hayashi wrote:
> This series includes the patches to add audio/video reset lines for PXs3 SoC
> and basic reset lines for new UniPhier NX1 SoC. NX1 SoC also has the same
> kinds of reset lines as the other UniPhier SoCs.
> 
> Kunihiko Hayashi (3):
>   reset: uniphier: Add audio system and video input reset control for
>     PXs3
>   dt-bindings: reset: uniphier: Add NX1 reset control binding
>   reset: uniphier: Add NX1 reset support
> 
>  .../reset/socionext,uniphier-glue-reset.yaml       |  1 +
>  .../bindings/reset/socionext,uniphier-reset.yaml   |  3 +++
>  drivers/reset/reset-uniphier-glue.c                |  4 ++++
>  drivers/reset/reset-uniphier.c                     | 27 ++++++++++++++++++++++
>  4 files changed, 35 insertions(+)

Thank you, applied to reset/next.

regards
Philipp

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-10-05 12:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-05  2:10 [PATCH 0/3] reset: uniphier: Introduce some features and NX1 support Kunihiko Hayashi
2021-10-05  2:10 ` [PATCH 1/3] reset: uniphier: Add audio system and video input reset control for PXs3 Kunihiko Hayashi
2021-10-05  2:10 ` [PATCH 2/3] dt-bindings: reset: uniphier: Add NX1 reset control binding Kunihiko Hayashi
2021-10-05 12:26   ` Rob Herring
2021-10-05  2:10 ` [PATCH 3/3] reset: uniphier: Add NX1 reset support Kunihiko Hayashi
2021-10-05  9:59 ` [PATCH 0/3] reset: uniphier: Introduce some features and NX1 support Philipp Zabel

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).