Merge "ARM: dts: msm: add device nodes to support DP on sdm630" (783427f7) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/sdm630-cdp.dtsi

+9 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,15 @@
		qcom,platform-te-gpio = <&tlmm 59 0>;
		};

		&mdss_dp_ctrl {
		pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";
		pinctrl-0 = <&mdss_dp_aux_active &mdss_dp_usbplug_cc_active>;
		pinctrl-1 = <&mdss_dp_aux_suspend &mdss_dp_usbplug_cc_suspend>;
		qcom,aux-en-gpio = <&tlmm 55 0>;
		qcom,aux-sel-gpio = <&tlmm 56 0>;
		qcom,usbplug-cc-gpio = <&tlmm 58 0>;
		};

		&pm660l_wled {
		qcom,led-strings-list = [01 02];
		};

arch/arm/boot/dts/qcom/sdm630-mdss-pll.dtsi

+35 −0

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

		mdss_dp_pll: qcom,mdss_dp_pll@c011000 {
		compatible = "qcom,mdss_dp_pll_sdm630";
		status = "ok";
		label = "MDSS DP PLL";
		cell-index = <0>;
		#clock-cells = <1>;

		reg = <0xc011c00 0x190>,
		<0xc011000 0x910>,
		<0x0c8c2300 0x8>;
		reg-names = "pll_base", "phy_base", "gdsc_base";

		gdsc-supply = <&gdsc_mdss>;

		clocks = <&clock_mmss MMSS_MDSS_AHB_CLK>,
		<&clock_rpmcc RPM_LN_BB_CLK1>,
		<&clock_gcc GCC_USB3_CLKREF_CLK>;
		clock-names = "iface_clk", "ref_clk_src", "ref_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>;
		};
		};
		};
		};

arch/arm/boot/dts/qcom/sdm630-mdss.dtsi

+35 −6

Original line number	Diff line number	Diff line
		@@ -382,7 +382,7 @@
		};

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

		ext_disp_audio_codec: qcom,msm-ext-disp-audio-codec-rx {
		@@ -392,13 +392,13 @@
		};

		mdss_dp_ctrl: qcom,dp_ctrl@c990000 {
		status = "disabled";
		status = "ok";
		cell-index = <0>;
		compatible = "qcom,mdss-dp";
		qcom,mdss-fb-map = <&mdss_fb2>;

		gdsc-supply = <&gdsc_mdss>;
		vdda-1p2-supply = <&pm660_l1>;
		vdda-1p8-supply = <&pm660_l10>;
		vdda-0p9-supply = <&pm660l_l1>;

		reg = <0xc990000 0xa84>,
		@@ -410,8 +410,37 @@
		reg-names = "dp_ctrl", "dp_phy", "tcsr_regs", "dp_mmss_cc",
		"qfprom_physical","hdcp_physical";

		clocks = <&clock_mmss MMSS_MNOC_AHB_CLK>,
		<&clock_mmss MMSS_MDSS_AHB_CLK>,
		<&clock_mmss MMSS_MDSS_AXI_CLK>,
		<&clock_mmss MMSS_MDSS_MDP_CLK>,
		<&clock_mmss MMSS_MDSS_HDMI_DP_AHB_CLK>,
		<&clock_mmss MMSS_MDSS_DP_AUX_CLK>,
		<&clock_rpmcc RPM_LN_BB_CLK1>,
		<&clock_gcc GCC_USB3_CLKREF_CLK>,
		<&clock_gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
		<&clock_mmss MMSS_MDSS_DP_LINK_CLK>,
		<&clock_mmss MMSS_MDSS_DP_LINK_INTF_CLK>,
		<&clock_mmss MMSS_MDSS_DP_CRYPTO_CLK>,
		<&clock_mmss MMSS_MDSS_DP_PIXEL_CLK>,
		<&clock_mmss DP_PIXEL_CLK_SRC>,
		<&mdss_dp_pll DP_VCO_DIVIDED_CLK_SRC_MUX>;
		clock-names = "core_mnoc_clk", "core_iface_clk", "core_bus_clk",
		"core_mdp_core_clk", "core_alt_iface_clk",
		"core_aux_clk", "core_ref_clk_src", "core_ref_clk",
		"core_ahb_phy_clk", "ctrl_link_clk",
		"ctrl_link_iface_clk", "ctrl_crypto_clk",
		"ctrl_pixel_clk", "pixel_clk_rcg", "pixel_parent";

		qcom,dp-usbpd-detection = <&pm660_pdphy>;

		qcom,msm_ext_disp = <&msm_ext_disp>;

		qcom,aux-cfg-settings = [00 13 00 00 0a 28 0a 03 b7 03];
		qcom,logical2physical-lane-map = [00 01 02 03];
		qcom,phy-register-offset = <0x4>;
		qcom,max-pclk-frequency-khz = <150000>;

		qcom,core-supply-entries {
		#address-cells = <1>;
		#size-cells = <0>;
		@@ -432,9 +461,9 @@

		qcom,ctrl-supply-entry@0 {
		reg = <0>;
		qcom,supply-name = "vdda-1p2";
		qcom,supply-min-voltage = <1200000>;
		qcom,supply-max-voltage = <1250000>;
		qcom,supply-name = "vdda-1p8";
		qcom,supply-min-voltage = <1780000>;
		qcom,supply-max-voltage = <1950000>;
		qcom,supply-enable-load = <12560>;
		qcom,supply-disable-load = <4>;
		};

arch/arm/boot/dts/qcom/sdm630-mtp.dtsi

+9 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,15 @@
		qcom,platform-te-gpio = <&tlmm 59 0>;
		};

		&mdss_dp_ctrl {
		pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";
		pinctrl-0 = <&mdss_dp_aux_active &mdss_dp_usbplug_cc_active>;
		pinctrl-1 = <&mdss_dp_aux_suspend &mdss_dp_usbplug_cc_suspend>;
		qcom,aux-en-gpio = <&tlmm 55 0>;
		qcom,aux-sel-gpio = <&tlmm 56 0>;
		qcom,usbplug-cc-gpio = <&tlmm 58 0>;
		};

		&pm660l_wled {
		qcom,led-strings-list = [01 02];
		};