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

Commit 9a288ba7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_dts_for_v4.16' of... 

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

Pull "SoCFPGA DTS updates for v4.16" from Dinh Nguyen:
- Stratix10 platform updates
  - Fix SPI interrupt numbers
  - Enable USB
- Disable over-current for Arria10 devkit

* tag 'socfpga_dts_for_v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: stratix10: fix SPI settings
  ARM: dts: socfpga: add i2c reset signals
  arm64: dts: stratix10: add USB ECC reset bit
  arm64: dts: stratix10: enable USB on the devkit
  ARM: dts: socfpga: disable over-current for Arria10 USB devkit
parents 1585defa 889d1509

arch/arm/boot/dts/socfpga.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ 
			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc04000 0x1000>;

			resets = <&rst I2C0_RESET>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 158 0x4>;

			status = "disabled";
@@ -661,6 +662,7 @@ 
			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc05000 0x1000>;

			resets = <&rst I2C1_RESET>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 159 0x4>;

			status = "disabled";
@@ -671,6 +673,7 @@ 
			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc06000 0x1000>;

			resets = <&rst I2C2_RESET>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 160 0x4>;

			status = "disabled";
@@ -681,6 +684,7 @@ 
			#size-cells = <0>;

			compatible = "snps,designware-i2c";

			reg = <0xffc07000 0x1000>;

			resets = <&rst I2C3_RESET>;

			clocks = <&l4_sp_clk>;

			interrupts = <0 161 0x4>;

			status = "disabled";

arch/arm/boot/dts/socfpga_arria10_socdk.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 


&usb0 {

	status = "okay";

	disable-over-current;

};



&watchdog1 {

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

+10 −6
Original line number Diff line number Diff line
@@ -248,7 +248,9 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xffda4000 0x1000>;

			interrupts = <0 101 4>;

			interrupts = <0 99 4>;

			resets = <&rst SPIM0_RESET>;

			reg-io-width = <4>;

			num-chipselect = <4>;

			bus-num = <0>;

			status = "disabled";
@@ -259,7 +261,9 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xffda5000 0x1000>;

			interrupts = <0 102 4>;

			interrupts = <0 100 4>;

			resets = <&rst SPIM1_RESET>;

			reg-io-width = <4>;

			num-chipselect = <4>;

			bus-num = <0>;

			status = "disabled";
@@ -335,8 +339,8 @@ 
			interrupts = <0 93 4>;

			phys = <&usbphy0>;

			phy-names = "usb2-phy";

			resets = <&rst USB0_RESET>;

			reset-names = "dwc2";

			resets = <&rst USB0_RESET>, <&rst USB0_OCP_RESET>;

			reset-names = "dwc2", "dwc2-ecc";

			status = "disabled";

		};
@@ -346,8 +350,8 @@ 
			interrupts = <0 94 4>;

			phys = <&usbphy0>;

			phy-names = "usb2-phy";

			resets = <&rst USB1_RESET>;

			reset-names = "dwc2";

			resets = <&rst USB1_RESET>, <&rst USB1_OCP_RESET>;

			reset-names = "dwc2", "dwc2-ecc";

			status = "disabled";

		};

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

+4 −0
Original line number Diff line number Diff line
@@ -97,3 +97,7 @@ 
&uart0 {

	status = "okay";

};



&usb0 {

	status = "okay";

};