mvebu: update and fixup 4.4 patches

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 47832

diff --git a/target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch b/target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch
index 7bc55dc3a73890f1cc975f7ff01d78a8240d3cd7..c92a1d73ef01b80d9af16052041d7333d95f31eb 100644 (file)
--- a/target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch
+++ b/target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch
@@ -11,7 +11,7 @@ Cc: <stable@vger.kernel.org> # v4.1 +
 
 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
 
 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi

-@@ -243,7 +243,7 @@
+@@ -245,7 +245,7 @@

                button@2 {
                        label = "Factory Reset Button";
                        linux,code = <KEY_RESTART>;
                button@2 {
                        label = "Factory Reset Button";
                        linux,code = <KEY_RESTART>;


@@ -20,7 +20,7 @@ Cc: <stable@vger.kernel.org> # v4.1 +
                };
        };
  
                };
        };
  

-@@ -258,7 +258,7 @@
+@@ -260,7 +260,7 @@

                };
  
                sata {
                };
  
                sata {


@@ -29,7 +29,7 @@ Cc: <stable@vger.kernel.org> # v4.1 +
                        default-state = "off";
                };
        };
                        default-state = "off";
                };
        };

-@@ -311,7 +311,7 @@
+@@ -313,7 +313,7 @@

  
  &pinctrl {
        keys_pin: keys-pin {
  
  &pinctrl {
        keys_pin: keys-pin {


@@ -40,7 +40,7 @@ Cc: <stable@vger.kernel.org> # v4.1 +
  
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
  
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts

-@@ -302,13 +302,13 @@
+@@ -304,13 +304,13 @@

                button@1 {
                        label = "WPS";
                        linux,code = <KEY_WPS_BUTTON>;
                button@1 {
                        label = "WPS";
                        linux,code = <KEY_WPS_BUTTON>;

diff --git a/target/linux/mvebu/patches-4.4/002-add_powertables.patch b/target/linux/mvebu/patches-4.4/002-add_powertables.patch
index 1df0ab36d8612c45ebaff28637c0f9244c5c95a4..a5a47e4ab23a38cca35db15714e9451f6e4e97a4 100644 (file)
--- a/target/linux/mvebu/patches-4.4/002-add_powertables.patch
+++ b/target/linux/mvebu/patches-4.4/002-add_powertables.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts

-@@ -84,12 +84,100 @@
+@@ -86,12 +86,100 @@

                        pcie@2,0 {
                                /* Port 0, Lane 1 */
                                status = "okay";
                        pcie@2,0 {
                                /* Port 0, Lane 1 */
                                status = "okay";

diff --git a/target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch b/target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch
index bb170f661726def56772946a51e93e178ee24ac8..1502b6b1424638169b710d49aab313f5c4186aef 100644 (file)
--- a/target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch
+++ b/target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts

-@@ -465,6 +465,16 @@
+@@ -467,6 +467,16 @@

                        };
                };
        };
                        };
                };
        };


@@ -19,7 +19,7 @@
  &pinctrl {
 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
  &pinctrl {
 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi

-@@ -307,6 +307,18 @@
+@@ -309,6 +309,18 @@

                        };
                };
        };
                        };
                };
        };

diff --git a/target/linux/mvebu/patches-4.4/010-build_new_dtbs.patch b/target/linux/mvebu/patches-4.4/010-build_new_dtbs.patch
index 87b6681dc4a208af3508904b87900078842af85d..334cbecef99adfdba3937882954e034fb13afc17 100644 (file)
--- a/target/linux/mvebu/patches-4.4/010-build_new_dtbs.patch
+++ b/target/linux/mvebu/patches-4.4/010-build_new_dtbs.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile

-@@ -635,6 +635,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
+@@ -748,6 +748,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \

        armada-385-db-ap.dtb \
        armada-385-linksys-caiman.dtb \
        armada-385-linksys-cobra.dtb \
        armada-385-db-ap.dtb \
        armada-385-linksys-caiman.dtb \
        armada-385-linksys-cobra.dtb \

diff --git a/target/linux/mvebu/patches-4.4/100-find_active_root.patch b/target/linux/mvebu/patches-4.4/100-find_active_root.patch
index e32b6089d10edf242e265de685a881e89bc5c9ed..cd5dd02f2e92e66d6cce4e0857757c6657ffa8f5 100644 (file)
--- a/target/linux/mvebu/patches-4.4/100-find_active_root.patch
+++ b/target/linux/mvebu/patches-4.4/100-find_active_root.patch
@@ -5,7 +5,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 
 --- a/drivers/mtd/ofpart.c
 +++ b/drivers/mtd/ofpart.c
 
 --- a/drivers/mtd/ofpart.c
 +++ b/drivers/mtd/ofpart.c

