Commit 97fc172d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-arm64-for-5.2-1' of... 

Merge tag 'qcom-arm64-for-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/dt

Qualcomm ARM64 Updates for v5.2 - Part 2

* Add ADC temp for temp alarm node on PM8998
* Add ref clks for DSI PHYs on SDM845 and MSM8916
* Add CPU capacity and topology on SDM845
* Add display and gpu related nodes on MSM8996
* Add sound and hdmi display support on DB820C
* Fixup thermal nodes on MSM8998 platform

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

:
  arm64: dts: msm8998: thermal: Restrict thermal zone name length to under 20
  arm64: dts: msm8998: thermal: Fix number of supported sensors
  arm64: dts: msm8998-mtp: thermal: Remove skin and battery thermal zones
  arm64: dts: db820c: Add sound card support
  arm64: dts: apq8096-db820c: Add HDMI display support
  arm64: dts: Add Adreno GPU definitions
  arm64: qcom: msm8996.dtsi: Add Display nodes
  arm64: dts: msm8996: Add display smmu node
  arm64: dts: msm8996: Add graphics smmu node
  arm64: dts: sdm845: Add CPU capacity values
  arm64: dts: sdm845: Add CPU topology
  arm64: dts: sdm845: Set 'bi_tcxo' as ref clock of the DSI PHYs
  arm64: dts: qcom: msm8916: Set 'xo_board' as ref clock of the DSI PHY
  arm64: dts: qcom: pm8998: Use ADC temperature to temp-alarm node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 366dd293 060f4211

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

