mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
Merge commit 'jwb/next' into next
This commit is contained in:
commit
d67ebe72c9
8 changed files with 36 additions and 3 deletions
|
@ -352,6 +352,7 @@ EMAC0: ethernet@ef600e00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
@ -381,6 +382,7 @@ EMAC1: ethernet@ef600f00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
|
|
@ -316,6 +316,7 @@ EMAC0: ethernet@ef600a00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
@ -345,6 +346,7 @@ EMAC1: ethernet@ef600b00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
@ -375,6 +377,8 @@ EMAC2: ethernet@ef600c00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
|
tx-fifo-size-gige = <16384>; /* emac2&3 only */
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII1>;
|
rgmii-device = <&RGMII1>;
|
||||||
|
@ -403,6 +407,8 @@ EMAC3: ethernet@ef600d00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
|
tx-fifo-size-gige = <16384>; /* emac2&3 only */
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII1>;
|
rgmii-device = <&RGMII1>;
|
||||||
|
|
|
@ -292,6 +292,7 @@ EMAC0: ethernet@ef600e00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
@ -321,6 +322,7 @@ EMAC1: ethernet@ef600f00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
@ -351,6 +353,8 @@ EMAC2: ethernet@ef601100 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
|
tx-fifo-size-gige = <16384>; /* emac2&3 only */
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII1>;
|
rgmii-device = <&RGMII1>;
|
||||||
|
@ -379,6 +383,8 @@ EMAC3: ethernet@ef601200 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
|
tx-fifo-size-gige = <16384>; /* emac2&3 only */
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII1>;
|
rgmii-device = <&RGMII1>;
|
||||||
|
|
|
@ -226,6 +226,8 @@ EMAC0: ethernet@ef600900 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
|
tx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
#address-cells = <2>;
|
#address-cells = <2>;
|
||||||
#size-cells = <1>;
|
#size-cells = <2>;
|
||||||
model = "amcc,katmai";
|
model = "amcc,katmai";
|
||||||
compatible = "amcc,katmai";
|
compatible = "amcc,katmai";
|
||||||
dcr-parent = <&{/cpus/cpu@0}>;
|
dcr-parent = <&{/cpus/cpu@0}>;
|
||||||
|
@ -49,7 +49,7 @@ cpu@0 {
|
||||||
|
|
||||||
memory {
|
memory {
|
||||||
device_type = "memory";
|
device_type = "memory";
|
||||||
reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */
|
reg = <0x0 0x00000000 0x0 0x00000000>; /* Filled in by U-Boot */
|
||||||
};
|
};
|
||||||
|
|
||||||
UIC0: interrupt-controller0 {
|
UIC0: interrupt-controller0 {
|
||||||
|
@ -112,7 +112,15 @@ plb {
|
||||||
compatible = "ibm,plb-440spe", "ibm,plb-440gp", "ibm,plb4";
|
compatible = "ibm,plb-440spe", "ibm,plb-440gp", "ibm,plb4";
|
||||||
#address-cells = <2>;
|
#address-cells = <2>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
ranges;
|
/* addr-child addr-parent size */
|
||||||
|
ranges = <0x4 0xe0000000 0x4 0xe0000000 0x20000000
|
||||||
|
0xc 0x00000000 0xc 0x00000000 0x20000000
|
||||||
|
0xd 0x00000000 0xd 0x00000000 0x80000000
|
||||||
|
0xd 0x80000000 0xd 0x80000000 0x80000000
|
||||||
|
0xe 0x00000000 0xe 0x00000000 0x80000000
|
||||||
|
0xe 0x80000000 0xe 0x80000000 0x80000000
|
||||||
|
0xf 0x00000000 0xf 0x00000000 0x80000000
|
||||||
|
0xf 0x80000000 0xf 0x80000000 0x80000000>;
|
||||||
clock-frequency = <0>; /* Filled in by zImage */
|
clock-frequency = <0>; /* Filled in by zImage */
|
||||||
|
|
||||||
SDRAM0: sdram {
|
SDRAM0: sdram {
|
||||||
|
|
|
@ -272,6 +272,8 @@ EMAC0: ethernet@ef600900 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
|
tx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
@ -300,6 +302,8 @@ EMAC1: ethernet@ef600a00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
|
tx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
|
|
@ -227,6 +227,8 @@ EMAC0: ethernet@ef600900 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
|
tx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x0000003f>; /* Start at 6 */
|
phy-map = <0x0000003f>; /* Start at 6 */
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
@ -255,6 +257,8 @@ EMAC1: ethernet@ef600a00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
|
tx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
|
|
@ -226,6 +226,7 @@ EMAC0: ethernet@ef600a00 {
|
||||||
max-frame-size = <9000>;
|
max-frame-size = <9000>;
|
||||||
rx-fifo-size = <4096>;
|
rx-fifo-size = <4096>;
|
||||||
tx-fifo-size = <2048>;
|
tx-fifo-size = <2048>;
|
||||||
|
rx-fifo-size-gige = <16384>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
phy-map = <0x00000000>;
|
phy-map = <0x00000000>;
|
||||||
rgmii-device = <&RGMII0>;
|
rgmii-device = <&RGMII0>;
|
||||||
|
|
Loading…
Reference in a new issue