diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-02 16:37:53 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-02 16:37:53 +0100 |
| commit | d29d30782acd9266c0afed08cb8f40a95e4f2212 (patch) | |
| tree | 36ebf8775d0a5de4dec2ec369a99b59c46ceefdd | |
| parent | Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/k... (diff) | |
| parent | arm64: dts: stratix10: fix interrupt number for gpio1 (diff) | |
| download | linux-d29d30782acd9266c0afed08cb8f40a95e4f2212.tar.xz linux-d29d30782acd9266c0afed08cb8f40a95e4f2212.zip | |
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
| -rw-r--r-- | arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi index 6804936f2459..7c9bdc7ab50b 100644 --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi @@ -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>; }; }; diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts index 46f27edaa08e..a37c46112876 100644 --- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts @@ -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"; |