diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-02 09:16:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-03 12:39:10 -0800 |
| commit | 3060817fe8936b1e2aab03b14c068c92d54b84bb (patch) | |
| tree | 6c59d8412ef9328bbe53199b167a781d06781e80 /arch/arm/boot | |
| parent | c0c3350c3c1171f7aff7373c658aa7d68975bd55 (diff) | |
| parent | 7093bf2b7195541281cb711e31c027a8d826c6df (diff) | |
| download | op-kernel-dev-3060817fe8936b1e2aab03b14c068c92d54b84bb.zip op-kernel-dev-3060817fe8936b1e2aab03b14c068c92d54b84bb.tar.gz | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
From Nicolas Ferre:
AT91: second round of fixes for 3.13
- reduce IP frequency for I2C on sama5d3
- missing aliases directive for USART3 on 9x5 family
- a PM symbol is missing if !CONFIG_PM
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
ARM: at91: add usart3 alias to dtsi
ARM: at91: sama5d3: reduce TWI internal clock frequency
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5_usart3.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5_usart3.dtsi b/arch/arm/boot/dts/at91sam9x5_usart3.dtsi index 2347e95..6801106 100644 --- a/arch/arm/boot/dts/at91sam9x5_usart3.dtsi +++ b/arch/arm/boot/dts/at91sam9x5_usart3.dtsi @@ -11,6 +11,10 @@ #include <dt-bindings/interrupt-controller/irq.h> / { + aliases { + serial4 = &usart3; + }; + ahb { apb { pinctrl@fffff400 { |
