Commit cce9d7e3 authored by Eugene Surovegin's avatar Eugene Surovegin Committed by Linus Torvalds

[PATCH] ppc32: fix EMAC Tx channel assignments for NPe405H

Fix PowerPC NPe405H EMAC Tx channel assignments.  EMAC unit in this chip
uses common for 4xx "two Tx / one Rx" configuration.
Signed-off-by: default avatarEugene Surovegin <ebs@ebshome.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5a6a4d43
...@@ -34,7 +34,7 @@ static struct ocp_func_emac_data ibmnp405h_emac1_def = { ...@@ -34,7 +34,7 @@ static struct ocp_func_emac_data ibmnp405h_emac1_def = {
.zmii_mux = 1, /* ZMII input of this EMAC */ .zmii_mux = 1, /* ZMII input of this EMAC */
.mal_idx = 0, /* MAL device index */ .mal_idx = 0, /* MAL device index */
.mal_rx_chan = 1, /* MAL rx channel number */ .mal_rx_chan = 1, /* MAL rx channel number */
.mal_tx_chan = 1, /* MAL tx channel number */ .mal_tx_chan = 2, /* MAL tx channel number */
.wol_irq = 41, /* WOL interrupt number */ .wol_irq = 41, /* WOL interrupt number */
.mdio_idx = -1, /* No shared MDIO */ .mdio_idx = -1, /* No shared MDIO */
.tah_idx = -1, /* No TAH */ .tah_idx = -1, /* No TAH */
...@@ -46,7 +46,7 @@ static struct ocp_func_emac_data ibmnp405h_emac2_def = { ...@@ -46,7 +46,7 @@ static struct ocp_func_emac_data ibmnp405h_emac2_def = {
.zmii_mux = 2, /* ZMII input of this EMAC */ .zmii_mux = 2, /* ZMII input of this EMAC */
.mal_idx = 0, /* MAL device index */ .mal_idx = 0, /* MAL device index */
.mal_rx_chan = 2, /* MAL rx channel number */ .mal_rx_chan = 2, /* MAL rx channel number */
.mal_tx_chan = 2, /* MAL tx channel number */ .mal_tx_chan = 4, /* MAL tx channel number */
.wol_irq = 41, /* WOL interrupt number */ .wol_irq = 41, /* WOL interrupt number */
.mdio_idx = -1, /* No shared MDIO */ .mdio_idx = -1, /* No shared MDIO */
.tah_idx = -1, /* No TAH */ .tah_idx = -1, /* No TAH */
...@@ -58,7 +58,7 @@ static struct ocp_func_emac_data ibmnp405h_emac3_def = { ...@@ -58,7 +58,7 @@ static struct ocp_func_emac_data ibmnp405h_emac3_def = {
.zmii_mux = 3, /* ZMII input of this EMAC */ .zmii_mux = 3, /* ZMII input of this EMAC */
.mal_idx = 0, /* MAL device index */ .mal_idx = 0, /* MAL device index */
.mal_rx_chan = 3, /* MAL rx channel number */ .mal_rx_chan = 3, /* MAL rx channel number */
.mal_tx_chan = 3, /* MAL tx channel number */ .mal_tx_chan = 6, /* MAL tx channel number */
.wol_irq = 41, /* WOL interrupt number */ .wol_irq = 41, /* WOL interrupt number */
.mdio_idx = -1, /* No shared MDIO */ .mdio_idx = -1, /* No shared MDIO */
.tah_idx = -1, /* No TAH */ .tah_idx = -1, /* No TAH */
......
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