Commit fe671772 authored by Kumar Gala's avatar Kumar Gala

powerpc/85xx: Use fsl,mpc85.. as prefix for memory ctrl & l2-cache nodes

Older devices tree's used "fsl,85.." instead of the preferred
"fsl,mpc85.." for the memory controller & l2 cache controller nodes.
The EDAC code is the only use of these and has been updated for some
time to support both "fsl,85.." and "fsl,mpc85.."
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 9310933c
...@@ -57,14 +57,14 @@ soc@fdf00000 { ...@@ -57,14 +57,14 @@ soc@fdf00000 {
bus-frequency = <0>; /* Fixed by bootwrapper */ bus-frequency = <0>; /* Fixed by bootwrapper */
memory-controller@2000 { memory-controller@2000 {
compatible = "fsl,8540-memory-controller"; compatible = "fsl,mpc8540-memory-controller";
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <0x12 0x2>; interrupts = <0x12 0x2>;
}; };
L2: l2-cache-controller@20000 { L2: l2-cache-controller@20000 {
compatible = "fsl,8540-l2-cache-controller"; compatible = "fsl,mpc8540-l2-cache-controller";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
cache-line-size = <0x20>; /* 32 bytes */ cache-line-size = <0x20>; /* 32 bytes */
cache-size = <0x40000>; /* L2, 256K */ cache-size = <0x40000>; /* L2, 256K */
......
...@@ -156,14 +156,14 @@ soc8548@e0000000 { ...@@ -156,14 +156,14 @@ soc8548@e0000000 {
compatible = "simple-bus"; compatible = "simple-bus";
memory-controller@2000 { memory-controller@2000 {
compatible = "fsl,8548-memory-controller"; compatible = "fsl,mpc8548-memory-controller";
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <0x12 0x2>; interrupts = <0x12 0x2>;
}; };
L2: l2-cache-controller@20000 { L2: l2-cache-controller@20000 {
compatible = "fsl,8548-l2-cache-controller"; compatible = "fsl,mpc8548-l2-cache-controller";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
cache-line-size = <0x20>; // 32 bytes cache-line-size = <0x20>; // 32 bytes
cache-size = <0x80000>; // L2, 512K cache-size = <0x80000>; // L2, 512K
......
...@@ -61,14 +61,14 @@ soc@ff700000 { ...@@ -61,14 +61,14 @@ soc@ff700000 {
clock-frequency = <0>; clock-frequency = <0>;
memory-controller@2000 { memory-controller@2000 {
compatible = "fsl,8560-memory-controller"; compatible = "fsl,mpc8560-memory-controller";
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <0x12 0x2>; interrupts = <0x12 0x2>;
}; };
L2: l2-cache-controller@20000 { L2: l2-cache-controller@20000 {
compatible = "fsl,8560-l2-cache-controller"; compatible = "fsl,mpc8560-l2-cache-controller";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
cache-line-size = <0x20>; // 32 bytes cache-line-size = <0x20>; // 32 bytes
cache-size = <0x40000>; // L2, 256K cache-size = <0x40000>; // L2, 256K
......
...@@ -57,14 +57,14 @@ soc@fdf00000 { ...@@ -57,14 +57,14 @@ soc@fdf00000 {
compatible = "fsl,mpc8560-immr", "simple-bus"; compatible = "fsl,mpc8560-immr", "simple-bus";
memory-controller@2000 { memory-controller@2000 {
compatible = "fsl,8540-memory-controller"; compatible = "fsl,mpc8540-memory-controller";
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <18 2>; interrupts = <18 2>;
}; };
L2: l2-cache-controller@20000 { L2: l2-cache-controller@20000 {
compatible = "fsl,8540-l2-cache-controller"; compatible = "fsl,mpc8540-l2-cache-controller";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
cache-line-size = <32>; cache-line-size = <32>;
cache-size = <0x40000>; // L2, 256K cache-size = <0x40000>; // L2, 256K
......
...@@ -59,14 +59,14 @@ soc@e0000000 { ...@@ -59,14 +59,14 @@ soc@e0000000 {
compatible = "fsl,mpc8540-immr", "simple-bus"; compatible = "fsl,mpc8540-immr", "simple-bus";
memory-controller@2000 { memory-controller@2000 {
compatible = "fsl,8540-memory-controller"; compatible = "fsl,mpc8540-memory-controller";
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <18 2>; interrupts = <18 2>;
}; };
L2: l2-cache-controller@20000 { L2: l2-cache-controller@20000 {
compatible = "fsl,8540-l2-cache-controller"; compatible = "fsl,mpc8540-l2-cache-controller";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
cache-line-size = <32>; cache-line-size = <32>;
cache-size = <0x40000>; // L2, 256K cache-size = <0x40000>; // L2, 256K
......
...@@ -58,14 +58,14 @@ soc@e0000000 { ...@@ -58,14 +58,14 @@ soc@e0000000 {
compatible = "fsl,mpc8541-immr", "simple-bus"; compatible = "fsl,mpc8541-immr", "simple-bus";
memory-controller@2000 { memory-controller@2000 {
compatible = "fsl,8540-memory-controller"; compatible = "fsl,mpc8540-memory-controller";
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <18 2>; interrupts = <18 2>;
}; };
L2: l2-cache-controller@20000 { L2: l2-cache-controller@20000 {
compatible = "fsl,8540-l2-cache-controller"; compatible = "fsl,mpc8540-l2-cache-controller";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
cache-line-size = <32>; cache-line-size = <32>;
cache-size = <0x40000>; // L2, 256K cache-size = <0x40000>; // L2, 256K
......
...@@ -58,14 +58,14 @@ soc@e0000000 { ...@@ -58,14 +58,14 @@ soc@e0000000 {
compatible = "fsl,mpc8555-immr", "simple-bus"; compatible = "fsl,mpc8555-immr", "simple-bus";
memory-controller@2000 { memory-controller@2000 {
compatible = "fsl,8540-memory-controller"; compatible = "fsl,mpc8540-memory-controller";
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <18 2>; interrupts = <18 2>;
}; };
L2: l2-cache-controller@20000 { L2: l2-cache-controller@20000 {
compatible = "fsl,8540-l2-cache-controller"; compatible = "fsl,mpc8540-l2-cache-controller";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
cache-line-size = <32>; cache-line-size = <32>;
cache-size = <0x40000>; // L2, 256K cache-size = <0x40000>; // L2, 256K
......
...@@ -60,14 +60,14 @@ soc@e0000000 { ...@@ -60,14 +60,14 @@ soc@e0000000 {
compatible = "fsl,mpc8560-immr", "simple-bus"; compatible = "fsl,mpc8560-immr", "simple-bus";
memory-controller@2000 { memory-controller@2000 {
compatible = "fsl,8540-memory-controller"; compatible = "fsl,mpc8540-memory-controller";
reg = <0x2000 0x1000>; reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <18 2>; interrupts = <18 2>;
}; };
L2: l2-cache-controller@20000 { L2: l2-cache-controller@20000 {
compatible = "fsl,8540-l2-cache-controller"; compatible = "fsl,mpc8540-l2-cache-controller";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
cache-line-size = <32>; cache-line-size = <32>;
cache-size = <0x40000>; // L2, 256K cache-size = <0x40000>; // L2, 256K
......
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