Skip to contentSkip to conversation

clk: imx7d: Add the OCOTP clock

PATCH New Fabio Estevam 4 participants 7 messages Jan 18, 2017 – Jan 26, 2017

Subsystems (4)
Device tree bindings Arm i.MX and Layerscape Common clk NXP i.MX clock drivers
lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH 1/2 clk: imx7d: Add the OCOTP clock

Add the OCOTP so that this hardware block can be used.

Signed-off-by Fabio Estevam <[email protected]>
---
 drivers/clk/imx/clk-imx7d.c             | 1 +
 include/dt-bindings/clock/imx7d-clock.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/clk/imx/clk-imx7d.c +1 -0
index e7c7353..ae1d31b 100644
@@ -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);
include/dt-bindings/clock/imx7d-clock.h +2 -1
index 1183347..a7a1a50 100644
@@ -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 */
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 2/2 clk: imx7d: Add the IPG root clock

Add an entry for the IMX7D_IPG_ROOT clock.

Signed-off-by Fabio Estevam <[email protected]>
---
 drivers/clk/imx/clk-imx7d.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx7d.c +1 -1
index ae1d31b..1705f44 100644
@@ -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);
Signature · 1 line
2.7.4
Applied
#2 lore raw

PATCH 2/2 clk: imx7d: Add the IPG root clock

Quoted 4 lines · Fabio Estevam

Add an entry for the IMX7D_IPG_ROOT clock.

Signed-off-by Fabio Estevam <[email protected]>

---

Applied to clk-next

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#3 lore raw

PATCH 2/2 clk: imx7d: Add the IPG root clock

In reply to Fabio Estevam

Hi Fabio,

Quoted 3 lines · Fabio Estevam

Add an entry for the IMX7D_IPG_ROOT clock.

Signed-off-by Fabio Estevam <[email protected]>

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/

Quoted 25 lines
---
 drivers/clk/imx/clk-imx7d.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx7d.c +1 -2
index ae1d31b..1705f44 100644
@@ -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

reviewer
#4 lore raw

PATCH 2/2 clk: imx7d: Add the IPG root clock

Hi Kevin,

Quoted 5 lines · Kevin Hilman

Hi Fabio,

Quoted 2 lines · Fabio Estevam

Add an entry for the IMX7D_IPG_ROOT clock.

Quoted 8 lines
Quoted 1 line
Signed-off-by Fabio Estevam <[email protected]>

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.

#5 lore raw

PATCH 2/2 clk: imx7d: Add the IPG root clock

Quoted 14 lines · Fabio Estevam

Hi Kevin,

Quoted 11 lines · Kevin Hilman

Hi Fabio,

Quoted 3 lines · Fabio Estevam

Add an entry for the IMX7D_IPG_ROOT clock.

Signed-off-by Fabio Estevam <[email protected]>

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.

Quoted 7 lines
Quoted 2 lines

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.

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
Applied
#6 lore raw

PATCH 1/2 clk: imx7d: Add the OCOTP clock

In reply to Fabio Estevam
Quoted 4 lines · Fabio Estevam

Add the OCOTP so that this hardware block can be used.

Signed-off-by Fabio Estevam <[email protected]>

---

Applied to clk-imx7 and merged into clk-next

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project