diff for duplicates of <522794F1.90301@st.com> diff --git a/a/1.txt b/N1/1.txt index 1f41249..1e291b4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,42 +3,40 @@ > is based on the view that it's better to have easy to read, maintainable > code than to save a few lines here and there. For that reason we're > expanding the array so initialisation is completed in full. -Also for this one, the channel names are general and can be shared=20 -between different sensors. For the channel definition it's not a problem=20 +Also for this one, the channel names are general and can be shared +between different sensors. For the channel definition it's not a problem for me, but I think it's not necessary adds all that code... Denis > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- -> drivers/iio/pressure/st_pressure_core.c | 45 +++++++++++++++++++++++++-= -------- +> drivers/iio/pressure/st_pressure_core.c | 45 +++++++++++++++++++++++++-------- > 1 file changed, 34 insertions(+), 11 deletions(-) > -> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressu= -re/st_pressure_core.c +> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c > index becfb25..7ba9299 100644 > --- a/drivers/iio/pressure/st_pressure_core.c > +++ b/drivers/iio/pressure/st_pressure_core.c > @@ -58,16 +58,39 @@ > #define ST_PRESS_LPS331AP_OUT_XL_ADDR 0x28 > #define ST_TEMP_LPS331AP_OUT_L_ADDR 0x2b -> =20 -> -static const struct iio_chan_spec st_press_channels[] =3D { +> +> -static const struct iio_chan_spec st_press_channels[] = { > - ST_SENSORS_LSM_CHANNELS(IIO_PRESSURE, -> +static const struct iio_chan_spec st_press_lsp331ap_channels[] =3D { +> +static const struct iio_chan_spec st_press_lsp331ap_channels[] = { > + { -> + .type =3D IIO_PRESSURE, -> + .channel2 =3D IIO_NO_MOD, -> + .address =3D ST_PRESS_LPS331AP_OUT_XL_ADDR, -> + .scan_index =3D ST_SENSORS_SCAN_X, -> + .scan_type =3D { -> + .sign =3D 'u', -> + .realbits =3D 24, -> + .storagebits =3D 24, -> + .endianness =3D IIO_LE, +> + .type = IIO_PRESSURE, +> + .channel2 = IIO_NO_MOD, +> + .address = ST_PRESS_LPS331AP_OUT_XL_ADDR, +> + .scan_index = ST_SENSORS_SCAN_X, +> + .scan_type = { +> + .sign = 'u', +> + .realbits = 24, +> + .storagebits = 24, +> + .endianness = IIO_LE, > + }, -> + .info_mask_separate =3D +> + .info_mask_separate = > BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), > - ST_SENSORS_SCAN_X, 0, IIO_NO_MOD, 'u', IIO_LE, 24, 24, > - ST_PRESS_LPS331AP_OUT_XL_ADDR), @@ -47,44 +45,43 @@ re/st_pressure_core.c > - BIT(IIO_CHAN_INFO_OFFSET), > - -1, 0, IIO_NO_MOD, 's', IIO_LE, 16, 16, > - ST_TEMP_LPS331AP_OUT_L_ADDR), -> + .modified =3D 0, +> + .modified = 0, > + }, > + { -> + .type =3D IIO_TEMP, -> + .channel2 =3D IIO_NO_MOD, -> + .address =3D ST_TEMP_LPS331AP_OUT_L_ADDR, -> + .scan_index =3D -1, -> + .scan_type =3D { -> + .sign =3D 'u', -> + .realbits =3D 16, -> + .storagebits =3D 16, -> + .endianness =3D IIO_LE, +> + .type = IIO_TEMP, +> + .channel2 = IIO_NO_MOD, +> + .address = ST_TEMP_LPS331AP_OUT_L_ADDR, +> + .scan_index = -1, +> + .scan_type = { +> + .sign = 'u', +> + .realbits = 16, +> + .storagebits = 16, +> + .endianness = IIO_LE, > + }, -> + .info_mask_separate =3D +> + .info_mask_separate = > + BIT(IIO_CHAN_INFO_RAW) | > + BIT(IIO_CHAN_INFO_SCALE) | > + BIT(IIO_CHAN_INFO_OFFSET), -> + .modified =3D 0, +> + .modified = 0, > + }, > IIO_CHAN_SOFT_TIMESTAMP(1) > }; -> =20 -> @@ -77,7 +100,7 @@ static const struct st_sensors st_press_sensors[] =3D = -{ -> .sensors_supported =3D { -> [0] =3D LPS331AP_PRESS_DEV_NAME, +> +> @@ -77,7 +100,7 @@ static const struct st_sensors st_press_sensors[] = { +> .sensors_supported = { +> [0] = LPS331AP_PRESS_DEV_NAME, > }, -> - .ch =3D (struct iio_chan_spec *)st_press_channels, -> + .ch =3D (struct iio_chan_spec *)st_press_lsp331ap_channels, -> .odr =3D { -> .addr =3D ST_PRESS_LPS331AP_ODR_ADDR, -> .mask =3D ST_PRESS_LPS331AP_ODR_MASK, +> - .ch = (struct iio_chan_spec *)st_press_channels, +> + .ch = (struct iio_chan_spec *)st_press_lsp331ap_channels, +> .odr = { +> .addr = ST_PRESS_LPS331AP_ODR_ADDR, +> .mask = ST_PRESS_LPS331AP_ODR_MASK, > @@ -214,7 +237,7 @@ int st_press_common_probe(struct iio_dev *indio_dev) -> pdata->num_data_channels =3D ST_PRESS_NUMBER_DATA_CHANNELS; -> pdata->multiread_bit =3D pdata->sensor->multi_read_bit; -> indio_dev->channels =3D pdata->sensor->ch; -> - indio_dev->num_channels =3D ARRAY_SIZE(st_press_channels); -> + indio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels); -> =20 -> pdata->current_fullscale =3D (struct st_sensor_fullscale_avl *) +> pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS; +> pdata->multiread_bit = pdata->sensor->multi_read_bit; +> indio_dev->channels = pdata->sensor->ch; +> - indio_dev->num_channels = ARRAY_SIZE(st_press_channels); +> + indio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels); +> +> pdata->current_fullscale = (struct st_sensor_fullscale_avl *) > &pdata->sensor->fs.fs_avl[0]; diff --git a/a/content_digest b/N1/content_digest index 4309132..6827efe 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\01378287103-21765-1-git-send-email-lee.jones@linaro.org\0" "ref\01378287103-21765-7-git-send-email-lee.jones@linaro.org\0" - "From\0Denis CIOCCA <denis.ciocca@st.com>\0" - "Subject\0Re: [PATCH 06/11] iio: pressure-core: st: Expand and rename LPS331AP's channel descriptor\0" + "From\0denis.ciocca@st.com (Denis CIOCCA)\0" + "Subject\0[PATCH 06/11] iio: pressure-core: st: Expand and rename LPS331AP's channel descriptor\0" "Date\0Wed, 4 Sep 2013 22:15:45 +0200\0" - "To\0Lee Jones <lee.jones@linaro.org>\0" - "Cc\0linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>" - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - jic23@cam.ac.uk <jic23@cam.ac.uk> - arnd@arndb.de <arnd@arndb.de> - linus.walleij@linaro.org <linus.walleij@linaro.org> - " linux-iio@vger.kernel.org <linux-iio@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "> Due to the MACRO used, the task of reading, understanding and maintaining\n" @@ -17,42 +11,40 @@ "> is based on the view that it's better to have easy to read, maintainable\n" "> code than to save a few lines here and there. For that reason we're\n" "> expanding the array so initialisation is completed in full.\n" - "Also for this one, the channel names are general and can be shared=20\n" - "between different sensors. For the channel definition it's not a problem=20\n" + "Also for this one, the channel names are general and can be shared \n" + "between different sensors. For the channel definition it's not a problem \n" "for me, but I think it's not necessary adds all that code...\n" "\n" "Denis\n" "\n" "> Signed-off-by: Lee Jones <lee.jones@linaro.org>\n" "> ---\n" - "> drivers/iio/pressure/st_pressure_core.c | 45 +++++++++++++++++++++++++-=\n" - "-------\n" + "> drivers/iio/pressure/st_pressure_core.c | 45 +++++++++++++++++++++++++--------\n" "> 1 file changed, 34 insertions(+), 11 deletions(-)\n" ">\n" - "> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressu=\n" - "re/st_pressure_core.c\n" + "> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c\n" "> index becfb25..7ba9299 100644\n" "> --- a/drivers/iio/pressure/st_pressure_core.c\n" "> +++ b/drivers/iio/pressure/st_pressure_core.c\n" "> @@ -58,16 +58,39 @@\n" "> #define ST_PRESS_LPS331AP_OUT_XL_ADDR\t\t0x28\n" "> #define ST_TEMP_LPS331AP_OUT_L_ADDR\t\t0x2b\n" - "> =20\n" - "> -static const struct iio_chan_spec st_press_channels[] =3D {\n" + "> \n" + "> -static const struct iio_chan_spec st_press_channels[] = {\n" "> -\tST_SENSORS_LSM_CHANNELS(IIO_PRESSURE,\n" - "> +static const struct iio_chan_spec st_press_lsp331ap_channels[] =3D {\n" + "> +static const struct iio_chan_spec st_press_lsp331ap_channels[] = {\n" "> +\t{\n" - "> +\t\t.type =3D IIO_PRESSURE,\n" - "> +\t\t.channel2 =3D IIO_NO_MOD,\n" - "> +\t\t.address =3D ST_PRESS_LPS331AP_OUT_XL_ADDR,\n" - "> +\t\t.scan_index =3D ST_SENSORS_SCAN_X,\n" - "> +\t\t.scan_type =3D {\n" - "> +\t\t\t.sign =3D 'u',\n" - "> +\t\t\t.realbits =3D 24,\n" - "> +\t\t\t.storagebits =3D 24,\n" - "> +\t\t\t.endianness =3D IIO_LE,\n" + "> +\t\t.type = IIO_PRESSURE,\n" + "> +\t\t.channel2 = IIO_NO_MOD,\n" + "> +\t\t.address = ST_PRESS_LPS331AP_OUT_XL_ADDR,\n" + "> +\t\t.scan_index = ST_SENSORS_SCAN_X,\n" + "> +\t\t.scan_type = {\n" + "> +\t\t\t.sign = 'u',\n" + "> +\t\t\t.realbits = 24,\n" + "> +\t\t\t.storagebits = 24,\n" + "> +\t\t\t.endianness = IIO_LE,\n" "> +\t\t},\n" - "> +\t\t.info_mask_separate =3D\n" + "> +\t\t.info_mask_separate =\n" "> \t\t\tBIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),\n" "> -\t\t\tST_SENSORS_SCAN_X, 0, IIO_NO_MOD, 'u', IIO_LE, 24, 24,\n" "> -\t\t\tST_PRESS_LPS331AP_OUT_XL_ADDR),\n" @@ -61,46 +53,45 @@ "> -\t\t\t\t\t\tBIT(IIO_CHAN_INFO_OFFSET),\n" "> -\t\t\t-1, 0, IIO_NO_MOD, 's', IIO_LE, 16, 16,\n" "> -\t\t\tST_TEMP_LPS331AP_OUT_L_ADDR),\n" - "> +\t\t.modified =3D 0,\n" + "> +\t\t.modified = 0,\n" "> +\t},\n" "> +\t{\n" - "> +\t\t.type =3D IIO_TEMP,\n" - "> +\t\t.channel2 =3D IIO_NO_MOD,\n" - "> +\t\t.address =3D ST_TEMP_LPS331AP_OUT_L_ADDR,\n" - "> +\t\t.scan_index =3D -1,\n" - "> +\t\t.scan_type =3D {\n" - "> +\t\t\t.sign =3D 'u',\n" - "> +\t\t\t.realbits =3D 16,\n" - "> +\t\t\t.storagebits =3D 16,\n" - "> +\t\t\t.endianness =3D IIO_LE,\n" + "> +\t\t.type = IIO_TEMP,\n" + "> +\t\t.channel2 = IIO_NO_MOD,\n" + "> +\t\t.address = ST_TEMP_LPS331AP_OUT_L_ADDR,\n" + "> +\t\t.scan_index = -1,\n" + "> +\t\t.scan_type = {\n" + "> +\t\t\t.sign = 'u',\n" + "> +\t\t\t.realbits = 16,\n" + "> +\t\t\t.storagebits = 16,\n" + "> +\t\t\t.endianness = IIO_LE,\n" "> +\t\t},\n" - "> +\t\t.info_mask_separate =3D\n" + "> +\t\t.info_mask_separate =\n" "> +\t\t\tBIT(IIO_CHAN_INFO_RAW) |\n" "> +\t\t\tBIT(IIO_CHAN_INFO_SCALE) |\n" "> +\t\t\tBIT(IIO_CHAN_INFO_OFFSET),\n" - "> +\t\t.modified =3D 0,\n" + "> +\t\t.modified = 0,\n" "> +\t},\n" "> \tIIO_CHAN_SOFT_TIMESTAMP(1)\n" "> };\n" - "> =20\n" - "> @@ -77,7 +100,7 @@ static const struct st_sensors st_press_sensors[] =3D =\n" - "{\n" - "> \t\t.sensors_supported =3D {\n" - "> \t\t\t[0] =3D LPS331AP_PRESS_DEV_NAME,\n" + "> \n" + "> @@ -77,7 +100,7 @@ static const struct st_sensors st_press_sensors[] = {\n" + "> \t\t.sensors_supported = {\n" + "> \t\t\t[0] = LPS331AP_PRESS_DEV_NAME,\n" "> \t\t},\n" - "> -\t\t.ch =3D (struct iio_chan_spec *)st_press_channels,\n" - "> +\t\t.ch =3D (struct iio_chan_spec *)st_press_lsp331ap_channels,\n" - "> \t\t.odr =3D {\n" - "> \t\t\t.addr =3D ST_PRESS_LPS331AP_ODR_ADDR,\n" - "> \t\t\t.mask =3D ST_PRESS_LPS331AP_ODR_MASK,\n" + "> -\t\t.ch = (struct iio_chan_spec *)st_press_channels,\n" + "> +\t\t.ch = (struct iio_chan_spec *)st_press_lsp331ap_channels,\n" + "> \t\t.odr = {\n" + "> \t\t\t.addr = ST_PRESS_LPS331AP_ODR_ADDR,\n" + "> \t\t\t.mask = ST_PRESS_LPS331AP_ODR_MASK,\n" "> @@ -214,7 +237,7 @@ int st_press_common_probe(struct iio_dev *indio_dev)\n" - "> \tpdata->num_data_channels =3D ST_PRESS_NUMBER_DATA_CHANNELS;\n" - "> \tpdata->multiread_bit =3D pdata->sensor->multi_read_bit;\n" - "> \tindio_dev->channels =3D pdata->sensor->ch;\n" - "> -\tindio_dev->num_channels =3D ARRAY_SIZE(st_press_channels);\n" - "> +\tindio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels);\n" - "> =20\n" - "> \tpdata->current_fullscale =3D (struct st_sensor_fullscale_avl *)\n" + "> \tpdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;\n" + "> \tpdata->multiread_bit = pdata->sensor->multi_read_bit;\n" + "> \tindio_dev->channels = pdata->sensor->ch;\n" + "> -\tindio_dev->num_channels = ARRAY_SIZE(st_press_channels);\n" + "> +\tindio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels);\n" + "> \n" + "> \tpdata->current_fullscale = (struct st_sensor_fullscale_avl *)\n" "> \t\t\t\t\t\t&pdata->sensor->fs.fs_avl[0];" -b71e34d195477afd01a3cf3a8f55bc623a3179cee9bdbf249a4c0c518e3c80d4 +3804e44082569e2a87d356ff4d8486c303d5508cdc74574452799f5d161b2cd2
diff --git a/a/1.txt b/N2/1.txt index 1f41249..1e291b4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,42 +3,40 @@ > is based on the view that it's better to have easy to read, maintainable > code than to save a few lines here and there. For that reason we're > expanding the array so initialisation is completed in full. -Also for this one, the channel names are general and can be shared=20 -between different sensors. For the channel definition it's not a problem=20 +Also for this one, the channel names are general and can be shared +between different sensors. For the channel definition it's not a problem for me, but I think it's not necessary adds all that code... Denis > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- -> drivers/iio/pressure/st_pressure_core.c | 45 +++++++++++++++++++++++++-= -------- +> drivers/iio/pressure/st_pressure_core.c | 45 +++++++++++++++++++++++++-------- > 1 file changed, 34 insertions(+), 11 deletions(-) > -> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressu= -re/st_pressure_core.c +> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c > index becfb25..7ba9299 100644 > --- a/drivers/iio/pressure/st_pressure_core.c > +++ b/drivers/iio/pressure/st_pressure_core.c > @@ -58,16 +58,39 @@ > #define ST_PRESS_LPS331AP_OUT_XL_ADDR 0x28 > #define ST_TEMP_LPS331AP_OUT_L_ADDR 0x2b -> =20 -> -static const struct iio_chan_spec st_press_channels[] =3D { +> +> -static const struct iio_chan_spec st_press_channels[] = { > - ST_SENSORS_LSM_CHANNELS(IIO_PRESSURE, -> +static const struct iio_chan_spec st_press_lsp331ap_channels[] =3D { +> +static const struct iio_chan_spec st_press_lsp331ap_channels[] = { > + { -> + .type =3D IIO_PRESSURE, -> + .channel2 =3D IIO_NO_MOD, -> + .address =3D ST_PRESS_LPS331AP_OUT_XL_ADDR, -> + .scan_index =3D ST_SENSORS_SCAN_X, -> + .scan_type =3D { -> + .sign =3D 'u', -> + .realbits =3D 24, -> + .storagebits =3D 24, -> + .endianness =3D IIO_LE, +> + .type = IIO_PRESSURE, +> + .channel2 = IIO_NO_MOD, +> + .address = ST_PRESS_LPS331AP_OUT_XL_ADDR, +> + .scan_index = ST_SENSORS_SCAN_X, +> + .scan_type = { +> + .sign = 'u', +> + .realbits = 24, +> + .storagebits = 24, +> + .endianness = IIO_LE, > + }, -> + .info_mask_separate =3D +> + .info_mask_separate = > BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), > - ST_SENSORS_SCAN_X, 0, IIO_NO_MOD, 'u', IIO_LE, 24, 24, > - ST_PRESS_LPS331AP_OUT_XL_ADDR), @@ -47,44 +45,43 @@ re/st_pressure_core.c > - BIT(IIO_CHAN_INFO_OFFSET), > - -1, 0, IIO_NO_MOD, 's', IIO_LE, 16, 16, > - ST_TEMP_LPS331AP_OUT_L_ADDR), -> + .modified =3D 0, +> + .modified = 0, > + }, > + { -> + .type =3D IIO_TEMP, -> + .channel2 =3D IIO_NO_MOD, -> + .address =3D ST_TEMP_LPS331AP_OUT_L_ADDR, -> + .scan_index =3D -1, -> + .scan_type =3D { -> + .sign =3D 'u', -> + .realbits =3D 16, -> + .storagebits =3D 16, -> + .endianness =3D IIO_LE, +> + .type = IIO_TEMP, +> + .channel2 = IIO_NO_MOD, +> + .address = ST_TEMP_LPS331AP_OUT_L_ADDR, +> + .scan_index = -1, +> + .scan_type = { +> + .sign = 'u', +> + .realbits = 16, +> + .storagebits = 16, +> + .endianness = IIO_LE, > + }, -> + .info_mask_separate =3D +> + .info_mask_separate = > + BIT(IIO_CHAN_INFO_RAW) | > + BIT(IIO_CHAN_INFO_SCALE) | > + BIT(IIO_CHAN_INFO_OFFSET), -> + .modified =3D 0, +> + .modified = 0, > + }, > IIO_CHAN_SOFT_TIMESTAMP(1) > }; -> =20 -> @@ -77,7 +100,7 @@ static const struct st_sensors st_press_sensors[] =3D = -{ -> .sensors_supported =3D { -> [0] =3D LPS331AP_PRESS_DEV_NAME, +> +> @@ -77,7 +100,7 @@ static const struct st_sensors st_press_sensors[] = { +> .sensors_supported = { +> [0] = LPS331AP_PRESS_DEV_NAME, > }, -> - .ch =3D (struct iio_chan_spec *)st_press_channels, -> + .ch =3D (struct iio_chan_spec *)st_press_lsp331ap_channels, -> .odr =3D { -> .addr =3D ST_PRESS_LPS331AP_ODR_ADDR, -> .mask =3D ST_PRESS_LPS331AP_ODR_MASK, +> - .ch = (struct iio_chan_spec *)st_press_channels, +> + .ch = (struct iio_chan_spec *)st_press_lsp331ap_channels, +> .odr = { +> .addr = ST_PRESS_LPS331AP_ODR_ADDR, +> .mask = ST_PRESS_LPS331AP_ODR_MASK, > @@ -214,7 +237,7 @@ int st_press_common_probe(struct iio_dev *indio_dev) -> pdata->num_data_channels =3D ST_PRESS_NUMBER_DATA_CHANNELS; -> pdata->multiread_bit =3D pdata->sensor->multi_read_bit; -> indio_dev->channels =3D pdata->sensor->ch; -> - indio_dev->num_channels =3D ARRAY_SIZE(st_press_channels); -> + indio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels); -> =20 -> pdata->current_fullscale =3D (struct st_sensor_fullscale_avl *) +> pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS; +> pdata->multiread_bit = pdata->sensor->multi_read_bit; +> indio_dev->channels = pdata->sensor->ch; +> - indio_dev->num_channels = ARRAY_SIZE(st_press_channels); +> + indio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels); +> +> pdata->current_fullscale = (struct st_sensor_fullscale_avl *) > &pdata->sensor->fs.fs_avl[0]; diff --git a/a/content_digest b/N2/content_digest index 4309132..8d91156 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -17,42 +17,40 @@ "> is based on the view that it's better to have easy to read, maintainable\n" "> code than to save a few lines here and there. For that reason we're\n" "> expanding the array so initialisation is completed in full.\n" - "Also for this one, the channel names are general and can be shared=20\n" - "between different sensors. For the channel definition it's not a problem=20\n" + "Also for this one, the channel names are general and can be shared \n" + "between different sensors. For the channel definition it's not a problem \n" "for me, but I think it's not necessary adds all that code...\n" "\n" "Denis\n" "\n" "> Signed-off-by: Lee Jones <lee.jones@linaro.org>\n" "> ---\n" - "> drivers/iio/pressure/st_pressure_core.c | 45 +++++++++++++++++++++++++-=\n" - "-------\n" + "> drivers/iio/pressure/st_pressure_core.c | 45 +++++++++++++++++++++++++--------\n" "> 1 file changed, 34 insertions(+), 11 deletions(-)\n" ">\n" - "> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressu=\n" - "re/st_pressure_core.c\n" + "> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c\n" "> index becfb25..7ba9299 100644\n" "> --- a/drivers/iio/pressure/st_pressure_core.c\n" "> +++ b/drivers/iio/pressure/st_pressure_core.c\n" "> @@ -58,16 +58,39 @@\n" "> #define ST_PRESS_LPS331AP_OUT_XL_ADDR\t\t0x28\n" "> #define ST_TEMP_LPS331AP_OUT_L_ADDR\t\t0x2b\n" - "> =20\n" - "> -static const struct iio_chan_spec st_press_channels[] =3D {\n" + "> \n" + "> -static const struct iio_chan_spec st_press_channels[] = {\n" "> -\tST_SENSORS_LSM_CHANNELS(IIO_PRESSURE,\n" - "> +static const struct iio_chan_spec st_press_lsp331ap_channels[] =3D {\n" + "> +static const struct iio_chan_spec st_press_lsp331ap_channels[] = {\n" "> +\t{\n" - "> +\t\t.type =3D IIO_PRESSURE,\n" - "> +\t\t.channel2 =3D IIO_NO_MOD,\n" - "> +\t\t.address =3D ST_PRESS_LPS331AP_OUT_XL_ADDR,\n" - "> +\t\t.scan_index =3D ST_SENSORS_SCAN_X,\n" - "> +\t\t.scan_type =3D {\n" - "> +\t\t\t.sign =3D 'u',\n" - "> +\t\t\t.realbits =3D 24,\n" - "> +\t\t\t.storagebits =3D 24,\n" - "> +\t\t\t.endianness =3D IIO_LE,\n" + "> +\t\t.type = IIO_PRESSURE,\n" + "> +\t\t.channel2 = IIO_NO_MOD,\n" + "> +\t\t.address = ST_PRESS_LPS331AP_OUT_XL_ADDR,\n" + "> +\t\t.scan_index = ST_SENSORS_SCAN_X,\n" + "> +\t\t.scan_type = {\n" + "> +\t\t\t.sign = 'u',\n" + "> +\t\t\t.realbits = 24,\n" + "> +\t\t\t.storagebits = 24,\n" + "> +\t\t\t.endianness = IIO_LE,\n" "> +\t\t},\n" - "> +\t\t.info_mask_separate =3D\n" + "> +\t\t.info_mask_separate =\n" "> \t\t\tBIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),\n" "> -\t\t\tST_SENSORS_SCAN_X, 0, IIO_NO_MOD, 'u', IIO_LE, 24, 24,\n" "> -\t\t\tST_PRESS_LPS331AP_OUT_XL_ADDR),\n" @@ -61,46 +59,45 @@ "> -\t\t\t\t\t\tBIT(IIO_CHAN_INFO_OFFSET),\n" "> -\t\t\t-1, 0, IIO_NO_MOD, 's', IIO_LE, 16, 16,\n" "> -\t\t\tST_TEMP_LPS331AP_OUT_L_ADDR),\n" - "> +\t\t.modified =3D 0,\n" + "> +\t\t.modified = 0,\n" "> +\t},\n" "> +\t{\n" - "> +\t\t.type =3D IIO_TEMP,\n" - "> +\t\t.channel2 =3D IIO_NO_MOD,\n" - "> +\t\t.address =3D ST_TEMP_LPS331AP_OUT_L_ADDR,\n" - "> +\t\t.scan_index =3D -1,\n" - "> +\t\t.scan_type =3D {\n" - "> +\t\t\t.sign =3D 'u',\n" - "> +\t\t\t.realbits =3D 16,\n" - "> +\t\t\t.storagebits =3D 16,\n" - "> +\t\t\t.endianness =3D IIO_LE,\n" + "> +\t\t.type = IIO_TEMP,\n" + "> +\t\t.channel2 = IIO_NO_MOD,\n" + "> +\t\t.address = ST_TEMP_LPS331AP_OUT_L_ADDR,\n" + "> +\t\t.scan_index = -1,\n" + "> +\t\t.scan_type = {\n" + "> +\t\t\t.sign = 'u',\n" + "> +\t\t\t.realbits = 16,\n" + "> +\t\t\t.storagebits = 16,\n" + "> +\t\t\t.endianness = IIO_LE,\n" "> +\t\t},\n" - "> +\t\t.info_mask_separate =3D\n" + "> +\t\t.info_mask_separate =\n" "> +\t\t\tBIT(IIO_CHAN_INFO_RAW) |\n" "> +\t\t\tBIT(IIO_CHAN_INFO_SCALE) |\n" "> +\t\t\tBIT(IIO_CHAN_INFO_OFFSET),\n" - "> +\t\t.modified =3D 0,\n" + "> +\t\t.modified = 0,\n" "> +\t},\n" "> \tIIO_CHAN_SOFT_TIMESTAMP(1)\n" "> };\n" - "> =20\n" - "> @@ -77,7 +100,7 @@ static const struct st_sensors st_press_sensors[] =3D =\n" - "{\n" - "> \t\t.sensors_supported =3D {\n" - "> \t\t\t[0] =3D LPS331AP_PRESS_DEV_NAME,\n" + "> \n" + "> @@ -77,7 +100,7 @@ static const struct st_sensors st_press_sensors[] = {\n" + "> \t\t.sensors_supported = {\n" + "> \t\t\t[0] = LPS331AP_PRESS_DEV_NAME,\n" "> \t\t},\n" - "> -\t\t.ch =3D (struct iio_chan_spec *)st_press_channels,\n" - "> +\t\t.ch =3D (struct iio_chan_spec *)st_press_lsp331ap_channels,\n" - "> \t\t.odr =3D {\n" - "> \t\t\t.addr =3D ST_PRESS_LPS331AP_ODR_ADDR,\n" - "> \t\t\t.mask =3D ST_PRESS_LPS331AP_ODR_MASK,\n" + "> -\t\t.ch = (struct iio_chan_spec *)st_press_channels,\n" + "> +\t\t.ch = (struct iio_chan_spec *)st_press_lsp331ap_channels,\n" + "> \t\t.odr = {\n" + "> \t\t\t.addr = ST_PRESS_LPS331AP_ODR_ADDR,\n" + "> \t\t\t.mask = ST_PRESS_LPS331AP_ODR_MASK,\n" "> @@ -214,7 +237,7 @@ int st_press_common_probe(struct iio_dev *indio_dev)\n" - "> \tpdata->num_data_channels =3D ST_PRESS_NUMBER_DATA_CHANNELS;\n" - "> \tpdata->multiread_bit =3D pdata->sensor->multi_read_bit;\n" - "> \tindio_dev->channels =3D pdata->sensor->ch;\n" - "> -\tindio_dev->num_channels =3D ARRAY_SIZE(st_press_channels);\n" - "> +\tindio_dev->num_channels =3D ARRAY_SIZE(st_press_lsp331ap_channels);\n" - "> =20\n" - "> \tpdata->current_fullscale =3D (struct st_sensor_fullscale_avl *)\n" + "> \tpdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;\n" + "> \tpdata->multiread_bit = pdata->sensor->multi_read_bit;\n" + "> \tindio_dev->channels = pdata->sensor->ch;\n" + "> -\tindio_dev->num_channels = ARRAY_SIZE(st_press_channels);\n" + "> +\tindio_dev->num_channels = ARRAY_SIZE(st_press_lsp331ap_channels);\n" + "> \n" + "> \tpdata->current_fullscale = (struct st_sensor_fullscale_avl *)\n" "> \t\t\t\t\t\t&pdata->sensor->fs.fs_avl[0];" -b71e34d195477afd01a3cf3a8f55bc623a3179cee9bdbf249a4c0c518e3c80d4 +1cc4b7f2a77aece04a910e115d3dcb1cc1d6ed92eb3ceafcfaf130d987ea6fb0
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.