From nobody Wed Dec 17 20:59:22 2025 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1B90D157A5A; Fri, 3 May 2024 18:14:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714760091; cv=none; b=dGLNj+n40NmZqouXGmERiPdcuV0sgLgZvzz59/kL+Z6dZfcPGOBXGHB+ShqEo4AZrNffZFgbdzgzriGAQ9U85AfCKHHrGMcwO/vSntAWS2l5xiLAfLQhN0kLG4GjeC8YbaBNTQljONlFBWYrx0pXh+WGtr5t/lo1Jo9ddAVCcZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714760091; c=relaxed/simple; bh=22dBn04si4XF11kkwY+t5cefibayE9rI92ict81WZ/s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VJnuM5AGgcZXQxbiq9doIQs+VNdx5RRX/mphbdyfmvc+ClPE3qrS7gOIxCPdjT11HtenVpdxHgrQ7QUWuCjICJHzieWqhbbE2KbWPBMGzAadltxBfv5rdC6nk/UzGEv7iu0QzXoVVWKLyGOuJNT24Wg0DUp1M6LmzIqaafjnw8s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=QA4njX7n; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="QA4njX7n" Received: from rrs24-12-35.corp.microsoft.com (unknown [131.107.8.16]) by linux.microsoft.com (Postfix) with ESMTPSA id 427A020B2C84; Fri, 3 May 2024 11:14:48 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 427A020B2C84 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1714760088; bh=ua5g2ZwKmsPA99T3iW6L40xR33oBbVXVKwa4swk/E1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QA4njX7n/veSqIuo8CJ+SG2W/4HSEpN/orsd6bcouEWHX23n0bUZ5YjDx2bTjBKP7 tEkk/alk/ztZy0AdH82uN/1tXqA5RoPnJMMhPin5OG9s4sx8pBL6Sm1czK//dsC6/g GNiuvuSRzV6nRtqJBeg5EuM2RbQwLtNyUCjQYRbU= From: Easwar Hariharan To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Harry Wentland , Leo Li , Rodrigo Siqueira , Evan Quan , Hawking Zhang , Candice Li , Ran Sun , Alexander Richards , Easwar Hariharan , Wolfram Sang , Andi Shyti , Dmitry Baryshkov , Heiko Stuebner , Heiner Kallweit , Hamza Mahfooz , Ruan Jinjie , Aurabindo Pillai , Wayne Lin , Samson Tam , Alvin Lee , Sohaib Nadeem , Charlene Liu , Tom Chung , Alan Liu , Bhawanpreet Lakha , Meenakshikumar Somasundaram , George Shen , Aric Cyr , Nicholas Kazlauskas , Qingqing Zhuo , Dillon Varone , Lijo Lazar , Asad kamal , Kenneth Feng , Ma Jun , Darren Powell , Yang Wang , Mario Limonciello , Yifan Zhang , Le Ma , amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM DRIVERS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list) Cc: Wolfram Sang , amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM DRIVERS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list), intel-gfx@lists.freedesktop.org (open list:INTEL DRM DISPLAY FOR XE AND I915 DRIVERS), intel-xe@lists.freedesktop.org (open list:INTEL DRM DISPLAY FOR XE AND I915 DRIVERS), nouveau@lists.freedesktop.org (open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS), linux-i2c@vger.kernel.org (open list:I2C SUBSYSTEM HOST DRIVERS), linux-media@vger.kernel.org (open list:BTTV VIDEO4LINUX DRIVER), linux-fbdev@vger.kernel.org (open list:FRAMEBUFFER LAYER) Subject: [PATCH v2 01/12] drm/amdgpu, drm/radeon: Make I2C terminology more inclusive Date: Fri, 3 May 2024 18:13:22 +0000 Message-Id: <20240503181333.2336999-2-eahariha@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240503181333.2336999-1-eahariha@linux.microsoft.com> References: <20240503181333.2336999-1-eahariha@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave" with more appropriate terms. Inspired by and following on to Wolfram's series to fix drivers/i2c/[1], fix the terminology for users of I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists in the specification. Compile tested, no functionality changes intended [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-eng= ineering.com/ Signed-off-by: Easwar Hariharan Acked-by: Aex Deucher --- .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 8 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 10 +++---- drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 8 +++--- drivers/gpu/drm/amd/amdgpu/atombios_i2c.h | 2 +- drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 20 ++++++------- .../gpu/drm/amd/display/dc/bios/bios_parser.c | 2 +- .../drm/amd/display/dc/bios/bios_parser2.c | 2 +- .../drm/amd/display/dc/core/dc_link_exports.c | 4 +-- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c | 4 +-- .../display/include/grph_object_ctrl_defs.h | 2 +- drivers/gpu/drm/amd/include/atombios.h | 2 +- drivers/gpu/drm/amd/include/atomfirmware.h | 26 ++++++++--------- .../powerplay/hwmgr/vega20_processpptables.c | 4 +-- .../amd/pm/powerplay/inc/smu11_driver_if.h | 2 +- .../inc/pmfw_if/smu11_driver_if_arcturus.h | 2 +- .../inc/pmfw_if/smu11_driver_if_navi10.h | 2 +- .../pmfw_if/smu11_driver_if_sienna_cichlid.h | 2 +- .../inc/pmfw_if/smu13_driver_if_aldebaran.h | 2 +- .../inc/pmfw_if/smu13_driver_if_v13_0_0.h | 2 +- .../inc/pmfw_if/smu13_driver_if_v13_0_7.h | 2 +- .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 4 +-- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 8 +++--- drivers/gpu/drm/radeon/atombios.h | 16 +++++------ drivers/gpu/drm/radeon/atombios_i2c.c | 4 +-- drivers/gpu/drm/radeon/radeon_combios.c | 28 +++++++++---------- drivers/gpu/drm/radeon/radeon_i2c.c | 10 +++---- drivers/gpu/drm/radeon/radeon_mode.h | 6 ++-- 28 files changed, 93 insertions(+), 93 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu= /drm/amd/amdgpu/amdgpu_atomfirmware.c index 6857c586ded7..37f50fc5d496 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c @@ -614,7 +614,7 @@ bool amdgpu_atomfirmware_ras_rom_addr(struct amdgpu_dev= ice *adev, if ((frev =3D=3D 3 && crev >=3D 4) || (frev > 3)) { firmware_info =3D (union firmware_info *) (mode_info->atom_context->bios + data_offset); - /* The ras_rom_i2c_slave_addr should ideally + /* The ras_rom_i2c_target_addr should ideally * be a 19-bit EEPROM address, which would be * used as is by the driver; see top of * amdgpu_eeprom.c. @@ -625,13 +625,13 @@ bool amdgpu_atomfirmware_ras_rom_addr(struct amdgpu_d= evice *adev, * leave the check for the pointer. * * The reason this works right now is because - * ras_rom_i2c_slave_addr contains the EEPROM + * ras_rom_i2c_target_addr contains the EEPROM * device type qualifier 1010b in the top 4 * bits. */ - if (firmware_info->v34.ras_rom_i2c_slave_addr) { + if (firmware_info->v34.ras_rom_i2c_target_addr) { if (i2c_address) - *i2c_address =3D firmware_info->v34.ras_rom_i2c_slave_addr; + *i2c_address =3D firmware_info->v34.ras_rom_i2c_target_addr; return true; } } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_i2c.c index d79cb13e1aa8..070049c92e2b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c @@ -280,7 +280,7 @@ amdgpu_i2c_lookup(struct amdgpu_device *adev, } =20 static void amdgpu_i2c_get_byte(struct amdgpu_i2c_chan *i2c_bus, - u8 slave_addr, + u8 target_addr, u8 addr, u8 *val) { @@ -288,13 +288,13 @@ static void amdgpu_i2c_get_byte(struct amdgpu_i2c_cha= n *i2c_bus, u8 in_buf[2]; struct i2c_msg msgs[] =3D { { - .addr =3D slave_addr, + .addr =3D target_addr, .flags =3D 0, .len =3D 1, .buf =3D out_buf, }, { - .addr =3D slave_addr, + .addr =3D target_addr, .flags =3D I2C_M_RD, .len =3D 1, .buf =3D in_buf, @@ -314,13 +314,13 @@ static void amdgpu_i2c_get_byte(struct amdgpu_i2c_cha= n *i2c_bus, } =20 static void amdgpu_i2c_put_byte(struct amdgpu_i2c_chan *i2c_bus, - u8 slave_addr, + u8 target_addr, u8 addr, u8 val) { uint8_t out_buf[2]; struct i2c_msg msg =3D { - .addr =3D slave_addr, + .addr =3D target_addr, .flags =3D 0, .len =3D 2, .buf =3D out_buf, diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_i2c.c b/drivers/gpu/drm/am= d/amdgpu/atombios_i2c.c index a6501114322f..a7d3c3d2c633 100644 --- a/drivers/gpu/drm/amd/amdgpu/atombios_i2c.c +++ b/drivers/gpu/drm/amd/amdgpu/atombios_i2c.c @@ -36,7 +36,7 @@ #define ATOM_MAX_HW_I2C_READ 255 =20 static int amdgpu_atombios_i2c_process_i2c_ch(struct amdgpu_i2c_chan *chan, - u8 slave_addr, u8 flags, + u8 target_addr, u8 flags, u8 *buf, u8 num) { struct drm_device *dev =3D chan->dev; @@ -83,7 +83,7 @@ static int amdgpu_atombios_i2c_process_i2c_ch(struct amdg= pu_i2c_chan *chan, args.ucFlag =3D flags; args.ucI2CSpeed =3D TARGET_HW_I2C_CLOCK; args.ucTransBytes =3D num; - args.ucSlaveAddr =3D slave_addr << 1; + args.ucTargetAddr =3D target_addr << 1; args.ucLineNumber =3D chan->rec.i2c_id; =20 amdgpu_atom_execute_table(adev->mode_info.atom_context, index, (uint32_t = *)&args, sizeof(args)); @@ -159,7 +159,7 @@ u32 amdgpu_atombios_i2c_func(struct i2c_adapter *adap) return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } =20 -void amdgpu_atombios_i2c_channel_trans(struct amdgpu_device *adev, u8 slav= e_addr, u8 line_number, u8 offset, u8 data) +void amdgpu_atombios_i2c_channel_trans(struct amdgpu_device *adev, u8 targ= et_addr, u8 line_number, u8 offset, u8 data) { PROCESS_I2C_CHANNEL_TRANSACTION_PS_ALLOCATION args; int index =3D GetIndexIntoMasterTable(COMMAND, ProcessI2cChannelTransacti= on); @@ -169,7 +169,7 @@ void amdgpu_atombios_i2c_channel_trans(struct amdgpu_de= vice *adev, u8 slave_addr args.ucFlag =3D 1; args.ucI2CSpeed =3D TARGET_HW_I2C_CLOCK; args.ucTransBytes =3D 1; - args.ucSlaveAddr =3D slave_addr; + args.ucTargetAddr =3D target_addr; args.ucLineNumber =3D line_number; =20 amdgpu_atom_execute_table(adev->mode_info.atom_context, index, (uint32_t = *)&args, sizeof(args)); diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_i2c.h b/drivers/gpu/drm/am= d/amdgpu/atombios_i2c.h index 251aaf41f65d..13e683896ef6 100644 --- a/drivers/gpu/drm/amd/amdgpu/atombios_i2c.h +++ b/drivers/gpu/drm/amd/amdgpu/atombios_i2c.h @@ -28,6 +28,6 @@ int amdgpu_atombios_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num); u32 amdgpu_atombios_i2c_func(struct i2c_adapter *adap); void amdgpu_atombios_i2c_channel_trans(struct amdgpu_device* adev, - u8 slave_addr, u8 line_number, u8 offset, u8 data); + u8 target_addr, u8 line_number, u8 offset, u8 data); =20 #endif diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c b/drivers/gpu/drm/a= md/amdgpu/smu_v11_0_i2c.c index dd2d66090d23..b91ed6050541 100644 --- a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c +++ b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c @@ -229,7 +229,7 @@ static uint32_t smu_v11_0_i2c_poll_rx_status(struct i2c= _adapter *control) =20 reg_c_tx_abrt_source =3D RREG32_SOC15(SMUIO, 0, mmCKSVII2C_IC_TX_ABRT_SOU= RCE); =20 - /* If slave is not present */ + /* If target is not present */ if (REG_GET_FIELD(reg_c_tx_abrt_source, CKSVII2C_IC_TX_ABRT_SOURCE, ABRT_7B_ADDR_NOACK) =3D=3D 1) { @@ -255,10 +255,10 @@ static uint32_t smu_v11_0_i2c_poll_rx_status(struct i= 2c_adapter *control) } =20 /** - * smu_v11_0_i2c_transmit - Send a block of data over the I2C bus to a sla= ve device. + * smu_v11_0_i2c_transmit - Send a block of data over the I2C bus to a tar= get device. * * @control: I2C adapter reference - * @address: The I2C address of the slave device. + * @address: The I2C address of the target device. * @data: The data to transmit over the bus. * @numbytes: The amount of data to transmit. * @i2c_flag: Flags for transmission @@ -284,7 +284,7 @@ static uint32_t smu_v11_0_i2c_transmit(struct i2c_adapt= er *control, 16, 1, data, numbytes, false); } =20 - /* Set the I2C slave address */ + /* Set the I2C target address */ smu_v11_0_i2c_set_address(control, address); /* Enable I2C */ smu_v11_0_i2c_enable(control, true); @@ -354,10 +354,10 @@ static uint32_t smu_v11_0_i2c_transmit(struct i2c_ada= pter *control, =20 =20 /** - * smu_v11_0_i2c_receive - Receive a block of data over the I2C bus from a= slave device. + * smu_v11_0_i2c_receive - Receive a block of data over the I2C bus from a= target device. * * @control: I2C adapter reference - * @address: The I2C address of the slave device. + * @address: The I2C address of the target device. * @data: Placeholder to store received data. * @numbytes: The amount of data to transmit. * @i2c_flag: Flags for transmission @@ -374,7 +374,7 @@ static uint32_t smu_v11_0_i2c_receive(struct i2c_adapte= r *control, =20 bytes_received =3D 0; =20 - /* Set the I2C slave address */ + /* Set the I2C target address */ smu_v11_0_i2c_set_address(control, address); =20 /* Enable I2C */ @@ -509,7 +509,7 @@ static void smu_v11_0_i2c_init(struct i2c_adapter *cont= rol) if (res !=3D I2C_OK) smu_v11_0_i2c_abort(control); =20 - /* Configure I2C to operate as master and in standard mode */ + /* Configure I2C to operate as controller and in standard mode */ smu_v11_0_i2c_configure(control); =20 /* Initialize the clock to 50 kHz default */ @@ -650,11 +650,11 @@ static int smu_v11_0_i2c_xfer(struct i2c_adapter *i2c= _adap, =20 smu_v11_0_i2c_init(i2c_adap); =20 - /* From the client's point of view, this sequence of + /* From the target's point of view, this sequence of * messages-- the array i2c_msg *msg, is a single transaction * on the bus, starting with START and ending with STOP. * - * The client is welcome to send any sequence of messages in + * The target is welcome to send any sequence of messages in * this array, as processing under this function here is * striving to be agnostic. * diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gp= u/drm/amd/display/dc/bios/bios_parser.c index 6450853fea94..51aa72e4eba4 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c @@ -1871,7 +1871,7 @@ static enum bp_result get_gpio_i2c_info(struct bios_p= arser *bp, info->i2c_hw_assist =3D record->sucI2cId.bfHW_Capable; info->i2c_line =3D record->sucI2cId.bfI2C_LineMux; info->i2c_engine_id =3D record->sucI2cId.bfHW_EngineID; - info->i2c_slave_address =3D record->ucI2CAddr; + info->i2c_target_address =3D record->ucI2CAddr; =20 info->gpio_info.clk_mask_register_index =3D le16_to_cpu(header->asGPIO_Info[info->i2c_line].usClkMaskRegisterIndex); diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/g= pu/drm/amd/display/dc/bios/bios_parser2.c index ab31643b1096..90abab6bd00a 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c @@ -511,7 +511,7 @@ static enum bp_result get_gpio_i2c_info( info->i2c_hw_assist =3D (record->i2c_id & I2C_HW_CAP) ? true : false; info->i2c_line =3D record->i2c_id & I2C_HW_LANE_MUX; info->i2c_engine_id =3D (record->i2c_id & I2C_HW_ENGINE_ID_MASK) >> 4; - info->i2c_slave_address =3D record->i2c_slave_addr; + info->i2c_target_address =3D record->i2c_target_addr; =20 /* TODO: check how to get register offset for en, Y, etc. */ info->gpio_info.clk_a_register_index =3D le16_to_cpu(pin->data_a_reg_inde= x); diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_exports.c b/driver= s/gpu/drm/amd/display/dc/core/dc_link_exports.c index c6c35037bdb8..9d2ec5fce4ae 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_exports.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_exports.c @@ -141,13 +141,13 @@ bool dc_link_update_dsc_config(struct pipe_ctx *pipe_= ctx) =20 bool dc_is_oem_i2c_device_present( struct dc *dc, - size_t slave_address) + size_t target_address) { if (dc->res_pool->oem_device) return dce_i2c_oem_device_present( dc->res_pool, dc->res_pool->oem_device, - slave_address); + target_address); =20 return false; } diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/disp= lay/dc/dc.h index ee8453bf958f..21608f42879f 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -1803,7 +1803,7 @@ int dc_link_aux_transfer_raw(struct ddc_service *ddc, =20 bool dc_is_oem_i2c_device_present( struct dc *dc, - size_t slave_address + size_t target_address ); =20 /* return true if the connected receiver supports the hdcp version */ diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c b/drivers/gpu/drm= /amd/display/dc/dce/dce_i2c.c index f5cd2392fc5f..f4c83d322350 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c @@ -28,7 +28,7 @@ bool dce_i2c_oem_device_present( struct resource_pool *pool, struct ddc_service *ddc, - size_t slave_address + size_t target_address ) { struct dc *dc =3D ddc->ctx->dc; @@ -45,7 +45,7 @@ bool dce_i2c_oem_device_present( if (dcb->funcs->get_i2c_info(dcb, id, &i2c_info) !=3D BP_RESULT_OK) return false; =20 - if (i2c_info.i2c_slave_address !=3D slave_address) + if (i2c_info.i2c_target_address !=3D target_address) return false; =20 return true; diff --git a/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h b/= drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h index 813463ffe15c..c30a2117a539 100644 --- a/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h +++ b/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h @@ -92,7 +92,7 @@ struct graphics_object_i2c_info { bool i2c_hw_assist; uint32_t i2c_line; uint32_t i2c_engine_id; - uint32_t i2c_slave_address; + uint32_t i2c_target_address; }; =20 struct graphics_object_hpd_info { diff --git a/drivers/gpu/drm/amd/include/atombios.h b/drivers/gpu/drm/amd/i= nclude/atombios.h index b78360a71bc9..5644920f45e6 100644 --- a/drivers/gpu/drm/amd/include/atombios.h +++ b/drivers/gpu/drm/amd/include/atombios.h @@ -8503,7 +8503,7 @@ typedef struct _PROCESS_I2C_CHANNEL_TRANSACTION_PARAM= ETERS USHORT lpI2CDataOut; UCHAR ucFlag; UCHAR ucTransBytes; - UCHAR ucSlaveAddr; + UCHAR ucTargetAddr; UCHAR ucLineNumber; }PROCESS_I2C_CHANNEL_TRANSACTION_PARAMETERS; =20 diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/a= md/include/atomfirmware.h index af3eebb4c9bc..0b76c3655df7 100644 --- a/drivers/gpu/drm/amd/include/atomfirmware.h +++ b/drivers/gpu/drm/amd/include/atomfirmware.h @@ -534,7 +534,7 @@ struct atom_firmware_info_v3_2 { uint32_t mc_baseaddr_low; uint8_t board_i2c_feature_id; // enum of atom_board_i2c_feat= ure_id_def uint8_t board_i2c_feature_gpio_id; // i2c id find in gpio_lut dat= a table gpio_id - uint8_t board_i2c_feature_slave_addr; + uint8_t board_i2c_feature_target_addr; uint8_t reserved3; uint16_t bootup_mvddq_mv; uint16_t bootup_mvpp_mv; @@ -562,7 +562,7 @@ struct atom_firmware_info_v3_3 uint32_t mc_baseaddr_low; uint8_t board_i2c_feature_id; // enum of atom_board_i2c_feat= ure_id_def uint8_t board_i2c_feature_gpio_id; // i2c id find in gpio_lut dat= a table gpio_id - uint8_t board_i2c_feature_slave_addr; + uint8_t board_i2c_feature_target_addr; uint8_t reserved3; uint16_t bootup_mvddq_mv; uint16_t bootup_mvpp_mv; @@ -590,8 +590,8 @@ struct atom_firmware_info_v3_4 { uint32_t mc_baseaddr_low; uint8_t board_i2c_feature_id; // enum of atom_board_i2c_featu= re_id_def uint8_t board_i2c_feature_gpio_id; // i2c id find in gpio_lut data= table gpio_id - uint8_t board_i2c_feature_slave_addr; - uint8_t ras_rom_i2c_slave_addr; + uint8_t board_i2c_feature_target_addr; + uint8_t ras_rom_i2c_target_addr; uint16_t bootup_mvddq_mv; uint16_t bootup_mvpp_mv; uint32_t zfbstartaddrin16mb; @@ -626,8 +626,8 @@ struct atom_firmware_info_v3_5 { uint32_t mc_baseaddr_low; uint8_t board_i2c_feature_id; // enum of atom_board_i2c_feat= ure_id_def uint8_t board_i2c_feature_gpio_id; // i2c id find in gpio_lut dat= a table gpio_id - uint8_t board_i2c_feature_slave_addr; - uint8_t ras_rom_i2c_slave_addr; + uint8_t board_i2c_feature_target_addr; + uint8_t ras_rom_i2c_target_addr; uint32_t bootup_voltage_reserved1; uint32_t zfb_reserved; // if pplib_pptable_id!=3D0, pplib get powerplay table inside driver ins= tead of from VBIOS @@ -830,7 +830,7 @@ struct atom_i2c_record { struct atom_common_record_header record_header; //record_type =3D ATOM= _I2C_RECORD_TYPE uint8_t i2c_id;=20 - uint8_t i2c_slave_addr; //The slave address, it's 0 wh= en the record is attached to connector for DDC + uint8_t i2c_target_addr; //The target address, it's 0 = when the record is attached to connector for DDC }; =20 struct atom_hpd_int_record @@ -2026,7 +2026,7 @@ struct atom_smu_info_v3_5 uint16_t smuinitoffset; uint32_t bootup_dprefclk_10khz; uint32_t bootup_usbclk_10khz; - uint32_t smb_slave_address; + uint32_t smb_target_address; uint32_t cg_fdo_ctrl0_val; uint32_t cg_fdo_ctrl1_val; uint32_t cg_fdo_ctrl2_val; @@ -2083,7 +2083,7 @@ struct atom_smu_info_v3_6 uint16_t smuinitoffset; uint32_t bootup_gfxavsclk_10khz; uint32_t bootup_mpioclk_10khz; - uint32_t smb_slave_address; + uint32_t smb_target_address; uint32_t cg_fdo_ctrl0_val; uint32_t cg_fdo_ctrl1_val; uint32_t cg_fdo_ctrl2_val; @@ -2138,7 +2138,7 @@ struct atom_smu_info_v4_0 { uint16_t smuinitoffset; uint32_t bootup_dprefclk_10khz; uint32_t bootup_usbclk_10khz; - uint32_t smb_slave_address; + uint32_t smb_target_address; uint32_t cg_fdo_ctrl0_val; uint32_t cg_fdo_ctrl1_val; uint32_t cg_fdo_ctrl2_val; @@ -2349,7 +2349,7 @@ struct atom_smc_dpm_info_v4_3 =20 struct smudpm_i2ccontrollerconfig_t { uint32_t enabled; - uint32_t slaveaddress; + uint32_t targetaddress; uint32_t controllerport; uint32_t controllername; uint32_t thermalthrottler; @@ -3510,7 +3510,7 @@ struct atom_i2c_voltage_object_v4 struct atom_voltage_object_header_v4 header; // voltage mode =3D VOLTA= GE_OBJ_VR_I2C_INIT_SEQ uint8_t regulator_id; //Indicate Voltage Regula= tor Id uint8_t i2c_id; - uint8_t i2c_slave_addr; + uint8_t i2c_target_addr; uint8_t i2c_control_offset; =20 uint8_t i2c_flag; // Bit0: 0 - One byte dat= a; 1 - Two byte data uint8_t i2c_speed; // =3D0, use default i2c = speed, otherwise use it in unit of kHz.=20 @@ -4152,7 +4152,7 @@ struct process_i2c_channel_transaction_parameters uint16_t i2c_data_out; uint8_t flag; /* enum atom_process_i2c_status */ uint8_t trans_bytes; - uint8_t slave_addr; + uint8_t target_addr; uint8_t i2c_id; }; =20 diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_processpptables.= c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_processpptables.c index 79c817752a33..cb9ee5345745 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_processpptables.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_processpptables.c @@ -784,8 +784,8 @@ static int append_vbios_pptable(struct pp_hwmgr *hwmgr,= PPTable_t *ppsmc_pptable for (i =3D 0; i < I2C_CONTROLLER_NAME_COUNT; i++) { ppsmc_pptable->I2cControllers[i].Enabled =3D smc_dpm_table->i2ccontrollers[i].enabled; - ppsmc_pptable->I2cControllers[i].SlaveAddress =3D - smc_dpm_table->i2ccontrollers[i].slaveaddress; + ppsmc_pptable->I2cControllers[i].TargetAddress =3D + smc_dpm_table->i2ccontrollers[i].targetaddress; ppsmc_pptable->I2cControllers[i].ControllerPort =3D smc_dpm_table->i2ccontrollers[i].controllerport; ppsmc_pptable->I2cControllers[i].ThermalThrottler =3D diff --git a/drivers/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h b/drive= rs/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h index c2efc70ef288..69d7ec6fd971 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h +++ b/drivers/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h @@ -287,7 +287,7 @@ typedef enum { =20 typedef struct { uint32_t Enabled; - uint32_t SlaveAddress; + uint32_t TargetAddress; uint32_t ControllerPort; uint32_t ControllerName; =20 diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_arctu= rus.h b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_arcturus.h index d518dee18e1b..5684e2a16e6c 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_arcturus.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_arcturus.h @@ -263,7 +263,7 @@ typedef struct { uint8_t Enabled; uint8_t Speed; uint8_t Padding[2]; - uint32_t SlaveAddress; + uint32_t TargetAddress; uint8_t ControllerPort; uint8_t ControllerName; uint8_t ThermalThrotter; diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_navi1= 0.h b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_navi10.h index c5c1943fb6a1..1782b8e8fcd2 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_navi10.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_navi10.h @@ -267,7 +267,7 @@ typedef struct { uint8_t Enabled; uint8_t Speed; uint8_t Padding[2]; - uint32_t SlaveAddress; + uint32_t TargetAddress; uint8_t ControllerPort; uint8_t ControllerName; uint8_t ThermalThrotter; diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_sienn= a_cichlid.h b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_sien= na_cichlid.h index aa6d29de4002..6be89c6dd492 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_sienna_cichl= id.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu11_driver_if_sienna_cichl= id.h @@ -342,7 +342,7 @@ typedef enum { typedef struct { uint8_t Enabled; uint8_t Speed; - uint8_t SlaveAddress; =20 + uint8_t TargetAddress; uint8_t ControllerPort; uint8_t ControllerName; uint8_t ThermalThrotter; diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldeb= aran.h b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran= .h index cddf45eebee8..c590f4557074 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h @@ -167,7 +167,7 @@ typedef enum { typedef struct { uint8_t Enabled; uint8_t Speed; - uint8_t SlaveAddress; + uint8_t TargetAddress; uint8_t ControllerPort; uint8_t ThermalThrotter; uint8_t I2cProtocol; diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0= _0.h b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h index b114d14fc053..ebe2d344bf5b 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h @@ -319,7 +319,7 @@ typedef enum { typedef struct { uint8_t Enabled; uint8_t Speed; - uint8_t SlaveAddress; + uint8_t TargetAddress; uint8_t ControllerPort; uint8_t ControllerName; uint8_t ThermalThrotter; diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0= _7.h b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h index 8b1496f8ce58..8e9c7fa22b4f 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h @@ -320,7 +320,7 @@ typedef enum { typedef struct { uint8_t Enabled; uint8_t Speed; - uint8_t SlaveAddress; + uint8_t TargetAddress; uint8_t ControllerPort; uint8_t ControllerName; uint8_t ThermalThrotter; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gp= u/drm/amd/pm/swsmu/smu11/arcturus_ppt.c index 0c2d04f978ac..e2c6a4806e5c 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c @@ -1909,8 +1909,8 @@ static void arcturus_dump_pptable(struct smu_context = *smu) dev_info(smu->adev->dev, "I2cControllers[%d]:\n", i); dev_info(smu->adev->dev, " .Enabled =3D %d\n", pptable->I2cControllers[i].Enabled); - dev_info(smu->adev->dev, " .SlaveAddress =3D 0x%x\n", - pptable->I2cControllers[i].SlaveAddress); + dev_info(smu->adev->dev, " .TargetAddress =3D 0x%x\n", + pptable->I2cControllers[i].TargetAddress); dev_info(smu->adev->dev, " .ControllerPort =3D %d\n", pptable->I2cControllers[i].ControllerPort); dev_info(smu->adev->dev, " .ControllerName =3D %d\n", diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/driv= ers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c index 1f18b61884f3..eec4b9b9598c 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c @@ -2988,8 +2988,8 @@ static void beige_goby_dump_pptable(struct smu_contex= t *smu) pptable->I2cControllers[i].Enabled); dev_info(smu->adev->dev, " .Speed =3D 0x%x\n", pptable->I2cControllers[i].Speed); - dev_info(smu->adev->dev, " .SlaveAddress =3D 0x%x\n", - pptable->I2cControllers[i].SlaveAddress); + dev_info(smu->adev->dev, " .TargetAddress =3D 0x%x\n", + pptable->I2cControllers[i].TargetAddress); dev_info(smu->adev->dev, " .ControllerPort =3D 0x%x\n", pptable->I2cControllers[i].ControllerPort); dev_info(smu->adev->dev, " .ControllerName =3D 0x%x\n", @@ -3627,8 +3627,8 @@ static void sienna_cichlid_dump_pptable(struct smu_co= ntext *smu) pptable->I2cControllers[i].Enabled); dev_info(smu->adev->dev, " .Speed =3D 0x%x\n", pptable->I2cControllers[i].Speed); - dev_info(smu->adev->dev, " .SlaveAddress =3D 0x%x\n", - pptable->I2cControllers[i].SlaveAddress); + dev_info(smu->adev->dev, " .TargetAddress =3D 0x%x\n", + pptable->I2cControllers[i].TargetAddress); dev_info(smu->adev->dev, " .ControllerPort =3D 0x%x\n", pptable->I2cControllers[i].ControllerPort); dev_info(smu->adev->dev, " .ControllerName =3D 0x%x\n", diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/ato= mbios.h index 2db40789235c..40444af51d0a 100644 --- a/drivers/gpu/drm/radeon/atombios.h +++ b/drivers/gpu/drm/radeon/atombios.h @@ -1834,7 +1834,7 @@ typedef struct _READ_EDID_FROM_HW_I2C_DATA_PARAMETERS USHORT usVRAMAddress; //Address in Frame Buffer where to pace ra= w EDID USHORT usStatus; //When use output: lower byte EDID checksu= m, high byte hardware status //WHen use input: lower byte as 'byte to = read':currently limited to 128byte or 1byte - UCHAR ucSlaveAddr; //Read from which slave + UCHAR ucTargetAddr; //Read from which slave UCHAR ucLineNumber; //Read from which HW assisted line }READ_EDID_FROM_HW_I2C_DATA_PARAMETERS; #define READ_EDID_FROM_HW_I2C_DATA_PS_ALLOCATION READ_EDID_FROM_HW_I2C_DA= TA_PARAMETERS @@ -1858,7 +1858,7 @@ typedef struct _WRITE_ONE_BYTE_HW_I2C_DATA_PARAMETERS //blockID+counterID+offsetID UCHAR ucData; //PS data1 UCHAR ucStatus; //Status byte 1=3Dsuccess, 2=3Dfailure, Al= so is used as PS data2 - UCHAR ucSlaveAddr; //Write to which slave + UCHAR ucTargetAddr; //Write to which slave UCHAR ucLineNumber; //Write from which HW assisted line }WRITE_ONE_BYTE_HW_I2C_DATA_PARAMETERS; =20 @@ -1867,7 +1867,7 @@ typedef struct _WRITE_ONE_BYTE_HW_I2C_DATA_PARAMETERS typedef struct _SET_UP_HW_I2C_DATA_PARAMETERS { USHORT usPrescale; //Ratio between Engine clock and I2C clock - UCHAR ucSlaveAddr; //Write to which slave + UCHAR ucTargetAddr; //Write to which slave UCHAR ucLineNumber; //Write from which HW assisted line }SET_UP_HW_I2C_DATA_PARAMETERS; =20 @@ -4741,7 +4741,7 @@ typedef struct _ATOM_POWER_SOURCE_OBJECT UCHAR ucPwrSrcId; // Power source UCHAR ucPwrSensorType; // GPIO, I2C or none UCHAR ucPwrSensId; // if GPIO detect, it is GPIO id, if I2C = detect, it is I2C id - UCHAR ucPwrSensSlaveAddr; // Slave address if I2C detect + UCHAR ucPwrSensTargetAddr; // Target address if I2C detect UCHAR ucPwrSensRegIndex; // I2C register Index if I2C detect UCHAR ucPwrSensRegBitMask; // detect which bit is used if I2C dete= ct UCHAR ucPwrSensActiveState; // high active or low active @@ -5449,7 +5449,7 @@ typedef struct _ATOM_I2C_DEVICE_SETUP_INFO { ATOM_I2C_ID_CONFIG_ACCESS sucI2cId; //I2C line and H= W/SW assisted cap. UCHAR ucSSChipID; //SS chip being u= sed - UCHAR ucSSChipSlaveAddr; //Slave Address t= o set up this SS chip + UCHAR ucSSChipTargetAddr; //Target Address= to set up this SS chip UCHAR ucNumOfI2CDataRecords; //number of data= block ATOM_I2C_DATA_RECORD asI2CData[]; }ATOM_I2C_DEVICE_SETUP_INFO; @@ -7229,7 +7229,7 @@ typedef struct _PROCESS_I2C_CHANNEL_TRANSACTION_PARAM= ETERS USHORT lpI2CDataOut; UCHAR ucFlag; =20 UCHAR ucTransBytes; - UCHAR ucSlaveAddr; + UCHAR ucTargetAddr; UCHAR ucLineNumber; }PROCESS_I2C_CHANNEL_TRANSACTION_PARAMETERS; =20 @@ -7599,8 +7599,8 @@ typedef struct _ATOM_XTMDS_INFO UCHAR ucSupportedLink; // Bit field, bit0=3D1, s= ingle link supported;bit1=3D1,dual link supported UCHAR ucSequnceAlterID; // Even with the same ext= ernal TMDS asic, it's possible that the program seqence alters=20 // due to design. This ID= is used to alert driver that the sequence is not "standard"! =20 - UCHAR ucMasterAddress; // Address to control Mas= ter xTMDS Chip - UCHAR ucSlaveAddress; // Address to control Sla= ve xTMDS Chip + UCHAR ucControllerAddress; // Address to control= Controller xTMDS Chip + UCHAR ucTargetAddress; // Address to control Ta= rget xTMDS Chip }ATOM_XTMDS_INFO; =20 typedef struct _DFP_DPMS_STATUS_CHANGE_PARAMETERS diff --git a/drivers/gpu/drm/radeon/atombios_i2c.c b/drivers/gpu/drm/radeon= /atombios_i2c.c index 730f0b25312b..3acae0b28122 100644 --- a/drivers/gpu/drm/radeon/atombios_i2c.c +++ b/drivers/gpu/drm/radeon/atombios_i2c.c @@ -34,7 +34,7 @@ #define ATOM_MAX_HW_I2C_READ 255 =20 static int radeon_process_i2c_ch(struct radeon_i2c_chan *chan, - u8 slave_addr, u8 flags, + u8 target_addr, u8 flags, u8 *buf, int num) { struct drm_device *dev =3D chan->dev; @@ -75,7 +75,7 @@ static int radeon_process_i2c_ch(struct radeon_i2c_chan *= chan, args.ucFlag =3D flags; args.ucI2CSpeed =3D TARGET_HW_I2C_CLOCK; args.ucTransBytes =3D num; - args.ucSlaveAddr =3D slave_addr << 1; + args.ucTargetAddr =3D target_addr << 1; args.ucLineNumber =3D chan->rec.i2c_id; =20 atom_execute_table_scratch_unlocked(rdev->mode_info.atom_context, index, = (uint32_t *)&args, sizeof(args)); diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/rade= on/radeon_combios.c index 6952b1273b0f..107638ec8c75 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -1398,7 +1398,7 @@ bool radeon_legacy_get_ext_tmds_info_from_table(struc= t radeon_encoder *encoder, case CT_MINI_EXTERNAL: default: tmds->dvo_chip =3D DVO_SIL164; - tmds->slave_addr =3D 0x70 >> 1; /* 7 bit addressing */ + tmds->target_addr =3D 0x70 >> 1; /* 7 bit addressing */ break; } =20 @@ -1420,14 +1420,14 @@ bool radeon_legacy_get_ext_tmds_info_from_combios(s= truct radeon_encoder *encoder i2c_bus =3D combios_setup_i2c_bus(rdev, DDC_MONID, 0, 0); tmds->i2c_bus =3D radeon_i2c_lookup(rdev, &i2c_bus); tmds->dvo_chip =3D DVO_SIL164; - tmds->slave_addr =3D 0x70 >> 1; /* 7 bit addressing */ + tmds->target_addr =3D 0x70 >> 1; /* 7 bit addressing */ } else { offset =3D combios_get_table_offset(dev, COMBIOS_EXT_TMDS_INFO_TABLE); if (offset) { ver =3D RBIOS8(offset); DRM_DEBUG_KMS("External TMDS Table revision: %d\n", ver); - tmds->slave_addr =3D RBIOS8(offset + 4 + 2); - tmds->slave_addr >>=3D 1; /* 7 bit addressing */ + tmds->target_addr =3D RBIOS8(offset + 4 + 2); + tmds->target_addr >>=3D 1; /* 7 bit addressing */ gpio =3D RBIOS8(offset + 4 + 3); if (gpio =3D=3D DDC_LCD) { /* MM i2c */ @@ -2846,19 +2846,19 @@ void radeon_external_tmds_setup(struct drm_encoder = *encoder) case DVO_SIL164: /* sil 164 */ radeon_i2c_put_byte(tmds->i2c_bus, - tmds->slave_addr, + tmds->target_addr, 0x08, 0x30); radeon_i2c_put_byte(tmds->i2c_bus, - tmds->slave_addr, + tmds->target_addr, 0x09, 0x00); radeon_i2c_put_byte(tmds->i2c_bus, - tmds->slave_addr, + tmds->target_addr, 0x0a, 0x90); radeon_i2c_put_byte(tmds->i2c_bus, - tmds->slave_addr, + tmds->target_addr, 0x0c, 0x89); radeon_i2c_put_byte(tmds->i2c_bus, - tmds->slave_addr, + tmds->target_addr, 0x08, 0x3b); break; case DVO_SIL1178: @@ -2887,7 +2887,7 @@ bool radeon_combios_external_tmds_setup(struct drm_en= coder *encoder) struct radeon_device *rdev =3D dev->dev_private; struct radeon_encoder *radeon_encoder =3D to_radeon_encoder(encoder); uint16_t offset; - uint8_t blocks, slave_addr, rev; + uint8_t blocks, target_addr, rev; uint32_t index, id; uint32_t reg, val, and_mask, or_mask; struct radeon_encoder_ext_tmds *tmds =3D radeon_encoder->enc_priv; @@ -2934,15 +2934,15 @@ bool radeon_combios_external_tmds_setup(struct drm_= encoder *encoder) mdelay(val); break; case 6: - slave_addr =3D id & 0xff; - slave_addr >>=3D 1; /* 7 bit addressing */ + target_addr =3D id & 0xff; + target_addr >>=3D 1; /* 7 bit addressing */ index++; reg =3D RBIOS8(index); index++; val =3D RBIOS8(index); index++; radeon_i2c_put_byte(tmds->i2c_bus, - slave_addr, + target_addr, reg, val); break; default: @@ -2997,7 +2997,7 @@ bool radeon_combios_external_tmds_setup(struct drm_en= coder *encoder) val =3D RBIOS8(index); index +=3D 1; radeon_i2c_put_byte(tmds->i2c_bus, - tmds->slave_addr, + tmds->target_addr, reg, val); break; default: diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/r= adeon_i2c.c index 3d174390a8af..a2eb00229428 100644 --- a/drivers/gpu/drm/radeon/radeon_i2c.c +++ b/drivers/gpu/drm/radeon/radeon_i2c.c @@ -1038,7 +1038,7 @@ struct radeon_i2c_chan *radeon_i2c_lookup(struct rade= on_device *rdev, } =20 void radeon_i2c_get_byte(struct radeon_i2c_chan *i2c_bus, - u8 slave_addr, + u8 target_addr, u8 addr, u8 *val) { @@ -1046,13 +1046,13 @@ void radeon_i2c_get_byte(struct radeon_i2c_chan *i2= c_bus, u8 in_buf[2]; struct i2c_msg msgs[] =3D { { - .addr =3D slave_addr, + .addr =3D target_addr, .flags =3D 0, .len =3D 1, .buf =3D out_buf, }, { - .addr =3D slave_addr, + .addr =3D target_addr, .flags =3D I2C_M_RD, .len =3D 1, .buf =3D in_buf, @@ -1072,13 +1072,13 @@ void radeon_i2c_get_byte(struct radeon_i2c_chan *i2= c_bus, } =20 void radeon_i2c_put_byte(struct radeon_i2c_chan *i2c_bus, - u8 slave_addr, + u8 target_addr, u8 addr, u8 val) { uint8_t out_buf[2]; struct i2c_msg msg =3D { - .addr =3D slave_addr, + .addr =3D target_addr, .flags =3D 0, .len =3D 2, .buf =3D out_buf, diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/= radeon_mode.h index 546381a5c918..701c5f9046a0 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -409,7 +409,7 @@ struct radeon_encoder_int_tmds { struct radeon_encoder_ext_tmds { /* tmds over dvo */ struct radeon_i2c_chan *i2c_bus; - uint8_t slave_addr; + uint8_t target_addr; enum radeon_dvo_chip dvo_chip; }; =20 @@ -749,11 +749,11 @@ extern struct radeon_i2c_chan *radeon_i2c_create(stru= ct drm_device *dev, const char *name); extern void radeon_i2c_destroy(struct radeon_i2c_chan *i2c); extern void radeon_i2c_get_byte(struct radeon_i2c_chan *i2c_bus, - u8 slave_addr, + u8 target_addr, u8 addr, u8 *val); extern void radeon_i2c_put_byte(struct radeon_i2c_chan *i2c, - u8 slave_addr, + u8 target_addr, u8 addr, u8 val); extern void radeon_router_select_ddc_port(struct radeon_connector *radeon_= connector); --=20 2.34.1