arm64: dts: ZynqMP DT changes for v5.20
- Extend gpio-zynq DT binding (compatible, power-domains, gpio-line-names) - Fix sm-k26 gpio comment - Wire AMS device - Align gpio-keys node names with dtschema -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQQbPNTMvXmYlBPRwx7KSWXLKUoMIQUCYsbszwAKCRDKSWXLKUoM IZggAJ9cTVwy6aARMPmgTpFCvpJP1E18gACfcUkdsBPy9RRj92PhDRujHxJGTHo= =hOqh -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmLH328ACgkQmmx57+YA GNk3EA//fhLY4XpUm/BEwkwk33/u7HljuHFaO5F/fP746wQHHB4M6NSTCAyonqC3 mol9IwyaoAXF3dsy2quebD14dXnR9az7+s0dF2fVNOLoIerG9qK2xSqMcvl+Rbdb mOZgYxzWTDaCeN+qgTFfjnQ/ZCUEoa13QrI3v2/W1D1MJxBTq/DX7L9EK+snHUoi 1SVrxM7gikH/bX5vgHyiOCREfNvdLji+VwFBHQB244h+ENuGOeimnHt/IH/+jaZ9 nIWwABS0zcpq7pzPleKC5dLd6RPfhZ91iz2ao1uSXrNebmAss2EtDJcM0yskeQ66 mBd++O1KD5f51GMNjL0VuOkOL/BV4aX6Fm41o4Q/v33oHqKPdCiNVo6dX0FC06ZN wNEZ6XsD7JsStcIktFAZlmU6ONpdKiKl6ZeGsR/LpgI68hbCaVqKRcRlDgA4OjRW Zrr9pBQPkfQ7IaTekRu5O1R9r+au+cZc827bEZX5pABabiTAuKXUuwzIFrrjhi0c sO3glNLItk7Y8r1qlAJc5XKlT9PwBNJaFJIWU7cPCDyqXNdePIf5QrHGC467bxFq weuRfz4SKDRLlaWOACk4o7diIIiGOdwjYWB/gLAcJQnxTsOJIRIm7T/mzKdF40dh 7bP1hA6zxm2yxsUCm0/wh7NE6iSofTzgJ4nk194J+zyQ/hgjpC0= =PSBg -----END PGP SIGNATURE----- Merge tag 'zynqmp-dt-for-v5.20' of https://github.com/Xilinx/linux-xlnx into arm/dt arm64: dts: ZynqMP DT changes for v5.20 - Extend gpio-zynq DT binding (compatible, power-domains, gpio-line-names) - Fix sm-k26 gpio comment - Wire AMS device - Align gpio-keys node names with dtschema * tag 'zynqmp-dt-for-v5.20' of https://github.com/Xilinx/linux-xlnx: arm64: dts: xilinx: align gpio-key node names with dtschema arm64: dts: zynqmp: add AMS driver to device tree dt-bindings: gpio: zynq: Describe gpio-line-names arm64: zynqmp: Fix comment about number of gpio line names dt-bindings: gpio: zynq: Add power-domains dt-bindings: gpio: zynq: Add missing compatible strings Link: https://lore.kernel.org/r/452e8c68-b63b-f4f6-a937-67f65c64a8a0@monstr.eu Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
d67fe5e3b2
|
|
@ -11,7 +11,11 @@ maintainers:
|
|||
|
||||
properties:
|
||||
compatible:
|
||||
const: xlnx,zynq-gpio-1.0
|
||||
enum:
|
||||
- xlnx,zynq-gpio-1.0
|
||||
- xlnx,zynqmp-gpio-1.0
|
||||
- xlnx,versal-gpio-1.0
|
||||
- xlnx,pmc-gpio-1.0
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
|
@ -24,6 +28,11 @@ properties:
|
|||
|
||||
gpio-controller: true
|
||||
|
||||
gpio-line-names:
|
||||
description: strings describing the names of each gpio line
|
||||
minItems: 58
|
||||
maxItems: 174
|
||||
|
||||
interrupt-controller: true
|
||||
|
||||
"#interrupt-cells":
|
||||
|
|
@ -32,6 +41,54 @@ properties:
|
|||
clocks:
|
||||
maxItems: 1
|
||||
|
||||
power-domains:
|
||||
maxItems: 1
|
||||
|
||||
allOf:
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- xlnx,zynqmp-gpio-1.0
|
||||
then:
|
||||
properties:
|
||||
gpio-line-names:
|
||||
minItems: 174
|
||||
maxItems: 174
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- xlnx,zynq-gpio-1.0
|
||||
then:
|
||||
properties:
|
||||
gpio-line-names:
|
||||
minItems: 118
|
||||
maxItems: 118
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- xlnx,versal-gpio-1.0
|
||||
then:
|
||||
properties:
|
||||
gpio-line-names:
|
||||
minItems: 58
|
||||
maxItems: 58
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- xlnx,pmc-gpio-1.0
|
||||
then:
|
||||
properties:
|
||||
gpio-line-names:
|
||||
minItems: 116
|
||||
maxItems: 116
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
|
|
|
|||
|
|
@ -239,6 +239,10 @@
|
|||
clocks = <&zynqmp_clk LPD_WDT>;
|
||||
};
|
||||
|
||||
&xilinx_ams {
|
||||
clocks = <&zynqmp_clk AMS_REF>;
|
||||
};
|
||||
|
||||
&zynqmp_dpdma {
|
||||
clocks = <&zynqmp_clk DPDMA_REF>;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
gpio-keys {
|
||||
compatible = "gpio-keys";
|
||||
autorepeat;
|
||||
fwuen {
|
||||
key-fwuen {
|
||||
label = "fwuen";
|
||||
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
|
@ -285,5 +285,5 @@
|
|||
"", "", "", "", "", /* 155 - 159 */
|
||||
"", "", "", "", "", /* 160 - 164 */
|
||||
"", "", "", "", "", /* 165 - 169 */
|
||||
"", "", "", ""; /* 170 - 174 */
|
||||
"", "", "", ""; /* 170 - 173 */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
gpio-keys {
|
||||
compatible = "gpio-keys";
|
||||
autorepeat;
|
||||
sw4 {
|
||||
switch-4 {
|
||||
label = "sw4";
|
||||
gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
|
||||
linux,code = <KEY_POWER>;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
gpio-keys {
|
||||
compatible = "gpio-keys";
|
||||
autorepeat;
|
||||
sw19 {
|
||||
switch-19 {
|
||||
label = "sw19";
|
||||
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
|
||||
linux,code = <KEY_DOWN>;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
gpio-keys {
|
||||
compatible = "gpio-keys";
|
||||
autorepeat;
|
||||
sw19 {
|
||||
switch-19 {
|
||||
label = "sw19";
|
||||
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
|
||||
linux,code = <KEY_DOWN>;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
gpio-keys {
|
||||
compatible = "gpio-keys";
|
||||
autorepeat;
|
||||
sw19 {
|
||||
switch-19 {
|
||||
label = "sw19";
|
||||
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
|
||||
linux,code = <KEY_DOWN>;
|
||||
|
|
|
|||
|
|
@ -874,6 +874,32 @@
|
|||
timeout-sec = <10>;
|
||||
};
|
||||
|
||||
xilinx_ams: ams@ffa50000 {
|
||||
compatible = "xlnx,zynqmp-ams";
|
||||
status = "disabled";
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 56 4>;
|
||||
reg = <0x0 0xffa50000 0x0 0x800>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
#io-channel-cells = <1>;
|
||||
ranges = <0 0 0xffa50800 0x800>;
|
||||
|
||||
ams_ps: ams_ps@0 {
|
||||
compatible = "xlnx,zynqmp-ams-ps";
|
||||
status = "disabled";
|
||||
reg = <0x0 0x400>;
|
||||
};
|
||||
|
||||
ams_pl: ams_pl@400 {
|
||||
compatible = "xlnx,zynqmp-ams-pl";
|
||||
status = "disabled";
|
||||
reg = <0x400 0x400>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
};
|
||||
};
|
||||
|
||||
zynqmp_dpdma: dma-controller@fd4c0000 {
|
||||
compatible = "xlnx,zynqmp-dpdma";
|
||||
status = "disabled";
|
||||
|
|
|
|||
Loading…
Reference in New Issue