-@@ -25,12 +25,15 @@ static bool node_has_compatible(struct d
+@@ -25,6 +25,8 @@ static bool node_has_compatible(struct d

        return of_get_property(pp, "compatible", NULL);
  }
  
        return of_get_property(pp, "compatible", NULL);
  }
  


@@ -14,14 +14,15 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  static int parse_ofpart_partitions(struct mtd_info *master,
                                   struct mtd_partition **pparts,
                                   struct mtd_part_parser_data *data)
  static int parse_ofpart_partitions(struct mtd_info *master,
                                   struct mtd_partition **pparts,
                                   struct mtd_part_parser_data *data)

- {
-       struct device_node *node;
+@@ -32,6 +34,7 @@ static int parse_ofpart_partitions(struc
+       struct device_node *mtd_node;
+       struct device_node *ofpart_node;

        const char *partname;
 +      const char *owrtpart = "ubi";
        struct device_node *pp;
        const char *partname;
 +      const char *owrtpart = "ubi";
        struct device_node *pp;

-       int nr_parts, i;
- 
-@@ -78,9 +81,15 @@ static int parse_ofpart_partitions(struc
+       int nr_parts, i, ret = 0;
+       bool dedicated = true;
+@@ -102,9 +105,15 @@ static int parse_ofpart_partitions(struc

                (*pparts)[i].offset = of_read_number(reg, a_cells);
                (*pparts)[i].size = of_read_number(reg + a_cells, s_cells);
  
                (*pparts)[i].offset = of_read_number(reg, a_cells);
                (*pparts)[i].size = of_read_number(reg + a_cells, s_cells);
  


@@ -40,7 +41,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
                (*pparts)[i].name = partname;
  
                if (of_get_property(pp, "read-only", &len))
                (*pparts)[i].name = partname;
  
                if (of_get_property(pp, "read-only", &len))

-@@ -178,6 +187,18 @@ static int __init ofpart_parser_init(voi
+@@ -207,6 +216,18 @@ static int __init ofpart_parser_init(voi

        return 0;
  }
  
        return 0;
  }
  

diff --git a/target/linux/mvebu/patches-4.4/102-revert_i2c_delay.patch b/target/linux/mvebu/patches-4.4/102-revert_i2c_delay.patch
index 45021d46f20bf0e989e6949ff78875c941581ff0..f97bba2ec8c49148fbecb8ae7c34db12cd40515e 100644 (file)
--- a/target/linux/mvebu/patches-4.4/102-revert_i2c_delay.patch
+++ b/target/linux/mvebu/patches-4.4/102-revert_i2c_delay.patch
@@ -1,7 +1,7 @@
 --- a/arch/arm/boot/dts/armada-xp.dtsi
 +++ b/arch/arm/boot/dts/armada-xp.dtsi
 --- a/arch/arm/boot/dts/armada-xp.dtsi
 +++ b/arch/arm/boot/dts/armada-xp.dtsi

-@@ -90,12 +90,10 @@
-                       };
+@@ -98,12 +98,10 @@
+ 

  
                        i2c0: i2c@11000 {
 -                              compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
  
                        i2c0: i2c@11000 {
 -                              compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

diff --git a/target/linux/mvebu/patches-4.4/202-gpio_mvebu_add_limited_pwm_support.patch b/target/linux/mvebu/patches-4.4/202-gpio_mvebu_add_limited_pwm_support.patch
index 178e5f5acb40321c4f2cf61257449aee965b932d..e9c4e026bbf06dee25dba455cf8733e0adf1a31d 100644 (file)
--- a/target/linux/mvebu/patches-4.4/202-gpio_mvebu_add_limited_pwm_support.patch
+++ b/target/linux/mvebu/patches-4.4/202-gpio_mvebu_add_limited_pwm_support.patch
@@ -23,8 +23,8 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
 
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
 
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig

-@@ -287,6 +287,11 @@ config GPIO_MVEBU
-       select GPIO_GENERIC
+@@ -294,6 +294,11 @@ config GPIO_MVEBU
+       depends on OF

        select GENERIC_IRQ_CHIP
  
 +config GPIO_MVEBU_PWM
        select GENERIC_IRQ_CHIP
  
 +config GPIO_MVEBU_PWM


@@ -37,9 +37,9 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
        depends on ARCH_MXC
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
        depends on ARCH_MXC
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile

-@@ -62,6 +62,7 @@ obj-$(CONFIG_GPIO_MPC8XXX)   += gpio-mpc8x
+@@ -67,6 +67,7 @@ obj-$(CONFIG_GPIO_MPC5200)   += gpio-mpc52
+ obj-$(CONFIG_GPIO_MPC8XXX)    += gpio-mpc8xxx.o

  obj-$(CONFIG_GPIO_MSIC)               += gpio-msic.o
  obj-$(CONFIG_GPIO_MSIC)               += gpio-msic.o

- obj-$(CONFIG_GPIO_MSM_V2)     += gpio-msm-v2.o

  obj-$(CONFIG_GPIO_MVEBU)        += gpio-mvebu.o
 +obj-$(CONFIG_GPIO_MVEBU_PWM)  += gpio-mvebu-pwm.o
  obj-$(CONFIG_GPIO_MXC)                += gpio-mxc.o
  obj-$(CONFIG_GPIO_MVEBU)        += gpio-mvebu.o
 +obj-$(CONFIG_GPIO_MVEBU_PWM)  += gpio-mvebu-pwm.o
  obj-$(CONFIG_GPIO_MXC)                += gpio-mxc.o


@@ -290,7 +290,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
  /*
   * Functions returning addresses of individual registers for a given
   * GPIO controller.
  /*
   * Functions returning addresses of individual registers for a given
   * GPIO controller.

-@@ -228,7 +211,7 @@ static int mvebu_gpio_get(struct gpio_ch
+@@ -218,7 +201,7 @@ static int mvebu_gpio_get(struct gpio_ch

        return (u >> pin) & 1;
  }
  
        return (u >> pin) & 1;
  }
  


@@ -299,7 +299,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
  {
        struct mvebu_gpio_chip *mvchip =
                container_of(chip, struct mvebu_gpio_chip, chip);
  {
        struct mvebu_gpio_chip *mvchip =
                container_of(chip, struct mvebu_gpio_chip, chip);

-@@ -617,6 +600,8 @@ static int mvebu_gpio_suspend(struct pla
+@@ -607,6 +590,8 @@ static int mvebu_gpio_suspend(struct pla

                BUG();
        }
  
                BUG();
        }
  


@@ -308,7 +308,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
        return 0;
  }
  
        return 0;
  }
  

-@@ -660,6 +645,8 @@ static int mvebu_gpio_resume(struct plat
+@@ -650,6 +635,8 @@ static int mvebu_gpio_resume(struct plat

                BUG();
        }
  
                BUG();
        }
  


@@ -317,7 +317,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
        return 0;
  }
  
        return 0;
  }
  

-@@ -671,7 +658,6 @@ static int mvebu_gpio_probe(struct platf
+@@ -661,7 +648,6 @@ static int mvebu_gpio_probe(struct platf

        struct resource *res;
        struct irq_chip_generic *gc;
        struct irq_chip_type *ct;
        struct resource *res;
        struct irq_chip_generic *gc;
        struct irq_chip_type *ct;


@@ -325,7 +325,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
        unsigned int ngpios;
        int soc_variant;
        int i, cpu, id;
        unsigned int ngpios;
        int soc_variant;
        int i, cpu, id;

-@@ -701,10 +687,10 @@ static int mvebu_gpio_probe(struct platf
+@@ -691,10 +677,10 @@ static int mvebu_gpio_probe(struct platf

                return id;
        }
  
                return id;
        }
  


@@ -339,7 +339,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
  
        mvchip->soc_variant = soc_variant;
        mvchip->chip.label = dev_name(&pdev->dev);
  
        mvchip->soc_variant = soc_variant;
        mvchip->chip.label = dev_name(&pdev->dev);

-@@ -838,7 +824,8 @@ static int mvebu_gpio_probe(struct platf
+@@ -828,7 +814,8 @@ static int mvebu_gpio_probe(struct platf

                goto err_generic_chip;
        }
  
                goto err_generic_chip;
        }
  

diff --git a/target/linux/mvebu/patches-4.4/204-mvebu_xp_add_pwm_properties_to_dtsi_files.patch b/target/linux/mvebu/patches-4.4/204-mvebu_xp_add_pwm_properties_to_dtsi_files.patch
index cedd639da08650beea2073855e6e75bae86ac2ea..69bec6c2a0f91aa38f6a7c97dd00842243565f31 100644 (file)
--- a/target/linux/mvebu/patches-4.4/204-mvebu_xp_add_pwm_properties_to_dtsi_files.patch
+++ b/target/linux/mvebu/patches-4.4/204-mvebu_xp_add_pwm_properties_to_dtsi_files.patch
@@ -11,7 +11,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
 
 --- a/arch/arm/boot/dts/armada-370.dtsi
 +++ b/arch/arm/boot/dts/armada-370.dtsi
 
 --- a/arch/arm/boot/dts/armada-370.dtsi
 +++ b/arch/arm/boot/dts/armada-370.dtsi

-@@ -158,24 +158,30 @@
+@@ -162,24 +162,30 @@

  
                        gpio0: gpio@18100 {
                                compatible = "marvell,orion-gpio";
  
                        gpio0: gpio@18100 {
                                compatible = "marvell,orion-gpio";

diff --git a/target/linux/mvebu/patches-4.4/205-arm_mvebu_enable_pwm_in_defconfig.patch b/target/linux/mvebu/patches-4.4/205-arm_mvebu_enable_pwm_in_defconfig.patch
index 024d6925442bf37345c80a5baabd52c648d46084..b52c60ff9f0704bd386ed2111a0b2e8e45a9bf22 100644 (file)
--- a/target/linux/mvebu/patches-4.4/205-arm_mvebu_enable_pwm_in_defconfig.patch
+++ b/target/linux/mvebu/patches-4.4/205-arm_mvebu_enable_pwm_in_defconfig.patch
@@ -8,7 +8,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
 
 --- a/arch/arm/configs/mvebu_v7_defconfig
 +++ b/arch/arm/configs/mvebu_v7_defconfig
 
 --- a/arch/arm/configs/mvebu_v7_defconfig
 +++ b/arch/arm/configs/mvebu_v7_defconfig

-@@ -120,6 +120,7 @@ CONFIG_DMADEVICES=y
+@@ -131,6 +131,7 @@ CONFIG_DMADEVICES=y

  CONFIG_MV_XOR=y
  # CONFIG_IOMMU_SUPPORT is not set
  CONFIG_MEMORY=y
  CONFIG_MV_XOR=y
  # CONFIG_IOMMU_SUPPORT is not set
  CONFIG_MEMORY=y

diff --git a/target/linux/mvebu/patches-4.4/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch b/target/linux/mvebu/patches-4.4/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch
index c0e3567c73021151c1de6218417d2a7d7f3d8c48..740fdcf8cf9757d86c6e332c9c4fe8709d2e245d 100644 (file)
--- a/target/linux/mvebu/patches-4.4/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch
+++ b/target/linux/mvebu/patches-4.4/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch
@@ -9,7 +9,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
 
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts

-@@ -412,13 +412,11 @@
+@@ -414,13 +414,11 @@

                };
        };
  
                };
        };
  

diff --git a/target/linux/mvebu/patches-4.4/207-armada-385-rd-mtd-partitions.patch b/target/linux/mvebu/patches-4.4/207-armada-385-rd-mtd-partitions.patch
index 51408ddd9b7159cf75258fa4ded1f9788105afe2..fc94d9af50a34587eb0518a3190cc6fea8c8435c 100644 (file)
--- a/target/linux/mvebu/patches-4.4/207-armada-385-rd-mtd-partitions.patch
+++ b/target/linux/mvebu/patches-4.4/207-armada-385-rd-mtd-partitions.patch
@@ -1,7 +1,7 @@
 --- a/arch/arm/boot/dts/armada-388-rd.dts
 +++ b/arch/arm/boot/dts/armada-388-rd.dts
 --- a/arch/arm/boot/dts/armada-388-rd.dts
 +++ b/arch/arm/boot/dts/armada-388-rd.dts

-@@ -77,6 +77,16 @@
-                                       compatible = "st,m25p128";
+@@ -79,6 +79,16 @@
+                                       compatible = "st,m25p128", "jedec,spi-nor";

                                        reg = <0>; /* Chip select 0 */
                                        spi-max-frequency = <108000000>;
 +
                                        reg = <0>; /* Chip select 0 */
                                        spi-max-frequency = <108000000>;
 +

diff --git a/target/linux/mvebu/patches-4.4/208-ARM-mvebu-385-ap-Add-partitions.patch b/target/linux/mvebu/patches-4.4/208-ARM-mvebu-385-ap-Add-partitions.patch
index d5a08a042ea2431aaa4497cb575ba5fe0bfbdd46..a06b51f2ab45d52a8fb19a570eab01f38dec2e6b 100644 (file)
--- a/target/linux/mvebu/patches-4.4/208-ARM-mvebu-385-ap-Add-partitions.patch
+++ b/target/linux/mvebu/patches-4.4/208-ARM-mvebu-385-ap-Add-partitions.patch
@@ -10,7 +10,7 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
 
 --- a/arch/arm/boot/dts/armada-385-db-ap.dts
 +++ b/arch/arm/boot/dts/armada-385-db-ap.dts
 
 --- a/arch/arm/boot/dts/armada-385-db-ap.dts
 +++ b/arch/arm/boot/dts/armada-385-db-ap.dts

-@@ -186,6 +186,21 @@
+@@ -170,6 +170,21 @@

                                marvell,nand-keep-config;
                                marvell,nand-enable-arbiter;
                                nand-on-flash-bbt;
                                marvell,nand-keep-config;
                                marvell,nand-enable-arbiter;
                                nand-on-flash-bbt;


@@ -30,5 +30,5 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
 +                                      reg = <0x01000000 0x3f000000>;
 +                              };
                        };
 +                                      reg = <0x01000000 0x3f000000>;
 +                              };
                        };

-               };

  
  

+                       usb3@f0000 {