diff options
| author | Octavian Purdila <octavian.purdila@nxp.com> | 2017-03-30 13:13:31 +0300 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:26:07 +0800 |
| commit | 9205ad90d1f132dd2aeae179b90ca3d527f57f44 (patch) | |
| tree | 3b4a2c4abf957e2c44b010c914cfd9511adb8895 /arch/arm/boot/dts/imx6ul-14x14-evk.dts | |
| parent | 6e2e51511294c6945c8f862014729aed6265ad53 (diff) | |
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>
Diffstat (limited to 'arch/arm/boot/dts/imx6ul-14x14-evk.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-evk.dts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts index 7d5415ea6850..0a5318cefbc4 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts @@ -177,6 +177,8 @@ compatible = "wlf,wm8960"; reg = <0x1a>; wlf,shared-lrclk; + clocks = <&clks IMX6UL_CLK_SAI2>; + clock-names = "mclk"; }; ov5640: ov5640@3c { |