summaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2020-09-28 19:24:55 +0200
committerPhilippe Schenker <philippe.schenker@toradex.com>2020-09-29 16:41:42 +0200
commit5d8a9c779ec5b21785fb106a228e9d16d3ea0edd (patch)
tree4b03d1e6492b09e0084e49859c7b49c82085762b /drivers/clk
parent4a17940e35ceb1802f62cae3bbf1e8212c46d188 (diff)
Revert "ARM: imx: clk: enable OCOTP clock by default"
This commit does not what it should and what is described. That was possibly a conflict during cherry-picking. Since the OCOTP clock is also in that file already. I guess that is no longer required. This reverts commit 4349cab47a62f17d574af2df78eabd04588f2243. Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/imx/clk-imx6ul.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c
index 5dcb8db48141..6c0a8e0a7ef4 100644
--- a/drivers/clk/imx/clk-imx6ul.c
+++ b/drivers/clk/imx/clk-imx6ul.c
@@ -384,7 +384,7 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)
hws[IMX6UL_CLK_I2C1] = imx_clk_hw_gate2("i2c1", "perclk", base + 0x70, 6);
hws[IMX6UL_CLK_I2C2] = imx_clk_hw_gate2("i2c2", "perclk", base + 0x70, 8);
hws[IMX6UL_CLK_I2C3] = imx_clk_hw_gate2("i2c3", "perclk", base + 0x70, 10);
- hws[IMX6UL_CLK_OCOTP] = imx_clk_hw_gate2_flags("ocotp", "ipg", base + 0x70, 12, CLK_IS_CRITICAL);
+ hws[IMX6UL_CLK_OCOTP] = imx_clk_hw_gate2("ocotp", "ipg", base + 0x70, 12);
hws[IMX6UL_CLK_IOMUXC] = imx_clk_hw_gate2("iomuxc", "lcdif_podf", base + 0x70, 14);
hws[IMX6UL_CLK_GPIO3] = imx_clk_hw_gate2("gpio3", "ipg", base + 0x70, 26);
hws[IMX6UL_CLK_LCDIF_APB] = imx_clk_hw_gate2("lcdif_apb", "axi", base + 0x70, 28);