diff options
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-9x9-evk.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-9x9-evk.dts | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/imx6ull-9x9-evk.dts b/arch/arm/boot/dts/imx6ull-9x9-evk.dts index 9ca45fab949f..6a772ef6f834 100644 --- a/arch/arm/boot/dts/imx6ull-9x9-evk.dts +++ b/arch/arm/boot/dts/imx6ull-9x9-evk.dts @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -93,7 +94,7 @@ audio-codec = <&codec>; asrc-controller = <&asrc>; codec-master; - gpr = <&gpr>; + gpr = <&gpr 4 0x100000 0x100000>; /* * hp-det = <hp-det-pin hp-det-polarity>; * hp-det-pin: JD1 JD2 or JD3 @@ -102,18 +103,19 @@ */ hp-det = <3 0>; hp-det-gpios = <&gpio5 4 0>; + mic-det-gpios = <&gpio5 4 0>; audio-routing = - "Headset Jack", "HP_L", - "Headset Jack", "HP_R", + "Headphone Jack", "HP_L", + "Headphone Jack", "HP_R", "Ext Spk", "SPK_LP", "Ext Spk", "SPK_LN", "Ext Spk", "SPK_RP", "Ext Spk", "SPK_RN", - "LINPUT2", "Hp MIC", - "LINPUT3", "Hp MIC", + "LINPUT2", "Mic Jack", + "LINPUT3", "Mic Jack", "RINPUT1", "Main MIC", "RINPUT2", "Main MIC", - "Hp MIC", "MICB", + "Mic Jack", "MICB", "Main MIC", "MICB", "CPU-Playback", "ASRC-Playback", "Playback", "CPU-Playback", @@ -738,10 +740,10 @@ &tsc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_tsc>; - status = "okay"; - xnur-gpio = <&gpio1 3 0>; + xnur-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>; measure_delay_time = <0xffff>; pre_charge_time = <0xfff>; + status = "okay"; }; &uart1 { |