Message ID | 1480689949-17957-1-git-send-email-d.schultz@phytec.de |
---|---|
State | Not Applicable, archived |
Headers | show |
On Fri, Dec 02, 2016 at 03:45:47PM +0100, Daniel Schultz wrote: > This patch adds OCOTP support for the i.MX6UL SoC. > > Signed-off-by: Daniel Schultz <d.schultz@phytec.de> > --- > Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 5 +++-- > drivers/nvmem/imx-ocotp.c | 1 + > 2 files changed, 4 insertions(+), 2 deletions(-) Acked-by: Rob Herring <robh@kernel.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Dec 02, 2016 at 03:45:48PM +0100, Daniel Schultz wrote: > This device node adds OCOTP for the i.MX6UL SoC. > > Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Bai Ping (Cc'ed here) from NXP is sending similar patches [1]. DTS change looks good to me, but I will not apply it until the driver and bindings get accepted. Shawn [1] https://www.spinics.net/lists/arm-kernel/msg540900.html > --- > arch/arm/boot/dts/imx6ul.dtsi | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi > index c5c05fd..ee53795 100644 > --- a/arch/arm/boot/dts/imx6ul.dtsi > +++ b/arch/arm/boot/dts/imx6ul.dtsi > @@ -849,6 +849,12 @@ > reg = <0x021b0000 0x4000>; > }; > > + ocotp: ocotp@021bc000 { > + compatible = "fsl,imx6ul-ocotp"; > + reg = <0x021bc000 0x4000>; > + clocks = <&clks IMX6UL_CLK_OCOTP>; > + }; > + > lcdif: lcdif@021c8000 { > compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif"; > reg = <0x021c8000 0x4000>; > -- > 1.9.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/12/16 14:45, Daniel Schultz wrote: > This patch adds OCOTP support for the i.MX6UL SoC. > > Signed-off-by: Daniel Schultz <d.schultz@phytec.de> As Shawn said, there is already a similar patch in the mailing list http://www.spinics.net/lists/arm-kernel/msg543203.html http://www.spinics.net/lists/arm-kernel/msg543204.html I will pick that patch + I will queue up fix from you "[PATCH 3/3] nvmem: imx-ocotp: Fix wrong register size" thanks, srini > --- > Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 5 +++-- > drivers/nvmem/imx-ocotp.c | 1 + > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt > index 383d588..fcb1a48 100644 > --- a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt > +++ b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt > @@ -1,13 +1,14 @@ > Freescale i.MX6 On-Chip OTP Controller (OCOTP) device tree bindings > > This binding represents the on-chip eFuse OTP controller found on > -i.MX6Q/D, i.MX6DL/S, i.MX6SL, and i.MX6SX SoCs. > +i.MX6Q/D, i.MX6DL/S, i.MX6SL, i.MX6SX and i.MX6UL SoCs. > > Required properties: > - compatible: should be one of > "fsl,imx6q-ocotp" (i.MX6Q/D/DL/S), > "fsl,imx6sl-ocotp" (i.MX6SL), or > - "fsl,imx6sx-ocotp" (i.MX6SX), followed by "syscon". > + "fsl,imx6sx-ocotp" (i.MX6SX), or > + "fsl,imx6ul-ocotp" (i.MX6UL), followed by "syscon". > - reg: Should contain the register base and length. > - clocks: Should contain a phandle pointing to the gated peripheral clock. > > diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c > index ac27b9b..d2f78d3 100644 > --- a/drivers/nvmem/imx-ocotp.c > +++ b/drivers/nvmem/imx-ocotp.c > @@ -71,6 +71,7 @@ static int imx_ocotp_read(void *context, unsigned int offset, > > static const struct of_device_id imx_ocotp_dt_ids[] = { > { .compatible = "fsl,imx6q-ocotp", (void *)128 }, > + { .compatible = "fsl,imx6ul-ocotp", (void *)128 }, > { .compatible = "fsl,imx6sl-ocotp", (void *)32 }, > { .compatible = "fsl,imx6sx-ocotp", (void *)128 }, > { }, > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt index 383d588..fcb1a48 100644 --- a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt +++ b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt @@ -1,13 +1,14 @@ Freescale i.MX6 On-Chip OTP Controller (OCOTP) device tree bindings This binding represents the on-chip eFuse OTP controller found on -i.MX6Q/D, i.MX6DL/S, i.MX6SL, and i.MX6SX SoCs. +i.MX6Q/D, i.MX6DL/S, i.MX6SL, i.MX6SX and i.MX6UL SoCs. Required properties: - compatible: should be one of "fsl,imx6q-ocotp" (i.MX6Q/D/DL/S), "fsl,imx6sl-ocotp" (i.MX6SL), or - "fsl,imx6sx-ocotp" (i.MX6SX), followed by "syscon". + "fsl,imx6sx-ocotp" (i.MX6SX), or + "fsl,imx6ul-ocotp" (i.MX6UL), followed by "syscon". - reg: Should contain the register base and length. - clocks: Should contain a phandle pointing to the gated peripheral clock. diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c index ac27b9b..d2f78d3 100644 --- a/drivers/nvmem/imx-ocotp.c +++ b/drivers/nvmem/imx-ocotp.c @@ -71,6 +71,7 @@ static int imx_ocotp_read(void *context, unsigned int offset, static const struct of_device_id imx_ocotp_dt_ids[] = { { .compatible = "fsl,imx6q-ocotp", (void *)128 }, + { .compatible = "fsl,imx6ul-ocotp", (void *)128 }, { .compatible = "fsl,imx6sl-ocotp", (void *)32 }, { .compatible = "fsl,imx6sx-ocotp", (void *)128 }, { },
This patch adds OCOTP support for the i.MX6UL SoC. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> --- Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 5 +++-- drivers/nvmem/imx-ocotp.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)