From d465902b6096b5db26531ae278437e9f35d7f84b Mon Sep 17 00:00:00 2001 From: Andy Duan Date: Tue, 19 Apr 2016 17:59:43 +0800 Subject: [PATCH] MLK-12682 ARM: dts: imx6ull: add adc support Add extra dts file to enable adc to avoid pin conflict with usbotg1. Signed-off-by: Fugang Duan --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6ull-ddr3-arm2-adc.dts | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 arch/arm/boot/dts/imx6ull-ddr3-arm2-adc.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index d6dfb58a9dd9..44a79649f329 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -481,6 +481,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-9x9-evk-ldo.dtb dtb-$(CONFIG_SOC_IMX6ULL) += \ imx6ull-ddr3-arm2.dtb \ + imx6ull-ddr3-arm2-adc.dtb \ imx6ull-ddr3-arm2-gpmi-weim.dtb \ imx6ull-ddr3-arm2-lcdif.dtb dtb-$(CONFIG_SOC_IMX7D) += \ diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-adc.dts b/arch/arm/boot/dts/imx6ull-ddr3-arm2-adc.dts new file mode 100644 index 000000000000..c586459303b5 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-ddr3-arm2-adc.dts @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2016 Freescale Semiconductor, Inc. + * + * 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 + * published by the Free Software Foundation. + */ + +#include "imx6ull-ddr3-arm2.dts" + +&usbotg1 { + status = "disabled"; +}; + +&adc1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_adc1>; + vref-supply = <®_vref_3v3>; + status = "okay"; +}; -- 2.17.1