Commit 5385c226 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'zynqmp-dt-for-v5.0' of https://github.com/Xilinx/linux-xlnx into next/dt 

arm64: dts: zynqmp: DT changes for v5.0

- Fix node names
- Fix wakeup-source
- Wire ddrc
- Label gpio controller (PS gpio)

* tag 'zynqmp-dt-for-v5.0' of https://github.com/Xilinx/linux-xlnx

:
  arm64: dts: zynqmp: Fix node names which contain "_"
  arm64: dts: zynqmp: Add missing gpio-controller to ps gpio
  arm64: dts: zynqmp: Add DDRC node
  arm64: dts: zynqmp: replace gpio-key,wakeup with wakeup-source property
  arm64: dts: zynqmp: Use mmc@ instead sdhci@

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b125eb0b d1d4445a

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

+2 −2
Original line number Diff line number Diff line
@@ -58,13 +58,13 @@ 
		clock-accuracy = <100>;

	};



	dpdma_clk: dpdma_clk {

	dpdma_clk: dpdma-clk {

		compatible = "fixed-clock";

		#clock-cells = <0x0>;

		clock-frequency = <533000000>;

	};



	drm_clock: drm_clock {

	drm_clock: drm-clock {

		compatible = "fixed-clock";

		#clock-cells = <0x0>;

		clock-frequency = <262750000>;

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

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
			label = "sw4";

			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			gpio-key,wakeup;

			wakeup-source;

			autorepeat;

		};

	};
@@ -82,7 +82,7 @@ 
			linux,default-trigger = "bluetooth-power";

		};



		vbus_det { /* U5 USB5744 VBUS detection via MIO25 */

		vbus-det { /* U5 USB5744 VBUS detection via MIO25 */

			label = "vbus_det";

			gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;

			default-state = "on";
@@ -98,7 +98,7 @@ 
		regulator-boot-on;

	};



	sdio_pwrseq: sdio_pwrseq {

	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&gpio 7 GPIO_ACTIVE_LOW>; /* WIFI_EN */

	};

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

+6 −6
Original line number Diff line number Diff line
@@ -46,14 +46,14 @@ 
			label = "sw19";

			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;

			linux,code = <KEY_DOWN>;

			gpio-key,wakeup;

			wakeup-source;

			autorepeat;

		};

	};



	leds {

		compatible = "gpio-leds";

		heartbeat_led {

		heartbeat-led {

			label = "heartbeat";

			gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";
@@ -139,25 +139,25 @@ 
		 * 7, 10 - 17 - not connected

		 */



		gtr_sel0 {

		gtr-sel0 {

			gpio-hog;

			gpios = <0 0>;

			output-low; /* PCIE = 0, DP = 1 */

			line-name = "sel0";

		};

		gtr_sel1 {

		gtr-sel1 {

			gpio-hog;

			gpios = <1 0>;

			output-high; /* PCIE = 0, DP = 1 */

			line-name = "sel1";

		};

		gtr_sel2 {

		gtr-sel2 {

			gpio-hog;

			gpios = <2 0>;

			output-high; /* PCIE = 0, USB0 = 1 */

			line-name = "sel2";

		};

		gtr_sel3 {

		gtr-sel3 {

			gpio-hog;

			gpios = <3 0>;

			output-high; /* PCIE = 0, SATA = 1 */

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

+2 −2
Original line number Diff line number Diff line
@@ -46,14 +46,14 @@ 
			label = "sw19";

			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;

			linux,code = <KEY_DOWN>;

			gpio-key,wakeup;

			wakeup-source;

			autorepeat;

		};

	};



	leds {

		compatible = "gpio-leds";

		heartbeat_led {

		heartbeat-led {

			label = "heartbeat";

			gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

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

+2 −2
Original line number Diff line number Diff line
@@ -46,14 +46,14 @@ 
			label = "sw19";

			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;

			linux,code = <KEY_DOWN>;

			gpio-key,wakeup;

			wakeup-source;

			autorepeat;

		};

	};



	leds {

		compatible = "gpio-leds";

		heartbeat_led {

		heartbeat-led {

			label = "heartbeat";

			gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

CRA Git | Maintained and supported by SUSTech CRA and CCSE