shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-02 17:26:42 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'tags/mvebu-dt-fixes-3.14' into mvebu/dt

Browse Source 
mvebu dt fixes for v3.14

 - mvebu: add missing 'eth3' alias for mv78260

 - dove: revert PMU interrupt controller node, wait for driver to land.
This commit is contained in:
Jason Cooper
2014-02-22 18:16:33 +00:00
parent 2d0a7addbd ae10f8329f
commit 3a7120431d
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/armada-xp-mv78260.dtsi
View File

@@ -23,6 +23,7 @@
gpio0 = &gpio0;
gpio1 = &gpio1;
gpio2 = &gpio2;
eth3 = &eth3;
};
cpus {
@@ -291,7 +292,7 @@
interrupts = <91>;
};
ethernet@34000 {
eth3: ethernet@34000 {
compatible = "marvell,armada-370-neta";
reg = <0x34000 0x4000>;
interrupts = <14>;

11
arch/arm/boot/dts/dove.dtsi
View File

@@ -387,15 +387,6 @@
#clock-cells = <1>;
};
pmu_intc: pmu-interrupt-ctrl@d0050 {
compatible = "marvell,dove-pmu-intc";
interrupt-controller;
#interrupt-cells = <1>;
reg = <0xd0050 0x8>;
interrupts = <33>;
marvell,#interrupts = <7>;
};
pinctrl: pin-ctrl@d0200 {
compatible = "marvell,dove-pinctrl";
reg = <0xd0200 0x10>;
@@ -618,8 +609,6 @@
rtc: real-time-clock@d8500 {
compatible = "marvell,orion-rtc";
reg = <0xd8500 0x20>;
interrupt-parent = <&pmu_intc>;
interrupts = <5>;
};
gpio2: gpio-ctrl@e8400 {