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

Commit 90656b84 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_dts_for_v4.4' of... 

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

Merge "SoCFPGA DTS updates for v4.4" from Dinh Nguyen:
- Add base arm64 dts for Statrix 10
- Peripheral updates for Arria10(USB,I2C,UART)

* tag 'socfpga_dts_for_v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: Add base stratix 10 dtsi
  ARM: socfpga: dts: enable USB and I2C on Arria10 SoCDK
  ARM: socfpga: dts: add clock fields for I2C, UART and USB on Arria10
parents b8faca6a 78cd6a9d

arch/arm/boot/dts/socfpga_arria10.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ 
			compatible = "snps,designware-i2c";

			reg = <0xffc02200 0x100>;

			interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&l4_sp_clk>;

			status = "disabled";

		};
@@ -528,6 +529,7 @@ 
			compatible = "snps,designware-i2c";

			reg = <0xffc02300 0x100>;

			interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&l4_sp_clk>;

			status = "disabled";

		};
@@ -537,6 +539,7 @@ 
			compatible = "snps,designware-i2c";

			reg = <0xffc02400 0x100>;

			interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&l4_sp_clk>;

			status = "disabled";

		};
@@ -546,6 +549,7 @@ 
			compatible = "snps,designware-i2c";

			reg = <0xffc02500 0x100>;

			interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&l4_sp_clk>;

			status = "disabled";

		};
@@ -555,6 +559,7 @@ 
			compatible = "snps,designware-i2c";

			reg = <0xffc02600 0x100>;

			interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&l4_sp_clk>;

			status = "disabled";

		};
@@ -658,6 +663,7 @@ 
			interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;

			reg-shift = <2>;

			reg-io-width = <4>;

			clocks = <&l4_sp_clk>;

			status = "disabled";

		};
@@ -692,6 +698,8 @@ 
			compatible = "snps,dwc2";

			reg = <0xffb40000 0xffff>;

			interrupts = <0 96 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&usb_clk>;

			clock-names = "otg";

			phys = <&usbphy0>;

			phy-names = "usb2-phy";

			status = "disabled";

arch/arm/boot/dts/socfpga_arria10_socdk.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -70,6 +70,33 @@ 
	status = "okay";

};



&i2c1 {

	speed-mode = <0>;

	status = "okay";



	/*

	 * adjust the falling times to decrease the i2c frequency to 50Khz

	 * because the LCD module does not work at the standard 100Khz

	 */

	i2c-sda-falling-time-ns = <6000>;

	i2c-scl-falling-time-ns = <6000>;



	eeprom@51 {

		compatible = "atmel,24c32";

		reg = <0x51>;

		pagesize = <32>;

	};



	rtc@68 {

		compatible = "dallas,ds1339";

		reg = <0x68>;

	};

};



&uart1 {

	status = "okay";

};



&usb0 {

	status = "okay";

};

arch/arm64/Kconfig.platforms

+5 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ config ARCH_SEATTLE 
	help

	  This enables support for AMD Seattle SOC Family



config ARCH_STRATIX10

	bool "Altera's Stratix 10 SoCFPGA Family"

	help

	  This enables support for Altera's Stratix 10 SoCFPGA Family.



config ARCH_TEGRA

	bool "NVIDIA Tegra SoC Family"

	select ARCH_HAS_RESET_CONTROLLER

arch/arm64/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line 
dts-dirs += altera

dts-dirs += amd

dts-dirs += apm

dts-dirs += arm

arch/arm64/boot/dts/altera/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_STRATIX10) += socfpga_stratix10_socdk.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

clean-files	:= *.dtb