aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux
diff options
context:
space:
mode:
authorDrew Moseley <drew_moseley@mentor.com>2016-07-13 10:55:33 -0700
committerDrew Moseley <drew_moseley@mentor.com>2016-07-13 15:22:08 -0700
commit6e3ef7997f57a6cb37e877cb75958ec392cd2cd9 (patch)
tree82ac18f113046cd000ff35b9a37a880422014d32 /common/recipes-kernel/linux
parentf469dd6f5d31fec9ddc210811234df830787c061 (diff)
downloadmeta-amd-6e3ef7997f57a6cb37e877cb75958ec392cd2cd9.tar.gz
meta-amd-6e3ef7997f57a6cb37e877cb75958ec392cd2cd9.tar.bz2
meta-amd-6e3ef7997f57a6cb37e877cb75958ec392cd2cd9.zip
i2c: Adapt patch for newer kernel
In the 4.1.2x kernels the i2c code was modified to use a helper routine for device probing called i2c_dw_probe. This patch originally modified the ordering of when i2c_add_numbered adapter was called. This is no longer needed. Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Diffstat (limited to 'common/recipes-kernel/linux')
-rw-r--r--common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch b/common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch
index cf83439f..12b131ee 100644
--- a/common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch
+++ b/common/recipes-kernel/linux/files/1570-4-1-0-kernel-s-drivers-I2C-directory.patch
@@ -197,33 +197,6 @@ index 3f7d487..0a80e4a 100644
if (ACPI_FAILURE(acpi_evaluate_object(handle, method, NULL, &buf)))
return;
-@@ -273,6 +253,12 @@ static int dw_i2c_probe(struct platform_device *pdev)
- adap->dev.parent = &pdev->dev;
- adap->dev.of_node = pdev->dev.of_node;
-
-+ r = i2c_add_numbered_adapter(adap);
-+ if (r) {
-+ dev_err(&pdev->dev, "failure adding adapter\n");
-+ return r;
-+ }
-+
- if (dev->pm_runtime_disabled) {
- pm_runtime_forbid(&pdev->dev);
- } else {
-@@ -282,13 +268,6 @@ static int dw_i2c_probe(struct platform_device *pdev)
- pm_runtime_enable(&pdev->dev);
- }
-
-- r = i2c_add_numbered_adapter(adap);
-- if (r) {
-- dev_err(&pdev->dev, "failure adding adapter\n");
-- pm_runtime_disable(&pdev->dev);
-- return r;
-- }
--
- return 0;
- }
-
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 5801227..30059c1 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c