github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
- mvebu
     - fix register area length in dtsi for ethernet and sata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJRpPK5AAoJEAi3KVZQDZAeY0IH/2zCJX+nmBBw9omcrDg3lXaU
 YKrpL6d/sV1Y+gyC6Xa8OLvmOZFndwt5ePh6RRprM7wDybw5JE6inCXtLUN31f0W
 ARjX6asJkPk/NqDx8Bhs+OzI157cGHKnDOTzemE0dMVtN4dBnEApKMB2w+8pzGPK
 SirwBvHuaIf5eNdIv9Vnj/UguMH7UKuPb7xKnq52FavkRcHWXXJNIDEibzwOOoBG
 KRjk1yBL3Spva51UwZ2Mgv+8J71y5KOGBUjEIHbVwcxl7lPQ37fP1yWDlreG0qdV
 xDTiB1wwfg8/IH/M+2z0AAKK4s/ngfLujZZZsHL9HrTudstThEaTi9T6scLtqOM=
 =BmX7
 -----END PGP SIGNATURE-----

Merge tag 'fixes-non-3.11-1' of git://git.infradead.org/users/jcooper/linux into next/fixes-non-critical

From Jason Cooper:
mvebu fixes non-critical for v3.11 (round 1)
 - mvebu
    - fix register area length in dtsi for ethernet and sata

Signed-off-by: Olof Johansson <olof@lixom.net>

* tag 'fixes-non-3.11-1' of git://git.infradead.org/users/jcooper/linux:
  arm: mvebu: fix length of Ethernet registers area in .dtsi
  arm: mvebu: fix length of SATA registers area in .dtsi
This commit is contained in:
Olof Johansson 2013-05-31 22:27:01 -07:00
commit b9747b3aaf
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/armada-370-xp.dtsi
View File

@ -80,7 +80,7 @@ timer@20300 {
sata@a0000 {
compatible = "marvell,orion-sata";
reg = <0xa0000 0x2400>;
reg = <0xa0000 0x5000>;
interrupts = <55>;
clocks = <&gateclk 15>, <&gateclk 30>;
clock-names = "0", "1";
@ -96,7 +96,7 @@ mdio {
ethernet@70000 {
compatible = "marvell,armada-370-neta";
reg = <0x70000 0x2500>;
reg = <0x70000 0x4000>;
interrupts = <8>;
clocks = <&gateclk 4>;
status = "disabled";
@ -104,7 +104,7 @@ ethernet@70000 {
ethernet@74000 {
compatible = "marvell,armada-370-neta";
reg = <0x74000 0x2500>;
reg = <0x74000 0x4000>;
interrupts = <10>;
clocks = <&gateclk 3>;
status = "disabled";

2
arch/arm/boot/dts/armada-xp-mv78460.dtsi
View File

@ -107,7 +107,7 @@ gpio2: gpio@18180 {
ethernet@34000 {
compatible = "marvell,armada-370-neta";
reg = <0x34000 0x2500>;
reg = <0x34000 0x4000>;
interrupts = <14>;
clocks = <&gateclk 1>;
status = "disabled";

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

@ -88,7 +88,7 @@ system-controller@18200 {
ethernet@30000 {
compatible = "marvell,armada-370-neta";
reg = <0x30000 0x2500>;
reg = <0x30000 0x4000>;
interrupts = <12>;
clocks = <&gateclk 2>;
status = "disabled";