diff for duplicates of <20180328065100.z5nxntyax7qk7jwb@fsr-ub1664-175>
diff --git a/a/1.txt b/N1/1.txt
index b618113..cf38b75 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,10 +1,12 @@
On Wed, Mar 28, 2018 at 09:46:36AM +0300, Abel Vesa wrote:
> From: Dong Aisheng <b29396@freescale.com>
->
-> For init on clocks we should move it at the first place in imx7d_clocks_init()
-> before any clock operations, else the clock operation may fail in case the clock
+>=20
+> For init on clocks we should move it at the first place in imx7d_clocks_i=
+nit()
+> before any clock operations, else the clock operation may fail in case th=
+e clock
> is still not on.
->
+>=20
> Acked-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@freescale.com>
> Signed-off-by: Dong Aisheng <b29396@freescale.com>
> Signed-off-by: Irina Tirdea <irina.tirdea@nxp.com>
@@ -12,44 +14,67 @@ On Wed, Mar 28, 2018 at 09:46:36AM +0300, Abel Vesa wrote:
> ---
> drivers/clk/imx/clk-imx7d.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
->
+>=20
> diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
> index 89bfa75..9b17805 100644
> --- a/drivers/clk/imx/clk-imx7d.c
> +++ b/drivers/clk/imx/clk-imx7d.c
-> @@ -433,13 +433,6 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
-> clks[IMX7D_PLL_AUDIO_MAIN_BYPASS] = imx_clk_mux_flags("pll_audio_main_bypass", base + 0xf0, 16, 1, pll_audio_bypass_sel, ARRAY_SIZE(pll_audio_bypass_sel), CLK_SET_RATE_PARENT);
-> clks[IMX7D_PLL_VIDEO_MAIN_BYPASS] = imx_clk_mux_flags("pll_video_main_bypass", base + 0x130, 16, 1, pll_video_bypass_sel, ARRAY_SIZE(pll_video_bypass_sel), CLK_SET_RATE_PARENT);
->
-> - clk_set_parent(clks[IMX7D_PLL_ARM_MAIN_BYPASS], clks[IMX7D_PLL_ARM_MAIN]);
-> - clk_set_parent(clks[IMX7D_PLL_DRAM_MAIN_BYPASS], clks[IMX7D_PLL_DRAM_MAIN]);
-> - clk_set_parent(clks[IMX7D_PLL_SYS_MAIN_BYPASS], clks[IMX7D_PLL_SYS_MAIN]);
-> - clk_set_parent(clks[IMX7D_PLL_ENET_MAIN_BYPASS], clks[IMX7D_PLL_ENET_MAIN]);
-> - clk_set_parent(clks[IMX7D_PLL_AUDIO_MAIN_BYPASS], clks[IMX7D_PLL_AUDIO_MAIN]);
-> - clk_set_parent(clks[IMX7D_PLL_VIDEO_MAIN_BYPASS], clks[IMX7D_PLL_VIDEO_MAIN]);
+> @@ -433,13 +433,6 @@ static void __init imx7d_clocks_init(struct device_n=
+ode *ccm_node)
+> clks[IMX7D_PLL_AUDIO_MAIN_BYPASS] =3D imx_clk_mux_flags("pll_audio_main=
+_bypass", base + 0xf0, 16, 1, pll_audio_bypass_sel, ARRAY_SIZE(pll_audio_by=
+pass_sel), CLK_SET_RATE_PARENT);
+> clks[IMX7D_PLL_VIDEO_MAIN_BYPASS] =3D imx_clk_mux_flags("pll_video_main=
+_bypass", base + 0x130, 16, 1, pll_video_bypass_sel, ARRAY_SIZE(pll_video_b=
+ypass_sel), CLK_SET_RATE_PARENT);
+> =20
+> - clk_set_parent(clks[IMX7D_PLL_ARM_MAIN_BYPASS], clks[IMX7D_PLL_ARM_MAIN=
+]);
+> - clk_set_parent(clks[IMX7D_PLL_DRAM_MAIN_BYPASS], clks[IMX7D_PLL_DRAM_MA=
+IN]);
+> - clk_set_parent(clks[IMX7D_PLL_SYS_MAIN_BYPASS], clks[IMX7D_PLL_SYS_MAIN=
+]);
+> - clk_set_parent(clks[IMX7D_PLL_ENET_MAIN_BYPASS], clks[IMX7D_PLL_ENET_MA=
+IN]);
+> - clk_set_parent(clks[IMX7D_PLL_AUDIO_MAIN_BYPASS], clks[IMX7D_PLL_AUDIO_=
+MAIN]);
+> - clk_set_parent(clks[IMX7D_PLL_VIDEO_MAIN_BYPASS], clks[IMX7D_PLL_VIDEO_=
+MAIN]);
> -
-> clks[IMX7D_PLL_ARM_MAIN_CLK] = imx_clk_gate("pll_arm_main_clk", "pll_arm_main_bypass", base + 0x60, 13);
-> clks[IMX7D_PLL_DRAM_MAIN_CLK] = imx_clk_gate("pll_dram_main_clk", "pll_dram_main_bypass", base + 0x70, 13);
-> clks[IMX7D_PLL_SYS_MAIN_CLK] = imx_clk_gate("pll_sys_main_clk", "pll_sys_main_bypass", base + 0xb0, 13);
-> @@ -886,6 +879,13 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
-> for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
+> clks[IMX7D_PLL_ARM_MAIN_CLK] =3D imx_clk_gate("pll_arm_main_clk", "pll_=
+arm_main_bypass", base + 0x60, 13);
+> clks[IMX7D_PLL_DRAM_MAIN_CLK] =3D imx_clk_gate("pll_dram_main_clk", "pl=
+l_dram_main_bypass", base + 0x70, 13);
+> clks[IMX7D_PLL_SYS_MAIN_CLK] =3D imx_clk_gate("pll_sys_main_clk", "pll_=
+sys_main_bypass", base + 0xb0, 13);
+> @@ -886,6 +879,13 @@ static void __init imx7d_clocks_init(struct device_n=
+ode *ccm_node)
+> for (i =3D 0; i < ARRAY_SIZE(clks_init_on); i++)
> clk_prepare_enable(clks[clks_init_on[i]]);
->
-> + clk_set_parent(clks[IMX7D_PLL_ARM_MAIN_BYPASS], clks[IMX7D_PLL_ARM_MAIN]);
-> + clk_set_parent(clks[IMX7D_PLL_DRAM_MAIN_BYPASS], clks[IMX7D_PLL_DRAM_MAIN]);
-> + clk_set_parent(clks[IMX7D_PLL_SYS_MAIN_BYPASS], clks[IMX7D_PLL_SYS_MAIN]);
-> + clk_set_parent(clks[IMX7D_PLL_ENET_MAIN_BYPASS], clks[IMX7D_PLL_ENET_MAIN]);
-> + clk_set_parent(clks[IMX7D_PLL_AUDIO_MAIN_BYPASS], clks[IMX7D_PLL_AUDIO_MAIN]);
-> + clk_set_parent(clks[IMX7D_PLL_VIDEO_MAIN_BYPASS], clks[IMX7D_PLL_VIDEO_MAIN]);
+> =20
+> + clk_set_parent(clks[IMX7D_PLL_ARM_MAIN_BYPASS], clks[IMX7D_PLL_ARM_MAIN=
+]);
+> + clk_set_parent(clks[IMX7D_PLL_DRAM_MAIN_BYPASS], clks[IMX7D_PLL_DRAM_MA=
+IN]);
+> + clk_set_parent(clks[IMX7D_PLL_SYS_MAIN_BYPASS], clks[IMX7D_PLL_SYS_MAIN=
+]);
+> + clk_set_parent(clks[IMX7D_PLL_ENET_MAIN_BYPASS], clks[IMX7D_PLL_ENET_MA=
+IN]);
+> + clk_set_parent(clks[IMX7D_PLL_AUDIO_MAIN_BYPASS], clks[IMX7D_PLL_AUDIO_=
+MAIN]);
+> + clk_set_parent(clks[IMX7D_PLL_VIDEO_MAIN_BYPASS], clks[IMX7D_PLL_VIDEO_=
+MAIN]);
> +
-> /* use old gpt clk setting, gpt1 root clk must be twice as gpt counter freq */
+> /* use old gpt clk setting, gpt1 root clk must be twice as gpt counter =
+freq */
> clk_set_parent(clks[IMX7D_GPT1_ROOT_SRC], clks[IMX7D_OSC_24M_CLK]);
->
-> --
+> =20
+> --=20
> 2.7.4
->
+>=20
-Ignore this one please, mistakenly sent because of sending all the patches from the current folder.
+Ignore this one please, mistakenly sent because of sending all the patches =
+from the current folder.
The patchset applies on linux-next/master just fine without this one.
---
\ No newline at end of file
+-- =
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index adaad8f..00736fb 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -36,11 +36,13 @@
[
"On Wed, Mar 28, 2018 at 09:46:36AM +0300, Abel Vesa wrote:\n",
"> From: Dong Aisheng <b29396\@freescale.com>\n",
- "> \n",
- "> For init on clocks we should move it at the first place in imx7d_clocks_init()\n",
- "> before any clock operations, else the clock operation may fail in case the clock\n",
+ ">=20\n",
+ "> For init on clocks we should move it at the first place in imx7d_clocks_i=\n",
+ "nit()\n",
+ "> before any clock operations, else the clock operation may fail in case th=\n",
+ "e clock\n",
"> is still not on.\n",
- "> \n",
+ ">=20\n",
"> Acked-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan\@freescale.com>\n",
"> Signed-off-by: Dong Aisheng <b29396\@freescale.com>\n",
"> Signed-off-by: Irina Tirdea <irina.tirdea\@nxp.com>\n",
@@ -48,47 +50,70 @@
"> ---\n",
"> drivers/clk/imx/clk-imx7d.c | 14 +++++++-------\n",
"> 1 file changed, 7 insertions(+), 7 deletions(-)\n",
- "> \n",
+ ">=20\n",
"> diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c\n",
"> index 89bfa75..9b17805 100644\n",
"> --- a/drivers/clk/imx/clk-imx7d.c\n",
"> +++ b/drivers/clk/imx/clk-imx7d.c\n",
- "> \@\@ -433,13 +433,6 \@\@ static void __init imx7d_clocks_init(struct device_node *ccm_node)\n",
- "> \tclks[IMX7D_PLL_AUDIO_MAIN_BYPASS] = imx_clk_mux_flags(\"pll_audio_main_bypass\", base + 0xf0, 16, 1, pll_audio_bypass_sel, ARRAY_SIZE(pll_audio_bypass_sel), CLK_SET_RATE_PARENT);\n",
- "> \tclks[IMX7D_PLL_VIDEO_MAIN_BYPASS] = imx_clk_mux_flags(\"pll_video_main_bypass\", base + 0x130, 16, 1, pll_video_bypass_sel, ARRAY_SIZE(pll_video_bypass_sel), CLK_SET_RATE_PARENT);\n",
- "> \n",
- "> -\tclk_set_parent(clks[IMX7D_PLL_ARM_MAIN_BYPASS], clks[IMX7D_PLL_ARM_MAIN]);\n",
- "> -\tclk_set_parent(clks[IMX7D_PLL_DRAM_MAIN_BYPASS], clks[IMX7D_PLL_DRAM_MAIN]);\n",
- "> -\tclk_set_parent(clks[IMX7D_PLL_SYS_MAIN_BYPASS], clks[IMX7D_PLL_SYS_MAIN]);\n",
- "> -\tclk_set_parent(clks[IMX7D_PLL_ENET_MAIN_BYPASS], clks[IMX7D_PLL_ENET_MAIN]);\n",
- "> -\tclk_set_parent(clks[IMX7D_PLL_AUDIO_MAIN_BYPASS], clks[IMX7D_PLL_AUDIO_MAIN]);\n",
- "> -\tclk_set_parent(clks[IMX7D_PLL_VIDEO_MAIN_BYPASS], clks[IMX7D_PLL_VIDEO_MAIN]);\n",
+ "> \@\@ -433,13 +433,6 \@\@ static void __init imx7d_clocks_init(struct device_n=\n",
+ "ode *ccm_node)\n",
+ "> \tclks[IMX7D_PLL_AUDIO_MAIN_BYPASS] =3D imx_clk_mux_flags(\"pll_audio_main=\n",
+ "_bypass\", base + 0xf0, 16, 1, pll_audio_bypass_sel, ARRAY_SIZE(pll_audio_by=\n",
+ "pass_sel), CLK_SET_RATE_PARENT);\n",
+ "> \tclks[IMX7D_PLL_VIDEO_MAIN_BYPASS] =3D imx_clk_mux_flags(\"pll_video_main=\n",
+ "_bypass\", base + 0x130, 16, 1, pll_video_bypass_sel, ARRAY_SIZE(pll_video_b=\n",
+ "ypass_sel), CLK_SET_RATE_PARENT);\n",
+ "> =20\n",
+ "> -\tclk_set_parent(clks[IMX7D_PLL_ARM_MAIN_BYPASS], clks[IMX7D_PLL_ARM_MAIN=\n",
+ "]);\n",
+ "> -\tclk_set_parent(clks[IMX7D_PLL_DRAM_MAIN_BYPASS], clks[IMX7D_PLL_DRAM_MA=\n",
+ "IN]);\n",
+ "> -\tclk_set_parent(clks[IMX7D_PLL_SYS_MAIN_BYPASS], clks[IMX7D_PLL_SYS_MAIN=\n",
+ "]);\n",
+ "> -\tclk_set_parent(clks[IMX7D_PLL_ENET_MAIN_BYPASS], clks[IMX7D_PLL_ENET_MA=\n",
+ "IN]);\n",
+ "> -\tclk_set_parent(clks[IMX7D_PLL_AUDIO_MAIN_BYPASS], clks[IMX7D_PLL_AUDIO_=\n",
+ "MAIN]);\n",
+ "> -\tclk_set_parent(clks[IMX7D_PLL_VIDEO_MAIN_BYPASS], clks[IMX7D_PLL_VIDEO_=\n",
+ "MAIN]);\n",
"> -\n",
- "> \tclks[IMX7D_PLL_ARM_MAIN_CLK] = imx_clk_gate(\"pll_arm_main_clk\", \"pll_arm_main_bypass\", base + 0x60, 13);\n",
- "> \tclks[IMX7D_PLL_DRAM_MAIN_CLK] = imx_clk_gate(\"pll_dram_main_clk\", \"pll_dram_main_bypass\", base + 0x70, 13);\n",
- "> \tclks[IMX7D_PLL_SYS_MAIN_CLK] = imx_clk_gate(\"pll_sys_main_clk\", \"pll_sys_main_bypass\", base + 0xb0, 13);\n",
- "> \@\@ -886,6 +879,13 \@\@ static void __init imx7d_clocks_init(struct device_node *ccm_node)\n",
- "> \tfor (i = 0; i < ARRAY_SIZE(clks_init_on); i++)\n",
+ "> \tclks[IMX7D_PLL_ARM_MAIN_CLK] =3D imx_clk_gate(\"pll_arm_main_clk\", \"pll_=\n",
+ "arm_main_bypass\", base + 0x60, 13);\n",
+ "> \tclks[IMX7D_PLL_DRAM_MAIN_CLK] =3D imx_clk_gate(\"pll_dram_main_clk\", \"pl=\n",
+ "l_dram_main_bypass\", base + 0x70, 13);\n",
+ "> \tclks[IMX7D_PLL_SYS_MAIN_CLK] =3D imx_clk_gate(\"pll_sys_main_clk\", \"pll_=\n",
+ "sys_main_bypass\", base + 0xb0, 13);\n",
+ "> \@\@ -886,6 +879,13 \@\@ static void __init imx7d_clocks_init(struct device_n=\n",
+ "ode *ccm_node)\n",
+ "> \tfor (i =3D 0; i < ARRAY_SIZE(clks_init_on); i++)\n",
"> \t\tclk_prepare_enable(clks[clks_init_on[i]]);\n",
- "> \n",
- "> +\tclk_set_parent(clks[IMX7D_PLL_ARM_MAIN_BYPASS], clks[IMX7D_PLL_ARM_MAIN]);\n",
- "> +\tclk_set_parent(clks[IMX7D_PLL_DRAM_MAIN_BYPASS], clks[IMX7D_PLL_DRAM_MAIN]);\n",
- "> +\tclk_set_parent(clks[IMX7D_PLL_SYS_MAIN_BYPASS], clks[IMX7D_PLL_SYS_MAIN]);\n",
- "> +\tclk_set_parent(clks[IMX7D_PLL_ENET_MAIN_BYPASS], clks[IMX7D_PLL_ENET_MAIN]);\n",
- "> +\tclk_set_parent(clks[IMX7D_PLL_AUDIO_MAIN_BYPASS], clks[IMX7D_PLL_AUDIO_MAIN]);\n",
- "> +\tclk_set_parent(clks[IMX7D_PLL_VIDEO_MAIN_BYPASS], clks[IMX7D_PLL_VIDEO_MAIN]);\n",
+ "> =20\n",
+ "> +\tclk_set_parent(clks[IMX7D_PLL_ARM_MAIN_BYPASS], clks[IMX7D_PLL_ARM_MAIN=\n",
+ "]);\n",
+ "> +\tclk_set_parent(clks[IMX7D_PLL_DRAM_MAIN_BYPASS], clks[IMX7D_PLL_DRAM_MA=\n",
+ "IN]);\n",
+ "> +\tclk_set_parent(clks[IMX7D_PLL_SYS_MAIN_BYPASS], clks[IMX7D_PLL_SYS_MAIN=\n",
+ "]);\n",
+ "> +\tclk_set_parent(clks[IMX7D_PLL_ENET_MAIN_BYPASS], clks[IMX7D_PLL_ENET_MA=\n",
+ "IN]);\n",
+ "> +\tclk_set_parent(clks[IMX7D_PLL_AUDIO_MAIN_BYPASS], clks[IMX7D_PLL_AUDIO_=\n",
+ "MAIN]);\n",
+ "> +\tclk_set_parent(clks[IMX7D_PLL_VIDEO_MAIN_BYPASS], clks[IMX7D_PLL_VIDEO_=\n",
+ "MAIN]);\n",
"> +\n",
- "> \t/* use old gpt clk setting, gpt1 root clk must be twice as gpt counter freq */\n",
+ "> \t/* use old gpt clk setting, gpt1 root clk must be twice as gpt counter =\n",
+ "freq */\n",
"> \tclk_set_parent(clks[IMX7D_GPT1_ROOT_SRC], clks[IMX7D_OSC_24M_CLK]);\n",
- "> \n",
- "> -- \n",
+ "> =20\n",
+ "> --=20\n",
"> 2.7.4\n",
- "> \n",
+ ">=20\n",
"\n",
- "Ignore this one please, mistakenly sent because of sending all the patches from the current folder.\n",
+ "Ignore this one please, mistakenly sent because of sending all the patches =\n",
+ "from the current folder.\n",
"The patchset applies on linux-next/master just fine without this one.\n",
"\n",
- "--"
+ "-- ="
]
-88512c86406273b0c69556151c9e1dbb44c35b03951fc7dd84d779b8d7a0a68c
+804df81ea928696ab30560f09d9350cb36c42003a6044c27270a04995936be39
diff --git a/a/content_digest b/N2/content_digest
index adaad8f..abf93aa 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -5,27 +5,16 @@
"ref\0001522219599-10831-3-git-send-email-abel.vesa\@nxp.com\0"
]
[
- "From\0Abel Vesa <abel.vesa\@nxp.com>\0"
+ "From\0abel.vesa\@nxp.com (Abel Vesa)\0"
]
[
- "Subject\0Re: [PATCH] clk: imx7d: Move clks_init_on before any clock operations\0"
+ "Subject\0[PATCH] clk: imx7d: Move clks_init_on before any clock operations\0"
]
[
"Date\0Wed, 28 Mar 2018 06:51:02 +0000\0"
]
[
- "To\0Fabio Estevam <festevam\@gmail.com>\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org <linux-arm-kernel\@lists.infradead.org>",
- " linux-clk\@vger.kernel.org <linux-clk\@vger.kernel.org>",
- " linux-kernel\@vger.kernel.org <linux-kernel\@vger.kernel.org>",
- " dl-linux-imx <linux-imx\@nxp.com>",
- " Anson Huang <anson.huang\@nxp.com>",
- " Ranjani Vaidyanathan <ranjani.vaidyanathan\@nxp.com>",
- " Abel Vesa <abelvesa\@linux.com>",
- " Daniel Baluta <daniel.baluta\@nxp.com>",
- " b29396\@freescale.com <b29396\@freescale.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -91,4 +80,4 @@
"--"
]
-88512c86406273b0c69556151c9e1dbb44c35b03951fc7dd84d779b8d7a0a68c
+3e65ce2647e585292d9c0a225ad659b76088e95f8aa062c7445e95fec1085786
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.