diff options
author | John Crispin <john@openwrt.org> | 2015-02-11 10:09:23 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2015-02-11 10:09:23 +0000 |
commit | 88ddb3746188037afd38d631f7a893587fa8bdf0 (patch) | |
tree | df4684db63441435126c4b6ff1fda4ce615e1ff0 /target/linux/ipq806x/patches/0136-ARM-ipq8064-ap148-Add-i2c-pinctrl-nodes.patch | |
parent | ddcbef5766fa18f52e7a7d1928b25edc63e73937 (diff) | |
download | upstream-88ddb3746188037afd38d631f7a893587fa8bdf0.tar.gz upstream-88ddb3746188037afd38d631f7a893587fa8bdf0.tar.bz2 upstream-88ddb3746188037afd38d631f7a893587fa8bdf0.zip |
ipq806x: update target to v3.18
Patches in the ipq806x/patches folder were out of tree in v3.14. The
newest patch at the time was from June, so we can safely assume that
either the patches have been merged, or they have been rejected for
a good reason. If patches are seen missing, we'll cherry-pick them
on a per-needed basis.
This new kernel have been tested on AP148, which seems to works fine.
Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
SVN-Revision: 44386
Diffstat (limited to 'target/linux/ipq806x/patches/0136-ARM-ipq8064-ap148-Add-i2c-pinctrl-nodes.patch')
-rw-r--r-- | target/linux/ipq806x/patches/0136-ARM-ipq8064-ap148-Add-i2c-pinctrl-nodes.patch | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/target/linux/ipq806x/patches/0136-ARM-ipq8064-ap148-Add-i2c-pinctrl-nodes.patch b/target/linux/ipq806x/patches/0136-ARM-ipq8064-ap148-Add-i2c-pinctrl-nodes.patch deleted file mode 100644 index 7e9776e57f..0000000000 --- a/target/linux/ipq806x/patches/0136-ARM-ipq8064-ap148-Add-i2c-pinctrl-nodes.patch +++ /dev/null @@ -1,86 +0,0 @@ -From e93b9480667cbd0e3a4276e8749279693fe239f4 Mon Sep 17 00:00:00 2001 -From: Andy Gross <agross@codeaurora.org> -Date: Wed, 14 May 2014 22:49:03 -0500 -Subject: [PATCH 136/182] ARM: ipq8064-ap148: Add i2c pinctrl nodes - -Signed-off-by: Andy Gross <agross@codeaurora.org> ---- - arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 17 +++++++++++++++++ - arch/arm/boot/dts/qcom-ipq8064.dtsi | 27 +++++++++++++++++++++++++++ - 2 files changed, 44 insertions(+) - ---- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts -+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts -@@ -14,12 +14,29 @@ - }; - - soc { -+ pinmux@800000 { -+ i2c4_pins: i2c4_pinmux { -+ pins = "gpio12", "gpio13"; -+ function = "gsbi4"; -+ bias-disable; -+ }; -+ }; -+ - gsbi@16300000 { - qcom,mode = <GSBI_PROT_I2C_UART>; - status = "ok"; - serial@16340000 { - status = "ok"; - }; -+ -+ i2c4: i2c@16380000 { -+ status = "ok"; -+ -+ clock-frequency = <200000>; -+ -+ pinctrl-0 = <&i2c4_pins>; -+ pinctrl-names = "default"; -+ }; - }; - }; - }; ---- a/arch/arm/boot/dts/qcom-ipq8064.dtsi -+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi -@@ -137,6 +137,20 @@ - clock-names = "core", "iface"; - status = "disabled"; - }; -+ -+ i2c@124a0000 { -+ compatible = "qcom,i2c-qup-v1.1.1"; -+ reg = <0x124a0000 0x1000>; -+ interrupts = <0 196 0>; -+ -+ clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>; -+ clock-names = "core", "iface"; -+ status = "disabled"; -+ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ }; -+ - }; - - gsbi4: gsbi@16300000 { -@@ -158,6 +172,19 @@ - clock-names = "core", "iface"; - status = "disabled"; - }; -+ -+ i2c@16380000 { -+ compatible = "qcom,i2c-qup-v1.1.1"; -+ reg = <0x16380000 0x1000>; -+ interrupts = <0 153 0>; -+ -+ clocks = <&gcc GSBI4_QUP_CLK>, <&gcc GSBI4_H_CLK>; -+ clock-names = "core", "iface"; -+ status = "disabled"; -+ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ }; - }; - - qcom,ssbi@500000 { |