* [PATCH 0/3] reset: meson: add Meson-A1 SoC support @ 2019-09-18 12:12 Xingyu Chen 2019-09-18 12:12 ` [PATCH 1/3] arm64: dts: meson: add reset controller for Meson-A1 SoC Xingyu Chen 2019-09-18 12:12 ` [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-A1 SoC Reset Controller Xingyu Chen 0 siblings, 2 replies; 5+ messages in thread From: Xingyu Chen @ 2019-09-18 12:12 UTC (permalink / raw) To: Philipp Zabel, Kevin Hilman Cc: devicetree, Hanjie Lin, Jianxin Pan, Neil Armstrong, linux-kernel, Rob Herring, linux-arm-kernel, linux-amlogic, Xingyu Chen, Jerome Brunet This patchset adds support for Meson-A1 SoC Reset Controller. A new struct meson_reset_param is introduced to describe the register differences between Meson-A1 and previous SoCs This patchset is based on A1 DTBv4[1]. [1] https://lore.kernel.org/linux-amlogic/1568276370-54181-1-git-send-email-jianxin.pan@amlogic.com Xingyu Chen (3): arm64: dts: meson: add reset controller for Meson-A1 SoC dt-bindings: reset: add bindings for the Meson-A1 SoC Reset Controller reset: add support for the Meson-A1 SoC Reset Controller .../bindings/reset/amlogic,meson-reset.txt | 4 +- arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 6 +++ drivers/reset/reset-meson.c | 35 ++++++++++--- include/dt-bindings/reset/amlogic,meson-a1-reset.h | 59 ++++++++++++++++++++++ 4 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-reset.h -- 2.7.4 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] arm64: dts: meson: add reset controller for Meson-A1 SoC 2019-09-18 12:12 [PATCH 0/3] reset: meson: add Meson-A1 SoC support Xingyu Chen @ 2019-09-18 12:12 ` Xingyu Chen 2019-09-18 12:12 ` [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-A1 SoC Reset Controller Xingyu Chen 1 sibling, 0 replies; 5+ messages in thread From: Xingyu Chen @ 2019-09-18 12:12 UTC (permalink / raw) To: Philipp Zabel, Kevin Hilman Cc: devicetree, Hanjie Lin, Jianxin Pan, Neil Armstrong, linux-kernel, Rob Herring, linux-arm-kernel, linux-amlogic, Xingyu Chen, Jerome Brunet Add the reset controller device of Meson-A1 SoC family Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com> Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com> --- arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi index 7210ad0..1c588ab 100644 --- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi @@ -74,6 +74,12 @@ #size-cells = <2>; ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x1000000>; + reset: reset-controller@0 { + compatible = "amlogic,meson-a1-reset"; + reg = <0x0 0x0 0x0 0x8c>; + #reset-cells = <1>; + }; + uart_AO: serial@1c00 { compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; -- 2.7.4 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-A1 SoC Reset Controller 2019-09-18 12:12 [PATCH 0/3] reset: meson: add Meson-A1 SoC support Xingyu Chen 2019-09-18 12:12 ` [PATCH 1/3] arm64: dts: meson: add reset controller for Meson-A1 SoC Xingyu Chen @ 2019-09-18 12:12 ` Xingyu Chen 2019-09-18 12:39 ` Neil Armstrong 1 sibling, 1 reply; 5+ messages in thread From: Xingyu Chen @ 2019-09-18 12:12 UTC (permalink / raw) To: Philipp Zabel, Kevin Hilman Cc: devicetree, Hanjie Lin, Jianxin Pan, Neil Armstrong, linux-kernel, Rob Herring, linux-arm-kernel, linux-amlogic, Xingyu Chen, Jerome Brunet Add DT bindings for the Meson-A1 SoC Reset Controller include file, and also slightly update documentation. Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com> Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com> --- .../bindings/reset/amlogic,meson-reset.txt | 4 +- include/dt-bindings/reset/amlogic,meson-a1-reset.h | 59 ++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-reset.h diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt index 28ef6c2..011151a 100644 --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt @@ -5,8 +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", "amlogic,meson-gxbb-reset" or - "amlogic,meson-axg-reset". +- compatible: Should be "amlogic,meson8b-reset", "amlogic,meson-gxbb-reset", + "amlogic,meson-axg-reset" or "amlogic,meson-a1-reset". - reg: should contain the register address base - #reset-cells: 1, see below diff --git a/include/dt-bindings/reset/amlogic,meson-a1-reset.h b/include/dt-bindings/reset/amlogic,meson-a1-reset.h new file mode 100644 index 00000000..8d76a47 --- /dev/null +++ b/include/dt-bindings/reset/amlogic,meson-a1-reset.h @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) + * + * Copyright (c) 2019 Amlogic, Inc. All rights reserved. + * Author: Xingyu Chen <xingyu.chen@amlogic.com> + * + */ + +#ifndef _DT_BINDINGS_AMLOGIC_MESON_A1_RESET_H +#define _DT_BINDINGS_AMLOGIC_MESON_A1_RESET_H + +/* RESET0 */ +#define RESET_AM2AXI_VAD 1 +#define RESET_PSRAM 4 +#define RESET_PAD_CTRL 5 +#define RESET_TEMP_SENSOR 7 +#define RESET_AM2AXI_DEV 8 +#define RESET_SPICC_A 10 +#define RESET_MSR_CLK 11 +#define RESET_AUDIO 12 +#define RESET_ANALOG_CTRL 13 +#define RESET_SAR_ADC 14 +#define RESET_AUDIO_VAD 15 +#define RESET_CEC 16 +#define RESET_PWM_EF 17 +#define RESET_PWM_CD 18 +#define RESET_PWM_AB 19 +#define RESET_IR_CTRL 21 +#define RESET_I2C_S_A 22 +#define RESET_I2C_M_D 24 +#define RESET_I2C_M_C 25 +#define RESET_I2C_M_B 26 +#define RESET_I2C_M_A 27 +#define RESET_I2C_PROD_AHB 28 +#define RESET_I2C_PROD 29 + +/* RESET1 */ +#define RESET_ACODEC 32 +#define RESET_DMA 33 +#define RESET_SD_EMMC_A 34 +#define RESET_USBCTRL 36 +#define RESET_USBPHY 38 +#define RESET_RSA 42 +#define RESET_DMC 43 +#define RESET_IRQ_CTRL 45 +#define RESET_NIC_VAD 47 +#define RESET_NIC_AXI 48 +#define RESET_RAMA 49 +#define RESET_RAMB 50 +#define RESET_ROM 53 +#define RESET_SPIFC 54 +#define RESET_GIC 55 +#define RESET_UART_C 56 +#define RESET_UART_B 57 +#define RESET_UART_A 58 +#define RESET_OSC_RING 59 + +/* RESET2 Reserved */ + +#endif -- 2.7.4 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-A1 SoC Reset Controller 2019-09-18 12:12 ` [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-A1 SoC Reset Controller Xingyu Chen @ 2019-09-18 12:39 ` Neil Armstrong 2019-09-19 2:34 ` Xingyu Chen 0 siblings, 1 reply; 5+ messages in thread From: Neil Armstrong @ 2019-09-18 12:39 UTC (permalink / raw) To: Xingyu Chen, Philipp Zabel, Kevin Hilman Cc: devicetree, Hanjie Lin, Jianxin Pan, linux-kernel, Rob Herring, linux-amlogic, linux-arm-kernel, Jerome Brunet Hi, On 18/09/2019 14:12, Xingyu Chen wrote: > Add DT bindings for the Meson-A1 SoC Reset Controller include file, > and also slightly update documentation. > > Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com> > Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com> > --- > .../bindings/reset/amlogic,meson-reset.txt | 4 +- The reset bindings has been moved to yaml, either rebase on linux-next or wait for v5.4-rc1 : https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next/+/refs/tags/next-20190917/Documentation/devicetree/bindings/reset/amlogic%2Cmeson-reset.yaml Neil > include/dt-bindings/reset/amlogic,meson-a1-reset.h | 59 ++++++++++++++++++++++ > 2 files changed, 61 insertions(+), 2 deletions(-) > create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-reset.h > > diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt > index 28ef6c2..011151a 100644 > --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt > +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt > @@ -5,8 +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", "amlogic,meson-gxbb-reset" or > - "amlogic,meson-axg-reset". > +- compatible: Should be "amlogic,meson8b-reset", "amlogic,meson-gxbb-reset", > + "amlogic,meson-axg-reset" or "amlogic,meson-a1-reset". > - reg: should contain the register address base > - #reset-cells: 1, see below > > diff --git a/include/dt-bindings/reset/amlogic,meson-a1-reset.h b/include/dt-bindings/reset/amlogic,meson-a1-reset.h > new file mode 100644 > index 00000000..8d76a47 > --- /dev/null > +++ b/include/dt-bindings/reset/amlogic,meson-a1-reset.h > @@ -0,0 +1,59 @@ > +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) > + * > + * Copyright (c) 2019 Amlogic, Inc. All rights reserved. > + * Author: Xingyu Chen <xingyu.chen@amlogic.com> > + * > + */ > + > +#ifndef _DT_BINDINGS_AMLOGIC_MESON_A1_RESET_H > +#define _DT_BINDINGS_AMLOGIC_MESON_A1_RESET_H > + > +/* RESET0 */ > +#define RESET_AM2AXI_VAD 1 > +#define RESET_PSRAM 4 > +#define RESET_PAD_CTRL 5 > +#define RESET_TEMP_SENSOR 7 > +#define RESET_AM2AXI_DEV 8 > +#define RESET_SPICC_A 10 > +#define RESET_MSR_CLK 11 > +#define RESET_AUDIO 12 > +#define RESET_ANALOG_CTRL 13 > +#define RESET_SAR_ADC 14 > +#define RESET_AUDIO_VAD 15 > +#define RESET_CEC 16 > +#define RESET_PWM_EF 17 > +#define RESET_PWM_CD 18 > +#define RESET_PWM_AB 19 > +#define RESET_IR_CTRL 21 > +#define RESET_I2C_S_A 22 > +#define RESET_I2C_M_D 24 > +#define RESET_I2C_M_C 25 > +#define RESET_I2C_M_B 26 > +#define RESET_I2C_M_A 27 > +#define RESET_I2C_PROD_AHB 28 > +#define RESET_I2C_PROD 29 > + > +/* RESET1 */ > +#define RESET_ACODEC 32 > +#define RESET_DMA 33 > +#define RESET_SD_EMMC_A 34 > +#define RESET_USBCTRL 36 > +#define RESET_USBPHY 38 > +#define RESET_RSA 42 > +#define RESET_DMC 43 > +#define RESET_IRQ_CTRL 45 > +#define RESET_NIC_VAD 47 > +#define RESET_NIC_AXI 48 > +#define RESET_RAMA 49 > +#define RESET_RAMB 50 > +#define RESET_ROM 53 > +#define RESET_SPIFC 54 > +#define RESET_GIC 55 > +#define RESET_UART_C 56 > +#define RESET_UART_B 57 > +#define RESET_UART_A 58 > +#define RESET_OSC_RING 59 > + > +/* RESET2 Reserved */ > + > +#endif > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-A1 SoC Reset Controller 2019-09-18 12:39 ` Neil Armstrong @ 2019-09-19 2:34 ` Xingyu Chen 0 siblings, 0 replies; 5+ messages in thread From: Xingyu Chen @ 2019-09-19 2:34 UTC (permalink / raw) To: Neil Armstrong, Philipp Zabel, Kevin Hilman Cc: devicetree, Hanjie Lin, Jianxin Pan, linux-kernel, Rob Herring, linux-amlogic, linux-arm-kernel, Jerome Brunet Hi, Neil Thanks for your review On 2019/9/18 20:39, Neil Armstrong wrote: > Hi, > > On 18/09/2019 14:12, Xingyu Chen wrote: >> Add DT bindings for the Meson-A1 SoC Reset Controller include file, >> and also slightly update documentation. >> >> Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com> >> Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com> >> --- >> .../bindings/reset/amlogic,meson-reset.txt | 4 +- > > The reset bindings has been moved to yaml, either rebase on linux-next or wait for v5.4-rc1 : > https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next/+/refs/tags/next-20190917/Documentation/devicetree/bindings/reset/amlogic%2Cmeson-reset.yaml > > NeilI will fix it in next version. > >> include/dt-bindings/reset/amlogic,meson-a1-reset.h | 59 ++++++++++++++++++++++ >> 2 files changed, 61 insertions(+), 2 deletions(-) >> create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-reset.h >> >> diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt >> index 28ef6c2..011151a 100644 >> --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt >> +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt >> @@ -5,8 +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", "amlogic,meson-gxbb-reset" or >> - "amlogic,meson-axg-reset". >> +- compatible: Should be "amlogic,meson8b-reset", "amlogic,meson-gxbb-reset", >> + "amlogic,meson-axg-reset" or "amlogic,meson-a1-reset". >> - reg: should contain the register address base >> - #reset-cells: 1, see below >> >> diff --git a/include/dt-bindings/reset/amlogic,meson-a1-reset.h b/include/dt-bindings/reset/amlogic,meson-a1-reset.h >> new file mode 100644 >> index 00000000..8d76a47 >> --- /dev/null >> +++ b/include/dt-bindings/reset/amlogic,meson-a1-reset.h >> @@ -0,0 +1,59 @@ >> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) >> + * >> + * Copyright (c) 2019 Amlogic, Inc. All rights reserved. >> + * Author: Xingyu Chen <xingyu.chen@amlogic.com> >> + * >> + */ >> + >> +#ifndef _DT_BINDINGS_AMLOGIC_MESON_A1_RESET_H >> +#define _DT_BINDINGS_AMLOGIC_MESON_A1_RESET_H >> + >> +/* RESET0 */ >> +#define RESET_AM2AXI_VAD 1 >> +#define RESET_PSRAM 4 >> +#define RESET_PAD_CTRL 5 >> +#define RESET_TEMP_SENSOR 7 >> +#define RESET_AM2AXI_DEV 8 >> +#define RESET_SPICC_A 10 >> +#define RESET_MSR_CLK 11 >> +#define RESET_AUDIO 12 >> +#define RESET_ANALOG_CTRL 13 >> +#define RESET_SAR_ADC 14 >> +#define RESET_AUDIO_VAD 15 >> +#define RESET_CEC 16 >> +#define RESET_PWM_EF 17 >> +#define RESET_PWM_CD 18 >> +#define RESET_PWM_AB 19 >> +#define RESET_IR_CTRL 21 >> +#define RESET_I2C_S_A 22 >> +#define RESET_I2C_M_D 24 >> +#define RESET_I2C_M_C 25 >> +#define RESET_I2C_M_B 26 >> +#define RESET_I2C_M_A 27 >> +#define RESET_I2C_PROD_AHB 28 >> +#define RESET_I2C_PROD 29 >> + >> +/* RESET1 */ >> +#define RESET_ACODEC 32 >> +#define RESET_DMA 33 >> +#define RESET_SD_EMMC_A 34 >> +#define RESET_USBCTRL 36 >> +#define RESET_USBPHY 38 >> +#define RESET_RSA 42 >> +#define RESET_DMC 43 >> +#define RESET_IRQ_CTRL 45 >> +#define RESET_NIC_VAD 47 >> +#define RESET_NIC_AXI 48 >> +#define RESET_RAMA 49 >> +#define RESET_RAMB 50 >> +#define RESET_ROM 53 >> +#define RESET_SPIFC 54 >> +#define RESET_GIC 55 >> +#define RESET_UART_C 56 >> +#define RESET_UART_B 57 >> +#define RESET_UART_A 58 >> +#define RESET_OSC_RING 59 >> + >> +/* RESET2 Reserved */ >> + >> +#endif >> > > . > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-09-19 2:34 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-09-18 12:12 [PATCH 0/3] reset: meson: add Meson-A1 SoC support Xingyu Chen 2019-09-18 12:12 ` [PATCH 1/3] arm64: dts: meson: add reset controller for Meson-A1 SoC Xingyu Chen 2019-09-18 12:12 ` [PATCH 2/3] dt-bindings: reset: add bindings for the Meson-A1 SoC Reset Controller Xingyu Chen 2019-09-18 12:39 ` Neil Armstrong 2019-09-19 2:34 ` Xingyu Chen
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).