git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6sx-nitrogen6sx.dts
diff --git
a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
index c5578d1c1ee4d126a2b2f156af02b0a4f29a1888..f9d40ee149824186442a0d4d8352f4ed9d59aaf1 100644
(file)
--- a/
arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
+++ b/
arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
@@
-231,7
+231,7
@@
pinctrl-0 = <&pinctrl_i2c1>;
status = "okay";
- codec: sgtl5000@
0
a {
+ codec: sgtl5000@a {
compatible = "fsl,sgtl5000";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sgtl5000>;