Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
boot
/
dts
/
imx6qdl-nitrogen6_max.dtsi
diff --git
a/kernel/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
b/kernel/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
index
a35d54f
..
ddfdb75
100644
(file)
--- a/
kernel/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/
kernel/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
@@
-319,8
+319,6
@@
compatible = "fsl,imx6q-nitrogen6_max-sgtl5000",
"fsl,imx-audio-sgtl5000";
model = "imx6q-nitrogen6_max-sgtl5000";
compatible = "fsl,imx6q-nitrogen6_max-sgtl5000",
"fsl,imx-audio-sgtl5000";
model = "imx6q-nitrogen6_max-sgtl5000";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_sgtl5000>;
ssi-controller = <&ssi1>;
audio-codec = <&codec>;
audio-routing =
ssi-controller = <&ssi1>;
audio-codec = <&codec>;
audio-routing =
@@
-401,6
+399,8
@@
codec: sgtl5000@0a {
compatible = "fsl,sgtl5000";
codec: sgtl5000@0a {
compatible = "fsl,sgtl5000";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sgtl5000>;
reg = <0x0a>;
clocks = <&clks 201>;
VDDA-supply = <®_2p5v>;
reg = <0x0a>;
clocks = <&clks 201>;
VDDA-supply = <®_2p5v>;