Merge "ARM: dts: msm: move esync RCG to SDE DSI node"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
aa852b0779
@@ -92,10 +92,17 @@
|
||||
* MDP clock nodes, no actual vote shall be added and this
|
||||
* change is done just to satisfy sync state requirements.
|
||||
*/
|
||||
<&dispcc DISP_CC_MDSS_MDP_CLK>;
|
||||
<&dispcc DISP_CC_MDSS_MDP_CLK>,
|
||||
/*
|
||||
* The esync clk RCG is only necessary here to set its parent
|
||||
* to the pll dsi clk, which also needs to be available at the
|
||||
* point that its known whether the clock will be used. After
|
||||
* updating the parent, this clock handle is no longer needed.
|
||||
*/
|
||||
<&dispcc DISP_CC_ESYNC0_CLK_SRC>;
|
||||
clock-names = "pll_byte_clk0", "pll_dsi_clk0",
|
||||
"pll_byte_clk1", "pll_dsi_clk1",
|
||||
"mdp_core_clk";
|
||||
"mdp_core_clk", "esync_clk_rcg";
|
||||
vddio-supply = <&L12B>;
|
||||
vci-supply = <&L13B>;
|
||||
vdd-supply = <&L11B>;
|
||||
@@ -121,10 +128,17 @@
|
||||
* MDP clock nodes, no actual vote shall be added and this
|
||||
* change is done just to satisfy sync state requirements.
|
||||
*/
|
||||
<&dispcc DISP_CC_MDSS_MDP_CLK>;
|
||||
<&dispcc DISP_CC_MDSS_MDP_CLK>,
|
||||
/*
|
||||
* The esync clk RCG is only necessary here to set its parent
|
||||
* to the pll dsi clk, which also needs to be available at the
|
||||
* point that its known whether the clock will be used. After
|
||||
* updating the parent, this clock handle is no longer needed.
|
||||
*/
|
||||
<&dispcc DISP_CC_ESYNC1_CLK_SRC>;
|
||||
clock-names = "pll_byte_clk0", "pll_dsi_clk0",
|
||||
"pll_byte_clk1", "pll_dsi_clk1",
|
||||
"mdp_core_clk";
|
||||
"mdp_core_clk", "esync_clk_rcg";
|
||||
vddio-supply = <&L12B>;
|
||||
vci-supply = <&L13B>;
|
||||
vdd-supply = <&L11B>;
|
||||
|
@@ -313,15 +313,13 @@
|
||||
<&dispcc DISP_CC_MDSS_BYTE0_INTF_CLK>,
|
||||
<&dispcc DISP_CC_MDSS_PCLK0_CLK>,
|
||||
<&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>,
|
||||
<&mdss_dsi_phy0 1>,
|
||||
<&dispcc DISP_CC_ESYNC0_CLK>,
|
||||
<&dispcc DISP_CC_ESYNC0_CLK_SRC>,
|
||||
<&dispcc DISP_CC_OSC_CLK>,
|
||||
<&dispcc DISP_CC_MDSS_ESC0_CLK>,
|
||||
<&rpmhcc RPMH_CXO_CLK>;
|
||||
clock-names = "byte_clk", "byte_clk_rcg", "byte_intf_clk",
|
||||
"pixel_clk", "pixel_clk_rcg", "pll_dsi_clk",
|
||||
"esync_clk", "esync_clk_rcg", "osc_clk", "esc_clk", "xo";
|
||||
"pixel_clk", "pixel_clk_rcg", "esync_clk", "osc_clk",
|
||||
"esc_clk", "xo";
|
||||
};
|
||||
|
||||
&mdss_dsi1 {
|
||||
@@ -332,15 +330,13 @@
|
||||
<&dispcc DISP_CC_MDSS_BYTE1_INTF_CLK>,
|
||||
<&dispcc DISP_CC_MDSS_PCLK1_CLK>,
|
||||
<&dispcc DISP_CC_MDSS_PCLK1_CLK_SRC>,
|
||||
<&mdss_dsi_phy1 1>,
|
||||
<&dispcc DISP_CC_ESYNC1_CLK>,
|
||||
<&dispcc DISP_CC_ESYNC1_CLK_SRC>,
|
||||
<&dispcc DISP_CC_OSC_CLK>,
|
||||
<&dispcc DISP_CC_MDSS_ESC1_CLK>,
|
||||
<&rpmhcc RPMH_CXO_CLK>;
|
||||
clock-names = "byte_clk", "byte_clk_rcg", "byte_intf_clk",
|
||||
"pixel_clk", "pixel_clk_rcg", "pll_dsi_clk",
|
||||
"esync_clk", "esync_clk_rcg", "osc_clk", "esc_clk", "xo";
|
||||
"pixel_clk", "pixel_clk_rcg", "esync_clk", "osc_clk",
|
||||
"esc_clk", "xo";
|
||||
};
|
||||
|
||||
&mdss_dsi_phy0 {
|
||||
|
Reference in New Issue
Block a user