Skip to content

Commit 4ea61fc

Browse files
authored
Merge pull request #119 from zandrey/5.4-1.0.0-imx
Cherry-pick commits from linux-master onto 5.4-1.0.0-imx (SoC Serial Number -related)
2 parents cd91bed + fd34d25 commit 4ea61fc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

arch/arm64/boot/dts/freescale/imx8mm.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -659,8 +659,8 @@
659659
reg = <0x30340000 0x10000>;
660660
};
661661

662-
ocotp: ocotp-ctrl@30350000 {
663-
compatible = "fsl,imx8mm-ocotp", "fsl,imx7d-ocotp", "syscon";
662+
ocotp: efuse@30350000 {
663+
compatible = "fsl,imx8mm-ocotp", "syscon";
664664
reg = <0x30350000 0x10000>;
665665
clocks = <&clk IMX8MM_CLK_OCOTP_ROOT>;
666666
/* For nvmem subnodes */

arch/arm64/boot/dts/freescale/imx8mn.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,8 @@
616616
reg = <0x30340000 0x10000>;
617617
};
618618

619-
ocotp: ocotp-ctrl@30350000 {
620-
compatible = "fsl,imx8mn-ocotp", "fsl,imx7d-ocotp", "syscon";
619+
ocotp: efuse@30350000 {
620+
compatible = "fsl,imx8mn-ocotp", "fsl,imx8mm-ocotp", "syscon";
621621
reg = <0x30350000 0x10000>;
622622
clocks = <&clk IMX8MN_CLK_OCOTP_ROOT>;
623623
#address-cells = <1>;

arch/arm64/boot/dts/freescale/imx8mq.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@
549549
};
550550
};
551551

552-
ocotp: ocotp-ctrl@30350000 {
552+
ocotp: efuse@30350000 {
553553
compatible = "fsl,imx8mq-ocotp", "syscon";
554554
reg = <0x30350000 0x10000>;
555555
clocks = <&clk IMX8MQ_CLK_OCOTP_ROOT>;

0 commit comments

Comments
 (0)