linux-helios4 to 5.3.7-1

gbcreation · Oct 20, 2019 · 82e9ad4 · 82e9ad4
1 parent 3f49923
commit 82e9ad4
Show file tree

Hide file tree

Showing 13 changed files with 288 additions and 199 deletions.
diff --git a/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,7 +1,7 @@
-From ff613634f9e7068b177d4b17789033744a200f94 Mon Sep 17 00:00:00 2001
+From 7e6e05267a620ba306a999982e685de549316c1d Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
-Subject: [PATCH 01/10] ARM: atags: add support for Marvell's u-boot
+Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot
 
 Marvell uses a specific atag in its u-boot which includes among other
 information the MAC addresses for up to 4 network interfaces.
@@ -12,7 +12,7 @@ Signed-off-by: Willy Tarreau <w@xxxxxx>
  1 file changed, 17 insertions(+)
 
 diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h
-index 6b335a9ff8c8..614150b53643 100644
+index 25ceda63b284..83578c54975b 100644
 --- a/arch/arm/include/uapi/asm/setup.h
 +++ b/arch/arm/include/uapi/asm/setup.h
 @@ -144,6 +144,18 @@ struct tag_memclk {

diff --git a/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,8 +1,8 @@
-From b7ad47d7fc3812b2e115a570448b44234ee1b9b2 Mon Sep 17 00:00:00 2001
+From b59d7aa4ef5ee2411cb65395dac623ed598095b6 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
-Subject: [PATCH 02/10] ARM: atags/fdt: retrieve MAC addresses from Marvell
- boot loader
+Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
+ loader
 
 The atags are parsed and if a Marvell atag is found, up to 4 MAC
 addresses are extracted there and assigned to node aliases eth0..3

diff --git a/0003-SMILE-Plug-device-tree-file.patch b/0003-SMILE-Plug-device-tree-file.patch
@@ -1,7 +1,7 @@
-From 140e552063180af228b37df97d2350af64796ee2 Mon Sep 17 00:00:00 2001
+From 0d1cf24a03256d2a666e720babcd174ae97bfddb Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
-Subject: [PATCH 03/10] SMILE Plug device tree file
+Subject: [PATCH 3/9] SMILE Plug device tree file
 
 This adds a dts file for the SMILE Plug, which only differs from the Mirabox
 dts with the LED definitions.
@@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index dab2914fa293..acc6197cdc41 100644
+index 9159fa2cea90..b73aca44d87a 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1202,6 +1202,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -1206,6 +1206,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
  	armada-370-db.dtb \
  	armada-370-dlink-dns327l.dtb \
  	armada-370-mirabox.dtb \

diff --git a/0004-fix-mvsdio-eMMC-timing.patch b/0004-fix-mvsdio-eMMC-timing.patch
@@ -1,7 +1,7 @@
-From 9e042330733ac4ad8fdf8e487046fcff933ea3f3 Mon Sep 17 00:00:00 2001
+From a3c359493c03401d2f40c6536d7715260d83d50b Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
-Subject: [PATCH 04/10] fix mvsdio eMMC timing
+Subject: [PATCH 4/9] fix mvsdio eMMC timing
 
 These changes from Globalscale change the MMC timing to allow the eMMC versions
 of the Mirabox and SMILE Plug to work.

diff --git a/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,8 +1,7 @@
-From 949cb0817cb0ee90052f08eeab8fd6a7c2ee9dca Mon Sep 17 00:00:00 2001
+From 244e51135d32faaa70f40a083be88bf8e6f184dd Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
-Subject: [PATCH 05/10] net/smsc95xx: Allow mac address to be set as a
- parameter
+Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter
 
 ---
  drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++

diff --git a/0006-set-default-cubietruck-led-triggers.patch b/0006-set-default-cubietruck-led-triggers.patch
@@ -1,7 +1,7 @@
-From 0316306aae3acc2929b8ecf808c7a0ce2a681584 Mon Sep 17 00:00:00 2001
+From 146490c16460ae11321acaafc6bff5b99c7e9392 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
-Subject: [PATCH 06/10] set default cubietruck led triggers
+Subject: [PATCH 6/9] set default cubietruck led triggers
 
 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---

diff --git a/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@@ -1,7 +1,7 @@
-From e24a6024b32b86271b0941cb49eca50bcbc88342 Mon Sep 17 00:00:00 2001
+From 4d87a361938887b04909018827f861a51b0f4dc4 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
-Subject: [PATCH 07/10] exynos4412-odroid: set higher minimum buck2 regulator
+Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator
  voltage
 
 Set a higher minimum voltage to help reboot issue.
@@ -13,10 +13,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-index 08d3a0a7b4eb..cf3e2ab900dd 100644
+index ea55f377d17c..a7bfc58bbc79 100644
 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-@@ -425,7 +425,7 @@
+@@ -430,7 +430,7 @@
 
  			buck2_reg: BUCK2 {
  				regulator-name = "vdd_arm";

diff --git a/0008-ARM-dove-enable-ethernet-on-D3Plug.patch b/0008-ARM-dove-enable-ethernet-on-D3Plug.patch
@@ -1,7 +1,7 @@
-From 554cee8b797900bf23a2b9dd8a973b41c29a341f Mon Sep 17 00:00:00 2001
+From 7e2691572ccf30a35c91f1c79b6e85f1c0817c68 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 7 May 2017 13:32:25 -0600
-Subject: [PATCH 08/10] ARM: dove: enable ethernet on D3Plug
+Subject: [PATCH 8/9] ARM: dove: enable ethernet on D3Plug
 
 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---

diff --git a/0009-USB-Armory-MkII-support.patch b/0009-USB-Armory-MkII-support.patch
@@ -1,7 +1,7 @@
-From 74f42aad50ad3a540c2af84f3decee87362c0d37 Mon Sep 17 00:00:00 2001
+From c4035052543c9d990ea439a1a1b4cc28c335196a Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 11 Aug 2019 12:34:17 -0600
-Subject: [PATCH 09/10] USB Armory MkII support
+Subject: [PATCH 9/9] USB Armory MkII support
 
 ---
  arch/arm/boot/dts/Makefile              |   2 +
@@ -12,7 +12,7 @@ Subject: [PATCH 09/10] USB Armory MkII support
  create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index acc6197cdc41..1a36a8de9ef2 100644
+index b73aca44d87a..f45a644a2e9e 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -577,9 +577,11 @@ dtb-$(CONFIG_SOC_IMX6UL) += \

diff --git a/0010-clk-imx-keep-the-mmdc-p1-ipg-clock-always-on-on-6sx-.patch b/0010-clk-imx-keep-the-mmdc-p1-ipg-clock-always-on-on-6sx-.patch
diff --git a/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch b/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch
@@ -1,8 +1,8 @@
 diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
-index adc768f908f1..a2bd264ee92c 100644
+index 869d47f89..75f36e469 100644
 --- a/drivers/gpio/gpio-mvebu.c
 +++ b/drivers/gpio/gpio-mvebu.c
-@@ -92,20 +92,41 @@
+@@ -93,20 +93,41 @@
 
  #define MVEBU_MAX_GPIO_PER_BANK		32
 
@@ -48,7 +48,7 @@ index adc768f908f1..a2bd264ee92c 100644
  struct mvebu_gpio_chip {
  	struct gpio_chip   chip;
  	struct regmap     *regs;
-@@ -282,12 +303,12 @@ mvebu_gpio_write_level_mask(struct mvebu_gpio_chip *mvchip, u32 val)
+@@ -283,12 +304,12 @@ mvebu_gpio_write_level_mask(struct mvebu_gpio_chip *mvchip, u32 val)
   * Functions returning addresses of individual registers for a given
   * PWM controller.
   */
@@ -63,7 +63,7 @@ index adc768f908f1..a2bd264ee92c 100644
  {
  	return mvpwm->membase + PWM_BLINK_OFF_DURATION_OFF;
  }
-@@ -599,43 +620,76 @@ static int mvebu_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
+@@ -610,39 +631,73 @@ static int mvebu_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
  	struct mvebu_pwm *mvpwm = to_mvebu_pwm(chip);
  	struct mvebu_gpio_chip *mvchip = mvpwm->mvchip;
  	struct gpio_desc *desc;
@@ -79,33 +79,24 @@ index adc768f908f1..a2bd264ee92c 100644
 -		ret = -EBUSY;
 -	} else {
 -		desc = gpiochip_request_own_desc(&mvchip->chip,
--						 pwm->hwpwm, "mvebu-pwm", 0);
--		if (IS_ERR(desc)) {
--			ret = PTR_ERR(desc);
--			goto out;
--		}
 +	regmap_read(mvchip->regs, GPIO_BLINK_EN_OFF + mvchip->offset,
 +		    &mvchip->blink_en_reg);
 +	if (pwm->chip_data || (mvchip->blink_en_reg & BIT(pwm->hwpwm)))
 +		return -EBUSY;
-
--		ret = gpiod_direction_output(desc, 0);
--		if (ret) {
--			gpiochip_free_own_desc(desc);
++
++	desc = gpiochip_request_own_desc(&mvchip->chip,
+ 						 pwm->hwpwm, "mvebu-pwm",
+ 						 GPIO_ACTIVE_HIGH,
+ 						 GPIOD_OUT_LOW);
+-		if (IS_ERR(desc)) {
+-			ret = PTR_ERR(desc);
 -			goto out;
 -		}
-+	desc = gpiochip_request_own_desc(&mvchip->chip, pwm->hwpwm, "mvebu-pwm", 0);
 +	if (IS_ERR(desc)) {
 +		ret = PTR_ERR(desc);
 +		goto out;
 +	}
 +
-+	ret = gpiod_direction_output(desc, 0);
-+	if (ret) {
-+		gpiochip_free_own_desc(desc);
-+		goto out;
-+	}
-+
 +	chip_data = kzalloc(sizeof(struct mvebu_pwm_chip_drv), GFP_KERNEL);
 +	if (!chip_data) {
 +		gpiochip_free_own_desc(desc);
@@ -161,7 +152,7 @@ index adc768f908f1..a2bd264ee92c 100644
  }
 
  static void mvebu_pwm_get_state(struct pwm_chip *chip,
-@@ -643,17 +697,24 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
+@@ -650,17 +705,24 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
  				struct pwm_state *state) {
 
  	struct mvebu_pwm *mvpwm = to_mvebu_pwm(chip);
@@ -189,7 +180,7 @@ index adc768f908f1..a2bd264ee92c 100644
  	if (val > UINT_MAX)
  		state->duty_cycle = UINT_MAX;
  	else if (val)
-@@ -662,9 +723,9 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
+@@ -669,9 +731,9 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
  		state->duty_cycle = 1;
 
  	val = (unsigned long long)
@@ -201,7 +192,7 @@ index adc768f908f1..a2bd264ee92c 100644
  	if (val < state->duty_cycle) {
  		state->period = 1;
  	} else {
-@@ -683,19 +744,21 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
+@@ -690,19 +752,21 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,
  	else
  		state->enabled = false;
 
@@ -225,7 +216,7 @@ index adc768f908f1..a2bd264ee92c 100644
  	do_div(val, NSEC_PER_SEC);
  	if (val > UINT_MAX)
  		return -EINVAL;
-@@ -704,7 +767,7 @@ static int mvebu_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
+@@ -711,7 +775,7 @@ static int mvebu_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
  	else
  		on = 1;
 
@@ -234,7 +225,7 @@ index adc768f908f1..a2bd264ee92c 100644
  		(state->period - state->duty_cycle);
  	do_div(val, NSEC_PER_SEC);
  	if (val > UINT_MAX)
-@@ -714,16 +777,16 @@ static int mvebu_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
+@@ -721,16 +785,16 @@ static int mvebu_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
  	else
  		off = 1;
 
@@ -255,7 +246,7 @@ index adc768f908f1..a2bd264ee92c 100644
 
  	return 0;
  }
-@@ -742,10 +805,10 @@ static void __maybe_unused mvebu_pwm_suspend(struct mvebu_gpio_chip *mvchip)
+@@ -749,10 +813,10 @@ static void __maybe_unused mvebu_pwm_suspend(struct mvebu_gpio_chip *mvchip)
 
  	regmap_read(mvchip->regs, GPIO_BLINK_CNT_SELECT_OFF + mvchip->offset,
  		    &mvpwm->blink_select);
@@ -270,7 +261,7 @@ index adc768f908f1..a2bd264ee92c 100644
  }
 
  static void __maybe_unused mvebu_pwm_resume(struct mvebu_gpio_chip *mvchip)
-@@ -754,10 +817,10 @@ static void __maybe_unused mvebu_pwm_resume(struct mvebu_gpio_chip *mvchip)
+@@ -761,10 +825,10 @@ static void __maybe_unused mvebu_pwm_resume(struct mvebu_gpio_chip *mvchip)
 
  	regmap_write(mvchip->regs, GPIO_BLINK_CNT_SELECT_OFF + mvchip->offset,
  		     mvpwm->blink_select);
@@ -285,15 +276,15 @@ index adc768f908f1..a2bd264ee92c 100644
  }
 
  static int mvebu_pwm_probe(struct platform_device *pdev,
-@@ -768,6 +831,7 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
+@@ -775,6 +839,7 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
  	struct mvebu_pwm *mvpwm;
  	struct resource *res;
  	u32 set;
 +	enum mvebu_pwm_ctrl ctrl_set;
 
  	if (!of_device_is_compatible(mvchip->chip.of_node,
  				     "marvell,armada-370-gpio"))
-@@ -790,12 +854,15 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
+@@ -797,12 +862,15 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
  	 * Use set A for lines of GPIO chip with id 0, B for GPIO chip
  	 * with id 1. Don't allow further GPIO chips to be used for PWM.
  	 */
@@ -312,7 +303,7 @@ index adc768f908f1..a2bd264ee92c 100644
  	regmap_write(mvchip->regs,
  		     GPIO_BLINK_CNT_SELECT_OFF + mvchip->offset, set);
 
-@@ -805,15 +872,13 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
+@@ -812,15 +880,13 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
  	mvchip->mvpwm = mvpwm;
  	mvpwm->mvchip = mvchip;
 
@@ -333,7 +324,7 @@ index adc768f908f1..a2bd264ee92c 100644
 
  	mvpwm->chip.dev = dev;
  	mvpwm->chip.ops = &mvebu_pwm_ops;
-@@ -826,7 +891,9 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
+@@ -833,7 +899,9 @@ static int mvebu_pwm_probe(struct platform_device *pdev,
  	 */
  	mvpwm->chip.base = -1;