linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller
@ 2017-11-10  8:46 Yixun Lan
  2017-11-10  8:46 ` [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC Yixun Lan
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Yixun Lan @ 2017-11-10  8:46 UTC (permalink / raw)
  To: Philipp Zabel, Rob Herring
  Cc: Neil Armstrong, Jerome Brunet, Carlo Caione, Kevin Hilman,
	Yixun Lan, linux-amlogic, linux-arm-kernel, linux-kernel

Add DT bindings for the Meson-AXG SoC Reset Controller include file,
and also slightly update documentation.

Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
---
 .../bindings/reset/amlogic,meson-reset.txt         |   3 +-
 .../dt-bindings/reset/amlogic,meson-axg-reset.h    | 124 +++++++++++++++++++++
 2 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 include/dt-bindings/reset/amlogic,meson-axg-reset.h

diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt
index e746b631793a..28ef6c295c76 100644
--- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt
+++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt
@@ -5,7 +5,8 @@ Please also refer to reset.txt in this directory for common reset
 controller binding usage.
 
 Required properties:
-- compatible: Should be "amlogic,meson8b-reset" or "amlogic,meson-gxbb-reset"
+- compatible: Should be "amlogic,meson8b-reset", "amlogic,meson-gxbb-reset" or
+	"amlogic,meson-axg-reset".
 - reg: should contain the register address base
 - #reset-cells: 1, see below
 
diff --git a/include/dt-bindings/reset/amlogic,meson-axg-reset.h b/include/dt-bindings/reset/amlogic,meson-axg-reset.h
new file mode 100644
index 000000000000..ad6f55dabd6d
--- /dev/null
+++ b/include/dt-bindings/reset/amlogic,meson-axg-reset.h
@@ -0,0 +1,124 @@
+/*
+ *
+ * Copyright (c) 2016 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * Copyright (c) 2017 Amlogic, inc.
+ * Author: Yixun Lan <yixun.lan@amlogic.com>
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR BSD)
+ */
+
+#ifndef _DT_BINDINGS_AMLOGIC_MESON_AXG_RESET_H
+#define _DT_BINDINGS_AMLOGIC_MESON_AXG_RESET_H
+
+/*	RESET0					*/
+#define RESET_HIU			0
+#define RESET_PCIE_A			1
+#define RESET_PCIE_B			2
+#define RESET_DDR_TOP			3
+/*					4	*/
+#define RESET_VIU			5
+#define RESET_PCIE_PHY			6
+#define RESET_PCIE_APB			7
+/*					8	*/
+/*					9	*/
+#define RESET_VENC			10
+#define RESET_ASSIST			11
+/*					12	*/
+#define RESET_VCBUS			13
+/*					14	*/
+/*					15	*/
+#define RESET_GIC			16
+#define RESET_CAPB3_DECODE		17
+/*					18-21	*/
+#define RESET_SYS_CPU_CAPB3		22
+#define RESET_CBUS_CAPB3		23
+#define RESET_AHB_CNTL			24
+#define RESET_AHB_DATA			25
+#define RESET_VCBUS_CLK81		26
+#define RESET_MMC			27
+/*					28-31	*/
+/*	RESET1					*/
+/*					32	*/
+/*					33	*/
+#define RESET_USB_OTG			34
+#define RESET_DDR			35
+#define RESET_AO_RESET			36
+/*					37	*/
+#define RESET_AHB_SRAM			38
+/*					39	*/
+/*					40	*/
+#define RESET_DMA			41
+#define RESET_ISA			42
+#define RESET_ETHERNET			43
+/*					44	*/
+#define RESET_SD_EMMC_B			45
+#define RESET_SD_EMMC_C			46
+#define RESET_ROM_BOOT			47
+#define RESET_SYS_CPU_0			48
+#define RESET_SYS_CPU_1			49
+#define RESET_SYS_CPU_2			50
+#define RESET_SYS_CPU_3			51
+#define RESET_SYS_CPU_CORE_0		52
+#define RESET_SYS_CPU_CORE_1		53
+#define RESET_SYS_CPU_CORE_2		54
+#define RESET_SYS_CPU_CORE_3		55
+#define RESET_SYS_PLL_DIV		56
+#define RESET_SYS_CPU_AXI		57
+#define RESET_SYS_CPU_L2		58
+#define RESET_SYS_CPU_P			59
+#define RESET_SYS_CPU_MBIST		60
+/*					61-63	*/
+/*	RESET2					*/
+/*					64	*/
+/*					65	*/
+#define RESET_AUDIO			66
+/*					67	*/
+#define RESET_MIPI_HOST			68
+#define RESET_AUDIO_LOCKER		69
+#define RESET_GE2D			70
+/*					71-76	*/
+#define RESET_AO_CPU_RESET		77
+/*					78-95	*/
+/*	RESET3					*/
+#define RESET_RING_OSCILLATOR		96
+/*					97-127	*/
+/*	RESET4					*/
+/*					128	*/
+/*					129	*/
+#define RESET_MIPI_PHY			130
+/*					131-140	*/
+#define RESET_VENCL			141
+#define RESET_I2C_MASTER_2		142
+#define RESET_I2C_MASTER_1		143
+/*					144-159	*/
+/*	RESET5					*/
+/*					160-191	*/
+/*	RESET6					*/
+#define RESET_PERIPHS_GENERAL		192
+#define RESET_PERIPHS_SPICC		193
+/*					194	*/
+/*					195	*/
+#define RESET_PERIPHS_I2C_MASTER_0	196
+/*					197-200	*/
+#define RESET_PERIPHS_UART_0		201
+#define RESET_PERIPHS_UART_1		202
+/*					203-204	*/
+#define RESET_PERIPHS_SPI_0		205
+#define RESET_PERIPHS_I2C_MASTER_3	206
+/*					207-223	*/
+/*	RESET7					*/
+#define RESET_USB_DDR_0			224
+#define RESET_USB_DDR_1			225
+#define RESET_USB_DDR_2			226
+#define RESET_USB_DDR_3			227
+/*					228	*/
+#define RESET_DEVICE_MMC_ARB		229
+/*					230	*/
+#define RESET_VID_LOCK			231
+#define RESET_A9_DMC_PIPEL		232
+#define RESET_DMC_VPU_PIPEL		233
+/*					234-255	*/
+
+#endif
-- 
2.14.1

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

* [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC
  2017-11-10  8:46 [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller Yixun Lan
@ 2017-11-10  8:46 ` Yixun Lan
  2017-11-17 13:08   ` Neil Armstrong
  2017-12-13 14:07   ` Yixun Lan
  2017-11-17 13:08 ` [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller Neil Armstrong
  2018-11-12 19:20 ` Thomas Gleixner
  2 siblings, 2 replies; 10+ messages in thread
