diff options
| author | Arnd Bergmann | 2015-03-11 20:46:52 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2015-03-11 20:46:52 +0100 |
| commit | 30fa7e0e85699f4887cf824401a4fd7f8174e603 (patch) | |
| tree | 7a2065527a753b00f9f2c3fb64b2dfc287e96158 /arch/arm/boot/dts/at91sam9260.dtsi | |
| parent | Merge tag 'imx-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sh... (diff) | |
| parent | ARM: at91: pm_slowclock: fix the compilation error (diff) | |
| download | kernel-qcow2-linux-30fa7e0e85699f4887cf824401a4fd7f8174e603.tar.gz kernel-qcow2-linux-30fa7e0e85699f4887cf824401a4fd7f8174e603.tar.xz kernel-qcow2-linux-30fa7e0e85699f4887cf824401a4fd7f8174e603.zip | |
Merge tag 'at91-fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes
Pull "Third fixes batch for AT91 on 4.0" from Nicolas Ferre:
- clock fixes for USB
- compatible string changes for handling USB IP differences
(+ needed AHB matrix syscon)
- fix of a compilation error in PM code
* tag 'at91-fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91: pm_slowclock: fix the compilation error
ARM: at91/dt: fix USB high-speed clock to select UTMI
ARM: at91/dt: fix at91 udc compatible strings
ARM: at91/dt: declare matrix node as a syscon device
ARM: at91/dt: at91sam9261: fix clocks and clock-names in udc definition
Diffstat (limited to 'arch/arm/boot/dts/at91sam9260.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9260.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index ac2c5dd03663..e7f0a4ae271c 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi @@ -853,7 +853,7 @@ }; usb1: gadget@fffa4000 { - compatible = "atmel,at91rm9200-udc"; + compatible = "atmel,at91sam9260-udc"; reg = <0xfffa4000 0x4000>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; clocks = <&udc_clk>, <&udpck>; |