Commit ad9d6156 authored by Jason Cooper's avatar Jason Cooper

Merge tag 'tags/fixes-non-3.11-1' into mvebu/regmap

mvebu fixes non-critical for v3.11 (round 1)

 - mvebu
    - fix register area length in dtsi for ethernet and sata
parents d683b96b cf8088c5
...@@ -80,7 +80,7 @@ timer@20300 { ...@@ -80,7 +80,7 @@ timer@20300 {
sata@a0000 { sata@a0000 {
compatible = "marvell,orion-sata"; compatible = "marvell,orion-sata";
reg = <0xa0000 0x2400>; reg = <0xa0000 0x5000>;
interrupts = <55>; interrupts = <55>;
clocks = <&gateclk 15>, <&gateclk 30>; clocks = <&gateclk 15>, <&gateclk 30>;
clock-names = "0", "1"; clock-names = "0", "1";
...@@ -96,7 +96,7 @@ mdio { ...@@ -96,7 +96,7 @@ mdio {
ethernet@70000 { ethernet@70000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-370-neta";
reg = <0x70000 0x2500>; reg = <0x70000 0x4000>;
interrupts = <8>; interrupts = <8>;
clocks = <&gateclk 4>; clocks = <&gateclk 4>;
status = "disabled"; status = "disabled";
...@@ -104,7 +104,7 @@ ethernet@70000 { ...@@ -104,7 +104,7 @@ ethernet@70000 {
ethernet@74000 { ethernet@74000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-370-neta";
reg = <0x74000 0x2500>; reg = <0x74000 0x4000>;
interrupts = <10>; interrupts = <10>;
clocks = <&gateclk 3>; clocks = <&gateclk 3>;
status = "disabled"; status = "disabled";
......
...@@ -107,7 +107,7 @@ gpio2: gpio@18180 { ...@@ -107,7 +107,7 @@ gpio2: gpio@18180 {
ethernet@34000 { ethernet@34000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-370-neta";
reg = <0x34000 0x2500>; reg = <0x34000 0x4000>;
interrupts = <14>; interrupts = <14>;
clocks = <&gateclk 1>; clocks = <&gateclk 1>;
status = "disabled"; status = "disabled";
......
...@@ -88,7 +88,7 @@ system-controller@18200 { ...@@ -88,7 +88,7 @@ system-controller@18200 {
ethernet@30000 { ethernet@30000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-370-neta";
reg = <0x30000 0x2500>; reg = <0x30000 0x4000>;
interrupts = <12>; interrupts = <12>;
clocks = <&gateclk 2>; clocks = <&gateclk 2>;
status = "disabled"; status = "disabled";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment