On 2017-12-22 09:46, Greg Kroah-Hartman wrote:
> 4.9-stable review patch. If anyone has any objections, please let me know.
I don't think this is relevant since the interrupt support code was
added in 4.11 or something like that with
f2114795f721 ("i2c: mux: pca954x: Add interrupt controller support")
Before that pca9545 and pca9546 was handled the same so this patch
changes nothing. No harm though, so do whatever is simpler.
Naturally, the same applies for all older stable tree as well...
Cheers,
Peter
>
> ------------------
>
> From: Mike Looijmans <mike.looijmans@xxxxxxxx>
>
>
> [ Upstream commit dbe4d69d252e9e65c6c46826980b77b11a142065 ]
>
> The spec for the pca9546 was missing. This chip is the same as the pca9545
> except that it lacks interrupt lines. While the i2c_device_id table mapped
> the pca9546 to the pca9545 definition the compatible table did not.
>
> Signed-off-by: Mike Looijmans <mike.looijmans@xxxxxxxx>
> Signed-off-by: Peter Rosin <peda@xxxxxxxxxx>
> Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> --- a/drivers/i2c/muxes/i2c-mux-pca954x.c
> +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
> @@ -96,6 +96,10 @@ static const struct chip_desc chips[] =
> .nchans = 4,
> .muxtype = pca954x_isswi,
> },
> + [pca_9546] = {
> + .nchans = 4,
> + .muxtype = pca954x_isswi,
> + },
> [pca_9547] = {
> .nchans = 8,
> .enable = 0x8,
> @@ -113,7 +117,7 @@ static const struct i2c_device_id pca954
> { "pca9543", pca_9543 },
> { "pca9544", pca_9544 },
> { "pca9545", pca_9545 },
> - { "pca9546", pca_9545 },
> + { "pca9546", pca_9546 },
> { "pca9547", pca_9547 },
> { "pca9548", pca_9548 },
> { }
>
>