Unverified Commit 777d90d5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'zynqmp-dt-for-v6.3' of https://github.com/Xilinx/linux-xlnx into arm/dt 

arm64: ZynqMP SOC changes for v6.3

- Fix node names to be aligned with dt schema
- Rename DT overlay files to dtso
- Add snps,resume-hs-terminations to usb nodes
- Describe gpio-modepin node
- Use xlnx prefix for ethernet IP

* tag 'zynqmp-dt-for-v6.3' of https://github.com/Xilinx/linux-xlnx:
  arm64: dts: zynqmp: Add xlnx prefix to GEM compatible string
  arm64: dts: zynqmp: Remove clock-names from GEM in zynqmp-clk-ccf.dtsi
  arm64: dts: zynqmp: Add mode-pin GPIO controller DT node
  arm64: zynqmp: Enable hs termination flag for USB dwc3 controller
  arm64: dts: xilinx: Rename DTB overlay source files from .dts to .dtso
  arm64: xilinx: Fix opp-table-cpu
  arm64: dts: xilinx: align LED node names with dtschema

Link: https://lore.kernel.org/r/89d82a7e-6b42-97ce-2912-aa7dec965ff2@monstr.eu


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 551413fe b993ea2b

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

+0 −4
Original line number Diff line number Diff line
@@ -135,28 +135,24 @@ &gem0 { 
	clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM0_REF>,

		 <&zynqmp_clk GEM0_TX>, <&zynqmp_clk GEM0_RX>,

		 <&zynqmp_clk GEM_TSU>;

	clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";

};



&gem1 {

	clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM1_REF>,

		 <&zynqmp_clk GEM1_TX>, <&zynqmp_clk GEM1_RX>,

		 <&zynqmp_clk GEM_TSU>;

	clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";

};



&gem2 {

	clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM2_REF>,

		 <&zynqmp_clk GEM2_TX>, <&zynqmp_clk GEM2_RX>,

		 <&zynqmp_clk GEM_TSU>;

	clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";

};



&gem3 {

	clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM3_REF>,

		 <&zynqmp_clk GEM3_TX>, <&zynqmp_clk GEM3_RX>,

		 <&zynqmp_clk GEM_TSU>;

	clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";

};



&gpio {

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

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ led-ds5 { 
			linux,default-trigger = "bluetooth-power";

		};



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

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

			label = "vbus_det";

			gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;

			default-state = "on";

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

+19 −9
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */



#include <dt-bindings/dma/xlnx-zynqmp-dpdma.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/power/xlnx-zynqmp-power.h>

#include <dt-bindings/reset/xlnx-zynqmp-resets.h>
@@ -75,7 +76,7 @@ CPU_SLEEP_0: cpu-sleep-0 { 
		};

	};



	cpu_opp_table: cpu-opp-table {

	cpu_opp_table: opp-table-cpu {

		compatible = "operating-points-v2";

		opp-shared;

		opp00 {
@@ -199,6 +200,12 @@ pinctrl0: pinctrl { 
				compatible = "xlnx,zynqmp-pinctrl";

				status = "disabled";

			};



			modepin_gpio: gpio {

				compatible = "xlnx,zynqmp-gpio-modepin";

				gpio-controller;

				#gpio-cells = <2>;

			};

		};

	};
@@ -533,12 +540,12 @@ nand0: nand-controller@ff100000 { 
		};



		gem0: ethernet@ff0b0000 {

			compatible = "cdns,zynqmp-gem", "cdns,gem";

			compatible = "xlnx,zynqmp-gem", "cdns,gem";

			status = "disabled";

			interrupt-parent = <&gic>;

			interrupts = <0 57 4>, <0 57 4>;

			reg = <0x0 0xff0b0000 0x0 0x1000>;

			clock-names = "pclk", "hclk", "tx_clk";

			clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";

			#address-cells = <1>;

			#size-cells = <0>;

			iommus = <&smmu 0x874>;
@@ -548,12 +555,12 @@ gem0: ethernet@ff0b0000 { 
		};



		gem1: ethernet@ff0c0000 {

			compatible = "cdns,zynqmp-gem", "cdns,gem";

			compatible = "xlnx,zynqmp-gem", "cdns,gem";

			status = "disabled";

			interrupt-parent = <&gic>;

			interrupts = <0 59 4>, <0 59 4>;

			reg = <0x0 0xff0c0000 0x0 0x1000>;

			clock-names = "pclk", "hclk", "tx_clk";

			clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";

			#address-cells = <1>;

			#size-cells = <0>;

			iommus = <&smmu 0x875>;
@@ -563,12 +570,12 @@ gem1: ethernet@ff0c0000 { 
		};



		gem2: ethernet@ff0d0000 {

			compatible = "cdns,zynqmp-gem", "cdns,gem";

			compatible = "xlnx,zynqmp-gem", "cdns,gem";

			status = "disabled";

			interrupt-parent = <&gic>;

			interrupts = <0 61 4>, <0 61 4>;

			reg = <0x0 0xff0d0000 0x0 0x1000>;

			clock-names = "pclk", "hclk", "tx_clk";

			clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";

			#address-cells = <1>;

			#size-cells = <0>;

			iommus = <&smmu 0x876>;
@@ -578,12 +585,12 @@ gem2: ethernet@ff0d0000 { 
		};



		gem3: ethernet@ff0e0000 {

			compatible = "cdns,zynqmp-gem", "cdns,gem";

			compatible = "xlnx,zynqmp-gem", "cdns,gem";

			status = "disabled";

			interrupt-parent = <&gic>;

			interrupts = <0 63 4>, <0 63 4>;

			reg = <0x0 0xff0e0000 0x0 0x1000>;

			clock-names = "pclk", "hclk", "tx_clk";

			clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";

			#address-cells = <1>;

			#size-cells = <0>;

			iommus = <&smmu 0x877>;
@@ -847,6 +854,7 @@ usb0: usb@ff9d0000 { 
				 <&zynqmp_reset ZYNQMP_RESET_USB0_HIBERRESET>,

				 <&zynqmp_reset ZYNQMP_RESET_USB0_APB>;

			reset-names = "usb_crst", "usb_hibrst", "usb_apbrst";

			reset-gpios = <&modepin_gpio 1 GPIO_ACTIVE_LOW>;

			ranges;



			dwc3_0: usb@fe200000 {
@@ -858,6 +866,7 @@ dwc3_0: usb@fe200000 { 
				clock-names = "bus_early", "ref";

				iommus = <&smmu 0x860>;

				snps,quirk-frame-length-adjustment = <0x20>;

				snps,resume-hs-terminations;

				/* dma-coherent; */

			};

		};
@@ -884,6 +893,7 @@ dwc3_1: usb@fe300000 { 
				clock-names = "bus_early", "ref";

				iommus = <&smmu 0x861>;

				snps,quirk-frame-length-adjustment = <0x20>;

				snps,resume-hs-terminations;

				/* dma-coherent; */

			};

		};