Commit cae52163 authored by Vadim Pasternak's avatar Vadim Pasternak Committed by Wolfram Sang
Browse files

i2c: mux: mlxcpld: Get rid of adapter numbers enforcement 



Do not set the argument 'force_nr' of i2c_mux_add_adapter() routine,
instead provide argument 'chan_id'.
Rename mux ids array from 'adap_ids' to 'chan_ids'.

The motivation is to prepare infrastructure to be able to:
- Create only the child adapters which are actually needed - for which
  channel ids are specified.
- To assign 'nrs' to these child adapters dynamically, with no 'nr'
  enforcement.

Signed-off-by: default avatarVadim Pasternak <vadimp@nvidia.com>
Acked-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 81566938

drivers/i2c/muxes/i2c-mux-mlxcpld.c

+2 −5
Original line number Diff line number Diff line
@@ -101,9 +101,8 @@ static int mlxcpld_mux_probe(struct platform_device *pdev) 
	struct mlxcpld_mux_plat_data *pdata = dev_get_platdata(&pdev->dev);

	struct i2c_client *client = to_i2c_client(pdev->dev.parent);

	struct i2c_mux_core *muxc;

	int num, force;

	struct mlxcpld_mux *data;

	int err;

	int num, err;



	if (!pdata)

		return -EINVAL;
@@ -130,9 +129,7 @@ static int mlxcpld_mux_probe(struct platform_device *pdev) 
			/* discard unconfigured channels */

			break;



		force = pdata->adap_ids[num];



		err = i2c_mux_add_adapter(muxc, force, num, 0);

		err = i2c_mux_add_adapter(muxc, 0, pdata->chan_ids[num], 0);

		if (err)

			goto virt_reg_failed;

	}

include/linux/platform_data/mlxcpld.h

+2 −2
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ 
/* Platform data for the CPLD I2C multiplexers */



/* mlxcpld_mux_plat_data - per mux data, used with i2c_register_board_info

 * @adap_ids - adapter array

 * @chan_ids - channels array

 * @num_adaps - number of adapters

 * @sel_reg_addr - mux select register offset in CPLD space

 */

struct mlxcpld_mux_plat_data {

	int *adap_ids;

	int *chan_ids;

	int num_adaps;

	int sel_reg_addr;

};