generic: ar8216: rename cpuport_cfg to port0_cfg in ar8327_platform_data

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34846 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 c7b9858..60baae9 100644 (file)
--- 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 71d4867..22d1680 100644 (file)
--- 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 7be2955..bf4cf46 100644 (file)
--- 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 163dc6f..fa8c474 100644 (file)
--- 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 ea692af..715fb06 100644 (file)
--- 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 97d8b53..0ca7861 100644 (file)
--- 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 65576b6..2e8fbdc 100644 (file)
--- 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 b378888..33d8073 100644 (file)
--- 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 9cbe3a8..f20cc28 100644 (file)
--- 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 f5c2ef0..f1673db 100644 (file)
--- 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;
 };