diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-16 07:52:56 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-16 07:53:14 +0200 |
| commit | eb6095b246264c47bd14a7d825d3d2b92d443d44 (patch) | |
| tree | 1cd6e756416784511555faa3a1780778f72953b7 /arch/arm/boot/dts/at91sam9x5ek.dtsi | |
| parent | Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | ARM: at91/DT: fix at91sam9n12ek memory node (diff) | |
| download | linux-eb6095b246264c47bd14a7d825d3d2b92d443d44.tar.xz linux-eb6095b246264c47bd14a7d825d3d2b92d443d44.zip | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
From Nicolas Ferre:
Device tree related fixes:
- USB host numbering for 9x5 which was preventing from using all ports
- a missing UART (not USART) clock lookup table was preventing from using
them on 9x5
- too large amount of memory was specified for 9n12ek
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91/DT: fix at91sam9n12ek memory node
ARM: at91: add missing uart clocks DT entries
ARM: at91/DT: at91sam9x5ek: fix USB host property to enable port C
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x5ek.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5ek.dtsi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi index b753855b2058..49e3c45818c2 100644 --- a/arch/arm/boot/dts/at91sam9x5ek.dtsi +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi @@ -94,8 +94,9 @@ usb0: ohci@00600000 { status = "okay"; - num-ports = <2>; - atmel,vbus-gpio = <&pioD 19 GPIO_ACTIVE_LOW + num-ports = <3>; + atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */ + &pioD 19 GPIO_ACTIVE_LOW &pioD 20 GPIO_ACTIVE_LOW >; }; |