On Thu, Aug 13, 2020 at 04:29:07AM +0300, Laurent Pinchart wrote:
> The LCDIF in the i.MX6 SoCs has additional features compared to the
> i.MX28. Replace the fsl,imx28-lcdif fallback compatible string with
> fsl,imx6sx-lcdif to reflect that.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> ---
> arch/arm/boot/dts/imx6sl.dtsi | 2 +-
> arch/arm/boot/dts/imx6sll.dtsi | 2 +-
> arch/arm/boot/dts/imx6sx.dtsi | 4 ++--
> arch/arm/boot/dts/imx6ul.dtsi | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
> index 911d8cf77f2c..deeb647ffc3f 100644
> --- a/arch/arm/boot/dts/imx6sl.dtsi
> +++ b/arch/arm/boot/dts/imx6sl.dtsi
> @@ -769,7 +769,7 @@ epdc: epdc@20f4000 {
> };
>
> lcdif: lcdif@20f8000 {
> - compatible = "fsl,imx6sl-lcdif", "fsl,imx28-lcdif";
> + compatible = "fsl,imx6sl-lcdif", "fsl,imx6sx-lcdif";
> reg = <0x020f8000 0x4000>;
> interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks IMX6SL_CLK_LCDIF_PIX>,
> diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
> index edd3abb9a9f1..c51072bb43ba 100644
> --- a/arch/arm/boot/dts/imx6sll.dtsi
> +++ b/arch/arm/boot/dts/imx6sll.dtsi
> @@ -644,7 +644,7 @@ pxp: pxp@20f0000 {
> };
>
> lcdif: lcd-controller@20f8000 {
> - compatible = "fsl,imx6sll-lcdif", "fsl,imx28-lcdif";
> + compatible = "fsl,imx6sll-lcdif", "fsl,imx6sx-lcdif";
> reg = <0x020f8000 0x4000>;
> interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks IMX6SLL_CLK_LCDIF_PIX>,
> diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
> index 94e3df47d1ad..67da3a2d48ec 100644
> --- a/arch/arm/boot/dts/imx6sx.dtsi
> +++ b/arch/arm/boot/dts/imx6sx.dtsi
> @@ -1241,7 +1241,7 @@ csi2: csi@221c000 {
> };
>
> lcdif1: lcdif@2220000 {
> - compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";
> + compatible = "fsl,imx6sx-lcdif";
> reg = <0x02220000 0x4000>;
> interrupts = <GIC_SPI 5 IRQ_TYPE_EDGE_RISING>;
> clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>,
> @@ -1253,7 +1253,7 @@ lcdif1: lcdif@2220000 {
> };
>
> lcdif2: lcdif@2224000 {
> - compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";
> + compatible = "fsl,imx6sx-lcdif";
> reg = <0x02224000 0x4000>;
> interrupts = <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>;
> clocks = <&clks IMX6SX_CLK_LCDIF2_PIX>,
> diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
> index 5379a03391bd..b16cce1680a9 100644
> --- a/arch/arm/boot/dts/imx6ul.dtsi
> +++ b/arch/arm/boot/dts/imx6ul.dtsi
> @@ -978,7 +978,7 @@ csi: csi@21c4000 {
> };
>
> lcdif: lcdif@21c8000 {
> - compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif";
> + compatible = "fsl,imx6ul-lcdif", "fsl,imx6sx-lcdif";
> reg = <0x021c8000 0x4000>;
> interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&clks IMX6UL_CLK_LCDIF_PIX>,
> --
> Regards,
>
> Laurent Pinchart
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
