Unverified Commit d67fe5e3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 30a32ee5 228e8a88

Documentation/devicetree/bindings/gpio/gpio-zynq.yaml

+58 −1
Original line number Diff line number Diff line
@@ -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

arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -239,6 +239,10 @@ &lpd_watchdog { 
	clocks = <&zynqmp_clk LPD_WDT>;

};



&xilinx_ams {

	clocks = <&zynqmp_clk AMS_REF>;

};



&zynqmp_dpdma {

	clocks = <&zynqmp_clk DPDMA_REF>;

};

arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ memory@0 { 
	gpio-keys {

		compatible = "gpio-keys";

		autorepeat;

		fwuen {

		key-fwuen {

			label = "fwuen";

			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;

		};
@@ -285,5 +285,5 @@ &gpio { 
			  "", "", "", "", "", /* 155 - 159 */

			  "", "", "", "", "", /* 160 - 164 */

			  "", "", "", "", "", /* 165 - 169 */

			  "", "", "", ""; /* 170 - 174 */

			  "", "", "", ""; /* 170 - 173 */

};

arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ memory@0 { 
	gpio-keys {

		compatible = "gpio-keys";

		autorepeat;

		sw4 {

		switch-4 {

			label = "sw4";

			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ memory@0 { 
	gpio-keys {

		compatible = "gpio-keys";

		autorepeat;

		sw19 {

		switch-19 {

			label = "sw19";

			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;

			linux,code = <KEY_DOWN>;