drop i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch

diff --git a/queue-3.18/i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch b/queue-3.18/i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch
deleted file mode 100644 (file)
index 3556424..0000000
--- a/queue-3.18/i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Thu Dec 21 10:55:04 CET 2017
-From: Mike Looijmans <mike.looijmans@topic.nl>
-Date: Thu, 23 Mar 2017 10:00:36 +0100
-Subject: i2c: mux: pca954x: Add missing pca9546 definition to chip_desc
-
-From: Mike Looijmans <mike.looijmans@topic.nl>
-
-
-[ 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@topic.nl>
-Signed-off-by: Peter Rosin <peda@axentia.se>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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
-@@ -93,6 +93,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,
-@@ -110,7 +114,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 },
-       { }

diff --git a/queue-3.18/series b/queue-3.18/series
index 9f8678459acade5abe89149954de4650aa91e60b..412187d35dec64df25f8f8542a5ebae6d05a99f4 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -12,7 +12,6 @@ scsi-lpfc-fix-pt2pt-prli-reject.patch
 kvm-x86-correct-async-page-present-tracepoint.patch
 arm-dts-ti-fix-pci-bus-dtc-warnings.patch
 hwmon-asus_atk0110-fix-uninitialized-data-access.patch
-i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch
 hid-xinmo-fix-for-out-of-range-for-tht-2p-arcade-controller.patch
 s390-qeth-no-eth-header-for-outbound-af_iucv.patch
 net-do-not-allow-negative-values-for-busy_read-and-busy_poll-sysctl-interfaces.patch

diff --git a/queue-4.4/i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch b/queue-4.4/i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch
deleted file mode 100644 (file)
index 8fa97ab..0000000
--- a/queue-4.4/i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Thu Dec 21 10:35:49 CET 2017
-From: Mike Looijmans <mike.looijmans@topic.nl>
-Date: Thu, 23 Mar 2017 10:00:36 +0100
-Subject: i2c: mux: pca954x: Add missing pca9546 definition to chip_desc
-
-From: Mike Looijmans <mike.looijmans@topic.nl>
-
-
-[ 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@topic.nl>
-Signed-off-by: Peter Rosin <peda@axentia.se>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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
-@@ -94,6 +94,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,
-@@ -111,7 +115,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 },
-       { }

diff --git a/queue-4.4/series b/queue-4.4/series
index 2b8707f3c506a7eaece967426da501fdb5c68a10..4db19fd35f806e9455f2066f78ccaab75b3a8021 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -34,7 +34,6 @@ kvm-x86-correct-async-page-present-tracepoint.patch
 kvm-vmx-fix-enable-vpid-conditions.patch
 arm-dts-ti-fix-pci-bus-dtc-warnings.patch
 hwmon-asus_atk0110-fix-uninitialized-data-access.patch
-i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch
 hid-xinmo-fix-for-out-of-range-for-tht-2p-arcade-controller.patch
 r8152-prevent-the-driver-from-transmitting-packets-with-carrier-off.patch
 s390-qeth-no-eth-header-for-outbound-af_iucv.patch

diff --git a/queue-4.9/i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch b/queue-4.9/i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch
deleted file mode 100644 (file)
index de41402..0000000
--- a/queue-4.9/i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Thu Dec 21 09:02:40 CET 2017
-From: Mike Looijmans <mike.looijmans@topic.nl>
-Date: Thu, 23 Mar 2017 10:00:36 +0100
-Subject: i2c: mux: pca954x: Add missing pca9546 definition to chip_desc
-
-From: Mike Looijmans <mike.looijmans@topic.nl>
-
-
-[ 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@topic.nl>
-Signed-off-by: Peter Rosin <peda@axentia.se>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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 },
-       { }

diff --git a/queue-4.9/series b/queue-4.9/series
index 091a8d047ba14c04e0742bc4dfcedd87614f1277..14a69767bef8c54d890ec546c1c3a9712eb0d052 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -34,7 +34,6 @@ kvm-x86-correct-async-page-present-tracepoint.patch
 kvm-vmx-fix-enable-vpid-conditions.patch
 arm-dts-ti-fix-pci-bus-dtc-warnings.patch
 hwmon-asus_atk0110-fix-uninitialized-data-access.patch
-i2c-mux-pca954x-add-missing-pca9546-definition-to-chip_desc.patch
 hid-xinmo-fix-for-out-of-range-for-tht-2p-arcade-controller.patch
 asoc-sti-fix-reader-substream-pointer-set.patch
 r8152-prevent-the-driver-from-transmitting-packets-with-carrier-off.patch