projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'for-4.3/chicony', 'for-4.3/cp2112', 'for-4.3/i2c-hid', 'for-4.3/lenov...
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
boot
/
dts
/
ste-nomadik-nhk15.dts
diff --git
a/arch/arm/boot/dts/ste-nomadik-nhk15.dts
b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
index 3d0b8755caeee62f77ac214d343ab40cebba2ce0..3d25dba143a5d7f4a254460343161ad5e9c4e6ff 100644
(file)
--- a/
arch/arm/boot/dts/ste-nomadik-nhk15.dts
+++ b/
arch/arm/boot/dts/ste-nomadik-nhk15.dts
@@
-17,6
+17,7
@@
};
aliases {
+ serial1 = &uart1;
stmpe-i2c0 = &stmpe0;
stmpe-i2c1 = &stmpe1;
};