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

Merge tag 'zynqmp-dt-for-6.6' of https://github.com/Xilinx/linux-xlnx into soc/dt 

arm64: ZynqMP DT changes for v6.6

- Describe caches
- Fix i2c gpio recovery description
- Setting up default i2c frequency
- Describe GEM TSU clock and assigned rates for SOMs
- Reserved 1MB for internal firmware usage
- Fix dwc3 IRQ description
- Describe interrupts by using macros

* tag 'zynqmp-dt-for-6.6' of https://github.com/Xilinx/linux-xlnx:
  arm64: zynqmp: Describe interrupts by using macros
  arm64: zynqmp: Fix dwc3 usb interrupt description
  arm64: zynqmp: Add memory reserved node for k26 Kria SOM board
  arm64: zynqmp: Assign TSU clock frequency for GEMs
  arm64: zynqmp: Setting default i2c clock frequency to 400kHz
  arm64: zynqmp: Fix open drain warning on ZynqMP
  arm64: zynqmp: Add L2 cache nodes

Link: https://lore.kernel.org/r/fde6d7b4-c751-219d-3ec5-04e5bad2aa17@monstr.eu


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

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

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

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

		 <&zynqmp_clk GEM_TSU>;

	assigned-clocks = <&zynqmp_clk GEM_TSU>;

};



&gem1 {

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

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

		 <&zynqmp_clk GEM_TSU>;

	assigned-clocks = <&zynqmp_clk GEM_TSU>;

};



&gem2 {

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

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

		 <&zynqmp_clk GEM_TSU>;

	assigned-clocks = <&zynqmp_clk GEM_TSU>;

};



&gem3 {

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

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

		 <&zynqmp_clk GEM_TSU>;

	assigned-clocks = <&zynqmp_clk GEM_TSU>;

};



&gpio {

arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso

+3 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ &i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */ 
	pinctrl-names = "default", "gpio";

	pinctrl-0 = <&pinctrl_i2c1_default>;

	pinctrl-1 = <&pinctrl_i2c1_gpio>;

	scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;

	sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;

	scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;



	/* u14 - 0x40 - ina260 */

	/* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
@@ -145,6 +145,7 @@ &gem3 { /* required by spec */ 
	pinctrl-0 = <&pinctrl_gem3_default>;

	phy-handle = <&phy0>;

	phy-mode = "rgmii-id";

	assigned-clock-rates = <250000000>;



	mdio: mdio {

		#address-cells = <1>;

arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso

+3 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ &i2c1 { /* I2C_SCK C23/C24 - MIO from SOM */ 
	pinctrl-names = "default", "gpio";

	pinctrl-0 = <&pinctrl_i2c1_default>;

	pinctrl-1 = <&pinctrl_i2c1_gpio>;

	scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;

	sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;

	scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;



	/* u14 - 0x40 - ina260 */

	/* u43 - 0x2d - usb5744 */
@@ -128,6 +128,7 @@ &gem3 { /* required by spec */ 
	pinctrl-0 = <&pinctrl_gem3_default>;

	phy-handle = <&phy0>;

	phy-mode = "rgmii-id";

	assigned-clock-rates = <250000000>;



	mdio: mdio {

		#address-cells = <1>;

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

+13 −2
Original line number Diff line number Diff line
@@ -50,6 +50,17 @@ memory@0 { 
		reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>;

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		pmu_region: pmu@7ff00000 {

			reg = <0x0 0x7ff00000 0x0 0x100000>;

			no-map;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		autorepeat;
@@ -245,8 +256,8 @@ &i2c1 { 
	status = "okay";

	bootph-all;

	clock-frequency = <400000>;

	scl-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;

	sda-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;

	scl-gpios = <&gpio 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	sda-gpios = <&gpio 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;



	eeprom: eeprom@50 { /* u46 - also at address 0x58 */

		bootph-all;

arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts

+2 −2
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ &i2c1 { 
	pinctrl-names = "default", "gpio";

	pinctrl-0 = <&pinctrl_i2c1_default>;

	pinctrl-1 = <&pinctrl_i2c1_gpio>;

	scl-gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;

	sda-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;

	scl-gpios = <&gpio 36 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	sda-gpios = <&gpio 37 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;



	eeprom: eeprom@55 {

		compatible = "atmel,24c64"; /* 24AA64 */