diff options
author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2014-12-03 12:32:03 +0100 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-09 12:28:09 +0100 |
commit | 05d6a0884729f808b881e88affe1700fe45aab56 (patch) | |
tree | 5d31d1755bc1513319324573a093cea7e8a35ce1 /arch/arm/boot/dts/at91sam9261.dtsi | |
parent | ARM: at91/pm: MOR register KEY was missing (diff) | |
download | linux-05d6a0884729f808b881e88affe1700fe45aab56.tar.xz linux-05d6a0884729f808b881e88affe1700fe45aab56.zip |
ARM: at91/dt: at91sam9261: fix clocks and clock-names in udc definition
Peripheral clock is named pclk and system clock is named hclk (those are
the names expected by the at91_udc driver).
Drop the deprecated usb_clk (formerly used to configure the usb clock rate
which is now directly configurable through hclk).
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
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 e247b0b5fdab..115b332b456b 100644 --- a/arch/arm/boot/dts/at91sam9261.dtsi +++ b/arch/arm/boot/dts/at91sam9261.dtsi @@ -127,8 +127,8 @@ compatible = "atmel,at91rm9200-udc"; reg = <0xfffa4000 0x4000>; interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>; - clocks = <&usb>, <&udc_clk>, <&udpck>; - clock-names = "usb_clk", "udc_clk", "udpck"; + clocks = <&udc_clk>, <&udpck>; + clock-names = "pclk", "hclk"; status = "disabled"; }; |