From aff25be646db826a91e9723003e5e57f4bea02ea Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 23 Jun 2020 20:52:54 -0400 Subject: [PATCH] Drop input-mms114-add-extra-compatible-for-mms345l.patch Signed-off-by: Sasha Levin --- ...114-add-extra-compatible-for-mms345l.patch | 88 ------------------- queue-4.19/series | 1 - ...114-add-extra-compatible-for-mms345l.patch | 88 ------------------- queue-5.4/series | 1 - ...114-add-extra-compatible-for-mms345l.patch | 88 ------------------- queue-5.7/series | 1 - 6 files changed, 267 deletions(-) delete mode 100644 queue-4.19/input-mms114-add-extra-compatible-for-mms345l.patch delete mode 100644 queue-5.4/input-mms114-add-extra-compatible-for-mms345l.patch delete mode 100644 queue-5.7/input-mms114-add-extra-compatible-for-mms345l.patch diff --git a/queue-4.19/input-mms114-add-extra-compatible-for-mms345l.patch b/queue-4.19/input-mms114-add-extra-compatible-for-mms345l.patch deleted file mode 100644 index 85feb869749..00000000000 --- a/queue-4.19/input-mms114-add-extra-compatible-for-mms345l.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 4148bbcad9ebd1c1c0edef2b46488203a3861e5a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 25 Apr 2020 13:06:31 -0700 -Subject: Input: mms114 - add extra compatible for mms345l - -From: Stephan Gerhold - -[ Upstream commit 7842087b0196d674ed877d768de8f2a34d7fdc53 ] - -MMS345L is another first generation touch screen from Melfas, -which uses mostly the same registers as MMS152. - -However, there is some garbage printed during initialization. -Apparently MMS345L does not have the MMS152_COMPAT_GROUP register -that is read+printed during initialization. - - TSP FW Rev: bootloader 0x6 / core 0x26 / config 0x26, Compat group: \x06 - -On earlier kernel versions the compat group was actually printed as -an ASCII control character, seems like it gets escaped now. - -But we probably shouldn't print something from a random register. - -Add a separate "melfas,mms345l" compatible that avoids reading -from the MMS152_COMPAT_GROUP register. This might also help in case -there is some other device-specific quirk in the future. - -Signed-off-by: Stephan Gerhold -Reviewed-by: Andi Shyti -Link: https://lore.kernel.org/r/20200423102431.2715-1-stephan@gerhold.net -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/touchscreen/mms114.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c -index fca908ba4841f..fb28fd2d6f1c5 100644 ---- a/drivers/input/touchscreen/mms114.c -+++ b/drivers/input/touchscreen/mms114.c -@@ -54,6 +54,7 @@ - enum mms_type { - TYPE_MMS114 = 114, - TYPE_MMS152 = 152, -+ TYPE_MMS345L = 345, - }; - - struct mms114_data { -@@ -250,6 +251,15 @@ static int mms114_get_version(struct mms114_data *data) - int error; - - switch (data->type) { -+ case TYPE_MMS345L: -+ error = __mms114_read_reg(data, MMS152_FW_REV, 3, buf); -+ if (error) -+ return error; -+ -+ dev_info(dev, "TSP FW Rev: bootloader 0x%x / core 0x%x / config 0x%x\n", -+ buf[0], buf[1], buf[2]); -+ break; -+ - case TYPE_MMS152: - error = __mms114_read_reg(data, MMS152_FW_REV, 3, buf); - if (error) -@@ -287,8 +297,8 @@ static int mms114_setup_regs(struct mms114_data *data) - if (error < 0) - return error; - -- /* MMS152 has no configuration or power on registers */ -- if (data->type == TYPE_MMS152) -+ /* Only MMS114 has configuration and power on registers */ -+ if (data->type != TYPE_MMS114) - return 0; - - error = mms114_set_active(data, true); -@@ -598,6 +608,9 @@ static const struct of_device_id mms114_dt_match[] = { - }, { - .compatible = "melfas,mms152", - .data = (void *)TYPE_MMS152, -+ }, { -+ .compatible = "melfas,mms345l", -+ .data = (void *)TYPE_MMS345L, - }, - { } - }; --- -2.25.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 73b67379f79..61bb000af41 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -57,7 +57,6 @@ staging-gasket-fix-mapping-refcnt-leak-when-put-attr.patch staging-gasket-fix-mapping-refcnt-leak-when-register.patch alsa-usb-audio-improve-frames-size-computation.patch alsa-usb-audio-fix-racy-list-management-in-output-qu.patch -input-mms114-add-extra-compatible-for-mms345l.patch s390-qdio-put-thinint-indicator-after-early-error.patch tty-hvc-fix-data-abort-due-to-race-in-hvc_open.patch slimbus-ngd-get-drvdata-from-correct-device.patch diff --git a/queue-5.4/input-mms114-add-extra-compatible-for-mms345l.patch b/queue-5.4/input-mms114-add-extra-compatible-for-mms345l.patch deleted file mode 100644 index 2b95456aa04..00000000000 --- a/queue-5.4/input-mms114-add-extra-compatible-for-mms345l.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 4566cf7c5e4157b89c6f9914e5536d9203cfa082 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 25 Apr 2020 13:06:31 -0700 -Subject: Input: mms114 - add extra compatible for mms345l - -From: Stephan Gerhold - -[ Upstream commit 7842087b0196d674ed877d768de8f2a34d7fdc53 ] - -MMS345L is another first generation touch screen from Melfas, -which uses mostly the same registers as MMS152. - -However, there is some garbage printed during initialization. -Apparently MMS345L does not have the MMS152_COMPAT_GROUP register -that is read+printed during initialization. - - TSP FW Rev: bootloader 0x6 / core 0x26 / config 0x26, Compat group: \x06 - -On earlier kernel versions the compat group was actually printed as -an ASCII control character, seems like it gets escaped now. - -But we probably shouldn't print something from a random register. - -Add a separate "melfas,mms345l" compatible that avoids reading -from the MMS152_COMPAT_GROUP register. This might also help in case -there is some other device-specific quirk in the future. - -Signed-off-by: Stephan Gerhold -Reviewed-by: Andi Shyti -Link: https://lore.kernel.org/r/20200423102431.2715-1-stephan@gerhold.net -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/touchscreen/mms114.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c -index fca908ba4841f..fb28fd2d6f1c5 100644 ---- a/drivers/input/touchscreen/mms114.c -+++ b/drivers/input/touchscreen/mms114.c -@@ -54,6 +54,7 @@ - enum mms_type { - TYPE_MMS114 = 114, - TYPE_MMS152 = 152, -+ TYPE_MMS345L = 345, - }; - - struct mms114_data { -@@ -250,6 +251,15 @@ static int mms114_get_version(struct mms114_data *data) - int error; - - switch (data->type) { -+ case TYPE_MMS345L: -+ error = __mms114_read_reg(data, MMS152_FW_REV, 3, buf); -+ if (error) -+ return error; -+ -+ dev_info(dev, "TSP FW Rev: bootloader 0x%x / core 0x%x / config 0x%x\n", -+ buf[0], buf[1], buf[2]); -+ break; -+ - case TYPE_MMS152: - error = __mms114_read_reg(data, MMS152_FW_REV, 3, buf); - if (error) -@@ -287,8 +297,8 @@ static int mms114_setup_regs(struct mms114_data *data) - if (error < 0) - return error; - -- /* MMS152 has no configuration or power on registers */ -- if (data->type == TYPE_MMS152) -+ /* Only MMS114 has configuration and power on registers */ -+ if (data->type != TYPE_MMS114) - return 0; - - error = mms114_set_active(data, true); -@@ -598,6 +608,9 @@ static const struct of_device_id mms114_dt_match[] = { - }, { - .compatible = "melfas,mms152", - .data = (void *)TYPE_MMS152, -+ }, { -+ .compatible = "melfas,mms345l", -+ .data = (void *)TYPE_MMS345L, - }, - { } - }; --- -2.25.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 6e2b2f0e41f..aa698ea9384 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -97,7 +97,6 @@ staging-gasket-fix-mapping-refcnt-leak-when-put-attr.patch staging-gasket-fix-mapping-refcnt-leak-when-register.patch alsa-usb-audio-improve-frames-size-computation.patch alsa-usb-audio-fix-racy-list-management-in-output-qu.patch -input-mms114-add-extra-compatible-for-mms345l.patch s390-qdio-put-thinint-indicator-after-early-error.patch tty-hvc-fix-data-abort-due-to-race-in-hvc_open.patch slimbus-ngd-get-drvdata-from-correct-device.patch diff --git a/queue-5.7/input-mms114-add-extra-compatible-for-mms345l.patch b/queue-5.7/input-mms114-add-extra-compatible-for-mms345l.patch deleted file mode 100644 index 0407113c8f7..00000000000 --- a/queue-5.7/input-mms114-add-extra-compatible-for-mms345l.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 6c05b9365d4cdfb40818024b1fdfdc5a7a3b5909 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 25 Apr 2020 13:06:31 -0700 -Subject: Input: mms114 - add extra compatible for mms345l - -From: Stephan Gerhold - -[ Upstream commit 7842087b0196d674ed877d768de8f2a34d7fdc53 ] - -MMS345L is another first generation touch screen from Melfas, -which uses mostly the same registers as MMS152. - -However, there is some garbage printed during initialization. -Apparently MMS345L does not have the MMS152_COMPAT_GROUP register -that is read+printed during initialization. - - TSP FW Rev: bootloader 0x6 / core 0x26 / config 0x26, Compat group: \x06 - -On earlier kernel versions the compat group was actually printed as -an ASCII control character, seems like it gets escaped now. - -But we probably shouldn't print something from a random register. - -Add a separate "melfas,mms345l" compatible that avoids reading -from the MMS152_COMPAT_GROUP register. This might also help in case -there is some other device-specific quirk in the future. - -Signed-off-by: Stephan Gerhold -Reviewed-by: Andi Shyti -Link: https://lore.kernel.org/r/20200423102431.2715-1-stephan@gerhold.net -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/touchscreen/mms114.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c -index 2ef1adaed9afb..5bdf4ac1a3033 100644 ---- a/drivers/input/touchscreen/mms114.c -+++ b/drivers/input/touchscreen/mms114.c -@@ -54,6 +54,7 @@ - enum mms_type { - TYPE_MMS114 = 114, - TYPE_MMS152 = 152, -+ TYPE_MMS345L = 345, - }; - - struct mms114_data { -@@ -250,6 +251,15 @@ static int mms114_get_version(struct mms114_data *data) - int error; - - switch (data->type) { -+ case TYPE_MMS345L: -+ error = __mms114_read_reg(data, MMS152_FW_REV, 3, buf); -+ if (error) -+ return error; -+ -+ dev_info(dev, "TSP FW Rev: bootloader 0x%x / core 0x%x / config 0x%x\n", -+ buf[0], buf[1], buf[2]); -+ break; -+ - case TYPE_MMS152: - error = __mms114_read_reg(data, MMS152_FW_REV, 3, buf); - if (error) -@@ -287,8 +297,8 @@ static int mms114_setup_regs(struct mms114_data *data) - if (error < 0) - return error; - -- /* MMS152 has no configuration or power on registers */ -- if (data->type == TYPE_MMS152) -+ /* Only MMS114 has configuration and power on registers */ -+ if (data->type != TYPE_MMS114) - return 0; - - error = mms114_set_active(data, true); -@@ -597,6 +607,9 @@ static const struct of_device_id mms114_dt_match[] = { - }, { - .compatible = "melfas,mms152", - .data = (void *)TYPE_MMS152, -+ }, { -+ .compatible = "melfas,mms345l", -+ .data = (void *)TYPE_MMS345L, - }, - { } - }; --- -2.25.1 - diff --git a/queue-5.7/series b/queue-5.7/series index 596993931dc..1b5dd07ac91 100644 --- a/queue-5.7/series +++ b/queue-5.7/series @@ -133,7 +133,6 @@ staging-gasket-fix-mapping-refcnt-leak-when-put-attr.patch staging-gasket-fix-mapping-refcnt-leak-when-register.patch alsa-usb-audio-improve-frames-size-computation.patch alsa-usb-audio-fix-racy-list-management-in-output-qu.patch -input-mms114-add-extra-compatible-for-mms345l.patch s390-qdio-consistently-restore-the-irq-handler.patch s390-qdio-tear-down-thinint-indicator-after-early-er.patch s390-qdio-put-thinint-indicator-after-early-error.patch -- 2.47.3