Unverified Commit 4a097f29 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_dts_update_for_v5.17' of... 

Merge tag 'socfpga_dts_update_for_v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/dt

SoCFPGA dts updates for v5.17
- Update N5X to include qspi, usb and ethernet
- Adjust NAND partition size for Agilex and Stratix10

* tag 'socfpga_dts_update_for_v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: Update NAND MTD partition for Agilex and Stratix 10
  arm64: dts: n5x: add qspi, usb, and ethernet support

Link: https://lore.kernel.org/r/20211215164545.300273-1-dinguyen@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5f424ff2 8dce88fe

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts

+2 −22
Original line number Diff line number Diff line
@@ -119,28 +119,8 @@ partition@0 { 
		};



		partition@200000 {

			label = "env";

			reg = <0x200000 0x40000>;

		};



		partition@240000 {

			label = "dtb";

			reg = <0x240000 0x40000>;

		};



		partition@280000 {

			label = "kernel";

			reg = <0x280000 0x2000000>;

		};



		partition@2280000 {

			label = "misc";

			reg = <0x2280000 0x2000000>;

		};



		partition@4280000 {

			label = "rootfs";

			reg = <0x4280000 0x3bd80000>;

			label = "root";

			reg = <0x200000 0x3fe00000>;

		};

	};

};

arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts

+2 −18
Original line number Diff line number Diff line
@@ -91,24 +91,8 @@ partition@0 { 
			reg = <0 0x200000>;

		};

		partition@200000 {

			label = "env";

			reg = <0x200000 0x40000>;

		};

		partition@240000 {

			label = "dtb";

			reg = <0x240000 0x40000>;

		};

		partition@280000 {

			label = "kernel";

			reg = <0x280000 0x2000000>;

		};

		partition@2280000 {

			label = "misc";

			reg = <0x2280000 0x2000000>;

		};

		partition@4280000 {

			label = "rootfs";

			reg = <0x4280000 0x3bd80000>;

			label = "root";

			reg = <0x200000 0x3fe00000>;

		};

	};

};

arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts

+71 −0
Original line number Diff line number Diff line
@@ -29,6 +29,36 @@ &clkmgr { 
	compatible = "intel,easic-n5x-clkmgr";

};



&gmac0 {

	status = "okay";

	phy-mode = "rgmii";

	phy-handle = <&phy0>;



	max-frame-size = <9000>;



	mdio0 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "snps,dwmac-mdio";

		phy0: ethernet-phy@0 {

			reg = <4>;



			txd0-skew-ps = <0>; /* -420ps */

			txd1-skew-ps = <0>; /* -420ps */

			txd2-skew-ps = <0>; /* -420ps */

			txd3-skew-ps = <0>; /* -420ps */

			rxd0-skew-ps = <420>; /* 0ps */

			rxd1-skew-ps = <420>; /* 0ps */

			rxd2-skew-ps = <420>; /* 0ps */

			rxd3-skew-ps = <420>; /* 0ps */

			txen-skew-ps = <0>; /* -420ps */

			txc-skew-ps = <900>; /* 0ps */

			rxdv-skew-ps = <420>; /* 0ps */

			rxc-skew-ps = <1680>; /* 780ps */

		};

	};

};



&mmc {

	status = "okay";

	cap-sd-highspeed;
@@ -40,10 +70,51 @@ &osc1 { 
	clock-frequency = <25000000>;

};



&qspi {

	status = "okay";

	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "micron,mt25qu02g", "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <100000000>;



		m25p,fast-read;

		cdns,page-size = <256>;

		cdns,block-size = <16>;

		cdns,read-delay = <2>;

		cdns,tshsl-ns = <50>;

		cdns,tsd2d-ns = <50>;

		cdns,tchsh-ns = <4>;

		cdns,tslch-ns = <4>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			qspi_boot: partition@0 {

				label = "Boot and fpga data";

				reg = <0x0 0x03FE0000>;

			};



			qspi_rootfs: partition@3FE0000 {

				label = "Root Filesystem - JFFS2";

				reg = <0x03FE0000 0x0C020000>;

			};

		};

	};

};



&uart0 {

	status = "okay";

};



&usb0 {

	status = "okay";

	disable-over-current;

};



&watchdog0 {

	status = "okay";

};