* [PATCH 1/2] clk: imx7d: Add the OCOTP clock
@ 2017-01-18 17:53 Fabio Estevam
2017-01-18 17:53 ` [PATCH 2/2] clk: imx7d: Add the IPG root clock Fabio Estevam
2017-01-21 0:28 ` [PATCH 1/2] clk: imx7d: Add the OCOTP clock Stephen Boyd
0 siblings, 2 replies; 7+ messages in thread
From: Fabio Estevam @ 2017-01-18 17:53 UTC (permalink / raw)
To: linux-arm-kernel
Add the OCOTP so that this hardware block can be used.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
drivers/clk/imx/clk-imx7d.c | 1 +
include/dt-bindings/clock/imx7d-clock.h | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
index e7c7353..ae1d31b 100644
--- a/drivers/clk/imx/clk-imx7d.c
+++ b/drivers/clk/imx/clk-imx7d.c
@@ -803,6 +803,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
clks[IMX7D_DRAM_PHYM_ROOT_CLK] = imx_clk_gate4("dram_phym_root_clk", "dram_phym_cg", base + 0x4130, 0);
clks[IMX7D_DRAM_PHYM_ALT_ROOT_CLK] = imx_clk_gate4("dram_phym_alt_root_clk", "dram_phym_alt_post_div", base + 0x4130, 0);
clks[IMX7D_DRAM_ALT_ROOT_CLK] = imx_clk_gate4("dram_alt_root_clk", "dram_alt_post_div", base + 0x4130, 0);
+ clks[IMX7D_OCOTP_CLK] = imx_clk_gate4("ocotp_clk", "ipg_root_clk", base + 0x4230, 0);
clks[IMX7D_USB_HSIC_ROOT_CLK] = imx_clk_gate4("usb_hsic_root_clk", "usb_hsic_post_div", base + 0x4420, 0);
clks[IMX7D_SDMA_CORE_CLK] = imx_clk_gate4("sdma_root_clk", "ahb_root_clk", base + 0x4480, 0);
clks[IMX7D_PCIE_CTRL_ROOT_CLK] = imx_clk_gate4("pcie_ctrl_root_clk", "pcie_ctrl_post_div", base + 0x4600, 0);
diff --git a/include/dt-bindings/clock/imx7d-clock.h b/include/dt-bindings/clock/imx7d-clock.h
index 1183347..a7a1a50 100644
--- a/include/dt-bindings/clock/imx7d-clock.h
+++ b/include/dt-bindings/clock/imx7d-clock.h
@@ -449,5 +449,6 @@
#define IMX7D_ADC_ROOT_CLK 436
#define IMX7D_CLK_ARM 437
#define IMX7D_CKIL 438
-#define IMX7D_CLK_END 439
+#define IMX7D_OCOTP_CLK 439
+#define IMX7D_CLK_END 440
#endif /* __DT_BINDINGS_CLOCK_IMX7D_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] clk: imx7d: Add the IPG root clock
2017-01-18 17:53 [PATCH 1/2] clk: imx7d: Add the OCOTP clock Fabio Estevam
@ 2017-01-18 17:53 ` Fabio Estevam
2017-01-21 0:28 ` Stephen Boyd
2017-01-26 5:24 ` Kevin Hilman
2017-01-21 0:28 ` [PATCH 1/2] clk: imx7d: Add the OCOTP clock Stephen Boyd
1 sibling, 2 replies; 7+ messages in thread
From: Fabio Estevam @ 2017-01-18 17:53 UTC (permalink / raw)
To: linux-arm-kernel
Add an entry for the IMX7D_IPG_ROOT clock.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
drivers/clk/imx/clk-imx7d.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
index ae1d31b..1705f44 100644
--- a/drivers/clk/imx/clk-imx7d.c
+++ b/drivers/clk/imx/clk-imx7d.c
@@ -788,7 +788,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
clks[IMX7D_WRCLK_ROOT_DIV] = imx_clk_divider2("wrclk_post_div", "wrclk_pre_div", base + 0xbd00, 0, 6);
clks[IMX7D_CLKO1_ROOT_DIV] = imx_clk_divider2("clko1_post_div", "clko1_pre_div", base + 0xbd80, 0, 6);
clks[IMX7D_CLKO2_ROOT_DIV] = imx_clk_divider2("clko2_post_div", "clko2_pre_div", base + 0xbe00, 0, 6);
-
+ clks[IMX7D_IPG_ROOT_CLK] = imx_clk_divider2("ipg_root_clk", "ahb_root_clk", base + 0x9080, 0, 2);
clks[IMX7D_ARM_A7_ROOT_CLK] = imx_clk_gate4("arm_a7_root_clk", "arm_a7_div", base + 0x4000, 0);
clks[IMX7D_ARM_M4_ROOT_CLK] = imx_clk_gate4("arm_m4_root_clk", "arm_m4_div", base + 0x4010, 0);
clks[IMX7D_ARM_M0_ROOT_CLK] = imx_clk_gate4("arm_m0_root_clk", "arm_m0_div", base + 0x4020, 0);
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] clk: imx7d: Add the IPG root clock
2017-01-18 17:53 ` [PATCH 2/2] clk: imx7d: Add the IPG root clock Fabio Estevam
@ 2017-01-21 0:28 ` Stephen Boyd
2017-01-26 5:24 ` Kevin Hilman
1 sibling, 0 replies; 7+ messages in thread
From: Stephen Boyd @ 2017-01-21 0:28 UTC (permalink / raw)
To: linux-arm-kernel
On 01/18, Fabio Estevam wrote:
> Add an entry for the IMX7D_IPG_ROOT clock.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
Applied to clk-next
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] clk: imx7d: Add the IPG root clock
2017-01-18 17:53 ` [PATCH 2/2] clk: imx7d: Add the IPG root clock Fabio Estevam
2017-01-21 0:28 ` Stephen Boyd
@ 2017-01-26 5:24 ` Kevin Hilman
2017-01-26 14:50 ` Fabio Estevam
1 sibling, 1 reply; 7+ messages in thread
From: Kevin Hilman @ 2017-01-26 5:24 UTC (permalink / raw)
To: linux-arm-kernel
Hi Fabio,
On Wed, Jan 18, 2017 at 9:53 AM, Fabio Estevam <fabio.estevam@nxp.com> wrote:
> Add an entry for the IMX7D_IPG_ROOT clock.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
kernelci.org started detecting boot failures on imx7s-warp in
next-20160124[1], and I bisected it down to this patch, which is in
linux-next as commit dde08302c083.
I verified that reverting that commit on top of next-20160124 gets
imx7s-warp booting again.
Kevin
P.S. Thanks for the donation of the imx7s-warp board, which allows us
to catch these failures early. :)
[1] https://kernelci.org/boot/id/588747e959b514e08213d106/
> ---
> drivers/clk/imx/clk-imx7d.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
> index ae1d31b..1705f44 100644
> --- a/drivers/clk/imx/clk-imx7d.c
> +++ b/drivers/clk/imx/clk-imx7d.c
> @@ -788,7 +788,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
> clks[IMX7D_WRCLK_ROOT_DIV] = imx_clk_divider2("wrclk_post_div", "wrclk_pre_div", base + 0xbd00, 0, 6);
> clks[IMX7D_CLKO1_ROOT_DIV] = imx_clk_divider2("clko1_post_div", "clko1_pre_div", base + 0xbd80, 0, 6);
> clks[IMX7D_CLKO2_ROOT_DIV] = imx_clk_divider2("clko2_post_div", "clko2_pre_div", base + 0xbe00, 0, 6);
> -
> + clks[IMX7D_IPG_ROOT_CLK] = imx_clk_divider2("ipg_root_clk", "ahb_root_clk", base + 0x9080, 0, 2);
> clks[IMX7D_ARM_A7_ROOT_CLK] = imx_clk_gate4("arm_a7_root_clk", "arm_a7_div", base + 0x4000, 0);
> clks[IMX7D_ARM_M4_ROOT_CLK] = imx_clk_gate4("arm_m4_root_clk", "arm_m4_div", base + 0x4010, 0);
> clks[IMX7D_ARM_M0_ROOT_CLK] = imx_clk_gate4("arm_m0_root_clk", "arm_m0_div", base + 0x4020, 0);
> --
> 2.7.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 2/2] clk: imx7d: Add the IPG root clock
2017-01-26 5:24 ` Kevin Hilman
@ 2017-01-26 14:50 ` Fabio Estevam
2017-01-26 23:54 ` Stephen Boyd
0 siblings, 1 reply; 7+ messages in thread
From: Fabio Estevam @ 2017-01-26 14:50 UTC (permalink / raw)
To: linux-arm-kernel
Hi Kevin,
On Thu, Jan 26, 2017 at 3:24 AM, Kevin Hilman <khilman@baylibre.com> wrote:
> Hi Fabio,
>
> On Wed, Jan 18, 2017 at 9:53 AM, Fabio Estevam <fabio.estevam@nxp.com> wrote:
>> Add an entry for the IMX7D_IPG_ROOT clock.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
>
> kernelci.org started detecting boot failures on imx7s-warp in
> next-20160124[1], and I bisected it down to this patch, which is in
> linux-next as commit dde08302c083.
>
> I verified that reverting that commit on top of next-20160124 gets
> imx7s-warp booting again.
Thanks for the report.
Stephen, could you please drop this patch from your tree? I will
investigate the issue.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] clk: imx7d: Add the IPG root clock
2017-01-26 14:50 ` Fabio Estevam
@ 2017-01-26 23:54 ` Stephen Boyd
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Boyd @ 2017-01-26 23:54 UTC (permalink / raw)
To: linux-arm-kernel
On 01/26, Fabio Estevam wrote:
> Hi Kevin,
>
> On Thu, Jan 26, 2017 at 3:24 AM, Kevin Hilman <khilman@baylibre.com> wrote:
> > Hi Fabio,
> >
> > On Wed, Jan 18, 2017 at 9:53 AM, Fabio Estevam <fabio.estevam@nxp.com> wrote:
> >> Add an entry for the IMX7D_IPG_ROOT clock.
> >>
> >> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> >
> > kernelci.org started detecting boot failures on imx7s-warp in
> > next-20160124[1], and I bisected it down to this patch, which is in
> > linux-next as commit dde08302c083.
> >
> > I verified that reverting that commit on top of next-20160124 gets
> > imx7s-warp booting again.
>
> Thanks for the report.
>
> Stephen, could you please drop this patch from your tree? I will
> investigate the issue.
Sure. I've dropped this patch.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] clk: imx7d: Add the OCOTP clock
2017-01-18 17:53 [PATCH 1/2] clk: imx7d: Add the OCOTP clock Fabio Estevam
2017-01-18 17:53 ` [PATCH 2/2] clk: imx7d: Add the IPG root clock Fabio Estevam
@ 2017-01-21 0:28 ` Stephen Boyd
1 sibling, 0 replies; 7+ messages in thread
From: Stephen Boyd @ 2017-01-21 0:28 UTC (permalink / raw)
To: linux-arm-kernel
On 01/18, Fabio Estevam wrote:
> Add the OCOTP so that this hardware block can be used.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
Applied to clk-imx7 and merged into clk-next
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-01-26 23:54 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-18 17:53 [PATCH 1/2] clk: imx7d: Add the OCOTP clock Fabio Estevam
2017-01-18 17:53 ` [PATCH 2/2] clk: imx7d: Add the IPG root clock Fabio Estevam
2017-01-21 0:28 ` Stephen Boyd
2017-01-26 5:24 ` Kevin Hilman
2017-01-26 14:50 ` Fabio Estevam
2017-01-26 23:54 ` Stephen Boyd
2017-01-21 0:28 ` [PATCH 1/2] clk: imx7d: Add the OCOTP clock Stephen Boyd
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).