From: Yixun Lan @ 2017-11-10  8:46 UTC (permalink / raw)
  To: Philipp Zabel, Rob Herring
  Cc: Neil Armstrong, Jerome Brunet, Carlo Caione, Kevin Hilman,
	Yixun Lan, linux-amlogic, linux-arm-kernel, linux-kernel

Try to add compatible string explictly to support new Meson-AXG SoC.

Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
---
 drivers/reset/reset-meson.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index c419a3753d00..93cbee1ae8ef 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -139,6 +139,8 @@ static const struct of_device_id meson_reset_dt_ids[] = {
 	   .data = &meson_reset_meson8_ops, },
 	 { .compatible = "amlogic,meson-gxbb-reset",
 	   .data = &meson_reset_gx_ops, },
+	 { .compatible = "amlogic,meson-axg-reset",
+	   .data = &meson_reset_gx_ops, },
 	 { /* sentinel */ },
 };
 
-- 
2.14.1

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

* Re: [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC
  2017-11-10  8:46 ` [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC Yixun Lan
@ 2017-11-17 13:08   ` Neil Armstrong
  2017-12-13 14:07   ` Yixun Lan
  1 sibling, 0 replies; 10+ messages in thread
From: Neil Armstrong @ 2017-11-17 13:08 UTC (permalink / raw)
  To: Yixun Lan, Philipp Zabel, Rob Herring
  Cc: Jerome Brunet, Carlo Caione, Kevin Hilman, linux-amlogic,
	linux-arm-kernel, linux-kernel

On 10/11/2017 09:46, Yixun Lan wrote:
> Try to add compatible string explictly to support new Meson-AXG SoC.
> 
> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
> ---
>  drivers/reset/reset-meson.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
> index c419a3753d00..93cbee1ae8ef 100644
> --- a/drivers/reset/reset-meson.c
> +++ b/drivers/reset/reset-meson.c
> @@ -139,6 +139,8 @@ static const struct of_device_id meson_reset_dt_ids[] = {
>  	   .data = &meson_reset_meson8_ops, },
>  	 { .compatible = "amlogic,meson-gxbb-reset",
>  	   .data = &meson_reset_gx_ops, },
> +	 { .compatible = "amlogic,meson-axg-reset",
> +	   .data = &meson_reset_gx_ops, },
>  	 { /* sentinel */ },
>  };
>  
> 

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>

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

* Re: [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller
  2017-11-10  8:46 [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller Yixun Lan
  2017-11-10  8:46 ` [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC Yixun Lan
@ 2017-11-17 13:08 ` Neil Armstrong
  2018-11-12 19:20 ` Thomas Gleixner
  2 siblings, 0 replies; 10+ messages in thread
From: Neil Armstrong @ 2017-11-17 13:08 UTC (permalink / raw)
  To: Yixun Lan, Philipp Zabel, Rob Herring
  Cc: Jerome Brunet, Carlo Caione, Kevin Hilman, linux-amlogic,
	linux-arm-kernel, linux-kernel

On 10/11/2017 09:46, Yixun Lan wrote:
> Add DT bindings for the Meson-AXG SoC Reset Controller include file,
> and also slightly update documentation.
> 
> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
> ---
>  .../bindings/reset/amlogic,meson-reset.txt         |   3 +-
>  .../dt-bindings/reset/amlogic,meson-axg-reset.h    | 124 +++++++++++++++++++++
>  2 files changed, 126 insertions(+), 1 deletion(-)
>  create mode 100644 include/dt-bindings/reset/amlogic,meson-axg-reset.h
> 
> diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt
> index e746b631793a..28ef6c295c76 100644
> --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt
> +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt
> @@ -5,7 +5,8 @@ Please also refer to reset.txt in this directory for common reset
>  controller binding usage.
>  
>  Required properties:
> -- compatible: Should be "amlogic,meson8b-reset" or "amlogic,meson-gxbb-reset"
> +- compatible: Should be "amlogic,meson8b-reset", "amlogic,meson-gxbb-reset" or
> +	"amlogic,meson-axg-reset".
>  - reg: should contain the register address base
>  - #reset-cells: 1, see below
>  
> diff --git a/include/dt-bindings/reset/amlogic,meson-axg-reset.h b/include/dt-bindings/reset/amlogic,meson-axg-reset.h
> new file mode 100644
> index 000000000000..ad6f55dabd6d
> --- /dev/null
> +++ b/include/dt-bindings/reset/amlogic,meson-axg-reset.h
> @@ -0,0 +1,124 @@
> +/*
> + *
> + * Copyright (c) 2016 BayLibre, SAS.
> + * Author: Neil Armstrong <narmstrong@baylibre.com>
> + *
> + * Copyright (c) 2017 Amlogic, inc.
> + * Author: Yixun Lan <yixun.lan@amlogic.com>
> + *
> + * SPDX-License-Identifier: (GPL-2.0+ OR BSD)
> + */
> +
> +#ifndef _DT_BINDINGS_AMLOGIC_MESON_AXG_RESET_H
> +#define _DT_BINDINGS_AMLOGIC_MESON_AXG_RESET_H
> +
> +/*	RESET0					*/
> +#define RESET_HIU			0
> +#define RESET_PCIE_A			1
> +#define RESET_PCIE_B			2
> +#define RESET_DDR_TOP			3
> +/*					4	*/
> +#define RESET_VIU			5
> +#define RESET_PCIE_PHY			6
> +#define RESET_PCIE_APB			7
> +/*					8	*/
> +/*					9	*/
> +#define RESET_VENC			10
> +#define RESET_ASSIST			11
> +/*					12	*/
> +#define RESET_VCBUS			13
> +/*					14	*/
> +/*					15	*/
> +#define RESET_GIC			16
> +#define RESET_CAPB3_DECODE		17
> +/*					18-21	*/
> +#define RESET_SYS_CPU_CAPB3		22
> +#define RESET_CBUS_CAPB3		23
> +#define RESET_AHB_CNTL			24
> +#define RESET_AHB_DATA			25
> +#define RESET_VCBUS_CLK81		26
> +#define RESET_MMC			27
> +/*					28-31	*/
> +/*	RESET1					*/
> +/*					32	*/
> +/*					33	*/
> +#define RESET_USB_OTG			34
> +#define RESET_DDR			35
> +#define RESET_AO_RESET			36
> +/*					37	*/
> +#define RESET_AHB_SRAM			38
> +/*					39	*/
> +/*					40	*/
> +#define RESET_DMA			41
> +#define RESET_ISA			42
> +#define RESET_ETHERNET			43
> +/*					44	*/
> +#define RESET_SD_EMMC_B			45
> +#define RESET_SD_EMMC_C			46
> +#define RESET_ROM_BOOT			47
> +#define RESET_SYS_CPU_0			48
> +#define RESET_SYS_CPU_1			49
> +#define RESET_SYS_CPU_2			50
> +#define RESET_SYS_CPU_3			51
> +#define RESET_SYS_CPU_CORE_0		52
> +#define RESET_SYS_CPU_CORE_1		53
> +#define RESET_SYS_CPU_CORE_2		54
> +#define RESET_SYS_CPU_CORE_3		55
> +#define RESET_SYS_PLL_DIV		56
> +#define RESET_SYS_CPU_AXI		57
> +#define RESET_SYS_CPU_L2		58
> +#define RESET_SYS_CPU_P			59
> +#define RESET_SYS_CPU_MBIST		60
> +/*					61-63	*/
> +/*	RESET2					*/
> +/*					64	*/
> +/*					65	*/
> +#define RESET_AUDIO			66
> +/*					67	*/
> +#define RESET_MIPI_HOST			68
> +#define RESET_AUDIO_LOCKER		69
> +#define RESET_GE2D			70
> +/*					71-76	*/
> +#define RESET_AO_CPU_RESET		77
> +/*					78-95	*/
> +/*	RESET3					*/
> +#define RESET_RING_OSCILLATOR		96
> +/*					97-127	*/
> +/*	RESET4					*/
> +/*					128	*/
> +/*					129	*/
> +#define RESET_MIPI_PHY			130
> +/*					131-140	*/
> +#define RESET_VENCL			141
> +#define RESET_I2C_MASTER_2		142
> +#define RESET_I2C_MASTER_1		143
> +/*					144-159	*/
> +/*	RESET5					*/
> +/*					160-191	*/
> +/*	RESET6					*/
> +#define RESET_PERIPHS_GENERAL		192
> +#define RESET_PERIPHS_SPICC		193
> +/*					194	*/
> +/*					195	*/
> +#define RESET_PERIPHS_I2C_MASTER_0	196
> +/*					197-200	*/
> +#define RESET_PERIPHS_UART_0		201
> +#define RESET_PERIPHS_UART_1		202
> +/*					203-204	*/
> +#define RESET_PERIPHS_SPI_0		205
> +#define RESET_PERIPHS_I2C_MASTER_3	206
> +/*					207-223	*/
> +/*	RESET7					*/
> +#define RESET_USB_DDR_0			224
> +#define RESET_USB_DDR_1			225
> +#define RESET_USB_DDR_2			226
> +#define RESET_USB_DDR_3			227
> +/*					228	*/
> +#define RESET_DEVICE_MMC_ARB		229
> +/*					230	*/
> +#define RESET_VID_LOCK			231
> +#define RESET_A9_DMC_PIPEL		232
> +#define RESET_DMC_VPU_PIPEL		233
> +/*					234-255	*/
> +
> +#endif
> 

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>

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

* Re: [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC
  2017-11-10  8:46 ` [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC Yixun Lan
  2017-11-17 13:08   ` Neil Armstrong
@ 2017-12-13 14:07   ` Yixun Lan
  2017-12-13 16:01     ` Philipp Zabel
  1 sibling, 1 reply; 10+ messages in thread
From: Yixun Lan @ 2017-12-13 14:07 UTC (permalink / raw)
  To: Philipp Zabel, Rob Herring
  Cc: yixun.lan, Neil Armstrong, Jerome Brunet, Carlo Caione,
	Kevin Hilman, linux-amlogic, linux-arm-kernel, linux-kernel

Hi Philipp

On 11/10/2017 04:46 PM, Yixun Lan wrote:
> Try to add compatible string explictly to support new Meson-AXG SoC.
> 
> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
> ---
>  drivers/reset/reset-meson.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
> index c419a3753d00..93cbee1ae8ef 100644
> --- a/drivers/reset/reset-meson.c
> +++ b/drivers/reset/reset-meson.c
> @@ -139,6 +139,8 @@ static const struct of_device_id meson_reset_dt_ids[] = {
>  	   .data = &meson_reset_meson8_ops, },
>  	 { .compatible = "amlogic,meson-gxbb-reset",
>  	   .data = &meson_reset_gx_ops, },
> +	 { .compatible = "amlogic,meson-axg-reset",
> +	   .data = &meson_reset_gx_ops, },
>  	 { /* sentinel */ },
>  };
>  
> 

it's generally a ping to the status of these two patches[1], are they
ready to go? or do you have any comment? or do you want me to send
another version with Neil's Reviewed-by added[1]

thanks

Yixun

[1]
http://lists.infradead.org/pipermail/linux-amlogic/2017-November/005278.html

[2]
http://lists.infradead.org/pipermail/linux-amlogic/2017-November/005318.html
http://lists.infradead.org/pipermail/linux-amlogic/2017-November/005319.html

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

* Re: [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC
  2017-12-13 14:07   ` Yixun Lan
@ 2017-12-13 16:01     ` Philipp Zabel
  2017-12-14  3:14       ` Yixun Lan
  0 siblings, 1 reply; 10+ messages in thread
From: Philipp Zabel @ 2017-12-13 16:01 UTC (permalink / raw)
  To: Yixun Lan, Rob Herring
  Cc: Neil Armstrong, Jerome Brunet, Carlo Caione, Kevin Hilman,
	linux-amlogic, linux-arm-kernel, linux-kernel

Hi Yixun,

On Wed, 2017-12-13 at 22:07 +0800, Yixun Lan wrote:
> Hi Philipp
> 
> On 11/10/2017 04:46 PM, Yixun Lan wrote:
> > Try to add compatible string explictly to support new Meson-AXG SoC.
> > 
> > Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
> > ---
> >  drivers/reset/reset-meson.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
> > index c419a3753d00..93cbee1ae8ef 100644
> > --- a/drivers/reset/reset-meson.c
> > +++ b/drivers/reset/reset-meson.c
> > @@ -139,6 +139,8 @@ static const struct of_device_id meson_reset_dt_ids[] = {
> >  	   .data = &meson_reset_meson8_ops, },
> >  	 { .compatible = "amlogic,meson-gxbb-reset",
> >  	   .data = &meson_reset_gx_ops, },
> > +	 { .compatible = "amlogic,meson-axg-reset",
> > +	   .data = &meson_reset_gx_ops, },
> >  	 { /* sentinel */ },
> >  };
> >  
> > 
> 
> it's generally a ping to the status of these two patches[1], are they
> ready to go? or do you have any comment? or do you want me to send
> another version with Neil's Reviewed-by added[1]

I forgot to update you on the status. I have put both patches on the
reset/next branch with Neil's R-b, they are in linux-next:

0e5721f76252 ("reset: meson-axg: add compatible string for Meson-AXG SoC")
c16292578ffa ("dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller")

I'll include them with the next pull request.

regards
Philipp

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

* Re: [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC
  2017-12-13 16:01     ` Philipp Zabel
@ 2017-12-14  3:14       ` Yixun Lan
  0 siblings, 0 replies; 10+ messages in thread
From: Yixun Lan @ 2017-12-14  3:14 UTC (permalink / raw)
  To: Philipp Zabel, Rob Herring
  Cc: yixun.lan, Neil Armstrong, Jerome Brunet, Carlo Caione,
	Kevin Hilman, linux-amlogic, linux-arm-kernel, linux-kernel



On 12/14/17 00:01, Philipp Zabel wrote:
> Hi Yixun,
> 
> On Wed, 2017-12-13 at 22:07 +0800, Yixun Lan wrote:
>> Hi Philipp
>>
>> On 11/10/2017 04:46 PM, Yixun Lan wrote:
>>> Try to add compatible string explictly to support new Meson-AXG SoC.
>>>
>>> Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
>>> ---
>>>  drivers/reset/reset-meson.c | 2 ++
>>>  1 file changed, 2 insertions(+)
>>>
>>> diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
>>> index c419a3753d00..93cbee1ae8ef 100644
>>> --- a/drivers/reset/reset-meson.c
>>> +++ b/drivers/reset/reset-meson.c
>>> @@ -139,6 +139,8 @@ static const struct of_device_id meson_reset_dt_ids[] = {
>>>  	   .data = &meson_reset_meson8_ops, },
>>>  	 { .compatible = "amlogic,meson-gxbb-reset",
>>>  	   .data = &meson_reset_gx_ops, },
>>> +	 { .compatible = "amlogic,meson-axg-reset",
>>> +	   .data = &meson_reset_gx_ops, },
>>>  	 { /* sentinel */ },
>>>  };
>>>  
>>>
>>
>> it's generally a ping to the status of these two patches[1], are they
>> ready to go? or do you have any comment? or do you want me to send
>> another version with Neil's Reviewed-by added[1]
> 
> I forgot to update you on the status. I have put both patches on the
> reset/next branch with Neil's R-b, they are in linux-next:
> 
> 0e5721f76252 ("reset: meson-axg: add compatible string for Meson-AXG SoC")
> c16292578ffa ("dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller")
> 
> I'll include them with the next pull request.
> 

Hi Philipp
 great & thanks.


Hi Kevin:
 could you take the DT part[1] via your tree, also with Neil's
Reviewed-by added? I've checked, it could apply cleanly to your
v4.16/dt64 branch
 many thanks

Yixun


[1]
http://lists.infradead.org/pipermail/linux-amlogic/2017-November/005280.html

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

* Re: [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller
  2017-11-10  8:46 [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller Yixun Lan
  2017-11-10  8:46 ` [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC Yixun Lan
  2017-11-17 13:08 ` [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller Neil Armstrong
@ 2018-11-12 19:20 ` Thomas Gleixner
  2019-01-16 10:14   ` Thomas Gleixner
  2 siblings, 1 reply; 10+ messages in thread
From: Thomas Gleixner @ 2018-11-12 19:20 UTC (permalink / raw)
  To: Yixun Lan
  Cc: Philipp Zabel, Rob Herring, Neil Armstrong, Kevin Hilman,
	linux-kernel, Carlo Caione, linux-amlogic, linux-arm-kernel,
	Jerome Brunet

Yixun,

On Fri, 10 Nov 2017, Yixun Lan wrote:

> +/*
> + *
> + * Copyright (c) 2016 BayLibre, SAS.
> + * Author: Neil Armstrong <narmstrong@baylibre.com>
> + *
> + * Copyright (c) 2017 Amlogic, inc.
> + * Author: Yixun Lan <yixun.lan@amlogic.com>
> + *
> + * SPDX-License-Identifier: (GPL-2.0+ OR BSD)

There are two things wrong:

  1) The placement. See Documentation/process/license-rules.rst

  2) BSD is not a valid license id. You really have to decide which BSD
     variant to use.

Please get that fixed as especially #2 is broken. The goal of using SPDX is
to provide reliable license information for compliance tools.

Thanks,

	tglx

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

* Re: [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller
  2018-11-12 19:20 ` Thomas Gleixner
@ 2019-01-16 10:14   ` Thomas Gleixner
       [not found]     ` <7hbm4fccb1.fsf@baylibre.com>
  0 siblings, 1 reply; 10+ messages in thread
From: Thomas Gleixner @ 2019-01-16 10:14 UTC (permalink / raw)
  To: Yixun Lan
  Cc: Philipp Zabel, Rob Herring, Neil Armstrong, Kevin Hilman,
	linux-kernel, Carlo Caione, linux-amlogic, linux-arm-kernel,
	Jerome Brunet

On Mon, 12 Nov 2018, Thomas Gleixner wrote:

Gentle ping.

> Yixun,
> 
> On Fri, 10 Nov 2017, Yixun Lan wrote:
> 
> > +/*
> > + *
> > + * Copyright (c) 2016 BayLibre, SAS.
> > + * Author: Neil Armstrong <narmstrong@baylibre.com>
> > + *
> > + * Copyright (c) 2017 Amlogic, inc.
> > + * Author: Yixun Lan <yixun.lan@amlogic.com>
> > + *
> > + * SPDX-License-Identifier: (GPL-2.0+ OR BSD)
> 
> There are two things wrong:
> 
>   1) The placement. See Documentation/process/license-rules.rst
> 
>   2) BSD is not a valid license id. You really have to decide which BSD
>      variant to use.
> 
> Please get that fixed as especially #2 is broken. The goal of using SPDX is
> to provide reliable license information for compliance tools.

This still is broken:

# scripts/spdxcheck.py include/dt-bindings/
include/dt-bindings/reset/amlogic,meson-axg-reset.h: 9:41 Invalid License ID: BSD

Thanks,

	tglx


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

* Re: [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller
       [not found]     ` <7hbm4fccb1.fsf@baylibre.com>
@ 2019-01-17 19:31       ` Kevin Hilman
  0 siblings, 0 replies; 10+ messages in thread
From: Kevin Hilman @ 2019-01-17 19:31 UTC (permalink / raw)
  To: Jianxin Pan
  Cc: Philipp Zabel, Rob Herring, Neil Armstrong, lkml, Carlo Caione,
	linux-amlogic, linux-arm-kernel, Jerome Brunet, Thomas Gleixner

On Thu, Jan 17, 2019 at 11:29 AM Kevin Hilman <khilman@baylibre.com> wrote:
>
> [ + Jianxin since Yixun is no longer at Amlogic ]
>
> Thomas Gleixner <tglx@linutronix.de> writes:
>
> > On Mon, 12 Nov 2018, Thomas Gleixner wrote:
> >
> > Gentle ping.
> >
> >> Yixun,
> >>
> >> On Fri, 10 Nov 2017, Yixun Lan wrote:
> >>
> >> > +/*
> >> > + *
> >> > + * Copyright (c) 2016 BayLibre, SAS.
> >> > + * Author: Neil Armstrong <narmstrong@baylibre.com>
> >> > + *
> >> > + * Copyright (c) 2017 Amlogic, inc.
> >> > + * Author: Yixun Lan <yixun.lan@amlogic.com>
> >> > + *
> >> > + * SPDX-License-Identifier: (GPL-2.0+ OR BSD)
> >>
> >> There are two things wrong:
> >>
> >>   1) The placement. See Documentation/process/license-rules.rst
> >>
> >>   2) BSD is not a valid license id. You really have to decide which BSD
> >>      variant to use.
> >>
> >> Please get that fixed as especially #2 is broken. The goal of using SPDX is
> >> to provide reliable license information for compliance tools.
> >
> > This still is broken:
> >
> > # scripts/spdxcheck.py include/dt-bindings/
> > include/dt-bindings/reset/amlogic,meson-axg-reset.h: 9:41 Invalid License ID: BSD
>
> Jianxin, can you fix this and clarify which BSD license was intended by
> Amlogic?
>
> If this isn't fixed soon, I will cleanup and remove the BSD part and
> Amlogic can clarify with a subsequent patch.

Oops, nevermind.  Looks like Jerome already did the cleanup.

Kevin

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

end of thread, other threads:[~2019-01-17 19:31 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-10  8:46 [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller Yixun Lan
2017-11-10  8:46 ` [PATCH 2/3] reset: meson-axg: add compatible string for Meson-AXG SoC Yixun Lan
2017-11-17 13:08   ` Neil Armstrong
2017-12-13 14:07   ` Yixun Lan
2017-12-13 16:01     ` Philipp Zabel
2017-12-14  3:14       ` Yixun Lan
2017-11-17 13:08 ` [PATCH 1/3] dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller Neil Armstrong
2018-11-12 19:20 ` Thomas Gleixner
2019-01-16 10:14   ` Thomas Gleixner
     [not found]     ` <7hbm4fccb1.fsf@baylibre.com>
2019-01-17 19:31       ` Kevin Hilman

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