ipq8064: pinctrl: Fixed missing RGMII pincontrol definitions

Signed-off-by: Ram Chandra Jangir <[email protected]>
(backported from 1ade96def7b6c97d2d4380446dead672197a8447)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <[email protected]>

diff --git a/target/linux/ipq806x/patches-4.14/0066-GPIO-add-named-gpio-exports.patch b/target/linux/ipq806x/patches-4.14/0066-GPIO-add-named-gpio-exports.patch
index 3f7de4716a727b9604701bceeb0158b6bfdeece2..b974641edb7806b39c4731f5910f8f6720c1ccf2 100644 (file)
--- a/target/linux/ipq806x/patches-4.14/0066-GPIO-add-named-gpio-exports.patch
+++ b/target/linux/ipq806x/patches-4.14/0066-GPIO-add-named-gpio-exports.patch
@@ -22,7 +22,7 @@ Signed-off-by: John Crispin <[email protected]>
  
  #include "gpiolib.h"
  
-@@ -507,3 +509,69 @@ void of_gpiochip_remove(struct gpio_chip
+@@ -507,3 +509,66 @@ void of_gpiochip_remove(struct gpio_chip
        gpiochip_remove_pin_ranges(chip);
        of_node_put(chip->of_node);
  }

diff --git a/target/linux/ipq806x/patches-4.14/0075-ipq8064-pinctrl-Fixed-missing-RGMII-pincontrol-defin.patch b/target/linux/ipq806x/patches-4.14/0075-ipq8064-pinctrl-Fixed-missing-RGMII-pincontrol-defin.patch
new file mode 100644 (file)
index 0000000..2867239
--- /dev/null
+++ b/target/linux/ipq806x/patches-4.14/0075-ipq8064-pinctrl-Fixed-missing-RGMII-pincontrol-defin.patch
@@ -0,0 +1,50 @@
+From a3488aa9bed37c56e405967d44e821c484b5d6b9 Mon Sep 17 00:00:00 2001
+From: Ram Chandra Jangir <[email protected]>
+Date: Fri, 28 Sep 2018 15:19:50 +0530
+Subject: [PATCH] ipq8064: pinctrl: Fixed missing RGMII pincontrol definitions
+
+Signed-off-by: Ram Chandra Jangir <[email protected]>
+---
+ drivers/pinctrl/qcom/pinctrl-ipq8064.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/drivers/pinctrl/qcom/pinctrl-ipq8064.c
++++ b/drivers/pinctrl/qcom/pinctrl-ipq8064.c
+@@ -308,7 +308,7 @@ static const char * const gpio_groups[]
+ };
+ 
+ static const char * const mdio_groups[] = {
+-      "gpio0", "gpio1", "gpio10", "gpio11",
++      "gpio0", "gpio1", "gpio2", "gpio10", "gpio11", "gpio66",
+ };
+ 
+ static const char * const mi2s_groups[] = {
+@@ -412,8 +412,8 @@ static const char * const usb2_hsic_grou
+ };
+ 
+ static const char * const rgmii2_groups[] = {
+-      "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
+-      "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62",
++      "gpio2", "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
++      "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62", "gpio66",
+ };
+ 
+ static const char * const sata_groups[] = {
+@@ -548,7 +548,7 @@ static const struct msm_function ipq8064
+ static const struct msm_pingroup ipq8064_groups[] = {
+       PINGROUP(0, mdio, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+       PINGROUP(1, mdio, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+-      PINGROUP(2, gsbi5_spi_cs3, NA, NA, NA, NA, NA, NA, NA, NA, NA),
++      PINGROUP(2, gsbi5_spi_cs3, rgmii2, mdio, NA, NA, NA, NA, NA, NA, NA),
+       PINGROUP(3, pcie1_rst, pcie1_prsnt, pdm, NA, NA, NA, NA, NA, NA, NA),
+       PINGROUP(4, pcie1_pwren_n, pcie1_pwren, NA, NA, NA, NA, NA, NA, NA, NA),
+       PINGROUP(5, pcie1_clk_req, pcie1_pwrflt, NA, NA, NA, NA, NA, NA, NA, NA),
+@@ -612,7 +612,7 @@ static const struct msm_pingroup ipq8064
+       PINGROUP(63, pcie3_rst, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+       PINGROUP(64, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+       PINGROUP(65, pcie3_clk_req, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+-      PINGROUP(66, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
++      PINGROUP(66, rgmii2, mdio, NA, NA, NA, NA, NA, NA, NA, NA),
+       PINGROUP(67, usb2_hsic, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+       PINGROUP(68, usb2_hsic, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+       SDC_PINGROUP(sdc3_clk, 0x204a, 14, 6),

diff --git a/target/linux/ipq806x/patches-4.14/105-mtd-nor-add-mx25l25635f.patch b/target/linux/ipq806x/patches-4.14/105-mtd-nor-add-mx25l25635f.patch
index eee2b4c5ec999b7515811146bf4228a60b1bd497..7ba0b2f2657e4a9fc2b859cf3dbe32fa328728b0 100644 (file)
--- a/target/linux/ipq806x/patches-4.14/105-mtd-nor-add-mx25l25635f.patch
+++ b/target/linux/ipq806x/patches-4.14/105-mtd-nor-add-mx25l25635f.patch
@@ -11,7 +11,7 @@ the ubi volume created by the other.
 ---
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1029,7 +1029,7 @@ static const struct flash_info spi_nor_i
+@@ -1030,7 +1030,7 @@ static const struct flash_info spi_nor_i
        { "mx25u6435f",  INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
        { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
        { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },