kernel/3.10: refresh all target patches

[openwrt/staging/lynxis/omap.git] / target / linux / lantiq / patches-3.10 / 0028-pinctrl-lantiq-add-missing-pin-definition-to-falcon-.patch

diff --git a/target/linux/lantiq/patches-3.10/0028-pinctrl-lantiq-add-missing-pin-definition-to-falcon-.patch b/target/linux/lantiq/patches-3.10/0028-pinctrl-lantiq-add-missing-pin-definition-to-falcon-.patch
index 5a56dae9e0bb8d3139fdb898a51f515343f10a1d..7cd8e1d5275f637d82fb1c063a6b53fd3a22b934 100644 (file)
--- a/target/linux/lantiq/patches-3.10/0028-pinctrl-lantiq-add-missing-pin-definition-to-falcon-.patch
+++ b/target/linux/lantiq/patches-3.10/0028-pinctrl-lantiq-add-missing-pin-definition-to-falcon-.patch
@@ -12,8 +12,6 @@ Acked-by: John Crispin <blogic@openwrt.org>
  drivers/pinctrl/pinctrl-falcon.c |    7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/pinctrl/pinctrl-falcon.c b/drivers/pinctrl/pinctrl-falcon.c
-index f9b2a1d..4e731f2 100644
 --- a/drivers/pinctrl/pinctrl-falcon.c
 +++ b/drivers/pinctrl/pinctrl-falcon.c
 @@ -75,6 +75,7 @@ enum falcon_mux {
@@ -24,7 +22,7 @@ index f9b2a1d..4e731f2 100644
        FALCON_MUX_MDIO,
        FALCON_MUX_LED,
        FALCON_MUX_SPI,
-@@ -114,7 +115,7 @@ static struct ltq_mfp_pin falcon_mfp[] = {
+@@ -114,7 +115,7 @@ static struct ltq_mfp_pin falcon_mfp[] =
        MFP_FALCON(GPIO2,       GPIO,   GPIO,   NONE,   NONE),
        MFP_FALCON(GPIO3,       GPIO,   GPIO,   NONE,   NONE),
        MFP_FALCON(GPIO4,       NTR,    GPIO,   NONE,   NONE),
@@ -33,7 +31,7 @@ index f9b2a1d..4e731f2 100644
        MFP_FALCON(GPIO6,       RST,    GPIO,   NONE,   NONE),
        MFP_FALCON(GPIO7,       MDIO,   GPIO,   NONE,   NONE),
        MFP_FALCON(GPIO8,       MDIO,   GPIO,   NONE,   NONE),
-@@ -168,6 +169,7 @@ static struct ltq_mfp_pin falcon_mfp[] = {
+@@ -168,6 +169,7 @@ static struct ltq_mfp_pin falcon_mfp[] =
  static const unsigned pins_por[] = {GPIO0};
  static const unsigned pins_ntr[] = {GPIO4};
  static const unsigned pins_ntr8k[] = {GPIO5};
@@ -41,7 +39,7 @@ index f9b2a1d..4e731f2 100644
  static const unsigned pins_hrst[] = {GPIO6};
  static const unsigned pins_mdio[] = {GPIO7, GPIO8};
  static const unsigned pins_bled[] = {GPIO9, GPIO10, GPIO11,
-@@ -186,6 +188,7 @@ static struct ltq_pin_group falcon_grps[] = {
+@@ -186,6 +188,7 @@ static struct ltq_pin_group falcon_grps[
        GRP_MUX("por", RST, pins_por),
        GRP_MUX("ntr", NTR, pins_ntr),
        GRP_MUX("ntr8k", NTR, pins_ntr8k),
@@ -49,7 +47,7 @@ index f9b2a1d..4e731f2 100644
        GRP_MUX("hrst", RST, pins_hrst),
        GRP_MUX("mdio", MDIO, pins_mdio),
        GRP_MUX("bootled", LED, pins_bled),
-@@ -201,7 +204,7 @@ static struct ltq_pin_group falcon_grps[] = {
+@@ -201,7 +204,7 @@ static struct ltq_pin_group falcon_grps[
  };
  
  static const char * const ltq_rst_grps[] = {"por", "hrst"};
@@ -58,6 +56,3 @@ index f9b2a1d..4e731f2 100644
  static const char * const ltq_mdio_grps[] = {"mdio"};
  static const char * const ltq_bled_grps[] = {"bootled"};
  static const char * const ltq_asc_grps[] = {"asc0", "asc1"};
--- 
-1.7.10.4
-