+52 −0
Original line number Diff line number Diff line
@@ -62,4 +62,56 @@ 
			bias-disable;

		};

	};



	hdmi_hpd_active: hdmi_hpd_active {

		mux {

			pins = "gpio34";

			function = "hdmi_hot";

		};



		config {

			pins = "gpio34";

			bias-pull-down;

			drive-strength = <16>;

		};

	};



	hdmi_hpd_suspend: hdmi_hpd_suspend {

		mux {

			pins = "gpio34";

			function = "hdmi_hot";

		};



		config {

			pins = "gpio34";

			bias-pull-down;

			drive-strength = <2>;

		};

	};



	hdmi_ddc_active: hdmi_ddc_active {

		mux {

			pins = "gpio32", "gpio33";

			function = "hdmi_ddc";

		};



		config {

			pins = "gpio32", "gpio33";

			drive-strength = <2>;

			bias-pull-up;

		};

	};



	hdmi_ddc_suspend: hdmi_ddc_suspend {

		mux {

			pins = "gpio32", "gpio33";

			function = "hdmi_ddc";

		};



		config {

			pins = "gpio32", "gpio33";

			drive-strength = <2>;

			bias-pull-down;

		};

	};

};

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

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ 
		};

	};



	audio_mclk: clk_div1 {

		pinconf {

			pins = "gpio15";

			function = "func1";

			power-source = <PM8994_GPIO_S4>; // 1.8V

		};

	};



	volume_up_gpio: pm8996_gpio2 {

		pinconf {

			pins = "gpio2";

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

+121 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include "apq8096-db820c-pmic-pins.dtsi"

#include <dt-bindings/input/input.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/sound/qcom,q6afe.h>

#include <dt-bindings/sound/qcom,q6asm.h>



/*

 * GPIO name legend: proper name = the GPIO line is used as GPIO
@@ -63,6 +65,7 @@ 
	};



	clocks {

		compatible = "simple-bus";

		divclk4: divclk4 {

			compatible = "fixed-clock";

			#clock-cells = <0>;
@@ -72,6 +75,15 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&divclk4_pin_a>;

		};



		div1_mclk: divclk1 {

			compatible = "gpio-gate-clock";

			pinctrl-0 = <&audio_mclk>;

			pinctrl-names = "default";

			clocks = <&rpmcc RPM_SMD_DIV_CLK1>;

			#clock-cells = <0>;

			enable-gpios = <&pm8994_gpios 15 0>;

		};

	};



	soc {
@@ -452,6 +464,43 @@ 
				perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>;

			};

		};



		slim_msm: slim@91c0000 {

			ngd@1 {

				wcd9335: codec@1{

					clock-names = "mclk", "slimbus";

					clocks = <&div1_mclk>,

						 <&rpmcc RPM_SMD_BB_CLK1>;

				};

			};

		};



		mdss@900000 {

			status = "okay";



			mdp@901000 {

				status = "okay";

			};



			hdmi-phy@9a0600 {

				status = "okay";



				vddio-supply = <&pm8994_l12>;

				vcca-supply = <&pm8994_l28>;

				#phy-cells = <0>;

			};



			hdmi-tx@9a0000 {

				status = "okay";



				pinctrl-names = "default", "sleep";

				pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;

				pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;



				core-vdda-supply = <&pm8994_l12>;

				core-vcc-supply = <&pm8994_s4>;

			};

		};

	};
@@ -639,3 +688,75 @@ 
		};

	};

};



&sound {

	compatible = "qcom,apq8096-sndcard";

	model = "DB820c";

	audio-routing =	"RX_BIAS", "MCLK";



	mm1-dai-link {

		link-name = "MultiMedia1";

		cpu {

			sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA1>;

		};

	};



	mm2-dai-link {

		link-name = "MultiMedia2";

		cpu {

			sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA2>;

		};

	};



	mm3-dai-link {

		link-name = "MultiMedia3";

		cpu {

			sound-dai = <&q6asmdai  MSM_FRONTEND_DAI_MULTIMEDIA3>;

		};

	};



	hdmi-dai-link {

		link-name = "HDMI";

		cpu {

			sound-dai = <&q6afedai HDMI_RX>;

		};



		platform {

			sound-dai = <&q6routing>;

		};



		codec {

			sound-dai = <&hdmi 0>;

		};

	};



	slim-dai-link {

		link-name = "SLIM Playback";

		cpu {

			sound-dai = <&q6afedai SLIMBUS_6_RX>;

		};



		platform {

			sound-dai = <&q6routing>;

	};



		codec {

			sound-dai = <&wcd9335 6>;

		};

	};



	slimcap-dai-link {

		link-name = "SLIM Capture";

		cpu {

			sound-dai = <&q6afedai SLIMBUS_0_TX>;

		};



		platform {

			sound-dai = <&q6routing>;

		};



		codec {

			sound-dai = <&wcd9335 1>;

		};

	};

};

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

+3 −2
Original line number Diff line number Diff line
@@ -1024,8 +1024,9 @@ 
				#clock-cells = <1>;

				#phy-cells = <0>;



				clocks = <&gcc GCC_MDSS_AHB_CLK>;

				clock-names = "iface";

				clocks = <&gcc GCC_MDSS_AHB_CLK>,

					 <&xo_board>;

				clock-names = "iface", "ref";

			};

		};

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

+43 −0
Original line number Diff line number Diff line
@@ -13,6 +13,49 @@ 


&msmgpio {



	wcd9xxx_intr {

		wcd_intr_default: wcd_intr_default{

			mux {

				pins = "gpio54";

				function = "gpio";

			};



			config {

				pins = "gpio54";

				drive-strength = <2>; /* 2 mA */

				bias-pull-down; /* pull down */

				input-enable;

			};

		};

	};



	cdc_reset_ctrl {

		cdc_reset_sleep: cdc_reset_sleep {

			mux {

				pins = "gpio64";

				function = "gpio";

			};

			config {

				pins = "gpio64";

				drive-strength = <16>;

				bias-disable;

				output-low;

			};

		};

		cdc_reset_active:cdc_reset_active {

			mux {

				pins = "gpio64";

				function = "gpio";

			};

			config {

				pins = "gpio64";

				drive-strength = <16>;

				bias-pull-down;

				output-high;

			};

		};

	};



	blsp1_spi0_default: blsp1_spi0_default {

		pinmux {

			function = "blsp_spi1";

CRA Git | Maintained and supported by SUSTech CRA and CCSE