Merge "clk/qcom/mdss: add DSI 7nm PLL support" (dbd95d18) · Commits · e / devices / android_kernel_xiaomi_nabu

Documentation/devicetree/bindings/fb/mdss-pll.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,8 @@ Required properties:
		"qcom,mdss_hdmi_pll_8996_v3", "qcom,mdss_hdmi_pll_8996_v3_1p8",
		"qcom,mdss_edp_pll_8996_v3", "qcom,mdss_edp_pll_8996_v3_1p8",
		"qcom,mdss_dsi_pll_10nm", "qcom,mdss_dp_pll_8998",
		"qcom,mdss_hdmi_pll_8998", "qcom,mdss_dp_pll_10nm".
		"qcom,mdss_hdmi_pll_8998", "qcom,mdss_dp_pll_10nm",
		"qcom,mdss_dsi_pll_7nm".
		- cell-index: Specifies the controller used
		- reg: offset and length of the register set for the device.
		- reg-names : names to refer to register sets related to this device

arch/arm64/boot/dts/qcom/sdm855-sde-display.dtsi

+37 −12

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -113,11 +113,15 @@
		<&mdss_dsi0_pll PCLK_MUX_0_CLK>;
		clock-names = "src_byte_clk", "src_pixel_clk";

		qcom,platform-te-gpio = <&tlmm 10 0>;
		pinctrl-names = "panel_active", "panel_suspend";
		pinctrl-0 = <&sde_dsi_active &sde_te_active>;
		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;
		qcom,platform-te-gpio = <&tlmm 8 0>;
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		qcom,panel-mode-gpio = <&tlmm 52 0>;
		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-panel = <&dsi_sharp_4k_dsc_video>;
		vddio-supply = <&pm855_l14>;

		};

		@@ -132,11 +136,15 @@
		<&mdss_dsi0_pll PCLK_MUX_0_CLK>;
		clock-names = "src_byte_clk", "src_pixel_clk";

		qcom,platform-te-gpio = <&tlmm 10 0>;
		pinctrl-names = "panel_active", "panel_suspend";
		pinctrl-0 = <&sde_dsi_active &sde_te_active>;
		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;
		qcom,platform-te-gpio = <&tlmm 8 0>;
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		qcom,panel-mode-gpio = <&tlmm 52 0>;
		qcom,panel-mode-gpio = <&tlmm 7 0>;

		qcom,dsi-panel = <&dsi_sharp_4k_dsc_cmd>;
		vddio-supply = <&pm855_l14>;

		};

		@@ -265,6 +273,9 @@
		<&mdss_dsi0_pll PCLK_MUX_0_CLK>;
		clock-names = "src_byte_clk", "src_pixel_clk";

		pinctrl-names = "panel_active", "panel_suspend";
		pinctrl-0 = <&sde_dsi_active &sde_te_active>;
		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-panel = <&dsi_sim_vid>;
		};
		@@ -280,6 +291,9 @@
		<&mdss_dsi0_pll PCLK_MUX_0_CLK>;
		clock-names = "src_byte_clk", "src_pixel_clk";

		pinctrl-names = "panel_active", "panel_suspend";
		pinctrl-0 = <&sde_dsi_active &sde_te_active>;
		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-panel = <&dsi_dual_sim_vid>;
		};
		@@ -295,6 +309,9 @@
		<&mdss_dsi0_pll PCLK_MUX_0_CLK>;
		clock-names = "src_byte_clk", "src_pixel_clk";

		pinctrl-names = "panel_active", "panel_suspend";
		pinctrl-0 = <&sde_dsi_active &sde_te_active>;
		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-panel = <&dsi_sim_cmd>;
		};
		@@ -310,6 +327,9 @@
		<&mdss_dsi0_pll PCLK_MUX_0_CLK>;
		clock-names = "src_byte_clk", "src_pixel_clk";

		pinctrl-names = "panel_active", "panel_suspend";
		pinctrl-0 = <&sde_dsi_active &sde_te_active>;
		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-panel = <&dsi_dual_sim_cmd>;
		};
		@@ -325,6 +345,9 @@
		<&mdss_dsi0_pll PCLK_MUX_0_CLK>;
		clock-names = "src_byte_clk", "src_pixel_clk";

		pinctrl-names = "panel_active", "panel_suspend";
		pinctrl-0 = <&sde_dsi_active &sde_te_active>;
		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-panel = <&dsi_sim_dsc_375_cmd>;
		};
		@@ -340,7 +363,9 @@
		<&mdss_dsi0_pll PCLK_MUX_0_CLK>;
		clock-names = "src_byte_clk", "src_pixel_clk";


		pinctrl-names = "panel_active", "panel_suspend";
		pinctrl-0 = <&sde_dsi_active &sde_te_active>;
		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;

		qcom,dsi-panel = <&dsi_dual_sim_dsc_375_cmd>;
		};
		@@ -433,12 +458,12 @@
		};

		&dsi_sharp_4k_dsc_video {
		qcom,mdss-dsi-t-clk-post = <0x0c>;
		qcom,mdss-dsi-t-clk-pre = <0x27>;
		qcom,mdss-dsi-t-clk-post = <0x10>;
		qcom,mdss-dsi-t-clk-pre = <0x25>;
		qcom,mdss-dsi-display-timings {
		timing@0{
		qcom,mdss-dsi-panel-phy-timings = [00 18 06 06 21 20 06
		06 04 03 04 00];
		qcom,mdss-dsi-panel-phy-timings = [00 54 09 12 21 22 09
		13 10 03 04 00 37 16];
		qcom,display-topology = <2 2 2>;
		qcom,default-topology-index = <0>;
		};
		@@ -450,8 +475,8 @@
		qcom,mdss-dsi-t-clk-pre = <0x27>;
		qcom,mdss-dsi-display-timings {
		timing@0{
		qcom,mdss-dsi-panel-phy-timings = [00 18 06 06 21 20 06
		06 04 03 04 00];
		qcom,mdss-dsi-panel-phy-timings = [00 54 09 12 21 22 09
		13 10 03 04 00 37 16];
		qcom,display-topology = <2 2 2>;
		qcom,default-topology-index = <0>;
		};

drivers/clk/qcom/mdss/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,4 +3,5 @@ obj-$(CONFIG_QCOM_MDSS_PLL) += mdss-pll.o
		obj-$(CONFIG_QCOM_MDSS_PLL) += mdss-dsi-pll-10nm.o
		obj-$(CONFIG_QCOM_MDSS_PLL) += mdss-dp-pll-10nm.o
		obj-$(CONFIG_QCOM_MDSS_PLL) += mdss-dp-pll-10nm-util.o
		obj-$(CONFIG_QCOM_MDSS_PLL) += mdss-dsi-pll-7nm.o

drivers/clk/qcom/mdss/mdss-dsi-pll-7nm.c

0 → 100644

+1824 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/clk/qcom/mdss/mdss-dsi-pll.h

+4 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -49,6 +49,9 @@ struct dsi_pll_vco_clk {
		int dsi_pll_clock_register_10nm(struct platform_device *pdev,
		struct mdss_pll_resources *pll_res);

		int dsi_pll_clock_register_7nm(struct platform_device *pdev,
		struct mdss_pll_resources *pll_res);

		static inline struct dsi_pll_vco_clk to_vco_clk_hw(struct clk_hw hw)
		{
		return container_of(hw, struct dsi_pll_vco_clk, hw);