diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-30 12:49:42 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-30 12:49:42 -0700 |
| commit | 38bf3a79785f50ecad01e0ea60bf779507032984 (patch) | |
| tree | e97036f8b9accbc1a5fae496a4fab1b33f4e0b8a /arch/arm/boot | |
| parent | 44b4aa97bea84fa8ac179155f147e3483cc7a6e0 (diff) | |
| parent | 9ff25d7b58d8a4374886843ed3ed21f1ef17bf16 (diff) | |
| download | op-kernel-dev-38bf3a79785f50ecad01e0ea60bf779507032984.zip op-kernel-dev-38bf3a79785f50ecad01e0ea60bf779507032984.tar.gz | |
Merge branch 'clk-pxa27x' into clk-next
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/pxa27x.dtsi | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi index a705469..80fc5d7 100644 --- a/arch/arm/boot/dts/pxa27x.dtsi +++ b/arch/arm/boot/dts/pxa27x.dtsi @@ -1,5 +1,6 @@ /* The pxa3xx skeleton simply augments the 2xx version */ -/include/ "pxa2xx.dtsi" +#include "pxa2xx.dtsi" +#include "dt-bindings/clock/pxa2xx-clock.h" / { model = "Marvell PXA27x familiy SoC"; @@ -35,4 +36,21 @@ #pwm-cells = <1>; }; }; + + clocks { + /* + * The muxing of external clocks/internal dividers for osc* clock + * sources has been hidden under the carpet by now. + */ + #address-cells = <1>; + #size-cells = <1>; + ranges; + + pxa2xx_clks: pxa2xx_clks@41300004 { + compatible = "marvell,pxa-clocks"; + #clock-cells = <1>; + status = "okay"; + }; + }; + }; |
