Merge "ARM: dts: msm: add hdmi ctrl and pll nodes on QCS405" (ff0e7faa) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/qcs405-iot-sku4.dts

+15 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,21 @@

		#include "qcs405-mdss-panels.dtsi"

		&mdss_hdmi_tx {
		pinctrl-names = "hdmi_hpd_active", "hdmi_ddc_active", "hdmi_cec_active",
		"hdmi_active", "hdmi_sleep";
		pinctrl-0 = <&mdss_hdmi_5v_active &mdss_hdmi_hpd_active
		&mdss_hdmi_ddc_suspend &mdss_hdmi_cec_suspend>;
		pinctrl-1 = <&mdss_hdmi_5v_active &mdss_hdmi_hpd_active
		&mdss_hdmi_ddc_active &mdss_hdmi_cec_suspend>;
		pinctrl-2 = <&mdss_hdmi_5v_active &mdss_hdmi_hpd_active
		&mdss_hdmi_cec_active &mdss_hdmi_ddc_suspend>;
		pinctrl-3 = <&mdss_hdmi_5v_active &mdss_hdmi_hpd_active
		&mdss_hdmi_ddc_active &mdss_hdmi_cec_active>;
		pinctrl-4 = <&mdss_hdmi_5v_suspend &mdss_hdmi_hpd_suspend
		&mdss_hdmi_ddc_suspend &mdss_hdmi_cec_suspend>;
		};

		&mdss_mdp {
		qcom,mdss-pref-prim-intf = "dsi";
		};

arch/arm64/boot/dts/qcom/qcs405-mdss-pll.dtsi

+40 −0

Original line number	Diff line number	Diff line
		@@ -83,4 +83,44 @@
		};
		};
		};

		mdss_hdmi_pll: qcom,mdss_hdmi_pll@0x1aa0600 {
		compatible = "qcom,mdss_hdmi_pll_28lpm";
		label = "MDSS HDMI PLL";
		cell-index = <0>;
		#clock-cells = <1>;

		reg = <0x1aa0600 0x49c>,
		<0x0184d074 0x8>;
		reg-names = "pll_base", "gdsc_base";

		gdsc-supply = <&gdsc_mdss>;
		vddx-pll-supply = <&pms405_l5>;

		clocks = <&clock_gcc GCC_MDSS_AHB_CLK>;
		clock-names = "iface_clk";
		clock-rate = <0>;

		qcom,platform-supply-entries {
		#address-cells = <1>;
		#size-cells = <0>;

		qcom,platform-supply-entry@0 {
		reg = <0>;
		qcom,supply-name = "gdsc";
		qcom,supply-min-voltage = <0>;
		qcom,supply-max-voltage = <0>;
		qcom,supply-enable-load = <0>;
		qcom,supply-disable-load = <0>;
		};
		qcom,platform-supply-entry@1 {
		reg = <1>;
		qcom,supply-name = "vddx-pll";
		qcom,supply-min-voltage = <1800000>;
		qcom,supply-max-voltage = <1800000>;
		qcom,supply-enable-load = <14300>;
		qcom,supply-disable-load = <1>;
		};
		};
		};
		};

arch/arm64/boot/dts/qcom/qcs405-mdss.dtsi

+47 −5

