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

Commit 8ed58985 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-4.7-gm20b' of... 

Merge tag 'tegra-for-4.7-gm20b' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt64

Merge "arm64: tegra: Enable GM20B GPU on Tegra210" from Thierry Reding:

Complement the GM20B GPU device tree node on Tegra210 with missing
properties to make it usable.

* tag 'tegra-for-4.7-gm20b' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Add IOMMU node to GM20B on Tegra210
  arm64: tegra: Add reference clock to GM20B on Tegra210
  dt-bindings: Add documentation for GM20B GPU
  dt-bindings: gk20a: Document iommus property
  dt-bindings: gk20a: Fix typo in compatible name
parents 0378fe89 30f949bc

Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt

+32 −5
Original line number Diff line number Diff line 
NVIDIA GK20A Graphics Processing Unit

NVIDIA Tegra Graphics Processing Units



Required properties:

- compatible: "nvidia,<chip>-<gpu>"

- compatible: "nvidia,<gpu>"

  Currently recognized values:

  - nvidia,tegra124-gk20a

  - nvidia,gk20a

  - nvidia,gm20b

- reg: Physical base address and length of the controller's registers.

  Must contain two entries:

  - first entry for bar0
@@ -19,14 +20,20 @@ Required properties: 
- clock-names: Must include the following entries:

  - gpu

  - pwr

If the compatible string is "nvidia,gm20b", then the following clock

is also required:

  - ref

- resets: Must contain an entry for each entry in reset-names.

  See ../reset/reset.txt for details.

- reset-names: Must include the following entries:

  - gpu



Example:

Optional properties:

- iommus: A reference to the IOMMU. See ../iommu/iommu.txt for details.



	gpu@0,57000000 {

Example for GK20A:



	gpu@57000000 {

		compatible = "nvidia,gk20a";

		reg = <0x0 0x57000000 0x0 0x01000000>,

		      <0x0 0x58000000 0x0 0x01000000>;
@@ -39,5 +46,25 @@ Example: 
		clock-names = "gpu", "pwr";

		resets = <&tegra_car 184>;

		reset-names = "gpu";

		iommus = <&mc TEGRA_SWGROUP_GPU>;

		status = "disabled";

	};



Example for GM20B:



	gpu@57000000 {

		compatible = "nvidia,gm20b";

		reg = <0x0 0x57000000 0x0 0x01000000>,

		      <0x0 0x58000000 0x0 0x01000000>;

		interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "stall", "nonstall";

		clocks = <&tegra_car TEGRA210_CLK_GPU>,

			 <&tegra_car TEGRA210_CLK_PLL_P_OUT5>,

			 <&tegra_car TEGRA210_CLK_PLL_G_REF>;

		clock-names = "gpu", "pwr", "ref";

		resets = <&tegra_car 184>;

		reset-names = "gpu";

		iommus = <&mc TEGRA_SWGROUP_GPU>;

		status = "disabled";

	};

arch/arm64/boot/dts/nvidia/tegra210.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -226,10 +226,14 @@ 
			     <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "stall", "nonstall";

		clocks = <&tegra_car TEGRA210_CLK_GPU>,

			 <&tegra_car TEGRA210_CLK_PLL_P_OUT5>;

		clock-names = "gpu", "pwr";

			 <&tegra_car TEGRA210_CLK_PLL_P_OUT5>,

			 <&tegra_car TEGRA210_CLK_PLL_G_REF>;

		clock-names = "gpu", "pwr", "ref";

		resets = <&tegra_car 184>;

		reset-names = "gpu";



		iommus = <&mc TEGRA_SWGROUP_GPU>;



		status = "disabled";

	};