* [PATCH 0/3] reset: amlogic-a4/a5: add reset driver
@ 2024-07-03 6:16 zelong dong
2024-07-03 6:16 ` [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller zelong dong
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: zelong dong @ 2024-07-03 6:16 UTC (permalink / raw)
To: Neil Armstrong, Philipp Zabel, Kevin Hilman, Rob Herring,
Martin Blumenstingl, Jerome Brunet, Krzysztof Kozlowski
Cc: linux-kernel, linux-amlogic, linux-arm-kernel, devicetree,
kelvin.zhang, Zelong Dong
From: Zelong Dong <zelong.dong@amlogic.com>
This patchset adds Reset controller driver support for
Amlogic A4/A5 SoC. The RESET registers count and offset
for A4/A5 Soc are same as S4 Soc.
Zelong Dong (3):
dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5
Reset Controller
arm64: dts: amlogic: Add Amlogic A4 reset controller
arm64: dts: amlogic: Add Amlogic A5 reset controller
.../bindings/reset/amlogic,meson-reset.yaml | 22 +++--
.../boot/dts/amlogic/amlogic-a4-common.dtsi | 8 ++
.../arm64/boot/dts/amlogic/amlogic-a4-reset.h | 93 ++++++++++++++++++
arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi | 1 +
.../arm64/boot/dts/amlogic/amlogic-a5-reset.h | 95 +++++++++++++++++++
arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 1 +
6 files changed, 213 insertions(+), 7 deletions(-)
create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h
create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h
--
2.35.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller 2024-07-03 6:16 [PATCH 0/3] reset: amlogic-a4/a5: add reset driver zelong dong @ 2024-07-03 6:16 ` zelong dong 2024-07-03 7:42 ` Neil Armstrong ` (3 more replies) 2024-07-03 6:16 ` [PATCH 2/3] arm64: dts: amlogic: Add Amlogic A4 reset controller zelong dong 2024-07-03 6:16 ` [PATCH 3/3] arm64: dts: amlogic: Add Amlogic A5 " zelong dong 2 siblings, 4 replies; 9+ messages in thread From: zelong dong @ 2024-07-03 6:16 UTC (permalink / raw) To: Neil Armstrong, Philipp Zabel, Kevin Hilman, Rob Herring, Martin Blumenstingl, Jerome Brunet, Krzysztof Kozlowski Cc: linux-kernel, linux-amlogic, linux-arm-kernel, devicetree, kelvin.zhang, Zelong Dong From: Zelong Dong <zelong.dong@amlogic.com> Add new compatible and DT bindings for Amlogic A4/A5 Reset Controller Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> --- .../bindings/reset/amlogic,meson-reset.yaml | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml index f0c6c0df0ce3..80345af81d5a 100644 --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml @@ -12,13 +12,21 @@ maintainers: properties: compatible: - enum: - - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs - - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs - - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs - - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs - - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs - - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs + oneOf: + - items: + - enum: + - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs + - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs + - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs + - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs + - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs + - amlogic,t7-reset + - items: + - enum: + - amlogic,a4-reset + - amlogic,a5-reset + - amlogic,c3-reset + - const: amlogic,meson-s4-reset reg: maxItems: 1 -- 2.35.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller 2024-07-03 6:16 ` [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller zelong dong @ 2024-07-03 7:42 ` Neil Armstrong 2024-07-04 6:08 ` kernel test robot ` (2 subsequent siblings) 3 siblings, 0 replies; 9+ messages in thread From: Neil Armstrong @ 2024-07-03 7:42 UTC (permalink / raw) To: zelong dong, Philipp Zabel, Kevin Hilman, Rob Herring, Martin Blumenstingl, Jerome Brunet, Krzysztof Kozlowski Cc: linux-kernel, linux-amlogic, linux-arm-kernel, devicetree, kelvin.zhang On 03/07/2024 08:16, zelong dong wrote: > From: Zelong Dong <zelong.dong@amlogic.com> > > Add new compatible and DT bindings for Amlogic A4/A5 Reset Controller > > Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> > --- > .../bindings/reset/amlogic,meson-reset.yaml | 22 +++++++++++++------ > 1 file changed, 15 insertions(+), 7 deletions(-) > > diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > index f0c6c0df0ce3..80345af81d5a 100644 > --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > @@ -12,13 +12,21 @@ maintainers: > > properties: > compatible: > - enum: > - - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs > - - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs > - - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs > - - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs > - - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs > - - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs > + oneOf: > + - items: > + - enum: > + - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs > + - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs > + - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs > + - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs > + - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs > + - amlogic,t7-reset > + - items: > + - enum: > + - amlogic,a4-reset > + - amlogic,a5-reset > + - amlogic,c3-reset > + - const: amlogic,meson-s4-reset Here you're changing bindings for amlogic,c3-reset, move it in the other enum list. Neil > > reg: > maxItems: 1 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller 2024-07-03 6:16 ` [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller zelong dong 2024-07-03 7:42 ` Neil Armstrong @ 2024-07-04 6:08 ` kernel test robot 2024-07-08 15:52 ` Rob Herring 2024-07-08 15:53 ` Rob Herring 3 siblings, 0 replies; 9+ messages in thread From: kernel test robot @ 2024-07-04 6:08 UTC (permalink / raw) To: zelong dong, Neil Armstrong, Philipp Zabel, Kevin Hilman, Rob Herring, Martin Blumenstingl, Jerome Brunet, Krzysztof Kozlowski Cc: oe-kbuild-all, linux-kernel, linux-amlogic, linux-arm-kernel, devicetree, kelvin.zhang, Zelong Dong Hi zelong, kernel test robot noticed the following build warnings: [auto build test WARNING on next-20240703] [also build test WARNING on linus/master v6.10-rc6] [cannot apply to robh/for-next pza/reset/next pza/imx-drm/next v6.10-rc6 v6.10-rc5 v6.10-rc4] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/zelong-dong/dt-bindings-reset-Add-compatible-and-DT-bindings-for-Amlogic-A4-A5-Reset-Controller/20240703-184517 base: next-20240703 patch link: https://lore.kernel.org/r/20240703061610.37217-2-zelong.dong%40amlogic.com patch subject: [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller config: arm64-randconfig-051-20240704 (https://download.01.org/0day-ci/archive/20240704/202407041333.QnHEnGRY-lkp@intel.com/config) compiler: aarch64-linux-gcc (GCC) 13.2.0 dtschema version: 2024.6.dev3+g650bf2d reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240704/202407041333.QnHEnGRY-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202407041333.QnHEnGRY-lkp@intel.com/ dtcheck warnings: (new ones prefixed by >>) arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi:97.34-111.6: Warning (unit_address_vs_reg): /soc/bus@fe000000/pinctrl@4000: node has a unit name, but no reg or ranges property arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi:97.34-111.6: Warning (simple_bus_reg): /soc/bus@fe000000/pinctrl@4000: missing or empty reg/ranges property >> arch/arm64/boot/dts/amlogic/amlogic-c3-c302x-aw409.dtb: reset-controller@2000: compatible: 'oneOf' conditional failed, one must be fixed: ['amlogic,c3-reset'] is too short 'amlogic,c3-reset' is not one of ['amlogic,meson8b-reset', 'amlogic,meson-gxbb-reset', 'amlogic,meson-axg-reset', 'amlogic,meson-a1-reset', 'amlogic,meson-s4-reset', 'amlogic,t7-reset'] from schema $id: http://devicetree.org/schemas/reset/amlogic,meson-reset.yaml# -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller 2024-07-03 6:16 ` [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller zelong dong 2024-07-03 7:42 ` Neil Armstrong 2024-07-04 6:08 ` kernel test robot @ 2024-07-08 15:52 ` Rob Herring 2024-07-08 15:53 ` Rob Herring 3 siblings, 0 replies; 9+ messages in thread From: Rob Herring @ 2024-07-08 15:52 UTC (permalink / raw) To: zelong dong Cc: Neil Armstrong, Philipp Zabel, Kevin Hilman, Martin Blumenstingl, Jerome Brunet, Krzysztof Kozlowski, linux-kernel, linux-amlogic, linux-arm-kernel, devicetree, kelvin.zhang On Wed, Jul 03, 2024 at 02:16:08PM +0800, zelong dong wrote: > From: Zelong Dong <zelong.dong@amlogic.com> > > Add new compatible and DT bindings for Amlogic A4/A5 Reset Controller > > Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> > --- > .../bindings/reset/amlogic,meson-reset.yaml | 22 +++++++++++++------ > 1 file changed, 15 insertions(+), 7 deletions(-) > > diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > index f0c6c0df0ce3..80345af81d5a 100644 > --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > @@ -12,13 +12,21 @@ maintainers: > > properties: > compatible: > - enum: > - - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs > - - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs > - - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs > - - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs > - - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs > - - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs > + oneOf: > + - items: Don't need items here. > + - enum: > + - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs > + - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs > + - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs > + - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs > + - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs > + - amlogic,t7-reset What's t7? > + - items: > + - enum: > + - amlogic,a4-reset > + - amlogic,a5-reset > + - amlogic,c3-reset > + - const: amlogic,meson-s4-reset > > reg: > maxItems: 1 > -- > 2.35.1 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller 2024-07-03 6:16 ` [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller zelong dong ` (2 preceding siblings ...) 2024-07-08 15:52 ` Rob Herring @ 2024-07-08 15:53 ` Rob Herring 3 siblings, 0 replies; 9+ messages in thread From: Rob Herring @ 2024-07-08 15:53 UTC (permalink / raw) To: zelong dong Cc: Neil Armstrong, Philipp Zabel, Kevin Hilman, Martin Blumenstingl, Jerome Brunet, Krzysztof Kozlowski, linux-kernel, linux-amlogic, linux-arm-kernel, devicetree, kelvin.zhang On Wed, Jul 03, 2024 at 02:16:08PM +0800, zelong dong wrote: > From: Zelong Dong <zelong.dong@amlogic.com> > > Add new compatible and DT bindings for Amlogic A4/A5 Reset Controller Also, in the subject and here drop 'and DT bindings'. > > Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> > --- > .../bindings/reset/amlogic,meson-reset.yaml | 22 +++++++++++++------ > 1 file changed, 15 insertions(+), 7 deletions(-) > > diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > index f0c6c0df0ce3..80345af81d5a 100644 > --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > @@ -12,13 +12,21 @@ maintainers: > > properties: > compatible: > - enum: > - - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs > - - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs > - - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs > - - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs > - - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs > - - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs > + oneOf: > + - items: > + - enum: > + - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs > + - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs > + - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs > + - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs > + - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs > + - amlogic,t7-reset > + - items: > + - enum: > + - amlogic,a4-reset > + - amlogic,a5-reset > + - amlogic,c3-reset > + - const: amlogic,meson-s4-reset > > reg: > maxItems: 1 > -- > 2.35.1 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/3] arm64: dts: amlogic: Add Amlogic A4 reset controller 2024-07-03 6:16 [PATCH 0/3] reset: amlogic-a4/a5: add reset driver zelong dong 2024-07-03 6:16 ` [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller zelong dong @ 2024-07-03 6:16 ` zelong dong 2024-07-03 6:16 ` [PATCH 3/3] arm64: dts: amlogic: Add Amlogic A5 " zelong dong 2 siblings, 0 replies; 9+ messages in thread From: zelong dong @ 2024-07-03 6:16 UTC (permalink / raw) To: Neil Armstrong, Philipp Zabel, Kevin Hilman, Rob Herring, Martin Blumenstingl, Jerome Brunet, Krzysztof Kozlowski Cc: linux-kernel, linux-amlogic, linux-arm-kernel, devicetree, kelvin.zhang, Zelong Dong From: Zelong Dong <zelong.dong@amlogic.com> Add the device node and related header file for Amlogic A4 reset controller. The count and offset for A4 Soc RESET registers are same as S4 Soc. Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> --- .../boot/dts/amlogic/amlogic-a4-common.dtsi | 7 ++ .../arm64/boot/dts/amlogic/amlogic-a4-reset.h | 93 +++++++++++++++++++ arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi | 1 + 3 files changed, 101 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi index b6106ad4a072..c527dfce65ab 100644 --- a/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi @@ -52,6 +52,13 @@ apb: bus@fe000000 { #size-cells = <2>; ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>; + reset: reset-controller@2000 { + compatible = "amlogic,a4-reset", + "amlogic,meson-s4-reset"; + reg = <0x0 0x2000 0x0 0x98>; + #reset-cells = <1>; + }; + uart_b: serial@7a000 { compatible = "amlogic,a4-uart", "amlogic,meson-s4-uart"; diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h b/arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h new file mode 100644 index 000000000000..f6a4c90bab3c --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/amlogic-a4-reset.h @@ -0,0 +1,93 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ +/* + * Copyright (c) 2024 Amlogic, Inc. All rights reserved. + */ + +#ifndef __DTS_AMLOGIC_A4_RESET_H +#define __DTS_AMLOGIC_A4_RESET_H + +/* RESET0 */ +/* 0-3 */ +#define RESET_USB 4 +/* 5-6*/ +#define RESET_U2PHY22 7 +#define RESET_USBPHY20 8 +#define RESET_U2PHY21 9 +#define RESET_USB2DRD 10 +#define RESET_U2H 11 +#define RESET_LED_CTRL 12 +/* 13-31 */ + +/* RESET1 */ +#define RESET_AUDIO 32 +#define RESET_AUDIO_VAD 33 +/* 34*/ +#define RESET_DDR_APB 35 +#define RESET_DDR 36 +#define RESET_VOUT_VENC 37 +#define RESET_VOUT 38 +/* 39-47 */ +#define RESET_ETHERNET 48 +/* 49-63 */ + +/* RESET2 */ +#define RESET_DEVICE_MMC_ARB 64 +#define RESET_IRCTRL 65 +/* 66*/ +#define RESET_TS_PLL 67 +/* 68-72*/ +#define RESET_SPICC_0 73 +#define RESET_SPICC_1 74 +/* 75-79*/ +#define RESET_MSR_CLK 80 +/* 81*/ +#define RESET_SAR_ADC 82 +/* 83-87*/ +#define RESET_ACODEC 88 +/* 89-90*/ +#define RESET_WATCHDOG 91 +/* 92-95*/ + +/* RESET3 */ +/* 96-127 */ + +/* RESET4 */ +/* 128-131 */ +#define RESET_PWM_AB 132 +#define RESET_PWM_CD 133 +#define RESET_PWM_EF 134 +#define RESET_PWM_GH 135 +/* 136-137*/ +#define RESET_UART_A 138 +#define RESET_UART_B 139 +/* 140*/ +#define RESET_UART_D 141 +#define RESET_UART_E 142 +/* 143-144*/ +#define RESET_I2C_M_A 145 +#define RESET_I2C_M_B 146 +#define RESET_I2C_M_C 147 +#define RESET_I2C_M_D 148 +/* 149-151*/ +#define RESET_SDEMMC_A 152 +/* 153*/ +#define RESET_SDEMMC_C 154 +/* 155-159*/ + +/* RESET5 */ +/* 160-175*/ +#define RESET_BRG_AO_NIC_SYS 176 +/* 177*/ +#define RESET_BRG_AO_NIC_MAIN 178 +#define RESET_BRG_AO_NIC_AUDIO 179 +/* 180-183*/ +#define RESET_BRG_AO_NIC_ALL 184 +/* 185*/ +#define RESET_BRG_NIC_SDIO 186 +#define RESET_BRG_NIC_EMMC 187 +#define RESET_BRG_NIC_DSU 188 +#define RESET_BRG_NIC_CLK81 189 +#define RESET_BRG_NIC_MAIN 190 +#define RESET_BRG_NIC_ALL 191 + +#endif diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi index de10e7aebf21..8a5fced0d70f 100644 --- a/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi +++ b/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi @@ -4,6 +4,7 @@ */ #include "amlogic-a4-common.dtsi" +#include "amlogic-a4-reset.h" #include <dt-bindings/power/amlogic,a4-pwrc.h> / { cpus { -- 2.35.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] arm64: dts: amlogic: Add Amlogic A5 reset controller 2024-07-03 6:16 [PATCH 0/3] reset: amlogic-a4/a5: add reset driver zelong dong 2024-07-03 6:16 ` [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller zelong dong 2024-07-03 6:16 ` [PATCH 2/3] arm64: dts: amlogic: Add Amlogic A4 reset controller zelong dong @ 2024-07-03 6:16 ` zelong dong 2024-07-04 7:56 ` kernel test robot 2 siblings, 1 reply; 9+ messages in thread From: zelong dong @ 2024-07-03 6:16 UTC (permalink / raw) To: Neil Armstrong, Philipp Zabel, Kevin Hilman, Rob Herring, Martin Blumenstingl, Jerome Brunet, Krzysztof Kozlowski Cc: linux-kernel, linux-amlogic, linux-arm-kernel, devicetree, kelvin.zhang, Zelong Dong From: Zelong Dong <zelong.dong@amlogic.com> Add the device node and related header file for Amlogic A5 reset controller. The count and offset for A5 Soc RESET registers are same as S4 Soc. Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> --- .../boot/dts/amlogic/amlogic-a4-common.dtsi | 1 + .../arm64/boot/dts/amlogic/amlogic-a5-reset.h | 95 +++++++++++++++++++ arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 1 + 3 files changed, 97 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi index c527dfce65ab..f11fe3ee83b2 100644 --- a/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi @@ -54,6 +54,7 @@ apb: bus@fe000000 { reset: reset-controller@2000 { compatible = "amlogic,a4-reset", + "amlogic,a5-reset", "amlogic,meson-s4-reset"; reg = <0x0 0x2000 0x0 0x98>; #reset-cells = <1>; diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h b/arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h new file mode 100644 index 000000000000..cdf0f5159620 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/amlogic-a5-reset.h @@ -0,0 +1,95 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ +/* + * Copyright (c) 2024 Amlogic, Inc. All rights reserved. + */ + +#ifndef __DTS_AMLOGIC_A5_RESET_H +#define __DTS_AMLOGIC_A5_RESET_H + +/* RESET0 */ +/* 0-3 */ +#define RESET_USB 4 +/* 5-7 */ +#define RESET_USBPHY20 8 +/* 9 */ +#define RESET_USB2DRD 10 +/* 11-31 */ + +/* RESET1 */ +#define RESET_AUDIO 32 +#define RESET_AUDIO_VAD 33 +/* 34 */ +#define RESET_DDR_APB 35 +#define RESET_DDR 36 +/* 37-40 */ +#define RESET_DSPA_DEBUG 41 +/* 42 */ +#define RESET_DSPA 43 +/* 44-46 */ +#define RESET_NNA 47 +#define RESET_ETHERNET 48 +/* 49-63 */ + +/* RESET2 */ +#define RESET_ABUS_ARB 64 +#define RESET_IRCTRL 65 +/* 66 */ +#define RESET_TS_PLL 67 +/* 68-72 */ +#define RESET_SPICC_0 73 +#define RESET_SPICC_1 74 +#define RESET_RSA 75 + +/* 76-79 */ +#define RESET_MSR_CLK 80 +#define RESET_SPIFC 81 +#define RESET_SAR_ADC 82 +/* 83-90 */ +#define RESET_WATCHDOG 91 +/* 92-95 */ + +/* RESET3 */ +/* 96-127 */ + +/* RESET4 */ +#define RESET_RTC 128 +/* 129-131 */ +#define RESET_PWM_AB 132 +#define RESET_PWM_CD 133 +#define RESET_PWM_EF 134 +#define RESET_PWM_GH 135 +/* 104-105 */ +#define RESET_UART_A 138 +#define RESET_UART_B 139 +#define RESET_UART_C 140 +#define RESET_UART_D 141 +#define RESET_UART_E 142 +/* 143*/ +#define RESET_I2C_S_A 144 +#define RESET_I2C_M_A 145 +#define RESET_I2C_M_B 146 +#define RESET_I2C_M_C 147 +#define RESET_I2C_M_D 148 +/* 149-151 */ +#define RESET_SDEMMC_A 152 +/* 153 */ +#define RESET_SDEMMC_C 154 +/* 155-159*/ + +/* RESET5 */ +/* 160-175 */ +#define RESET_BRG_AO_NIC_SYS 176 +#define RESET_BRG_AO_NIC_DSPA 177 +#define RESET_BRG_AO_NIC_MAIN 178 +#define RESET_BRG_AO_NIC_AUDIO 179 +/* 180-183 */ +#define RESET_BRG_AO_NIC_ALL 184 +#define RESET_BRG_NIC_NNA 185 +#define RESET_BRG_NIC_SDIO 186 +#define RESET_BRG_NIC_EMMC 187 +#define RESET_BRG_NIC_DSU 188 +#define RESET_BRG_NIC_SYSCLK 189 +#define RESET_BRG_NIC_MAIN 190 +#define RESET_BRG_NIC_ALL 191 + +#endif diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi index 43f68a7da2f7..ea9d4f2ce42b 100644 --- a/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi +++ b/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi @@ -4,6 +4,7 @@ */ #include "amlogic-a4-common.dtsi" +#include "amlogic-a5-reset.h" / { cpus { #address-cells = <2>; -- 2.35.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] arm64: dts: amlogic: Add Amlogic A5 reset controller 2024-07-03 6:16 ` [PATCH 3/3] arm64: dts: amlogic: Add Amlogic A5 " zelong dong @ 2024-07-04 7:56 ` kernel test robot 0 siblings, 0 replies; 9+ messages in thread From: kernel test robot @ 2024-07-04 7:56 UTC (permalink / raw) To: zelong dong, Neil Armstrong, Philipp Zabel, Kevin Hilman, Rob Herring, Martin Blumenstingl, Jerome Brunet, Krzysztof Kozlowski Cc: oe-kbuild-all, linux-kernel, linux-amlogic, linux-arm-kernel, devicetree, kelvin.zhang, Zelong Dong Hi zelong, kernel test robot noticed the following build warnings: [auto build test WARNING on next-20240703] [cannot apply to robh/for-next pza/reset/next pza/imx-drm/next v6.10-rc6 v6.10-rc5 v6.10-rc4 linus/master v6.10-rc6] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/zelong-dong/dt-bindings-reset-Add-compatible-and-DT-bindings-for-Amlogic-A4-A5-Reset-Controller/20240703-184517 base: next-20240703 patch link: https://lore.kernel.org/r/20240703061610.37217-4-zelong.dong%40amlogic.com patch subject: [PATCH 3/3] arm64: dts: amlogic: Add Amlogic A5 reset controller config: arm64-randconfig-051-20240704 (https://download.01.org/0day-ci/archive/20240704/202407041520.P9v4H7Sq-lkp@intel.com/config) compiler: aarch64-linux-gcc (GCC) 13.2.0 dtschema version: 2024.6.dev3+g650bf2d reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240704/202407041520.P9v4H7Sq-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202407041520.P9v4H7Sq-lkp@intel.com/ dtcheck warnings: (new ones prefixed by >>) >> arch/arm64/boot/dts/amlogic/amlogic-a4-a113l2-ba400.dtb: reset-controller@2000: compatible: 'oneOf' conditional failed, one must be fixed: ['amlogic,a4-reset', 'amlogic,a5-reset', 'amlogic,meson-s4-reset'] is too long 'amlogic,a4-reset' is not one of ['amlogic,meson8b-reset', 'amlogic,meson-gxbb-reset', 'amlogic,meson-axg-reset', 'amlogic,meson-a1-reset', 'amlogic,meson-s4-reset', 'amlogic,t7-reset'] 'amlogic,meson-s4-reset' was expected from schema $id: http://devicetree.org/schemas/reset/amlogic,meson-reset.yaml# -- >> arch/arm64/boot/dts/amlogic/amlogic-a5-a113x2-av400.dtb: reset-controller@2000: compatible: 'oneOf' conditional failed, one must be fixed: ['amlogic,a4-reset', 'amlogic,a5-reset', 'amlogic,meson-s4-reset'] is too long 'amlogic,a4-reset' is not one of ['amlogic,meson8b-reset', 'amlogic,meson-gxbb-reset', 'amlogic,meson-axg-reset', 'amlogic,meson-a1-reset', 'amlogic,meson-s4-reset', 'amlogic,t7-reset'] 'amlogic,meson-s4-reset' was expected from schema $id: http://devicetree.org/schemas/reset/amlogic,meson-reset.yaml# -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-07-08 15:53 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-07-03 6:16 [PATCH 0/3] reset: amlogic-a4/a5: add reset driver zelong dong 2024-07-03 6:16 ` [PATCH 1/3] dt-bindings: reset: Add compatible and DT bindings for Amlogic A4/A5 Reset Controller zelong dong 2024-07-03 7:42 ` Neil Armstrong 2024-07-04 6:08 ` kernel test robot 2024-07-08 15:52 ` Rob Herring 2024-07-08 15:53 ` Rob Herring 2024-07-03 6:16 ` [PATCH 2/3] arm64: dts: amlogic: Add Amlogic A4 reset controller zelong dong 2024-07-03 6:16 ` [PATCH 3/3] arm64: dts: amlogic: Add Amlogic A5 " zelong dong 2024-07-04 7:56 ` kernel test robot
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).