Original line number	Diff line number	Diff line
		@@ -193,12 +193,13 @@
		compatible = "qcom,mdss-fb";
		};

		mdss_fb1: qcom,mdss_fb_wfd {
		mdss_fb1: qcom,mdss_fb_hdmi {
		cell-index = <1>;
		compatible = "qcom,mdss-fb";
		qcom,mdss-intf = <&mdss_hdmi_tx>;
		};

		mdss_fb2: qcom,mdss_fb_secondary {
		mdss_fb2: qcom,mdss_fb_wfd {
		cell-index = <2>;
		compatible = "qcom,mdss-fb";
		};
		@@ -242,8 +243,6 @@
		qcom,mmss-phyreset-ctrl-offset = <0x24>;

		qcom,mdss-fb-map-prim = <&mdss_fb0>;
		qcom,mdss-fb-map-sec = <&mdss_fb2>;
		/qcom,mdss-fb-map = <&mdss_fb0>;/
		qcom,core-supply-entries {
		#address-cells = <1>;
		#size-cells = <0>;
		@@ -322,11 +321,54 @@
		};
		};

		msm_ext_disp: qcom,msm_ext_disp {
		compatible = "qcom,msm-ext-disp";

		ext_disp_audio_codec: qcom,msm-ext-disp-audio-codec-rx {
		compatible = "qcom,msm-ext-disp-audio-codec-rx";
		qcom,msm_ext_disp = <&msm_ext_disp>;
		};
		};

		mdss_hdmi_tx: qcom,hdmi_tx@1aa0000 {
		cell-index = <0>;
		compatible = "qcom,hdmi-tx";

		reg = <0x1aa0000 0x50c>,
		<0xa0000 0x6400>,
		<0x1ae0000 0x28>;
		reg-names = "core_physical", "qfprom_physical", "hdcp_physical";

		hpd-gdsc-supply = <&gdsc_mdss>;

		qcom,supply-names = "hpd-gdsc";
		qcom,min-voltage-level = <0>;
		qcom,max-voltage-level = <0>;
		qcom,enable-load = <0>;
		qcom,disable-load = <0>;

		qcom,msm_ext_disp = <&msm_ext_disp>;

		clocks = <&clock_gcc GCC_MDSS_AHB_CLK>,
		<&clock_gcc_mdss MDSS_MDP_VOTE_CLK>,
		<&clock_gcc GCC_MDSS_HDMI_APP_CLK>,
		<&clock_gcc GCC_MDSS_HDMI_PCLK_CLK>,
		<&clock_gcc HDMI_PCLK_CLK_SRC>,
		<&mdss_hdmi_pll HDMI_PCLK_SRC>;

		clock-names = "hpd_iface_clk", "hpd_mdp_core_clk",
		"hpd_core_clk", "core_extp_clk",
		"hdmi_pclk_rcg", "ext_hdmi_pixel_clk";

		qcom,mdss-fb-map = <&mdss_fb1>;
		qcom,pluggable;
		};

		qcom,mdss_wb_panel {
		compatible = "qcom,mdss_wb";
		qcom,mdss_pan_res = <640 640>;
		qcom,mdss_pan_bpp = <24>;
		qcom,mdss-fb-map = <&mdss_fb1>;
		qcom,mdss-fb-map = <&mdss_fb2>;
		};

		};

arch/arm64/boot/dts/qcom/qcs405-pinctrl.dtsi

+104 −0

Original line number	Diff line number	Diff line
		@@ -686,6 +686,110 @@
		};
		};

		mdss_hdmi_5v_active: mdss_hdmi_5v_active {
		mux {
		pins = "gpio109";
		function = "gpio";
		};

		config {
		pins = "gpio109";
		bias-pull-up;
		drive-strength = <16>;
		};
		};

		mdss_hdmi_5v_suspend: mdss_hdmi_5v_suspend {
		mux {
		pins = "gpio109";
		function = "gpio";
		};

		config {
		pins = "gpio109";
		bias-pull-down;
		drive-strength = <2>;
		};
		};

		mdss_hdmi_hpd_active: mdss_hdmi_hpd_active {
		mux {
		pins = "gpio106";
		function = "hdmi_hot";
		};

		config {
		pins = "gpio106";
		bias-pull-down;
		drive-strength = <16>;
		};
		};

		mdss_hdmi_hpd_suspend: mdss_hdmi_hpd_suspend {
		mux {
		pins = "gpio106";
		function = "hdmi_hot";
		};

		config {
		pins = "gpio106";
		bias-pull-down;
		drive-strength = <2>;
		};
		};

		mdss_hdmi_ddc_active: mdss_hdmi_ddc_active {
		mux {
		pins = "gpio15", "gpio16";
		function = "hdmi_ddc";
		};

		config {
		pins = "gpio15", "gpio16";
		drive-strength = <2>;
		bias-pull-up;
		};
		};

		mdss_hdmi_ddc_suspend: mdss_hdmi_ddc_suspend {
		mux {
		pins = "gpio15", "gpio16";
		function = "hdmi_ddc";
		};

		config {
		pins = "gpio15", "gpio16";
		drive-strength = <2>;
		bias-pull-up;
		};
		};

		mdss_hdmi_cec_active: mdss_hdmi_cec_active {
		mux {
		pins = "gpio14";
		function = "hdmi_cec";
		};

		config {
		pins = "gpio14";
		drive-strength = <2>;
		bias-pull-up;
		};
		};

		mdss_hdmi_cec_suspend: mdss_hdmi_cec_suspend {
		mux {
		pins = "gpio14";
		function = "hdmi_cec";
		};

		config {
		pins = "gpio14";
		drive-strength = <2>;
		bias-pull-up;
		};
		};

		pmx_mdss: pmx_mdss {
		mdss_dsi_active: mdss_dsi_active {
		mux {