Commit e691c23e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_dts_updates_for_v5.5_part2' of... 

Merge tag 'socfpga_dts_updates_for_v5.5_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/dt

SoCFPGA DTS updates for v5.5, part 2
- Add NAND support for both Agilex and Stratix10 boards
- Agilex
	- Add FPGA manager and Service Layer support
	- Add EDAC support
	- Add System manager
	- Add System manager property to ethernet nodes

* tag 'socfpga_dts_updates_for_v5.5_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: agilex: Add SysMgr to Ethernet nodes
  arm64: dts: agilex: Add SysMgr compatible
  arm64: dts: agilex: Add EDAC Device Tree
  arm64: dts: add NAND board files for Stratix10 and Agilex
  arm64: dts: agilex: add NAND IP to base dts

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5a7df447 2f804ba7

arch/arm64/boot/dts/altera/Makefile

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

dtb-$(CONFIG_ARCH_STRATIX10) += socfpga_stratix10_socdk.dtb
 
dtb-$(CONFIG_ARCH_STRATIX10) += socfpga_stratix10_socdk.dtb \

				socfpga_stratix10_socdk_nand.dtb

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

0 → 100644
+223 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright Altera Corporation (C) 2015. All rights reserved.

 */



#include "socfpga_stratix10.dtsi"



/ {

	model = "SoCFPGA Stratix 10 SoCDK";



	aliases {

		serial0 = &uart0;

		ethernet0 = &gmac0;

		ethernet1 = &gmac1;

		ethernet2 = &gmac2;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	leds {

		compatible = "gpio-leds";

		hps0 {

			label = "hps_led0";

			gpios = <&portb 20 GPIO_ACTIVE_HIGH>;

		};



		hps1 {

			label = "hps_led1";

			gpios = <&portb 19 GPIO_ACTIVE_HIGH>;

		};



		hps2 {

			label = "hps_led2";

			gpios = <&portb 21 GPIO_ACTIVE_HIGH>;

		};

	};



	memory {

		device_type = "memory";

		/* We expect the bootloader to fill in the reg */

		reg = <0 0 0 0>;

	};



	ref_033v: 033-v-ref {

		compatible = "regulator-fixed";

		regulator-name = "0.33V";

		regulator-min-microvolt = <330000>;

		regulator-max-microvolt = <330000>;

	};



	soc {

		clocks {

			osc1 {

				clock-frequency = <25000000>;

			};

		};



		eccmgr {

			sdmmca-ecc@ff8c8c00 {

				compatible = "altr,socfpga-s10-sdmmc-ecc",

					     "altr,socfpga-sdmmc-ecc";

				reg = <0xff8c8c00 0x100>;

				altr,ecc-parent = <&mmc>;

				interrupts = <14 4>,

					     <15 4>;

			};

		};

	};

};



&gpio1 {

	status = "okay";

};



&gmac2 {

	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 */

		};

	};

};



&nand {

	status = "okay";



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0>;

		nand-bus-width = <16>;



		partition@0 {

			label = "u-boot";

			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>;

		};

	};

};



&uart0 {

	status = "okay";

};



&usb0 {

	status = "okay";

	disable-over-current;

};



&watchdog0 {

	status = "okay";

};



&i2c2 {

	status = "okay";

	clock-frequency = <100000>;

	i2c-sda-falling-time-ns = <890>;  /* hcnt */

	i2c-sdl-falling-time-ns = <890>;  /* lcnt */



	adc@14 {

		compatible = "lltc,ltc2497";

		reg = <0x14>;

		vref-supply = <&ref_033v>;

	};



	temp@4c {

		compatible = "maxim,max1619";

		reg = <0x4c>;

	};



	eeprom@51 {

		compatible = "atmel,24c32";

		reg = <0x51>;

		pagesize = <32>;

	};



	rtc@68 {

		compatible = "dallas,ds1339";

		reg = <0x68>;

	};

};



&qspi {

	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "n25q00a";

		reg = <0>;

		spi-max-frequency = <100000000>;



		m25p,fast-read;

		cdns,page-size = <256>;

		cdns,block-size = <16>;

		cdns,read-delay = <1>;

		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 0x034B0000>;

			};



			qspi_rootfs: partition@4000000 {

				label = "Root Filesystem - JFFS2";

				reg = <0x034B0000 0x0EB50000>;

			};

		};

	};

};

arch/arm64/boot/dts/intel/Makefile

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

dtb-$(CONFIG_ARCH_AGILEX) += socfpga_agilex_socdk.dtb
 
dtb-$(CONFIG_ARCH_AGILEX) += socfpga_agilex_socdk.dtb \

			     socfpga_agilex_socdk_nand.dtb

arch/arm64/boot/dts/intel/socfpga_agilex.dtsi

+75 −1
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ gmac0: ethernet@ff800000 { 
			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 1>;

			altr,sysmgr-syscon = <&sysmgr 0x44 0>;

			status = "disabled";

		};
@@ -128,6 +129,7 @@ gmac1: ethernet@ff802000 { 
			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 2>;

			altr,sysmgr-syscon = <&sysmgr 0x48 8>;

			status = "disabled";

		};
