From: Gabor Juhos Date: Sat, 22 Dec 2012 12:12:35 +0000 (+0000) Subject: generic: ar8216: rename cpuport_cfg to port0_cfg in ar8327_platform_data X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a0b31f97bb215b2de2c4addbc426121511f1d625;p=openwrt%2Fstaging%2Fkaloz.git generic: ar8216: rename cpuport_cfg to port0_cfg in ar8327_platform_data Signed-off-by: Gabor Juhos SVN-Revision: 34846 --- diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c index c7b985863f..60baae9b79 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c @@ -106,7 +106,7 @@ static struct ar8327_pad_cfg rb2011_ar8327_pad0_cfg = { static struct ar8327_platform_data rb2011_ar8327_data = { .pad0_cfg = &rb2011_ar8327_pad0_cfg, - .cpuport_cfg = { + .port0_cfg = { .force_link = 1, .speed = AR8327_PORT_SPEED_1000, .duplex = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c index 71d48679d2..22d1680519 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c @@ -184,7 +184,7 @@ static struct ar8327_pad_cfg rb750gr3_ar8327_pad0_cfg = { static struct ar8327_platform_data rb750gr3_ar8327_data = { .pad0_cfg = &rb750gr3_ar8327_pad0_cfg, - .cpuport_cfg = { + .port0_cfg = { .force_link = 1, .speed = AR8327_PORT_SPEED_1000, .duplex = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c index 7be29555dd..bf4cf4629e 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c @@ -121,7 +121,7 @@ static struct ar8327_led_cfg wdr4300_ar8327_led_cfg = { static struct ar8327_platform_data wdr4300_ar8327_data = { .pad0_cfg = &wdr4300_ar8327_pad0_cfg, - .cpuport_cfg = { + .port0_cfg = { .force_link = 1, .speed = AR8327_PORT_SPEED_1000, .duplex = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c index 163dc6fa63..fa8c4749cd 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c @@ -84,7 +84,7 @@ static struct ar8327_pad_cfg db120_ar8327_pad0_cfg = { static struct ar8327_platform_data db120_ar8327_data = { .pad0_cfg = &db120_ar8327_pad0_cfg, - .cpuport_cfg = { + .port0_cfg = { .force_link = 1, .speed = AR8327_PORT_SPEED_1000, .duplex = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c index ea692af60b..715fb064fe 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c @@ -131,7 +131,7 @@ static struct ar8327_led_cfg wndr4300_ar8327_led_cfg = { static struct ar8327_platform_data wndr4300_ar8327_data = { .pad0_cfg = &wndr4300_ar8327_pad0_cfg, - .cpuport_cfg = { + .port0_cfg = { .force_link = 1, .speed = AR8327_PORT_SPEED_1000, .duplex = 1, diff --git a/target/linux/ar71xx/patches-3.6/605-MIPS-ath79-db120-fixes.patch b/target/linux/ar71xx/patches-3.6/605-MIPS-ath79-db120-fixes.patch index 97d8b539bb..0ca786124f 100644 --- a/target/linux/ar71xx/patches-3.6/605-MIPS-ath79-db120-fixes.patch +++ b/target/linux/ar71xx/patches-3.6/605-MIPS-ath79-db120-fixes.patch @@ -99,7 +99,7 @@ - .num_chipselect = 1, +static struct ar8327_platform_data db120_ar8327_data = { + .pad0_cfg = &db120_ar8327_pad0_cfg, -+ .cpuport_cfg = { ++ .port0_cfg = { + .force_link = 1, + .speed = AR8327_PORT_SPEED_1000, + .duplex = 1, diff --git a/target/linux/ar71xx/patches-3.6/608-MIPS-ath79-ubnt-xm-add-more-boards.patch b/target/linux/ar71xx/patches-3.6/608-MIPS-ath79-ubnt-xm-add-more-boards.patch index 65576b652a..2e8fbdc93f 100644 --- a/target/linux/ar71xx/patches-3.6/608-MIPS-ath79-ubnt-xm-add-more-boards.patch +++ b/target/linux/ar71xx/patches-3.6/608-MIPS-ath79-ubnt-xm-add-more-boards.patch @@ -249,7 +249,7 @@ + +static struct ar8327_platform_data uap_pro_ar8327_data = { + .pad0_cfg = &uap_pro_ar8327_pad0_cfg, -+ .cpuport_cfg = { ++ .port0_cfg = { + .force_link = 1, + .speed = AR8327_PORT_SPEED_1000, + .duplex = 1, diff --git a/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch b/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch index b378888bfd..33d8073921 100644 --- a/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch +++ b/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch @@ -93,7 +93,7 @@ +static struct ar8327_platform_data ap136_ar8327_data = { + .pad0_cfg = &ap136_ar8327_pad0_cfg, + .pad6_cfg = &ap136_ar8327_pad6_cfg, -+ .cpuport_cfg = { ++ .port0_cfg = { + .force_link = 1, + .speed = AR8327_PORT_SPEED_1000, + .duplex = 1, diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index 9cbe3a838c..f20cc281bf 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -1084,7 +1084,7 @@ ar8327_init_cpuport(struct ar8216_priv *priv) if (!pdata) return; - cfg = &pdata->cpuport_cfg; + cfg = &pdata->port0_cfg; if (!cfg->force_link) { priv->write(priv, AR8327_REG_PORT_STATUS(AR8216_PORT_CPU), AR8216_PORT_STATUS_LINK_AUTO); diff --git a/target/linux/generic/files/include/linux/ar8216_platform.h b/target/linux/generic/files/include/linux/ar8216_platform.h index f5c2ef065f..f1673dbb53 100644 --- a/target/linux/generic/files/include/linux/ar8216_platform.h +++ b/target/linux/generic/files/include/linux/ar8216_platform.h @@ -74,7 +74,7 @@ struct ar8327_platform_data { struct ar8327_pad_cfg *pad0_cfg; struct ar8327_pad_cfg *pad5_cfg; struct ar8327_pad_cfg *pad6_cfg; - struct ar8327_port_cfg cpuport_cfg; + struct ar8327_port_cfg port0_cfg; struct ar8327_led_cfg *led_cfg; };