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

Commit fe97068b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add kgsl smmu support for MSM8909w"

parents aaae1ba8 6aa9a864

arch/arm/configs/msm8909w-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ CONFIG_USB_BAM=y 
CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_QCOM_PM=y

CONFIG_MSM_SPM=y

CONFIG_MSM_L2_SPM=y
@@ -414,6 +415,7 @@ CONFIG_MSM_SMEM=y 
CONFIG_MSM_SMD=y

CONFIG_MSM_SMD_DEBUG=y

CONFIG_MSM_GLINK=y

CONFIG_MSM_TZ_SMMU=y

CONFIG_MSM_GLINK_LOOPBACK_SERVER=y

CONFIG_MSM_GLINK_SMEM_NATIVE_XPRT=y

CONFIG_MSM_GLINK_SPI_XPRT=y

arch/arm/configs/msm8909w_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ CONFIG_USB_BAM=y 
CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_LAZY_MAPPING=y

CONFIG_QCOM_PM=y

CONFIG_MSM_SPM=y

CONFIG_MSM_L2_SPM=y
@@ -414,6 +415,7 @@ CONFIG_MSM_SMEM=y 
CONFIG_MSM_SMD=y

CONFIG_MSM_SMD_DEBUG=y

CONFIG_MSM_GLINK=y

CONFIG_MSM_TZ_SMMU=y

CONFIG_MSM_GLINK_LOOPBACK_SERVER=y

CONFIG_MSM_GLINK_SMEM_NATIVE_XPRT=y

CONFIG_MSM_GLINK_SPI_XPRT=y

arch/arm64/boot/dts/qcom/msm-arm-smmu-8909.dtsi

+40 −0
Original line number Diff line number Diff line
@@ -16,6 +16,46 @@ 


&soc {



	kgsl_smmu: arm,smmu-kgsl@1f00000 {

		status = "ok";

		compatible = "qcom,qsmmu-v500";

		reg = <0x1f00000 0x10000>,

			<0x1ef2000 0x20>;

		reg-names = "base", "tcu-base";

		#iommu-cells = <1>;

		qcom,tz-device-id = "GPU";

		qcom,skip-init;

		qcom,dynamic;

		qcom,use-3-lvl-tables;

		#global-interrupts = <0>;

		#size-cells = <1>;

		#address-cells = <1>;

		ranges;

		interrupts =

			<GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>,

			<GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>,

			<GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>,

			<GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>;



		vdd-supply = <&gdsc_oxili_gx>;

		qcom,regulator-names = "vdd";

		clocks =

			<&clock_gcc clk_gcc_oxili_ahb_clk>,

			<&clock_gcc clk_gcc_bimc_gfx_clk>;

		clock-names = "gpu_ahb_clk", "gcc_bimc_gfx_clk";

	};



	/* A test device to test the SMMU operation */

	kgsl_iommu_test_device0 {

		status = "disabled";

		compatible = "iommu-debug-test";

		/*

		 * The SID should be valid one to get the proper

		 * SMR,S2CR indices.

		 */

		iommus = <&kgsl_smmu 0x0>;

	};



	apps_iommu: qcom,iommu@1e00000 {

		compatible = "qcom,qsmmu-v500";

		reg = <0x1e00000 0x40000>,