Changeset 42315


Ignore:
Timestamp:
2014-08-28T08:05:36+02:00 (3 years ago)
Author:
blogic
Message:

ramips: unbreak i2c for 3.14

Signed-off-by: John Crispin <blogic@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ramips/patches-3.14/0052-i2c-MIPS-adds-ralink-I2C-driver.patch

    r42040 r42315  
    1414 create mode 100644 drivers/i2c/busses/i2c-ralink.c 
    1515 
    16 diff --git a/Documentation/devicetree/bindings/i2c/i2c-ralink.txt b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt 
    17 new file mode 100644 
    18 index 0000000..8fa8ac3 
    19 --- /dev/null 
    20 +++ b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt 
     16Index: linux-3.14.16/Documentation/devicetree/bindings/i2c/i2c-ralink.txt 
     17=================================================================== 
     18--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     19+++ linux-3.14.16/Documentation/devicetree/bindings/i2c/i2c-ralink.txt  2014-08-24 16:03:20.586671002 +0200 
    2120@@ -0,0 +1,27 @@ 
    2221+I2C for Ralink platforms 
     
    4746+       }; 
    4847+}; 
    49 diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig 
    50 index de17c55..d773b72 100644 
    51 --- a/drivers/i2c/busses/Kconfig 
    52 +++ b/drivers/i2c/busses/Kconfig 
    53 @@ -658,6 +658,10 @@ config I2C_RIIC 
     48Index: linux-3.14.16/drivers/i2c/busses/Kconfig 
     49=================================================================== 
     50--- linux-3.14.16.orig/drivers/i2c/busses/Kconfig       2014-08-08 01:50:59.000000000 +0200 
     51+++ linux-3.14.16/drivers/i2c/busses/Kconfig    2014-08-24 16:03:20.586671002 +0200 
     52@@ -659,6 +659,10 @@ 
    5453          This driver can also be built as a module.  If so, the module 
    5554          will be called i2c-riic. 
     
    6261        bool 
    6362        help 
    64 diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile 
    65 index a08931f..9682895 100644 
    66 --- a/drivers/i2c/busses/Makefile 
    67 +++ b/drivers/i2c/busses/Makefile 
    68 @@ -63,6 +63,7 @@ obj-$(CONFIG_I2C_PNX)         += i2c-pnx.o 
     63Index: linux-3.14.16/drivers/i2c/busses/Makefile 
     64=================================================================== 
     65--- linux-3.14.16.orig/drivers/i2c/busses/Makefile      2014-08-08 01:50:59.000000000 +0200 
     66+++ linux-3.14.16/drivers/i2c/busses/Makefile   2014-08-24 16:03:20.586671002 +0200 
     67@@ -63,6 +63,7 @@ 
    6968 obj-$(CONFIG_I2C_PUV3)         += i2c-puv3.o 
    7069 obj-$(CONFIG_I2C_PXA)          += i2c-pxa.o 
     
    7473 obj-$(CONFIG_I2C_S3C2410)      += i2c-s3c2410.o 
    7574 obj-$(CONFIG_I2C_S6000)                += i2c-s6000.o 
    76 diff --git a/drivers/i2c/busses/i2c-ralink.c b/drivers/i2c/busses/i2c-ralink.c 
    77 new file mode 100644 
    78 index 0000000..f4dc13d 
    79 --- /dev/null 
    80 +++ b/drivers/i2c/busses/i2c-ralink.c 
    81 @@ -0,0 +1,274 @@ 
     75Index: linux-3.14.16/drivers/i2c/busses/i2c-ralink.c 
     76=================================================================== 
     77--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     78+++ linux-3.14.16/drivers/i2c/busses/i2c-ralink.c       2014-08-27 23:07:01.318731261 +0200 
     79@@ -0,0 +1,271 @@ 
    8280+/* 
    8381+ * drivers/i2c/busses/i2c-ralink.c 
     
    107105+#include <linux/i2c.h> 
    108106+#include <linux/io.h> 
    109 +#include <linux/of_i2c.h> 
    110107+#include <linux/err.h> 
    111108+ 
     
    304301+               return ret; 
    305302+ 
    306 +       of_i2c_register_devices(adapter); 
    307 + 
    308303+       platform_set_drvdata(pdev, adapter); 
    309304+ 
     
    354349+MODULE_LICENSE("GPL"); 
    355350+MODULE_ALIAS("platform:Ralink-I2C"); 
    356 --  
    357 1.7.10.4 
    358  
Note: See TracChangeset for help on using the changeset viewer.