From 36f292077681b3f15ecffbbf72525ae80298beba Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 18 Aug 2015 09:25:10 +0800 Subject: [PATCH] MLK-11371-2 imx: fix ocotp dts node Fix imx6/7 ocotp dts node. Signed-off-by: Peng Fan --- arch/arm/boot/dts/imx6sx.dtsi | 2 +- arch/arm/boot/dts/imx6ul.dtsi | 8 +------- arch/arm/boot/dts/imx7d.dtsi | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 974764500ba7..58ad459f9df5 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -1079,7 +1079,7 @@ }; ocotp: ocotp@021bc000 { - compatible = "fsl,imx6sx-ocotp", "syscon"; + compatible = "fsl,imx6sx-ocotp", "fsl,imx6q-ocotp", "syscon"; reg = <0x021bc000 0x4000>; clocks = <&clks IMX6SX_CLK_OCOTP>; }; diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi index 7cd20c120cda..e60405127b8a 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -1037,13 +1037,7 @@ }; ocotp: ocotp-ctrl@021bc000 { - compatible = "syscon"; - reg = <0x021bc000 0x4000>; - clocks = <&clks IMX6UL_CLK_OCOTP>; - }; - - ocotp-fuse@021bc000 { - compatible = "fsl,imx6ul-ocotp", "fsl,imx6q-ocotp"; + compatible = "fsl,imx6ul-ocotp", "syscon"; reg = <0x021bc000 0x4000>; clocks = <&clks IMX6UL_CLK_OCOTP>; }; diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi index 3e44b8897895..c1db4af124c0 100644 --- a/arch/arm/boot/dts/imx7d.dtsi +++ b/arch/arm/boot/dts/imx7d.dtsi @@ -214,8 +214,8 @@ status = "disabled"; }; - ocotp-fuse@30350000 { - compatible = "fsl,imx7d-ocotp"; + ocotp: ocotp-ctrl@30350000 { + compatible = "fsl,imx7d-ocotp", "syscon"; reg = <0x30350000 0x10000>; clocks = <&clks IMX7D_OCOTP_CLK>; }; -- 2.17.1