diff options
| author | Winter Wang <wente.wang@nxp.com> | 2016-09-12 15:04:14 +0800 |
|---|---|---|
| committer | Winter Wang <wente.wang@nxp.com> | 2016-09-12 16:05:02 +0800 |
| commit | 7c42a355d151fb704b3a8d9f42aa2ee7c8b937bf (patch) | |
| tree | 18047f2d1b651f7d3f151045622364fd40b14f79 | |
| parent | 717c85e7263f95ab11df04e468c2ea1d78c0f1b7 (diff) | |
| download | imx-v4.1-7c42a355d151fb704b3a8d9f42aa2ee7c8b937bf.tar.gz | |
ARM: dts: imx6ul-pico-hobbit: add sgtl5000 support
use fsl-asoc-card to bring up sgtl5000 in 4.1 kernel
move sgtl5000 codec from i2c3 to i2c2
Change-Id: Ib8ee87e589b76cd187d58d727db5ef8a71aed79e
Signed-off-by: Winter Wang <wente.wang@nxp.com>
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-picosom-hobbit.dts | 32 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v7_android_defconfig | 1 |
2 files changed, 15 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts b/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts index b3e932b13577..53a84474cebc 100644 --- a/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts +++ b/arch/arm/boot/dts/imx6ul-picosom-hobbit.dts @@ -104,27 +104,24 @@ }; sound { - compatible = "fsl,imx6ul-sgtl5000", - "fsl,imx-audio-sgtl5000"; + compatible = "fsl,imx-audio-sgtl5000"; model = "imx6ul-sgtl5000"; - cpu-dai = <&sai1>; + audio-cpu = <&sai1>; audio-codec = <&codec>; audio-routing = "LINE_IN", "Line In Jack", "MIC_IN", "Mic Jack", "Mic Jack", "Mic Bias", "Headphone Jack", "HP_OUT"; - mux-int-port = <1>; - mux-ext-port = <1>; }; clocks { sys_mclk: clock { - compatible = "fixed-clock"; + compatible = "fixed-clock"; #clock-cells = <0>; - clock-frequency = <24576000>; - }; - }; + clock-frequency = <24576000>; + }; + }; external_gpio { pinctrl-names = "default"; @@ -297,7 +294,7 @@ }; }; - adc: adc081c { + adc: adc081c@50 { compatible = "ti,adc081c"; reg = <0x50>; }; @@ -309,14 +306,6 @@ pinctrl-0 = <&pinctrl_i2c2>; status = "okay"; -}; - -&i2c3 { - clock_frequency = <100000>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c3>; - status = "okay"; - codec: sgtl5000@0a { compatible = "fsl,sgtl5000"; reg = <0x0a>; @@ -326,6 +315,13 @@ }; }; +&i2c3 { + clock_frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; +}; + &iomuxc { pinctrl-names = "default"; pico-imx6ul { diff --git a/arch/arm/configs/imx_v7_android_defconfig b/arch/arm/configs/imx_v7_android_defconfig index 95e7154deba6..b0c961431356 100644 --- a/arch/arm/configs/imx_v7_android_defconfig +++ b/arch/arm/configs/imx_v7_android_defconfig @@ -437,6 +437,7 @@ CONFIG_SND_SOC_IMX_SPDIF=y CONFIG_SND_SOC_IMX_MC13783=y CONFIG_SND_SOC_IMX_SI476X=y CONFIG_SND_SOC_IMX_HDMI=y +CONFIG_SND_SOC_FSL_ASOC_CARD=y CONFIG_HIDRAW=y CONFIG_UHID=y CONFIG_HID_A4TECH=y |