projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iwlwifi-for-kalle-2015-07-30' of https://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
zynq-7000.dtsi
diff --git
a/arch/arm/boot/dts/zynq-7000.dtsi
b/arch/arm/boot/dts/zynq-7000.dtsi
index 9ea54b3dba09b7de9be7936ae0a755c4ed115a97..06915080b875dd34b163859cb71c5bc0925de373 100644
(file)
--- a/
arch/arm/boot/dts/zynq-7000.dtsi
+++ b/
arch/arm/boot/dts/zynq-7000.dtsi
@@
-193,7
+193,7
@@
};
gem0: ethernet@e000b000 {
};
gem0: ethernet@e000b000 {
- compatible = "cdns,zynq-gem";
+ compatible = "cdns,zynq-gem"
, "cdns,gem"
;
reg = <0xe000b000 0x1000>;
status = "disabled";
interrupts = <0 22 4>;
reg = <0xe000b000 0x1000>;
status = "disabled";
interrupts = <0 22 4>;
@@
-204,7
+204,7
@@
};
gem1: ethernet@e000c000 {
};
gem1: ethernet@e000c000 {
- compatible = "cdns,zynq-gem";
+ compatible = "cdns,zynq-gem"
, "cdns,gem"
;
reg = <0xe000c000 0x1000>;
status = "disabled";
interrupts = <0 45 4>;
reg = <0xe000c000 0x1000>;
status = "disabled";
interrupts = <0 45 4>;