Commit cbd82259 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'juno-dt-4.10' of... 

Merge tag 'juno-dt-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt64

ARMv8 Vexpress/Juno DT updates for v4.10

1. Addition of SMMU(MMU-401) device nodes mainly to assist other
   developments and testing

2. Addition of CPU dmips/capacity information on all the Juno boards

* tag 'juno-dt-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux

:
  arm64: dts: juno: add cpu capacity-dmips-mhz information to R2 boards
  arm64: dts: juno: add cpu capacity-dmips-mhz information to R1 boards
  arm64: dts: juno: add cpu capacity-dmips-mhz information to R0 boards
  arm64: dts: juno: Add SMMUs device nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 07d9a380 c1ab65b2

arch/arm64/boot/dts/arm/juno-base.dtsi

+80 −0
Original line number Diff line number Diff line
@@ -29,6 +29,28 @@ 
		clock-names = "apb_pclk";

	};



	smmu_pcie: iommu@2b500000 {

		compatible = "arm,mmu-401", "arm,smmu-v1";

		reg = <0x0 0x2b500000 0x0 0x10000>;

		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

		#iommu-cells = <1>;

		#global-interrupts = <1>;

		dma-coherent;

		status = "disabled";

	};



	smmu_etr: iommu@2b600000 {

		compatible = "arm,mmu-401", "arm,smmu-v1";

		reg = <0x0 0x2b600000 0x0 0x10000>;

		interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

		#iommu-cells = <1>;

		#global-interrupts = <1>;

		dma-coherent;

		status = "disabled";

	};



	gic: interrupt-controller@2c010000 {

		compatible = "arm,gic-400", "arm,cortex-a15-gic";

		reg = <0x0 0x2c010000 0 0x1000>,
@@ -146,6 +168,7 @@ 
	etr@20070000 {

		compatible = "arm,coresight-tmc", "arm,primecell";

		reg = <0 0x20070000 0 0x1000>;

		iommus = <&smmu_etr 0>;



		clocks = <&soc_smc50mhz>;

		clock-names = "apb_pclk";
@@ -404,6 +427,8 @@ 
				<0 0 0 4 &gic 0 0 0 139 4>;

		msi-parent = <&v2m_0>;

		status = "disabled";

		iommu-map-mask = <0x0>;	/* RC has no means to output PCI RID */

		iommu-map = <0x0 &smmu_pcie 0x0 0x1>;

	};



	scpi {
@@ -484,6 +509,48 @@ 


	/include/ "juno-clocks.dtsi"



	smmu_dma: iommu@7fb00000 {

		compatible = "arm,mmu-401", "arm,smmu-v1";

		reg = <0x0 0x7fb00000 0x0 0x10000>;

		interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;

		#iommu-cells = <1>;

		#global-interrupts = <1>;

		dma-coherent;

		status = "disabled";

	};



	smmu_hdlcd1: iommu@7fb10000 {

		compatible = "arm,mmu-401", "arm,smmu-v1";

		reg = <0x0 0x7fb10000 0x0 0x10000>;

		interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;

		#iommu-cells = <1>;

		#global-interrupts = <1>;

		status = "disabled";

	};



	smmu_hdlcd0: iommu@7fb20000 {

		compatible = "arm,mmu-401", "arm,smmu-v1";

		reg = <0x0 0x7fb20000 0x0 0x10000>;

		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

		#iommu-cells = <1>;

		#global-interrupts = <1>;

		status = "disabled";

	};



	smmu_usb: iommu@7fb30000 {

		compatible = "arm,mmu-401", "arm,smmu-v1";

		reg = <0x0 0x7fb30000 0x0 0x10000>;

		interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;

		#iommu-cells = <1>;

		#global-interrupts = <1>;

		dma-coherent;

		status = "disabled";

	};



	dma@7ff00000 {

		compatible = "arm,pl330", "arm,primecell";

		reg = <0x0 0x7ff00000 0 0x1000>;
@@ -499,6 +566,15 @@ 
			     <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;

		iommus = <&smmu_dma 0>,

			 <&smmu_dma 1>,

			 <&smmu_dma 2>,

			 <&smmu_dma 3>,

			 <&smmu_dma 4>,

			 <&smmu_dma 5>,

			 <&smmu_dma 6>,

			 <&smmu_dma 7>,

			 <&smmu_dma 8>;

		clocks = <&soc_faxiclk>;

		clock-names = "apb_pclk";

	};
@@ -507,6 +583,7 @@ 
		compatible = "arm,hdlcd";

		reg = <0 0x7ff50000 0 0x1000>;

		interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;

		iommus = <&smmu_hdlcd1 0>;

		clocks = <&scpi_clk 3>;

		clock-names = "pxlclk";
@@ -521,6 +598,7 @@ 
		compatible = "arm,hdlcd";

		reg = <0 0x7ff60000 0 0x1000>;

		interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

		iommus = <&smmu_hdlcd0 0>;

		clocks = <&scpi_clk 3>;

		clock-names = "pxlclk";
@@ -574,6 +652,7 @@ 
		compatible = "generic-ohci";

		reg = <0x0 0x7ffb0000 0x0 0x10000>;

		interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;

		iommus = <&smmu_usb 0>;

		clocks = <&soc_usb48mhz>;

	};
@@ -581,6 +660,7 @@ 
		compatible = "generic-ehci";

		reg = <0x0 0x7ffc0000 0x0 0x10000>;

		interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

		iommus = <&smmu_usb 0>;

		clocks = <&soc_usb48mhz>;

	};

