summaryrefslogtreecommitdiffstats
path: root/0016-i2c-designware-Convert-to-use-unified-device-propert.patch
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-01-05 08:35:12 -0800
committerLaura Abbott <labbott@fedoraproject.org>2016-01-05 08:35:14 -0800
commit597938b6aabbba29b6d0cac84fe44d2648faff53 (patch)
tree9856c8e3134a2d452fd0f557d8cad6726fdd14c7 /0016-i2c-designware-Convert-to-use-unified-device-propert.patch
parent94beff34d1612edbd141baafed867613860eee79 (diff)
downloadkernel-597938b6aabbba29b6d0cac84fe44d2648faff53.tar.gz
kernel-597938b6aabbba29b6d0cac84fe44d2648faff53.tar.xz
kernel-597938b6aabbba29b6d0cac84fe44d2648faff53.zip
Drop patches for Lenovo Yoga Touchpad (rhbz 1275718)
These patches break the touchpad on Dell Inspiron 7559. Drop until they make it in.
Diffstat (limited to '0016-i2c-designware-Convert-to-use-unified-device-propert.patch')
-rw-r--r--0016-i2c-designware-Convert-to-use-unified-device-propert.patch106
1 files changed, 0 insertions, 106 deletions
diff --git a/0016-i2c-designware-Convert-to-use-unified-device-propert.patch b/0016-i2c-designware-Convert-to-use-unified-device-propert.patch
deleted file mode 100644
index f3039a1bd..000000000
--- a/0016-i2c-designware-Convert-to-use-unified-device-propert.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 4c5301abbf81f4351416cec1e8a02647d96e6fd1 Mon Sep 17 00:00:00 2001
-From: Mika Westerberg <mika.westerberg@linux.intel.com>
-Date: Mon, 30 Nov 2015 17:11:44 +0200
-Subject: [PATCH 16/16] i2c: designware: Convert to use unified device property
- API
-
-With ACPI _DSD (introduced in ACPI v5.1) it is now possible to pass device
-configuration information from ACPI in addition to DT. In order to support
-this, convert the driver to use the unified device property accessors
-instead of DT specific.
-
-Change to ordering a bit so that we first try platform data and if that's
-not available look from device properties. ACPI *CNT methods are then used
-as last resort to override everything else.
-
-Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
-Acked-by: Wolfram Sang <wsa@the-dreams.de>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
----
- drivers/i2c/busses/i2c-designware-platdrv.c | 50 +++++++++++++----------------
- 1 file changed, 23 insertions(+), 27 deletions(-)
-
-diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
-index 809579e..06061b5 100644
---- a/drivers/i2c/busses/i2c-designware-platdrv.c
-+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
-@@ -36,6 +36,7 @@
- #include <linux/platform_device.h>
- #include <linux/pm.h>
- #include <linux/pm_runtime.h>
-+#include <linux/property.h>
- #include <linux/io.h>
- #include <linux/slab.h>
- #include <linux/acpi.h>
-@@ -129,10 +130,10 @@ static inline int dw_i2c_acpi_configure(struct platform_device *pdev)
-
- static int dw_i2c_plat_probe(struct platform_device *pdev)
- {
-+ struct dw_i2c_platform_data *pdata = dev_get_platdata(&pdev->dev);
- struct dw_i2c_dev *dev;
- struct i2c_adapter *adap;
- struct resource *mem;
-- struct dw_i2c_platform_data *pdata;
- int irq, r;
- u32 clk_freq, ht = 0;
-
-@@ -156,33 +157,28 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
- /* fast mode by default because of legacy reasons */
- clk_freq = 400000;
-
-- if (has_acpi_companion(&pdev->dev)) {
-- dw_i2c_acpi_configure(pdev);
-- } else if (pdev->dev.of_node) {
-- of_property_read_u32(pdev->dev.of_node,
-- "i2c-sda-hold-time-ns", &ht);
--
-- of_property_read_u32(pdev->dev.of_node,
-- "i2c-sda-falling-time-ns",
-- &dev->sda_falling_time);
-- of_property_read_u32(pdev->dev.of_node,
-- "i2c-scl-falling-time-ns",
-- &dev->scl_falling_time);
--
-- of_property_read_u32(pdev->dev.of_node, "clock-frequency",
-- &clk_freq);
--
-- /* Only standard mode at 100kHz and fast mode at 400kHz
-- * are supported.
-- */
-- if (clk_freq != 100000 && clk_freq != 400000) {
-- dev_err(&pdev->dev, "Only 100kHz and 400kHz supported");
-- return -EINVAL;
-- }
-+ if (pdata) {
-+ clk_freq = pdata->i2c_scl_freq;
- } else {
-- pdata = dev_get_platdata(&pdev->dev);
-- if (pdata)
-- clk_freq = pdata->i2c_scl_freq;
-+ device_property_read_u32(&pdev->dev, "i2c-sda-hold-time-ns",
-+ &ht);
-+ device_property_read_u32(&pdev->dev, "i2c-sda-falling-time-ns",
-+ &dev->sda_falling_time);
-+ device_property_read_u32(&pdev->dev, "i2c-scl-falling-time-ns",
-+ &dev->scl_falling_time);
-+ device_property_read_u32(&pdev->dev, "clock-frequency",
-+ &clk_freq);
-+ }
-+
-+ if (has_acpi_companion(&pdev->dev))
-+ dw_i2c_acpi_configure(pdev);
-+
-+ /*
-+ * Only standard mode at 100kHz and fast mode at 400kHz are supported.
-+ */
-+ if (clk_freq != 100000 && clk_freq != 400000) {
-+ dev_err(&pdev->dev, "Only 100kHz and 400kHz supported");
-+ return -EINVAL;
- }
-
- r = i2c_dw_eval_lock_support(dev);
---
-2.5.0
-