From dedc16587ee73c3b123b0bace2bf89edadca8de6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 6 May 2019 16:24:41 +0200 Subject: [PATCH] drop queue-5.0/i2c-of-try-to-find-an-i2c-adapter-matching-the-parent.patch --- ...d-an-i2c-adapter-matching-the-parent.patch | 60 ------------------- queue-5.0/series | 1 - 2 files changed, 61 deletions(-) delete mode 100644 queue-5.0/i2c-of-try-to-find-an-i2c-adapter-matching-the-parent.patch diff --git a/queue-5.0/i2c-of-try-to-find-an-i2c-adapter-matching-the-parent.patch b/queue-5.0/i2c-of-try-to-find-an-i2c-adapter-matching-the-parent.patch deleted file mode 100644 index 127ac3e9cff..00000000000 --- a/queue-5.0/i2c-of-try-to-find-an-i2c-adapter-matching-the-parent.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e814e688413aabd7b0d75e2a8ed1caa472951dec Mon Sep 17 00:00:00 2001 -From: Thierry Reding -Date: Fri, 25 Jan 2019 14:11:42 +0100 -Subject: i2c: of: Try to find an I2C adapter matching the parent - -From: Thierry Reding - -commit e814e688413aabd7b0d75e2a8ed1caa472951dec upstream. - -If an I2C adapter doesn't match the provided device tree node, also try -matching the parent's device tree node. This allows finding an adapter -based on the device node of the parent device that was used to register -it. - -This fixes a regression on Tegra124-based Chromebooks (Nyan) where the -eDP controller registers an I2C adapter that is used to read to EDID. -After commit 993a815dcbb2 ("dt-bindings: panel: Add missing .txt -suffix") this stopped working because the I2C adapter could no longer -be found. The approach in this patch fixes the regression without -introducing the issues that the above commit solved. - -Fixes: 17ab7806de0c ("drm: don't link DP aux i2c adapter to the hardware device node") -Signed-off-by: Thierry Reding -Tested-by: Tristan Bastian -Signed-off-by: Wolfram Sang -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/i2c/i2c-core-of.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - ---- a/drivers/i2c/i2c-core-of.c -+++ b/drivers/i2c/i2c-core-of.c -@@ -132,13 +132,25 @@ static int of_dev_or_parent_node_match(s - return 0; - } - -+static int of_dev_or_parent_node_match(struct device *dev, void *data) -+{ -+ if (dev->of_node == data) -+ return 1; -+ -+ if (dev->parent) -+ return dev->parent->of_node == data; -+ -+ return 0; -+} -+ - /* must call put_device() when done with returned i2c_client device */ - struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) - { - struct device *dev; - struct i2c_client *client; - -- dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match); -+ dev = bus_find_device(&i2c_bus_type, NULL, node, -+ of_dev_or_parent_node_match); - if (!dev) - return NULL; - diff --git a/queue-5.0/series b/queue-5.0/series index 3a43f0d6cea..48bc33966d8 100644 --- a/queue-5.0/series +++ b/queue-5.0/series @@ -120,4 +120,3 @@ x86-mm-fix-a-crash-with-kmemleak_scan.patch x86-mm-tlb-revert-x86-mm-align-tlb-invalidation-info.patch i2c-i2c-stm32f7-fix-sdadel-minimum-formula.patch media-v4l2-i2c-ov7670-fix-pll-bypass-register-values.patch -i2c-of-try-to-find-an-i2c-adapter-matching-the-parent.patch -- 2.47.2