summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeng Fan <peng.fan@nxp.com>2017-03-01 14:40:53 +0800
committerBryan O'Donoghue <bryan.odonoghue@linaro.org>2017-09-05 15:59:08 +0100
commitcf4651b6c80e6878807e0eff22d02d9d48471886 (patch)
treea87c8f7802bdee8efa97b4972ee5c2861ff9009d
parented286f762351c588e46d815d0b07213c7ce0b1d4 (diff)
ARM: dts: imx7s: enable ocotplinaro-20170905-001
[ Upstream commit 9f29183fa344704f7317e421d47b149ab38224f2 ] Enable ocotp for i.mx7D/S. Correct the clock entry and compatible string. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx7s.dtsi5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 2b6cb05bc01a..b16ffde8438f 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -483,10 +483,9 @@
};
ocotp: ocotp-ctrl@30350000 {
- compatible = "syscon";
+ compatible = "fsl,imx7d-ocotp", "syscon";
reg = <0x30350000 0x10000>;
- clocks = <&clks IMX7D_CLK_DUMMY>;
- status = "disabled";
+ clocks = <&clks IMX7D_OCOTP_CLK>;
};
anatop: anatop@30360000 {