diff options
author | Paul Moore <pmoore@redhat.com> | 2014-01-23 21:52:06 +0100 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2014-01-23 21:52:06 +0100 |
commit | 41be702a542a0d14bb0b1c16e824fa9ed27616ec (patch) | |
tree | e48942a05882da47544e179c6a0c920e00137a6a /arch/arm/boot/dts/dove-cubox.dts | |
parent | SELinux: Fix memory leak upon loading policy (diff) | |
parent | Linux 3.13 (diff) | |
download | linux-41be702a542a0d14bb0b1c16e824fa9ed27616ec.tar.xz linux-41be702a542a0d14bb0b1c16e824fa9ed27616ec.zip |
Merge tag 'v3.13' into next
Linux 3.13
Minor fixup needed in selinux_inet_conn_request()
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'arch/arm/boot/dts/dove-cubox.dts')
-rw-r--r-- | arch/arm/boot/dts/dove-cubox.dts | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index 022646ef4b38..8349a248ecea 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts @@ -1,6 +1,6 @@ /dts-v1/; -/include/ "dove.dtsi" +#include "dove.dtsi" / { model = "SolidRun CuBox"; @@ -99,18 +99,12 @@ silabs,pll-master; }; - clkout1 { - reg = <1>; - silabs,drive-strength = <8>; - silabs,multisynth-source = <1>; - silabs,clock-source = <0>; - silabs,pll-master; - }; - clkout2 { reg = <2>; + silabs,drive-strength = <8>; silabs,multisynth-source = <1>; silabs,clock-source = <0>; + silabs,pll-master; }; }; }; @@ -132,3 +126,11 @@ reg = <0>; }; }; + +&audio1 { + status = "okay"; + clocks = <&gate_clk 13>, <&si5351 2>; + clock-names = "internal", "extclk"; + pinctrl-0 = <&pmx_audio1_i2s1_spdifo &pmx_audio1_extclk>; + pinctrl-names = "default"; +}; |