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 tag 'kconfig-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
ls1021a-qds.dts
diff --git
a/arch/arm/boot/dts/ls1021a-qds.dts
b/arch/arm/boot/dts/ls1021a-qds.dts
index 67b4de0e343921fda48d7e94b228732fe2d0131d..7bb402d3e9d04e0d43f6fe649ea2ded2d8784960 100644
(file)
--- a/
arch/arm/boot/dts/ls1021a-qds.dts
+++ b/
arch/arm/boot/dts/ls1021a-qds.dts
@@
-331,3
+331,19
@@
&uart1 {
status = "okay";
};
+
+&can0 {
+ status = "okay";
+};
+
+&can1 {
+ status = "okay";
+};
+
+&can2 {
+ status = "disabled";
+};
+
+&can3 {
+ status = "disabled";
+};