MLK-14450 ARM: dts: imx6ul-14x14-evk: remove duplicate i2c node

Commit 2c2a56059ff7e7e4 ("MLK-11407-8: ARM: dts: i.mx6sx/i.mx6ul: add
ldo-bypass support") was backported from imx_4.1.y and added a
duplicate i2c node which was already present upstream.

This patch removes the duplicated node and moves the difference
(clocks for wm8960) to the existing upstream node.

Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>

diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
index 4e77bd8..543e5fe 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
@@ -168,6 +168,8 @@
                compatible = "wlf,wm8960";
                reg = <0x1a>;
                wlf,shared-lrclk;
+               clocks = <&clks IMX6UL_CLK_SAI2>;
+               clock-names = "mclk";
        };
 
        ov5640: ov5640@3c {
@@ -275,41 +277,6 @@
        };
 };
 
-&i2c2 {
-       clock_frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2>;
-       status = "okay";
-
-       codec: wm8960@1a {
-               compatible = "wlf,wm8960";
-               reg = <0x1a>;
-               clocks = <&clks IMX6UL_CLK_SAI2>;
-               clock-names = "mclk";
-               wlf,shared-lrclk;
-       };
-
-       ov5640: ov5640@3c {
-               compatible = "ovti,ov5640";
-               reg = <0x3c>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_csi1>;
-               clocks = <&clks IMX6UL_CLK_CSI>;
-               clock-names = "csi_mclk";
-               pwn-gpios = <&gpio_spi 6 1>;
-               rst-gpios = <&gpio_spi 5 0>;
-               csi_id = <0>;
-               mclk = <24000000>;
-               mclk_source = <0>;
-               status = "disabled";
-               port {
-                       ov5640_ep: endpoint {
-                               remote-endpoint = <&csi1_ep>;
-                       };
-               };
-       };
-};
-
 &lcdif {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lcdif_dat