arch/arm64/boot/dts/arm/juno-r1.dts

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
			next-level-cache = <&A57_L2>;

			clocks = <&scpi_dvfs 0>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <1024>;

		};



		A57_1: cpu@1 {
@@ -100,6 +101,7 @@ 
			next-level-cache = <&A57_L2>;

			clocks = <&scpi_dvfs 0>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <1024>;

		};



		A53_0: cpu@100 {
@@ -110,6 +112,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <578>;

		};



		A53_1: cpu@101 {
@@ -120,6 +123,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <578>;

		};



		A53_2: cpu@102 {
@@ -130,6 +134,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <578>;

		};



		A53_3: cpu@103 {
@@ -140,6 +145,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <578>;

		};



		A57_L2: l2-cache0 {

arch/arm64/boot/dts/arm/juno-r2.dts

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
			next-level-cache = <&A72_L2>;

			clocks = <&scpi_dvfs 0>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <1024>;

		};



		A72_1: cpu@1 {
@@ -100,6 +101,7 @@ 
			next-level-cache = <&A72_L2>;

			clocks = <&scpi_dvfs 0>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <1024>;

		};



		A53_0: cpu@100 {
@@ -110,6 +112,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <485>;

		};



		A53_1: cpu@101 {
@@ -120,6 +123,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <485>;

		};



		A53_2: cpu@102 {
@@ -130,6 +134,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <485>;

		};



		A53_3: cpu@103 {
@@ -140,6 +145,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <485>;

		};



		A72_L2: l2-cache0 {

arch/arm64/boot/dts/arm/juno.dts

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
			next-level-cache = <&A57_L2>;

			clocks = <&scpi_dvfs 0>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <1024>;

		};



		A57_1: cpu@1 {
@@ -100,6 +101,7 @@ 
			next-level-cache = <&A57_L2>;

			clocks = <&scpi_dvfs 0>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <1024>;

		};



		A53_0: cpu@100 {
@@ -110,6 +112,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <578>;

		};



		A53_1: cpu@101 {
@@ -120,6 +123,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <578>;

		};



		A53_2: cpu@102 {
@@ -130,6 +134,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <578>;

		};



		A53_3: cpu@103 {
@@ -140,6 +145,7 @@ 
			next-level-cache = <&A53_L2>;

			clocks = <&scpi_dvfs 1>;

			cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;

			capacity-dmips-mhz = <578>;

		};



		A57_L2: l2-cache0 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE