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

Merge tag 'qcom-arm64-for-4.21-2' of... 

Merge tag 'qcom-arm64-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt

Qualcomm ARM64 Updates for v4.21 Part 2

* Switch to use dwc3-qcom glue driver on MSM8996
* Fix issue with xo clk name on MSM8998
* Add cooling maps on MSM8916
* Add UART nodes on SDM845
* Add camera subsystem support on MSM8996 and MSM8916

* tag 'qcom-arm64-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  arm64: dts: msm8996: Use dwc3-qcom glue driver for USB
  arm64: dts: qcom: msm8998: Fixup clock to use xo_board
  arm64: dts: qcom: sdm845: Add UART nodes
  arm64: dts: qcom: msm8996: Add CAMSS support
  arm64: dts: qcom: msm8996: Add VFE SMMU node
  arm64: dts: qcom: Add pinctrls for camera sensors
  arm64: dts: qcom: Add Camera Control Interface pinctrls
  arm64: dts: qcom: msm8916: Add CAMSS support
  arm64: dts: qcom: msm8916: Add IOMMU sub-node for VFE context bank
  arm64: dts: msm8916: Add all CPUs in cooling maps

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ee261c7e 1504b91c

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -385,8 +385,9 @@ 
			status = "okay";

		};



		usb@6a00000 {

		usb@6af8800 {

			status = "okay";

			extcon = <&usb3_id>;



			dwc3@6a00000 {

				extcon = <&usb3_id>;
@@ -401,8 +402,9 @@ 
			pinctrl-0 = <&usb3_vbus_det_gpio>;

		};



		usb@7600000 {

		usb@76f8800 {

			status = "okay";

			extcon = <&usb2_id>;



			dwc3@7600000 {

				extcon = <&usb2_id>;

arch/arm64/boot/dts/qcom/msm8916-pins.dtsi

+76 −0
Original line number Diff line number Diff line
@@ -689,4 +689,80 @@ 
			bias-pull-up;

		};

	};



	cci0_default: cci0_default {

		pinmux {

			function = "cci_i2c";

			pins = "gpio29", "gpio30";

		};

		pinconf {

			pins = "gpio29", "gpio30";

			drive-strength = <16>;

			bias-disable;

		};

	};



	camera_front_default: camera_front_default {

		pinmux_pwdn {

			function = "gpio";

			pins = "gpio33";

		};

		pinconf_pwdn {

			pins = "gpio33";

			drive-strength = <16>;

			bias-disable;

		};



		pinmux_rst {

			function = "gpio";

			pins = "gpio28";

		};

		pinconf_rst {

			pins = "gpio28";

			drive-strength = <16>;

			bias-disable;

		};



		pinmux_mclk1 {

			function = "cam_mclk1";

			pins = "gpio27";

		};

		pinconf_mclk1 {

			pins = "gpio27";

			drive-strength = <16>;

			bias-disable;

		};

	};



	camera_rear_default: camera_rear_default {

		pinmux_pwdn {

			function = "gpio";

			pins = "gpio34";

		};

		pinconf_pwdn {

			pins = "gpio34";

			drive-strength = <16>;

			bias-disable;

		};



		 pinmux_rst {

			function = "gpio";

			pins = "gpio35";

		};

		pinconf_rst {

			pins = "gpio35";

			drive-strength = <16>;

			bias-disable;

		};



		pinmux_mclk0 {

			function = "cam_mclk0";

			pins = "gpio26";

		};

		pinconf_mclk0 {

			pins = "gpio26";

			drive-strength = <16>;

			bias-disable;

		};

	};

};

arch/arm64/boot/dts/qcom/msm8916.dtsi

+95 −2
Original line number Diff line number Diff line
@@ -202,7 +202,10 @@ 
			cooling-maps {

				map0 {

					trip = <&cpu_alert0>;

					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							 <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

				};

			};

		};
@@ -229,7 +232,10 @@ 
			cooling-maps {

				map0 {

					trip = <&cpu_alert1>;

					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,

							 <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

				};

			};

		};
@@ -821,6 +827,13 @@ 
			clock-names = "iface", "bus";

			qcom,iommu-secure-id = <17>;



			// vfe:

			iommu-ctx@3000 {

				compatible = "qcom,msm-iommu-v1-sec";

				reg = <0x3000 0x1000>;

				interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

			};



			// mdp_0:

			iommu-ctx@4000 {

				compatible = "qcom,msm-iommu-v1-ns";
@@ -1432,6 +1445,86 @@ 
				compatible = "venus-encoder";

			};

		};



		camss: camss@1b00000 {

			compatible = "qcom,msm8916-camss";

			reg = <0x1b0ac00 0x200>,

				<0x1b00030 0x4>,

				<0x1b0b000 0x200>,

				<0x1b00038 0x4>,

				<0x1b08000 0x100>,

				<0x1b08400 0x100>,

				<0x1b0a000 0x500>,

				<0x1b00020 0x10>,

				<0x1b10000 0x1000>;

			reg-names = "csiphy0",

				"csiphy0_clk_mux",

				"csiphy1",

				"csiphy1_clk_mux",

				"csid0",

				"csid1",

				"ispif",

				"csi_clk_mux",

				"vfe0";

			interrupts = <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>,

				<GIC_SPI 79 IRQ_TYPE_EDGE_RISING>,

				<GIC_SPI 51 IRQ_TYPE_EDGE_RISING>,

				<GIC_SPI 52 IRQ_TYPE_EDGE_RISING>,

				<GIC_SPI 55 IRQ_TYPE_EDGE_RISING>,

				<GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "csiphy0",

				"csiphy1",

				"csid0",

				"csid1",

				"ispif",

				"vfe0";

			power-domains = <&gcc VFE_GDSC>;

			clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,

				<&gcc GCC_CAMSS_ISPIF_AHB_CLK>,

				<&gcc GCC_CAMSS_CSI0PHYTIMER_CLK>,

				<&gcc GCC_CAMSS_CSI1PHYTIMER_CLK>,

				<&gcc GCC_CAMSS_CSI0_AHB_CLK>,

				<&gcc GCC_CAMSS_CSI0_CLK>,

				<&gcc GCC_CAMSS_CSI0PHY_CLK>,

				<&gcc GCC_CAMSS_CSI0PIX_CLK>,

				<&gcc GCC_CAMSS_CSI0RDI_CLK>,

				<&gcc GCC_CAMSS_CSI1_AHB_CLK>,

				<&gcc GCC_CAMSS_CSI1_CLK>,

				<&gcc GCC_CAMSS_CSI1PHY_CLK>,

				<&gcc GCC_CAMSS_CSI1PIX_CLK>,

				<&gcc GCC_CAMSS_CSI1RDI_CLK>,

				<&gcc GCC_CAMSS_AHB_CLK>,

				<&gcc GCC_CAMSS_VFE0_CLK>,

				<&gcc GCC_CAMSS_CSI_VFE0_CLK>,

				<&gcc GCC_CAMSS_VFE_AHB_CLK>,

				<&gcc GCC_CAMSS_VFE_AXI_CLK>;

			clock-names = "top_ahb",

				"ispif_ahb",

				"csiphy0_timer",

				"csiphy1_timer",

				"csi0_ahb",

				"csi0",

				"csi0_phy",

				"csi0_pix",

				"csi0_rdi",

				"csi1_ahb",

				"csi1",

				"csi1_phy",

				"csi1_pix",

				"csi1_rdi",

				"ahb",

				"vfe0",

				"csi_vfe0",

				"vfe_ahb",

				"vfe_axi";

			vdda-supply = <&pm8916_l2>;

			iommus = <&apps_iommu 3>;

			status = "disabled";

			ports {

				#address-cells = <1>;

				#size-cells = <0>;

			};

		};

	};



	smd {

arch/arm64/boot/dts/qcom/msm8996-pins.dtsi

+120 −0
Original line number Diff line number Diff line
@@ -495,4 +495,124 @@ 
			bias-disable;

		};

	};



	cci0_default: cci0_default {

		pinmux {

			function = "cci_i2c";

			pins = "gpio17", "gpio18";

		};

		pinconf {

			pins = "gpio17", "gpio18";

			drive-strength = <16>;

			bias-disable;

		};

	};



	cci1_default: cci1_default {

		pinmux {

			function = "cci_i2c";

			pins = "gpio19", "gpio20";

		};

		pinconf {

			pins = "gpio19", "gpio20";

			drive-strength = <16>;

			bias-disable;

		};

	};



	camera_board_default: camera_board_default {

		mux_pwdn {

			function = "gpio";

			pins = "gpio98";

		};

		config_pwdn {

			pins = "gpio98";

			drive-strength = <16>;

			bias-disable;

		};



		mux_rst {

			function = "gpio";

			pins = "gpio104";

		};

		config_rst {

			pins = "gpio104";

			drive-strength = <16>;

			bias-disable;

		};



		mux_mclk1 {

			function = "cam_mclk";

			pins = "gpio14";

		};

		config_mclk1 {

			pins = "gpio14";

			drive-strength = <16>;

			bias-disable;

		};

	};



	camera_front_default: camera_front_default {

		mux_pwdn {

			function = "gpio";

			pins = "gpio133";

		};

		config_pwdn {

			pins = "gpio133";

			drive-strength = <16>;

			bias-disable;

		};



		mux_rst {

			function = "gpio";

			pins = "gpio23";

		};

		config_rst {

			pins = "gpio23";

			drive-strength = <16>;

			bias-disable;

		};



		mux_mclk2 {

			function = "cam_mclk";

			pins = "gpio15";

		};

		config_mclk2 {

			pins = "gpio15";

			drive-strength = <16>;

			bias-disable;

		};

	};



	camera_rear_default: camera_rear_default {

		mux_pwdn {

			function = "gpio";

			pins = "gpio26";

		};

		config_pwdn {

			pins = "gpio26";

			drive-strength = <16>;

			bias-disable;

		};



		mux_rst {

			function = "gpio";

			pins = "gpio25";

		};

		config_rst {

			pins = "gpio25";

			drive-strength = <16>;

			bias-disable;

		};



		mux_mclk0 {

			function = "cam_mclk";

			pins = "gpio13";

		};

		config_mclk0 {

			pins = "gpio13";

			drive-strength = <16>;

			bias-disable;

		};

	};

};

arch/arm64/boot/dts/qcom/msm8996.dtsi

+158 −4
Original line number Diff line number Diff line
@@ -893,8 +893,9 @@ 
			status = "disabled";

		};



		usb2: usb@7600000 {

			compatible = "qcom,dwc3";

		usb2: usb@76f8800 {

			compatible = "qcom,msm8996-dwc3", "qcom,dwc3";

			reg = <0x76f8800 0x400>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;
@@ -921,8 +922,9 @@ 
			};

		};



		usb3: usb@6a00000 {

			compatible = "qcom,dwc3";

		usb3: usb@6af8800 {

			compatible = "qcom,msm8996-dwc3", "qcom,dwc3";

			reg = <0x6af8800 0x400>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;
@@ -950,6 +952,158 @@ 
			};

		};



		vfe_smmu: arm,smmu@da0000 {

			compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2";

			reg = <0xda0000 0x10000>;



			#global-interrupts = <1>;

			interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>;

			power-domains = <&mmcc MMAGIC_CAMSS_GDSC>;

			clocks = <&mmcc SMMU_VFE_AHB_CLK>,

				 <&mmcc SMMU_VFE_AXI_CLK>;

			clock-names = "iface",

				      "bus";

			#iommu-cells = <1>;

			status = "ok";

		};



		camss: camss@a00000 {

			compatible = "qcom,msm8996-camss";

			reg = <0xa34000 0x1000>,

				<0xa00030 0x4>,

				<0xa35000 0x1000>,

				<0xa00038 0x4>,

				<0xa36000 0x1000>,

				<0xa00040 0x4>,

				<0xa30000 0x100>,

				<0xa30400 0x100>,

				<0xa30800 0x100>,

				<0xa30c00 0x100>,

				<0xa31000 0x500>,

				<0xa00020 0x10>,

				<0xa10000 0x1000>,

				<0xa14000 0x1000>;

			reg-names = "csiphy0",

				"csiphy0_clk_mux",

				"csiphy1",

				"csiphy1_clk_mux",

				"csiphy2",

				"csiphy2_clk_mux",

				"csid0",

				"csid1",

				"csid2",

				"csid3",

				"ispif",

				"csi_clk_mux",

				"vfe0",

				"vfe1";

			interrupts = <GIC_SPI 78 0>,

				<GIC_SPI 79 0>,

				<GIC_SPI 80 0>,

				<GIC_SPI 296 0>,

				<GIC_SPI 297 0>,

				<GIC_SPI 298 0>,

				<GIC_SPI 299 0>,

				<GIC_SPI 309 0>,

				<GIC_SPI 314 0>,

				<GIC_SPI 315 0>;

			interrupt-names = "csiphy0",

				"csiphy1",

				"csiphy2",

				"csid0",

				"csid1",

				"csid2",

				"csid3",

				"ispif",

				"vfe0",

				"vfe1";

			power-domains = <&mmcc VFE0_GDSC>;

			clocks = <&mmcc CAMSS_TOP_AHB_CLK>,

				<&mmcc CAMSS_ISPIF_AHB_CLK>,

				<&mmcc CAMSS_CSI0PHYTIMER_CLK>,

				<&mmcc CAMSS_CSI1PHYTIMER_CLK>,

				<&mmcc CAMSS_CSI2PHYTIMER_CLK>,

				<&mmcc CAMSS_CSI0_AHB_CLK>,

				<&mmcc CAMSS_CSI0_CLK>,

				<&mmcc CAMSS_CSI0PHY_CLK>,

				<&mmcc CAMSS_CSI0PIX_CLK>,

				<&mmcc CAMSS_CSI0RDI_CLK>,

				<&mmcc CAMSS_CSI1_AHB_CLK>,

				<&mmcc CAMSS_CSI1_CLK>,

				<&mmcc CAMSS_CSI1PHY_CLK>,

				<&mmcc CAMSS_CSI1PIX_CLK>,

				<&mmcc CAMSS_CSI1RDI_CLK>,

				<&mmcc CAMSS_CSI2_AHB_CLK>,

				<&mmcc CAMSS_CSI2_CLK>,

				<&mmcc CAMSS_CSI2PHY_CLK>,

				<&mmcc CAMSS_CSI2PIX_CLK>,

				<&mmcc CAMSS_CSI2RDI_CLK>,

				<&mmcc CAMSS_CSI3_AHB_CLK>,

				<&mmcc CAMSS_CSI3_CLK>,

				<&mmcc CAMSS_CSI3PHY_CLK>,

				<&mmcc CAMSS_CSI3PIX_CLK>,

				<&mmcc CAMSS_CSI3RDI_CLK>,

				<&mmcc CAMSS_AHB_CLK>,

				<&mmcc CAMSS_VFE0_CLK>,

				<&mmcc CAMSS_CSI_VFE0_CLK>,

				<&mmcc CAMSS_VFE0_AHB_CLK>,

				<&mmcc CAMSS_VFE0_STREAM_CLK>,

				<&mmcc CAMSS_VFE1_CLK>,

				<&mmcc CAMSS_CSI_VFE1_CLK>,

				<&mmcc CAMSS_VFE1_AHB_CLK>,

				<&mmcc CAMSS_VFE1_STREAM_CLK>,

				<&mmcc CAMSS_VFE_AHB_CLK>,

				<&mmcc CAMSS_VFE_AXI_CLK>;

			clock-names = "top_ahb",

				"ispif_ahb",

				"csiphy0_timer",

				"csiphy1_timer",

				"csiphy2_timer",

				"csi0_ahb",

				"csi0",

				"csi0_phy",

				"csi0_pix",

				"csi0_rdi",

				"csi1_ahb",

				"csi1",

				"csi1_phy",

				"csi1_pix",

				"csi1_rdi",

				"csi2_ahb",

				"csi2",

				"csi2_phy",

				"csi2_pix",

				"csi2_rdi",

				"csi3_ahb",

				"csi3",

				"csi3_phy",

				"csi3_pix",

				"csi3_rdi",

				"ahb",

				"vfe0",

				"csi_vfe0",

				"vfe0_ahb",

				"vfe0_stream",

				"vfe1",

				"csi_vfe1",

				"vfe1_ahb",

				"vfe1_stream",

				"vfe_ahb",

				"vfe_axi";

			vdda-supply = <&pm8994_l2>;

			iommus = <&vfe_smmu 0>,

				 <&vfe_smmu 1>,

				 <&vfe_smmu 2>,

				 <&vfe_smmu 3>;

			status = "disabled";

			ports {

				#address-cells = <1>;

				#size-cells = <0>;

			};

		};



		agnoc@0 {

			power-domains = <&gcc AGGRE0_NOC_GDSC>;

			compatible = "simple-pm-bus";

CRA Git | Maintained and supported by SUSTech CRA and CCSE