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

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

Merge tag 'socfpga_dts_for_v4.15_part2' of... 

Merge tag 'socfpga_dts_for_v4.15_part2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

Pull "SoCFPGA DTS updates for v4.15, part 2" from Dinh Nguyen:

- Stratix10 platform update
  - Enable GPIO and LEDs for Stratix10 devkit

* tag 'socfpga_dts_for_v4.15_part2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: stratix10: fix interrupt number for gpio1
  arm64: dts: stratix10: enable gpio and leds
  arm64: dts: stratix10: add gpio header
parents 18ea0db3 a067fb42

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


/dts-v1/;

#include <dt-bindings/reset/altr,rst-mgr-s10.h>

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



/ {

	compatible = "altr,socfpga-stratix10";
@@ -164,7 +165,7 @@ 
				reg = <0>;

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <0 110 4>;

				interrupts = <0 111 4>;

			};

		};

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

+22 −0
Original line number Diff line number Diff line
@@ -27,6 +27,24 @@ 
		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 */
@@ -34,6 +52,10 @@ 
	};

};



&gpio1 {

	status = "okay";

};



&gmac0 {

	status = "okay";

	phy-mode = "rgmii";