Commit 6ed0b900 authored by Gil Fine's avatar Gil Fine Committed by Mika Westerberg
Browse files

thunderbolt: Fix typo of HPD bit for Hot Plug Detect 



Fix typo of HPD bit stands for Hot Plug Detect.

Signed-off-by: default avatarGil Fine <gil.fine@linux.intel.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 7cbabed1

drivers/thunderbolt/switch.c

+4 −4
Original line number Diff line number Diff line
@@ -1332,7 +1332,7 @@ int tb_pci_port_enable(struct tb_port *port, bool enable) 
 * tb_dp_port_hpd_is_active() - Is HPD already active

 * @port: DP out port to check

 *

 * Checks if the DP OUT adapter port has HDP bit already set.

 * Checks if the DP OUT adapter port has HPD bit already set.

 */

int tb_dp_port_hpd_is_active(struct tb_port *port)

{
@@ -1344,14 +1344,14 @@ int tb_dp_port_hpd_is_active(struct tb_port *port) 
	if (ret)

		return ret;



	return !!(data & ADP_DP_CS_2_HDP);

	return !!(data & ADP_DP_CS_2_HPD);

}



/**

 * tb_dp_port_hpd_clear() - Clear HPD from DP IN port

 * @port: Port to clear HPD

 *

 * If the DP IN port has HDP set, this function can be used to clear it.

 * If the DP IN port has HPD set, this function can be used to clear it.

 */

int tb_dp_port_hpd_clear(struct tb_port *port)

{
@@ -1363,7 +1363,7 @@ int tb_dp_port_hpd_clear(struct tb_port *port) 
	if (ret)

		return ret;



	data |= ADP_DP_CS_3_HDPC;

	data |= ADP_DP_CS_3_HPDC;

	return tb_port_write(port, &data, TB_CFG_PORT,

			     port->cap_adap + ADP_DP_CS_3, 1);

}

drivers/thunderbolt/tb_regs.h

+2 −2
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ struct tb_regs_port_header { 
#define ADP_DP_CS_1_AUX_RX_HOPID_SHIFT		11

#define ADP_DP_CS_2				0x02

#define ADP_DP_CS_2_NRD_MLC_MASK		GENMASK(2, 0)

#define ADP_DP_CS_2_HDP				BIT(6)

#define ADP_DP_CS_2_HPD				BIT(6)

#define ADP_DP_CS_2_NRD_MLR_MASK		GENMASK(9, 7)

#define ADP_DP_CS_2_NRD_MLR_SHIFT		7

#define ADP_DP_CS_2_CA				BIT(10)
@@ -417,7 +417,7 @@ struct tb_regs_port_header { 
#define ADP_DP_CS_2_ESTIMATED_BW_MASK		GENMASK(31, 24)

#define ADP_DP_CS_2_ESTIMATED_BW_SHIFT		24

#define ADP_DP_CS_3				0x03

#define ADP_DP_CS_3_HDPC			BIT(9)

#define ADP_DP_CS_3_HPDC			BIT(9)

#define DP_LOCAL_CAP				0x04

#define DP_REMOTE_CAP				0x05

/* For DP IN adapter */