diff options
| author | Mark Brown | 2017-01-24 17:24:18 +0100 |
|---|---|---|
| committer | Mark Brown | 2017-01-24 17:24:18 +0100 |
| commit | dbbc21bbf2c640dd148903e82f752c2f269fc58a (patch) | |
| tree | e85f5b686774e2fbae6387f94bf44c4076c49046 /arch/arm/boot/dts/at91sam9261.dtsi | |
| parent | ASoC: hdac_hdmi: use audio component framework to read ELD (diff) | |
| parent | Linux 4.10-rc1 (diff) | |
| download | kernel-qcow2-linux-dbbc21bbf2c640dd148903e82f752c2f269fc58a.tar.gz kernel-qcow2-linux-dbbc21bbf2c640dd148903e82f752c2f269fc58a.tar.xz kernel-qcow2-linux-dbbc21bbf2c640dd148903e82f752c2f269fc58a.zip | |
Merge tag 'v4.10-rc1' into asoc-intel
Linux 4.10-rc1
Diffstat (limited to 'arch/arm/boot/dts/at91sam9261.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9261.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi index 32752d7883f1..3fe77c38bd0d 100644 --- a/arch/arm/boot/dts/at91sam9261.dtsi +++ b/arch/arm/boot/dts/at91sam9261.dtsi @@ -302,8 +302,8 @@ dbgu { pinctrl_dbgu: dbgu-0 { atmel,pins = - <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE>, - <AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; + <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>, + <AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; }; }; |