Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1940cbd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_dts_updates_for_v3.19' of... 

Merge tag 'socfpga_dts_updates_for_v3.19' of git://git.rocketboards.org/linux-socfpga-next into next/dt

Pull "SoCFPGA DTS updates for v3.19" from Dinh Nguyen:

- Add DTS support for a new chip in the SOCFPGA family, the Arria 10.
- Enable watchdog node.
- Add SPI nodes.
- Add the OCRAM node.

* tag 'socfpga_dts_updates_for_v3.19' of git://git.rocketboards.org/linux-socfpga-next

:
  arm: dts: socfpga: Add a base DTSI for Altera's Arria10 SOC
  arm: dts: socfpga: enable watchdog for socfpga platform
  arm: dts: socfpga: Add SPI nodes to SOCFPGA DT.
  arm: dts: socfpga: Add OCRAM node

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5ba3c24c 475dc86d

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ 
	r8a7791-koelsch.dtb \

	r8a7794-alt.dtb

dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \

	socfpga_arria10_socdk.dtb \

	socfpga_cyclone5_socdk.dtb \

	socfpga_cyclone5_sockit.dtb \

	socfpga_cyclone5_socrates.dtb \

arch/arm/boot/dts/socfpga.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -639,6 +639,33 @@ 
			clock-names = "biu", "ciu";

		};



		ocram: sram@ffff0000 {

			compatible = "mmio-sram";

			reg = <0xffff0000 0x10000>;

		};



		spi0: spi@fff00000 {

			compatible = "snps,dw-apb-ssi";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xfff00000 0x1000>;

			interrupts = <0 154 4>;

			num-cs = <4>;

			clocks = <&spi_m_clk>;

			status = "disabled";

		};



		spi1: spi@fff01000 {

			compatible = "snps,dw-apb-ssi";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xfff01000 0x1000>;

			interrupts = <0 156 4>;

			num-cs = <4>;

			clocks = <&spi_m_clk>;

			status = "disabled";

		};



		/* Local timer */

		timer@fffec600 {

			compatible = "arm,cortex-a9-twd-timer";

arch/arm/boot/dts/socfpga_arria10.dtsi

0 → 100644
+374 −0
Original line number Diff line number Diff line 
/*

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include "skeleton.dtsi"

#include <dt-bindings/interrupt-controller/arm-gic.h>



/ {

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		ethernet0 = &gmac0;

		ethernet1 = &gmac1;

		ethernet2 = &gmac2;

		serial0 = &uart0;

		serial1 = &uart1;

		timer0 = &timer0;

		timer1 = &timer1;

		timer2 = &timer2;

		timer3 = &timer3;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			compatible = "arm,cortex-a9";

			device_type = "cpu";

			reg = <0>;

			next-level-cache = <&L2>;

		};

		cpu@1 {

			compatible = "arm,cortex-a9";

			device_type = "cpu";

			reg = <1>;

			next-level-cache = <&L2>;

		};

	};



	intc: intc@ffffd000 {

		compatible = "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		interrupt-controller;

		reg = <0xffffd000 0x1000>,

		      <0xffffc100 0x100>;

	};



	soc {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "simple-bus";

		device_type = "soc";

		interrupt-parent = <&intc>;

		ranges;



		amba {

			compatible = "arm,amba-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			pdma: pdma@ffda1000 {

				compatible = "arm,pl330", "arm,primecell";

				reg = <0xffda1000 0x1000>;

				interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>,

					     <0 84 IRQ_TYPE_LEVEL_HIGH>,

					     <0 85 IRQ_TYPE_LEVEL_HIGH>,

					     <0 86 IRQ_TYPE_LEVEL_HIGH>,

					     <0 87 IRQ_TYPE_LEVEL_HIGH>,

					     <0 88 IRQ_TYPE_LEVEL_HIGH>,

					     <0 89 IRQ_TYPE_LEVEL_HIGH>,

					     <0 90 IRQ_TYPE_LEVEL_HIGH>;

				#dma-cells = <1>;

				#dma-channels = <8>;

				#dma-requests = <32>;

			};

		};



		clkmgr@ffd04000 {

				compatible = "altr,clk-mgr";

				reg = <0xffd04000 0x1000>;



				clocks {

					#address-cells = <1>;

					#size-cells = <0>;



					osc1: osc1 {

						#clock-cells = <0>;

						compatible = "fixed-clock";

					};



					main_pll: main_pll {

						#address-cells = <1>;

						#size-cells = <0>;

						#clock-cells = <0>;

						compatible = "altr,socfpga-pll-clock";

						clocks = <&osc1>;

					};



					periph_pll: periph_pll {

						#address-cells = <1>;

						#size-cells = <0>;

						#clock-cells = <0>;

						compatible = "altr,socfpga-pll-clock";

						clocks = <&osc1>;

					};

				};

		};



		gmac0: ethernet@ff800000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";

			reg = <0xff800000 0x2000>;

			interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			/* Filled in by bootloader */

			mac-address = [00 00 00 00 00 00];

			status = "disabled";

		};



		gmac1: ethernet@ff802000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";

		        reg = <0xff802000 0x2000>;

			interrupts = <0 93 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			/* Filled in by bootloader */

			mac-address = [00 00 00 00 00 00];

			status = "disabled";

		};



		gmac2: ethernet@ff804000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";

			reg = <0xff804000 0x2000>;

			interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			/* Filled in by bootloader */

			mac-address = [00 00 00 00 00 00];

			status = "disabled";

		};



		gpio0: gpio@ffc02900 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,dw-apb-gpio";

			reg = <0xffc02900 0x100>;

			status = "disabled";



			porta: gpio-controller@0 {

				compatible = "snps,dw-apb-gpio-port";

				gpio-controller;

				#gpio-cells = <2>;

				snps,nr-gpios = <29>;

				reg = <0>;

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <0 112 IRQ_TYPE_LEVEL_HIGH>;

			};

		};



		gpio1: gpio@ffc02a00 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,dw-apb-gpio";

			reg = <0xffc02a00 0x100>;

			status = "disabled";



			portb: gpio-controller@0 {

				compatible = "snps,dw-apb-gpio-port";

				gpio-controller;

				#gpio-cells = <2>;

				snps,nr-gpios = <29>;

				reg = <0>;

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <0 113 IRQ_TYPE_LEVEL_HIGH>;

			};

		};



		gpio2: gpio@ffc02b00 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,dw-apb-gpio";

			reg = <0xffc02b00 0x100>;

			status = "disabled";



			portc: gpio-controller@0 {

				compatible = "snps,dw-apb-gpio-port";

				gpio-controller;

				#gpio-cells = <2>;

				snps,nr-gpios = <27>;

				reg = <0>;

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <0 114 IRQ_TYPE_LEVEL_HIGH>;

			};

		};



		i2c0: i2c@ffc02200 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc02200 0x100>;

			interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		i2c1: i2c@ffc02300 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc02300 0x100>;

			interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		i2c2: i2c@ffc02400 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc02400 0x100>;

			interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		i2c3: i2c@ffc02500 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc02500 0x100>;

			interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		i2c4: i2c@ffc02600 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc02600 0x100>;

			interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		L2: l2-cache@fffff000 {

			compatible = "arm,pl310-cache";

			reg = <0xfffff000 0x1000>;

			interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;

			cache-unified;

			cache-level = <2>;

		};



		mmc: dwmmc0@ff808000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "altr,socfpga-dw-mshc";

			reg = <0xff808000 0x1000>;

			interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;

			fifo-depth = <0x400>;

		};



		ocram: sram@ffe00000 {

			compatible = "mmio-sram";

			reg = <0xffe00000 0x40000>;

		};



		rst: rstmgr@ffd05000 {

			#reset-cells = <1>;

			compatible = "altr,rst-mgr";

			reg = <0xffd05000 0x100>;

		};



		sysmgr: sysmgr@ffd06000 {

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

			reg = <0xffd06000 0x300>;

		};



		/* Local timer */

		timer@ffffc600 {

			compatible = "arm,cortex-a9-twd-timer";

			reg = <0xffffc600 0x100>;

			interrupts = <1 13 0xf04>;

		};



		timer0: timer0@ffc02700 {

			compatible = "snps,dw-apb-timer";

			interrupts = <0 115 IRQ_TYPE_LEVEL_HIGH>;

			reg = <0xffc02700 0x100>;

		};



		timer1: timer1@ffc02800 {

			compatible = "snps,dw-apb-timer";

			interrupts = <0 116 IRQ_TYPE_LEVEL_HIGH>;

			reg = <0xffc02800 0x100>;

		};



		timer2: timer2@ffd00000 {

			compatible = "snps,dw-apb-timer";

			interrupts = <0 117 IRQ_TYPE_LEVEL_HIGH>;

			reg = <0xffd00000 0x100>;

		};



		timer3: timer3@ffd00100 {

			compatible = "snps,dw-apb-timer";

			interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>;

			reg = <0xffd01000 0x100>;

		};



		uart0: serial0@ffc02000 {

			compatible = "snps,dw-apb-uart";

			reg = <0xffc02000 0x100>;

			interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;

			reg-shift = <2>;

			reg-io-width = <4>;

		};



		uart1: serial1@ffc02100 {

			compatible = "snps,dw-apb-uart";

			reg = <0xffc02100 0x100>;

			interrupts = <0 111 IRQ_TYPE_LEVEL_HIGH>;

			reg-shift = <2>;

			reg-io-width = <4>;

		};



		usbphy0: usbphy@0 {

			#phy-cells = <0>;

			compatible = "usb-nop-xceiv";

			status = "okay";

		};



		usb0: usb@ffb00000 {

			compatible = "snps,dwc2";

			reg = <0xffb00000 0xffff>;

			interrupts = <0 95 IRQ_TYPE_LEVEL_HIGH>;

			phys = <&usbphy0>;

			phy-names = "usb2-phy";

			status = "disabled";

		};



		usb1: usb@ffb40000 {

			compatible = "snps,dwc2";

			reg = <0xffb40000 0xffff>;

			interrupts = <0 96 IRQ_TYPE_LEVEL_HIGH>;

			phys = <&usbphy0>;

			phy-names = "usb2-phy";

			status = "disabled";

		};



		watchdog0: watchdog@ffd00200 {

			compatible = "snps,dw-wdt";

			reg = <0xffd00200 0x100>;

			interrupts = <0 119 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		watchdog1: watchdog@ffd00300 {

			compatible = "snps,dw-wdt";

			reg = <0xffd00300 0x100>;

			interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/socfpga_arria10_socdk.dts

0 → 100755
+48 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 Altera Corporation <www.altera.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



/dts-v1/;

#include "socfpga_arria10.dtsi"



/ {

	model = "Altera SOCFPGA Arria 10";

	compatible = "altr,socfpga-arria10", "altr,socfpga";



	chosen {

		bootargs = "console=ttyS0,115200 rootwait";

	};



	memory {

		name = "memory";

		device_type = "memory";

		reg = <0x0 0x40000000>; /* 1GB */

	};



	soc {

		clkmgr@ffd04000 {

			clocks {

				osc1 {

					clock-frequency = <25000000>;

				};

			};

		};



		serial0@ffc02000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/socfpga_cyclone5.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -49,3 +49,7 @@ 
		};

	};

};



&watchdog0 {

	status = "okay";

};