diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-29 14:37:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-29 14:37:06 +0200 |
| commit | 9f0942c873dc7bf20a74062fd1a0c903eeacbb5f (patch) | |
| tree | 1fe8e52b382d331708ffcdf9fd7f07431cf2b240 /dts/src | |
| parent | 48d44d036058b7882b91024cae63c750a9c63c6f (diff) | |
| download | barebox-9f0942c873dc7bf20a74062fd1a0c903eeacbb5f.tar.gz barebox-9f0942c873dc7bf20a74062fd1a0c903eeacbb5f.tar.xz | |
dts: update to v3.16-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src')
| -rw-r--r-- | dts/src/arm/at91sam9n12.dtsi | 2 | ||||
| -rw-r--r-- | dts/src/arm/at91sam9x5.dtsi | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dts/src/arm/at91sam9n12.dtsi b/dts/src/arm/at91sam9n12.dtsi index 287795985e..b84bac5bad 100644 --- a/dts/src/arm/at91sam9n12.dtsi +++ b/dts/src/arm/at91sam9n12.dtsi @@ -925,7 +925,7 @@ compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00500000 0x00100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; - clocks = <&usb>, <&uhphs_clk>, <&udphs_clk>, + clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>; clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck"; status = "disabled"; diff --git a/dts/src/arm/at91sam9x5.dtsi b/dts/src/arm/at91sam9x5.dtsi index 2ebc42140e..2c0d6ea3ab 100644 --- a/dts/src/arm/at91sam9x5.dtsi +++ b/dts/src/arm/at91sam9x5.dtsi @@ -1124,6 +1124,7 @@ compatible = "atmel,at91sam9rl-pwm"; reg = <0xf8034000 0x300>; interrupts = <18 IRQ_TYPE_LEVEL_HIGH 4>; + clocks = <&pwm_clk>; #pwm-cells = <3>; status = "disabled"; }; @@ -1155,8 +1156,7 @@ compatible = "atmel,at91rm9200-ohci", "usb-ohci"; reg = <0x00600000 0x100000>; interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; - clocks = <&usb>, <&uhphs_clk>, <&udphs_clk>, - <&uhpck>; + clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>; clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck"; status = "disabled"; }; |