diff options
author | Olof Johansson <olof@lixom.net> | 2016-02-24 17:19:04 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-02-24 17:19:04 -0800 |
commit | 2bc51d76d20d7f6be064fe59755d1081de947221 (patch) | |
tree | e30e8e002041b22a8d3ba9e62d8f3b8b12f51c3a /arch/arm/boot/dts/at91-sama5d2_xplained.dts | |
parent | f21a3c7d57b88004e5dced07106ac1691a73ce7b (diff) | |
parent | 5e72c25b40c1e9ed77650f258799514aabd17303 (diff) | |
download | linux-2bc51d76d20d7f6be064fe59755d1081de947221.tar.bz2 |
Merge tag 'at91-ab-4.6-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
DT changes for 4.6:
- Addition of the ADC for sama5d2 and sama5d2_xplained
* tag 'at91-ab-4.6-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: dts: at91: sama5d2 Xplained: enable the adc device
ARM: dts: at91: sama5d2: add adc device
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/at91-sama5d2_xplained.dts')
-rw-r--r-- | arch/arm/boot/dts/at91-sama5d2_xplained.dts | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index e683856c507c..5b65ffe0845a 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -267,7 +267,29 @@ }; }; + adc: adc@fc030000 { + vddana-supply = <&vdd_3v3_lp_reg>; + vref-supply = <&vdd_3v3_lp_reg>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_adc_default>; + status = "okay"; + }; + pinctrl@fc038000 { + /* + * There is no real pinmux for ADC, if the pin + * is not requested by another peripheral then + * the muxing is done when channel is enabled. + * Requesting pins for ADC is GPIO is + * encouraged to prevent conflicts and to + * disable bias in order to be in the same + * state when the pin is not muxed to the adc. + */ + pinctrl_adc_default: adc_default { + pinmux = <PIN_PD23__GPIO>; + bias-disable; + }; + pinctrl_flx0_default: flx0_default { pinmux = <PIN_PB28__FLEXCOM0_IO0>, <PIN_PB29__FLEXCOM0_IO1>; |