From e890a3bc9a2bc8713be6719796724c4e24ecdfb9 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 22 Mar 2015 15:11:14 +0000 Subject: [PATCH] ramips: make ethernet register map u16 instead of u32 Signed-off-by: Felix Fietkau SVN-Revision: 44940 --- .../ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.c | 4 ++-- .../ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h | 2 +- .../ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c | 4 ++-- .../ramips/files/drivers/net/ethernet/ralink/soc_rt305x.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.c index ef828244f94b..1822feac7ec1 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.c @@ -65,7 +65,7 @@ static int fe_msg_level = -1; module_param_named(msg_level, fe_msg_level, int, 0); MODULE_PARM_DESC(msg_level, "Message level (-1=defaults,0=none,...,16=all)"); -static const u32 fe_reg_table_default[FE_REG_COUNT] = { +static const u16 fe_reg_table_default[FE_REG_COUNT] = { [FE_REG_PDMA_GLO_CFG] = FE_PDMA_GLO_CFG, [FE_REG_PDMA_RST_CFG] = FE_PDMA_RST_CFG, [FE_REG_DLY_INT_CFG] = FE_DLY_INT_CFG, @@ -84,7 +84,7 @@ static const u32 fe_reg_table_default[FE_REG_COUNT] = { [FE_REG_FE_RST_GL] = FE_FE_RST_GL, }; -static const u32 *fe_reg_table = fe_reg_table_default; +static const u16 *fe_reg_table = fe_reg_table_default; struct fe_work_t { int bitnr; diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h index 2ad5d0130dbf..ac7c7e54bffa 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h @@ -382,7 +382,7 @@ struct fe_phy { struct fe_soc_data { - const u32 *reg_table; + const u16 *reg_table; void (*init_data)(struct fe_soc_data *data, struct net_device *netdev); void (*reset_fe)(void); diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c index f408f0773320..a18c1c9a5451 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c @@ -72,7 +72,7 @@ #define MT7621_FE_GDM1_AF BIT(28) #define MT7621_FE_GDM2_AF BIT(29) -static const u32 mt7620_reg_table[FE_REG_COUNT] = { +static const u16 mt7620_reg_table[FE_REG_COUNT] = { [FE_REG_PDMA_GLO_CFG] = RT5350_PDMA_GLO_CFG, [FE_REG_PDMA_RST_CFG] = RT5350_PDMA_RST_CFG, [FE_REG_DLY_INT_CFG] = RT5350_DLY_INT_CFG, @@ -92,7 +92,7 @@ static const u32 mt7620_reg_table[FE_REG_COUNT] = { [FE_REG_FE_INT_STATUS2] = MT7620_FE_INT_STATUS2, }; -static const u32 mt7621_reg_table[FE_REG_COUNT] = { +static const u16 mt7621_reg_table[FE_REG_COUNT] = { [FE_REG_PDMA_GLO_CFG] = RT5350_PDMA_GLO_CFG, [FE_REG_PDMA_RST_CFG] = RT5350_PDMA_RST_CFG, [FE_REG_DLY_INT_CFG] = RT5350_DLY_INT_CFG, diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt305x.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt305x.c index eacb8d874b68..c1baa40b8240 100644 --- a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt305x.c +++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt305x.c @@ -25,7 +25,7 @@ #define RT305X_RESET_FE BIT(21) #define RT305X_RESET_ESW BIT(23) -static const u32 rt5350_reg_table[FE_REG_COUNT] = { +static const u16 rt5350_reg_table[FE_REG_COUNT] = { [FE_REG_PDMA_GLO_CFG] = RT5350_PDMA_GLO_CFG, [FE_REG_PDMA_RST_CFG] = RT5350_PDMA_RST_CFG, [FE_REG_DLY_INT_CFG] = RT5350_DLY_INT_CFG, -- 2.30.2