Hayes Wang <hayesw...@realtek.com> :
> - Replace the current settings with rtl_writephy and rtl_readphy.
> For the hardware, the settings are same with previous ones. This
> make the setting method like the previous chips.
> - Add new PHY settings.
Would you mind spliting it in two ?
On closer inspection the settings do not look the same.
> Signed-off-by: Hayes Wang <hayesw...@realtek.com>
> ---
> drivers/net/ethernet/realtek/r8169.c | 72
> +++++++++++++++++++++++++-----------
> 1 file changed, 51 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/net/ethernet/realtek/r8169.c
> b/drivers/net/ethernet/realtek/r8169.c
> index d36aa76..b8b59a9 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
[...]
> @@ -3370,23 +3362,61 @@ static void rtl8168g_1_hw_phy_config(struct
> rtl8169_private *tp)
> {
> rtl_apply_firmware(tp);
>
> - if (r8168_phy_ocp_read(tp, 0xa460) & 0x0100)
> - rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x0000, 0x8000);
> - else
> - rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x8000, 0x0000);
> + rtl_writephy(tp, 0x1f, 0x0a46);
> + if (rtl_readphy(tp, 0x10) & 0x0100) {
> + rtl_writephy(tp, 0x1f, 0x0bcc);
> + rtl_w1w0_phy(tp, 0x12, 0x0000, 0x8000);
> + } else {
> + rtl_writephy(tp, 0x1f, 0x0bcc);
> + rtl_w1w0_phy(tp, 0x12, 0x8000, 0x0000);
> + }
>
> - if (r8168_phy_ocp_read(tp, 0xa466) & 0x0100)
> - rtl_w1w0_phy_ocp(tp, 0xc41a, 0x0002, 0x0000);
> - else
> - rtl_w1w0_phy_ocp(tp, 0xbcc4, 0x0000, 0x0002);
^^^^^^
This one was not right, was it ?
> + rtl_writephy(tp, 0x1f, 0x0a46);
> + if (rtl_readphy(tp, 0x13) & 0x0100) {
> + rtl_writephy(tp, 0x1f, 0x0c41);
> + rtl_w1w0_phy(tp, 0x15, 0x0002, 0x0000);
> + } else {
> + rtl_writephy(tp, 0x1f, 0x0c41);
> + rtl_w1w0_phy(tp, 0x15, 0x0000, 0x0002);
> + }
--
Ueimor
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
