diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-30 10:48:45 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-30 10:48:58 +0300 |
| commit | c69f203df3e61414fbf1a66d130abfd7c3bf3fd0 (patch) | |
| tree | a6850417a1871f7bf321ef0318bd8c43439d7fed /arch/arm/boot/dts/ste-href.dtsi | |
| parent | 3906a13a6b4e78fbc0def03a808f091f0dff1b44 (diff) | |
| parent | fe82203b63e598c34d96e846dea49679a726fc7a (diff) | |
| download | linux-c69f203df3e61414fbf1a66d130abfd7c3bf3fd0.tar.xz | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/ste-href.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/ste-href.dtsi | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index f37f9e10713c..9e359e4f342e 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -186,15 +186,6 @@ status = "okay"; }; - sound { - compatible = "stericsson,snd-soc-mop500"; - - stericsson,cpu-dai = <&msp1 &msp3>; - stericsson,audio-codec = <&codec>; - clocks = <&prcmu_clk PRCMU_SYSCLK>; - clock-names = "sysclk"; - }; - msp0: msp@80123000 { pinctrl-names = "default"; pinctrl-0 = <&msp0_default_mode>; |