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

Commit 392366c3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'gemini-v4.13-dts-2' of... 

Merge tag 'gemini-v4.13-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

Gemini DTS patches for v4.13, take 2:
- Add DMA controller
- Add PATA controller and SATA bridge

* tag 'gemini-v4.13-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik

:
  ARM: dts: add Gemini PATA/SATA support
  ARM: dts: Add Gemini DMA controller

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2a65ec81 0d7a2c35

arch/arm/boot/dts/gemini-nas4220b.dts

+10 −0
Original line number Diff line number Diff line
@@ -98,5 +98,15 @@ 
				read-only;

			};

		};



		sata: sata@46000000 {

			cortina,gemini-ata-muxmode = <0>;

			cortina,gemini-enable-sata-bridge;

			status = "okay";

		};



		ata@63000000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/gemini-sq201.dts

+10 −0
Original line number Diff line number Diff line
@@ -93,6 +93,12 @@ 
			};

		};



		sata: sata@46000000 {

			cortina,gemini-ata-muxmode = <0>;

			cortina,gemini-enable-sata-bridge;

			status = "okay";

		};



		pci@50000000 {

			status = "okay";

			interrupt-map-mask = <0xf800 0 0 7>;
@@ -114,5 +120,9 @@ 
				<0x6000 0 0 3 &pci_intc 1>,

				<0x6000 0 0 4 &pci_intc 2>;

		};



		ata@63000000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/gemini.dtsi

+52 −0
Original line number Diff line number Diff line
@@ -81,6 +81,19 @@ 
			clock-names = "PCLK", "EXTCLK";

		};



		sata: sata@46000000 {

			compatible = "cortina,gemini-sata-bridge";

			reg = <0x46000000 0x100>;

			resets = <&syscon 26>,

				 <&syscon 27>;

			reset-names = "sata0", "sata1";

			clocks = <&syscon 10>,

				 <&syscon 11>;

			clock-names = "SATA0_PCLK", "SATA1_PCLK";

			syscon = <&syscon>;

			status = "disabled";

		};



		intcon: interrupt-controller@48000000 {

			compatible = "faraday,ftintc010";

			reg = <0x48000000 0x1000>;
@@ -175,5 +188,44 @@ 
				#interrupt-cells = <1>;

			};

		};



		ata@63000000 {

			compatible = "cortina,gemini-pata", "faraday,ftide010";

			reg = <0x63000000 0x1000>;

			interrupts = <4 IRQ_TYPE_EDGE_RISING>;

			resets = <&syscon 2>;

			clocks = <&syscon 14>;

			clock-names = "PCLK";

			sata = <&sata>;

			status = "disabled";

		};



		ata@63400000 {

			compatible = "cortina,gemini-pata", "faraday,ftide010";

			reg = <0x63400000 0x1000>;

			interrupts = <5 IRQ_TYPE_EDGE_RISING>;

			resets = <&syscon 2>;

			clocks = <&syscon 14>;

			clock-names = "PCLK";

			sata = <&sata>;

			status = "disabled";

		};



		dma-controller@67000000 {

			compatible = "faraday,ftdma020", "arm,pl080", "arm,primecell";

			/* Faraday Technology FTDMAC020 variant */

			arm,primecell-periphid = <0x0003b080>;

			reg = <0x67000000 0x1000>;

			interrupts = <9 IRQ_TYPE_EDGE_RISING>;

			resets = <&syscon 10>;

			clocks = <&syscon 1>;

			clock-names = "apb_pclk";

			/* Bus interface AHB1 (AHB0) is totally tilted */

			lli-bus-interface-ahb2;

			mem-bus-interface-ahb2;

			memcpy-burst-size = <256>;

			memcpy-bus-width = <32>;

			#dma-cells = <2>;

		};

	};

};