@@ -143,6 +145,7 @@ gmac2: ethernet@ff804000 { 
			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 3>;

			altr,sysmgr-syscon = <&sysmgr 0x4c 16>;

			status = "disabled";

		};
@@ -249,6 +252,18 @@ mmc: dwmmc0@ff808000 { 
			status = "disabled";

		};



		nand: nand@ffb90000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "altr,socfpga-denali-nand";

			reg = <0xffb90000 0x10000>,

			      <0xffb80000 0x1000>;

			reg-names = "nand_data", "denali_reg";

			interrupts = <0 97 4>;

			resets = <&rst NAND_RESET>, <&rst NAND_OCP_RESET>;

			status = "disabled";

		};



		ocram: sram@ffe00000 {

			compatible = "mmio-sram";

			reg = <0xffe00000 0x40000>;
@@ -325,7 +340,7 @@ spi1: spi@ffda5000 { 
		};



		sysmgr: sysmgr@ffd12000 {

			compatible = "altr,sys-mgr", "syscon";

			compatible = "altr,sys-mgr-s10","altr,sys-mgr";

			reg = <0xffd12000 0x500>;

		};
@@ -449,6 +464,65 @@ sdr: sdr@f8011100 { 
			reg = <0xf8011100 0xc0>;

		};



		eccmgr {

			compatible = "altr,socfpga-s10-ecc-manager",

				     "altr,socfpga-a10-ecc-manager";

			altr,sysmgr-syscon = <&sysmgr>;

			#address-cells = <1>;

			#size-cells = <1>;

			interrupts = <0 15 4>;

			interrupt-controller;

			#interrupt-cells = <2>;

			ranges;



			sdramedac {

				compatible = "altr,sdram-edac-s10";

				altr,sdr-syscon = <&sdr>;

				interrupts = <16 4>;

			};



			ocram-ecc@ff8cc000 {

				compatible = "altr,socfpga-s10-ocram-ecc",

					     "altr,socfpga-a10-ocram-ecc";

				reg = <0xff8cc000 0x100>;

				altr,ecc-parent = <&ocram>;

				interrupts = <1 4>;

			};



			usb0-ecc@ff8c4000 {

				compatible = "altr,socfpga-s10-usb-ecc",

					     "altr,socfpga-usb-ecc";

				reg = <0xff8c4000 0x100>;

				altr,ecc-parent = <&usb0>;

				interrupts = <2 4>;

			};



			emac0-rx-ecc@ff8c0000 {

				compatible = "altr,socfpga-s10-eth-mac-ecc",

					     "altr,socfpga-eth-mac-ecc";

				reg = <0xff8c0000 0x100>;

				altr,ecc-parent = <&gmac0>;

				interrupts = <4 4>;

			};



			emac0-tx-ecc@ff8c0400 {

				compatible = "altr,socfpga-s10-eth-mac-ecc",

					     "altr,socfpga-eth-mac-ecc";

				reg = <0xff8c0400 0x100>;

				altr,ecc-parent = <&gmac0>;

				interrupts = <5 4>;

			};



			sdmmca-ecc@ff8c8c00 {

				compatible = "altr,socfpga-s10-sdmmc-ecc",

					     "altr,socfpga-sdmmc-ecc";

				reg = <0xff8c8c00 0x100>;

				altr,ecc-parent = <&mmc>;

				interrupts = <14 4>,

					     <15 4>;

			};

		};



		qspi: spi@ff8d2000 {

			compatible = "cdns,qspi-nor";

			#address-cells = <1>;

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

0 → 100644
+135 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier:     GPL-2.0

/*

 * Copyright (C) 2019, Intel Corporation

 */

#include "socfpga_agilex.dtsi"



/ {

	model = "SoCFPGA Agilex SoCDK";



	aliases {

		serial0 = &uart0;

		ethernet0 = &gmac0;

		ethernet1 = &gmac1;

		ethernet2 = &gmac2;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	leds {

		compatible = "gpio-leds";

		hps0 {

			label = "hps_led0";

			gpios = <&portb 20 GPIO_ACTIVE_HIGH>;

		};



		hps1 {

			label = "hps_led1";

			gpios = <&portb 19 GPIO_ACTIVE_HIGH>;

		};



		hps2 {

			label = "hps_led2";

			gpios = <&portb 21 GPIO_ACTIVE_HIGH>;

		};

	};



	memory {

		device_type = "memory";

		/* We expect the bootloader to fill in the reg */

		reg = <0 0 0 0>;

	};



	soc {

		clocks {

			osc1 {

				clock-frequency = <25000000>;

			};

		};

	};

};



&gpio1 {

	status = "okay";

};



&gmac2 {

	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 */

		};

	};

};



&nand {

	status = "okay";



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0>;

		nand-bus-width = <16>;



		partition@0 {

			label = "u-boot";

			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>;

		};

	};

};



&uart0 {

	status = "okay";

};



&usb0 {

	status = "okay";

	disable-over-current;

};



&watchdog0 {

	status = "okay";

};