diff options
| author | Haibo Chen <haibo.chen@freescale.com> | 2014-11-21 14:19:57 +0800 |
|---|---|---|
| committer | Haibo Chen <haibo.chen@freescale.com> | 2014-11-21 16:20:35 +0800 |
| commit | 38708fc1c18b67ba3c4c3355f026a747bc847dc6 (patch) | |
| tree | 78af4614134c62a2eff578252ce5f4a70d10ae03 /arch | |
| parent | 67f859dc0a2a31c432f06d72e8a262b3647ce312 (diff) | |
MLK-9888 arm: dts: imx6sx: remove the duplicate i2c2 bus description for imx6sx-sabreauto board
There are two places descript the i2c2 bus, remove one to make the
dts file pithily.
Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sabreauto.dts | 87 |
1 files changed, 40 insertions, 47 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts index e98405099cd4..849ab9beafcf 100644 --- a/arch/arm/boot/dts/imx6sx-sabreauto.dts +++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts @@ -309,6 +309,46 @@ pinctrl-0 = <&pinctrl_i2c2_1>; status = "okay"; + egalax_ts@04 { + compatible = "eeti,egalax_ts"; + reg = <0x04>; + interrupt-parent = <&gpio6>; + interrupts = <22 2>; + wakeup-gpios = <&gpio6 22 0>; + }; + + codec: cs42888@048 { + compatible = "cirrus,cs42888"; + reg = <0x048>; + clocks = <&codec_osc 0>; + clock-names = "mclk"; + VA-supply = <®_audio>; + VD-supply = <®_audio>; + VLS-supply = <®_audio>; + VLC-supply = <®_audio>; + }; + + si4763: si4763@63 { + compatible = "si4761"; + reg = <0x63>; + va-supply = <&si4763_va>; + vd-supply = <&si4763_vd>; + vio1-supply = <&si4763_vio1>; + vio2-supply = <&si4763_vio2>; + + si476x_codec: si476x-codec { + compatible = "si476x-codec"; + }; + }; + + max7322: gpio@68 { + compatible = "maxim,max7322"; + reg = <0x68>; + gpio-controller; + #gpio-cells = <2>; + resets = <&max7322_reset>; + }; + pmic: pfuze100@08 { compatible = "fsl,pfuze100"; reg = <0x08>; @@ -411,53 +451,6 @@ }; }; -&i2c2 { - clock-frequency = <100000>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c2_1>; - status = "okay"; - - egalax_ts@04 { - compatible = "eeti,egalax_ts"; - reg = <0x04>; - interrupt-parent = <&gpio6>; - interrupts = <22 2>; - wakeup-gpios = <&gpio6 22 0>; - }; - - codec: cs42888@048 { - compatible = "cirrus,cs42888"; - reg = <0x048>; - clocks = <&codec_osc 0>; - clock-names = "mclk"; - VA-supply = <®_audio>; - VD-supply = <®_audio>; - VLS-supply = <®_audio>; - VLC-supply = <®_audio>; - }; - - si4763: si4763@63 { - compatible = "si4761"; - reg = <0x63>; - va-supply = <&si4763_va>; - vd-supply = <&si4763_vd>; - vio1-supply = <&si4763_vio1>; - vio2-supply = <&si4763_vio2>; - - si476x_codec: si476x-codec { - compatible = "si476x-codec"; - }; - }; - - max7322: gpio@68 { - compatible = "maxim,max7322"; - reg = <0x68>; - gpio-controller; - #gpio-cells = <2>; - resets = <&max7322_reset>; - }; -}; - &spdif { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spdif_3>; |