| Message ID | 1568211887-19318-1-git-send-email-Anson.Huang@nxp.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | b09802a03f0390fc115bf4ce4683645dc9b090bd |
| Headers | show |
| Series | [1/2] arm64: dts: imx8mm: Remove incorrect fallback compatible for ocotp | expand |
On 11/09/2019 16:24, Anson Huang wrote: > Compared to i.MX7D, i.MX8MM has different ocotp layout, so it should > NOT use "fsl,imx7d-ocotp" as ocotp's fallback compatible, remove it. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> > --- > arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > index 5f9d0da..7c4dcce 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > @@ -426,7 +426,7 @@ > }; > > ocotp: ocotp-ctrl@30350000 { > - compatible = "fsl,imx8mm-ocotp", "fsl,imx7d-ocotp", "syscon"; > + compatible = "fsl,imx8mm-ocotp", "syscon"; > reg = <0x30350000 0x10000>; > clocks = <&clk IMX8MM_CLK_OCOTP_ROOT>; > /* For nvmem subnodes */ Why not fold the two patches?
Hi, Daniel > On 11/09/2019 16:24, Anson Huang wrote: > > Compared to i.MX7D, i.MX8MM has different ocotp layout, so it should > > NOT use "fsl,imx7d-ocotp" as ocotp's fallback compatible, remove it. > > > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> > > --- > > arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > index 5f9d0da..7c4dcce 100644 > > --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > @@ -426,7 +426,7 @@ > > }; > > > > ocotp: ocotp-ctrl@30350000 { > > - compatible = "fsl,imx8mm-ocotp", "fsl,imx7d- > ocotp", "syscon"; > > + compatible = "fsl,imx8mm-ocotp", "syscon"; > > reg = <0x30350000 0x10000>; > > clocks = <&clk IMX8MM_CLK_OCOTP_ROOT>; > > /* For nvmem subnodes */ > > Why not fold the two patches? For i.MX8MM, it just removes the incorrect fallback compatible, for i.MX8MN, it needs to replace the incorrect fallback compatible in order to support SoC UID read, so I think this should be 2 separate patch? Thanks, Anson.
On Wed, Sep 11, 2019 at 09:05:49AM +0000, Anson Huang wrote: > Hi, Daniel > > > On 11/09/2019 16:24, Anson Huang wrote: > > > Compared to i.MX7D, i.MX8MM has different ocotp layout, so it should > > > NOT use "fsl,imx7d-ocotp" as ocotp's fallback compatible, remove it. > > > > > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> > > > --- > > > arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > > b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > > index 5f9d0da..7c4dcce 100644 > > > --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > > +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > > @@ -426,7 +426,7 @@ > > > }; > > > > > > ocotp: ocotp-ctrl@30350000 { > > > - compatible = "fsl,imx8mm-ocotp", "fsl,imx7d- > > ocotp", "syscon"; > > > + compatible = "fsl,imx8mm-ocotp", "syscon"; > > > reg = <0x30350000 0x10000>; > > > clocks = <&clk IMX8MM_CLK_OCOTP_ROOT>; > > > /* For nvmem subnodes */ > > > > Why not fold the two patches? > > For i.MX8MM, it just removes the incorrect fallback compatible, for i.MX8MN, it needs > to replace the incorrect fallback compatible in order to support SoC UID read, so I think > this should be 2 separate patch? Oh, yes, there is a subtle difference in the file name :) m|n. I understand now why you splitted it.
On Wed, Sep 11, 2019 at 10:24:46AM -0400, Anson Huang wrote: > Compared to i.MX7D, i.MX8MM has different ocotp layout, so it should > NOT use "fsl,imx7d-ocotp" as ocotp's fallback compatible, remove it. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Applied both, thanks.
diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index 5f9d0da..7c4dcce 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi @@ -426,7 +426,7 @@ }; ocotp: ocotp-ctrl@30350000 { - compatible = "fsl,imx8mm-ocotp", "fsl,imx7d-ocotp", "syscon"; + compatible = "fsl,imx8mm-ocotp", "syscon"; reg = <0x30350000 0x10000>; clocks = <&clk IMX8MM_CLK_OCOTP_ROOT>; /* For nvmem subnodes */
Compared to i.MX7D, i.MX8MM has different ocotp layout, so it should NOT use "fsl,imx7d-ocotp" as ocotp's fallback compatible, remove it. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> --- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)