Commit a21b52aa authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'phy-fixes-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy

Pull phy fixes from Vinod Koul:

 - Qualcomm QMP driver fixes for missing register offsets and correct N4
   offsets for registers

* tag 'phy-fixes-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
  phy: qcom: qmp-combo: Switch from V6 to V6 N4 register offsets
  phy: qcom-qmp: pcs: Add missing v6 N4 register offsets
  phy: qcom-qmp: qserdes-txrx: Add missing registers offsets
parents d512d025 163c1a35
This diff is collapsed.
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2023, Linaro Limited
*/
#ifndef QCOM_PHY_QMP_PCS_V6_N4_H_
#define QCOM_PHY_QMP_PCS_V6_N4_H_
/* Only for QMP V6 N4 PHY - USB/PCIe PCS registers */
#define QPHY_V6_N4_PCS_SW_RESET 0x000
#define QPHY_V6_N4_PCS_PCS_STATUS1 0x014
#define QPHY_V6_N4_PCS_POWER_DOWN_CONTROL 0x040
#define QPHY_V6_N4_PCS_START_CONTROL 0x044
#define QPHY_V6_N4_PCS_POWER_STATE_CONFIG1 0x090
#define QPHY_V6_N4_PCS_LOCK_DETECT_CONFIG1 0x0c4
#define QPHY_V6_N4_PCS_LOCK_DETECT_CONFIG2 0x0c8
#define QPHY_V6_N4_PCS_LOCK_DETECT_CONFIG3 0x0cc
#define QPHY_V6_N4_PCS_LOCK_DETECT_CONFIG6 0x0d8
#define QPHY_V6_N4_PCS_REFGEN_REQ_CONFIG1 0x0dc
#define QPHY_V6_N4_PCS_RX_SIGDET_LVL 0x188
#define QPHY_V6_N4_PCS_RCVR_DTCT_DLY_P1U2_L 0x190
#define QPHY_V6_N4_PCS_RCVR_DTCT_DLY_P1U2_H 0x194
#define QPHY_V6_N4_PCS_RATE_SLEW_CNTRL1 0x198
#define QPHY_V6_N4_PCS_RX_CONFIG 0x1b0
#define QPHY_V6_N4_PCS_ALIGN_DETECT_CONFIG1 0x1c0
#define QPHY_V6_N4_PCS_ALIGN_DETECT_CONFIG2 0x1c4
#define QPHY_V6_N4_PCS_PCS_TX_RX_CONFIG 0x1d0
#define QPHY_V6_N4_PCS_EQ_CONFIG1 0x1dc
#define QPHY_V6_N4_PCS_EQ_CONFIG2 0x1e0
#define QPHY_V6_N4_PCS_EQ_CONFIG5 0x1ec
#endif
......@@ -6,11 +6,24 @@
#ifndef QCOM_PHY_QMP_QSERDES_TXRX_V6_N4_H_
#define QCOM_PHY_QMP_QSERDES_TXRX_V6_N4_H_
#define QSERDES_V6_N4_TX_CLKBUF_ENABLE 0x08
#define QSERDES_V6_N4_TX_TX_EMP_POST1_LVL 0x0c
#define QSERDES_V6_N4_TX_TX_DRV_LVL 0x14
#define QSERDES_V6_N4_TX_RESET_TSYNC_EN 0x1c
#define QSERDES_V6_N4_TX_PRE_STALL_LDO_BOOST_EN 0x20
#define QSERDES_V6_N4_TX_RES_CODE_LANE_OFFSET_TX 0x30
#define QSERDES_V6_N4_TX_RES_CODE_LANE_OFFSET_RX 0x34
#define QSERDES_V6_N4_TX_TRANSCEIVER_BIAS_EN 0x48
#define QSERDES_V6_N4_TX_HIGHZ_DRVR_EN 0x4c
#define QSERDES_V6_N4_TX_TX_POL_INV 0x50
#define QSERDES_V6_N4_TX_PARRATE_REC_DETECT_IDLE_EN 0x54
#define QSERDES_V6_N4_TX_LANE_MODE_1 0x78
#define QSERDES_V6_N4_TX_LANE_MODE_2 0x7c
#define QSERDES_V6_N4_TX_LANE_MODE_3 0x80
#define QSERDES_V6_N4_TX_TRAN_DRVR_EMP_EN 0xac
#define QSERDES_V6_N4_TX_TX_BAND 0xd8
#define QSERDES_V6_N4_TX_INTERFACE_SELECT 0xe4
#define QSERDES_V6_N4_TX_VMODE_CTRL1 0xb0
#define QSERDES_V6_N4_RX_UCDR_FO_GAIN_RATE2 0x8
#define QSERDES_V6_N4_RX_UCDR_SO_GAIN_RATE2 0x18
......
......@@ -46,6 +46,8 @@
#include "phy-qcom-qmp-pcs-v6.h"
#include "phy-qcom-qmp-pcs-v6-n4.h"
#include "phy-qcom-qmp-pcs-v6_20.h"
#include "phy-qcom-qmp-pcs-v7.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment