diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2016-08-22 09:47:34 +0200 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2016-08-22 10:01:04 +0200 |
commit | 4eb376586c5785025af07d439f58cb31337bb6b6 (patch) | |
tree | b75d926fc599ed991b1fae213e6746dd4f5f36e7 /target/linux/generic/patches-4.4/077-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch | |
parent | c6164d961037ceb722b03ccfe1725be6b9a6d533 (diff) | |
download | mtk-20170518-4eb376586c5785025af07d439f58cb31337bb6b6.zip mtk-20170518-4eb376586c5785025af07d439f58cb31337bb6b6.tar.gz mtk-20170518-4eb376586c5785025af07d439f58cb31337bb6b6.tar.bz2 |
kernel: bgmac: use upstream accepted patches
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.4/077-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch')
-rw-r--r-- | target/linux/generic/patches-4.4/077-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.4/077-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch b/target/linux/generic/patches-4.4/077-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch new file mode 100644 index 0000000..5f60a32 --- /dev/null +++ b/target/linux/generic/patches-4.4/077-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch @@ -0,0 +1,31 @@ +From e2d8f646c79f26e094bfaf9b21be614d1e148a67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> +Date: Wed, 17 Aug 2016 23:11:52 +0200 +Subject: [PATCH] net: bgmac: make it clear when setting interface type to RMII +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It doesn't really change anything as BGMAC_CHIPCTL_1_IF_TYPE_RMII is +equal to 0. It make code a bit clener, so far when reading it one could +think we forgot to set a proper mode. It also keeps this mode code in +sync with other ones. + +Signed-off-by: Rafał Miłecki <rafal@milecki.pl> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/ethernet/broadcom/bgmac.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/ethernet/broadcom/bgmac.c ++++ b/drivers/net/ethernet/broadcom/bgmac.c +@@ -932,7 +932,8 @@ static void bgmac_chip_reset(struct bgma + et_swtype <<= 4; + sw_type = et_swtype; + } else if (bgmac->feature_flags & BGMAC_FEAT_SW_TYPE_EPHYRMII) { +- sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHYRMII; ++ sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RMII | ++ BGMAC_CHIPCTL_1_SW_TYPE_EPHYRMII; + } else if (bgmac->feature_flags & BGMAC_FEAT_SW_TYPE_RGMII) { + sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII | + BGMAC_CHIPCTL_1_SW_TYPE_RGMII; |