Merge branch 'r8152-bp-settings'
Hayes Wang says: ==================== r8152: fix bp settings Fix the wrong bp settings of the firmware. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
c15128c97b
@ -3955,17 +3955,28 @@ static void rtl_clear_bp(struct r8152 *tp, u16 type)
|
||||
case RTL_VER_06:
|
||||
ocp_write_byte(tp, type, PLA_BP_EN, 0);
|
||||
break;
|
||||
case RTL_VER_14:
|
||||
ocp_write_word(tp, type, USB_BP2_EN, 0);
|
||||
|
||||
ocp_write_word(tp, type, USB_BP_8, 0);
|
||||
ocp_write_word(tp, type, USB_BP_9, 0);
|
||||
ocp_write_word(tp, type, USB_BP_10, 0);
|
||||
ocp_write_word(tp, type, USB_BP_11, 0);
|
||||
ocp_write_word(tp, type, USB_BP_12, 0);
|
||||
ocp_write_word(tp, type, USB_BP_13, 0);
|
||||
ocp_write_word(tp, type, USB_BP_14, 0);
|
||||
ocp_write_word(tp, type, USB_BP_15, 0);
|
||||
break;
|
||||
case RTL_VER_08:
|
||||
case RTL_VER_09:
|
||||
case RTL_VER_10:
|
||||
case RTL_VER_11:
|
||||
case RTL_VER_12:
|
||||
case RTL_VER_13:
|
||||
case RTL_VER_14:
|
||||
case RTL_VER_15:
|
||||
default:
|
||||
if (type == MCU_TYPE_USB) {
|
||||
ocp_write_byte(tp, MCU_TYPE_USB, USB_BP2_EN, 0);
|
||||
ocp_write_word(tp, MCU_TYPE_USB, USB_BP2_EN, 0);
|
||||
|
||||
ocp_write_word(tp, MCU_TYPE_USB, USB_BP_8, 0);
|
||||
ocp_write_word(tp, MCU_TYPE_USB, USB_BP_9, 0);
|
||||
@ -4331,7 +4342,6 @@ static bool rtl8152_is_fw_mac_ok(struct r8152 *tp, struct fw_mac *mac)
|
||||
case RTL_VER_11:
|
||||
case RTL_VER_12:
|
||||
case RTL_VER_13:
|
||||
case RTL_VER_14:
|
||||
case RTL_VER_15:
|
||||
fw_reg = 0xf800;
|
||||
bp_ba_addr = PLA_BP_BA;
|
||||
@ -4339,6 +4349,13 @@ static bool rtl8152_is_fw_mac_ok(struct r8152 *tp, struct fw_mac *mac)
|
||||
bp_start = PLA_BP_0;
|
||||
max_bp = 8;
|
||||
break;
|
||||
case RTL_VER_14:
|
||||
fw_reg = 0xf800;
|
||||
bp_ba_addr = PLA_BP_BA;
|
||||
bp_en_addr = USB_BP2_EN;
|
||||
bp_start = PLA_BP_0;
|
||||
max_bp = 16;
|
||||
break;
|
||||
default:
|
||||
goto out;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user