[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-33-g618b6ccd6
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-33-g618b6ccd6
|
From: Julien B a. A. <ar...@us...> - 2019-01-26 17:56:57
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 618b6ccd6a2d3fcb447f03b9a01b69360de10dd2 (commit)
via 42edba2a67c1aaed8bdd6535e81be7c54c6bb26b (commit)
from 1c9db8dfb2804eb186372fd9a23f2ac093646920 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 618b6ccd6a2d3fcb447f03b9a01b69360de10dd2
Author: Julien BOIBESSOT <jul...@ar...>
Date: Sat Jan 26 18:56:29 2019 +0100
[LINUX] 4.9: updates patches for 4.9.152
commit 42edba2a67c1aaed8bdd6535e81be7c54c6bb26b
Author: Julien BOIBESSOT <jul...@ar...>
Date: Sat Jan 26 18:46:11 2019 +0100
[BUILDROOT] apf6legacy-4.1_defconfig: add stress_ng, tree, input_tools and gst-videoparsers
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy-4.1_defconfig | 5 ++-
...never-the-enet_out-clock-is-being-enabled.patch | 49 +++++++++++-----------
.../0703-armadeus-mxs-uart-add-rs485-support.patch | 14 +++----
...pos6ul-and-opos6uldev-add-initial-support.patch | 14 +++----
...-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch | 14 +++----
...d-devicetree-support-and-trivial-bindings.patch | 2 +-
6 files changed, 51 insertions(+), 47 deletions(-)
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index 0d6743d3c..c118111b2 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -97,7 +97,8 @@ BR2_PACKAGE_PV=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_SPIDEV_TEST=y
BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_HWDATA=y
+BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_TREE=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
@@ -123,8 +124,10 @@ BR2_PACKAGE_IMX_GPU_VIV=y
BR2_PACKAGE_IMX_GPU_VIV_APITRACE=y
BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES=y
BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO=y
+BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_IMX_TEST=y
+BR2_PACKAGE_INPUT_TOOLS=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_LEPTONMODULE=y
BR2_PACKAGE_PCI_DEBUG=y
diff --git a/patches/linux/4.9/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch b/patches/linux/4.9/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch
index f5889d96c..8cf5461bb 100644
--- a/patches/linux/4.9/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch
+++ b/patches/linux/4.9/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch
@@ -12,10 +12,10 @@ fec 02188000.ethernet eth0: Link is Down
Signed-off-by: Lothar WaÃmann <LW...@KA...>
Signed-off-by: Julien Boibessot <jul...@ar...> (4.9.x adaptation)
-Index: linux-4.9.59/drivers/net/ethernet/freescale/fec.h
+Index: linux-4.9.152/drivers/net/ethernet/freescale/fec.h
===================================================================
---- linux-4.9.59.orig/drivers/net/ethernet/freescale/fec.h
-+++ linux-4.9.59/drivers/net/ethernet/freescale/fec.h
+--- linux-4.9.152.orig/drivers/net/ethernet/freescale/fec.h
++++ linux-4.9.152/drivers/net/ethernet/freescale/fec.h
@@ -534,6 +534,7 @@ struct fec_enet_private {
int pause_flag;
int wol_flag;
@@ -24,19 +24,19 @@ Index: linux-4.9.59/drivers/net/ethernet/freescale/fec.h
struct napi_struct napi;
int csum_flags;
-Index: linux-4.9.59/drivers/net/ethernet/freescale/fec_main.c
+Index: linux-4.9.152/drivers/net/ethernet/freescale/fec_main.c
===================================================================
---- linux-4.9.59.orig/drivers/net/ethernet/freescale/fec_main.c
-+++ linux-4.9.59/drivers/net/ethernet/freescale/fec_main.c
+--- linux-4.9.152.orig/drivers/net/ethernet/freescale/fec_main.c
++++ linux-4.9.152/drivers/net/ethernet/freescale/fec_main.c
@@ -68,6 +68,7 @@
static void set_multicast_list(struct net_device *ndev);
static void fec_enet_itr_coal_init(struct net_device *ndev);
-+static void fec_reset_phy(struct platform_device *pdev);
++static int fec_reset_phy(struct platform_device *pdev);
#define DRIVER_NAME "fec"
-@@ -1845,6 +1846,8 @@ static int fec_enet_clk_enable(struct ne
+@@ -1853,6 +1854,8 @@ static int fec_enet_clk_enable(struct ne
ret = clk_prepare_enable(fep->clk_enet_out);
if (ret)
goto failed_clk_enet_out;
@@ -45,9 +45,9 @@ Index: linux-4.9.59/drivers/net/ethernet/freescale/fec_main.c
}
if (fep->clk_ptp) {
mutex_lock(&fep->ptp_clk_mutex);
-@@ -3208,12 +3211,13 @@ static int fec_enet_init(struct net_devi
+@@ -3215,12 +3218,13 @@ static int fec_enet_init(struct net_devi
#ifdef CONFIG_OF
- static void fec_reset_phy(struct platform_device *pdev)
+ static int fec_reset_phy(struct platform_device *pdev)
{
- int err, phy_reset;
- bool active_high = false;
@@ -60,10 +60,10 @@ Index: linux-4.9.59/drivers/net/ethernet/freescale/fec_main.c
- if (!np)
+ if (!gpio_is_valid(fep->phy_reset_gpio))
- return;
+ return 0;
of_property_read_u32(np, "phy-reset-duration", &msec);
-@@ -3221,26 +3225,35 @@ static void fec_reset_phy(struct platfor
+@@ -3228,13 +3232,28 @@ static int fec_reset_phy(struct platform
if (msec > 1000)
msec = 1;
@@ -84,19 +84,18 @@ Index: linux-4.9.59/drivers/net/ethernet/freescale/fec_main.c
+ int active_high;
+
phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
- if (!gpio_is_valid(phy_reset))
-- return;
+ if (phy_reset == -EPROBE_DEFER)
+ return phy_reset;
+ else if (!gpio_is_valid(phy_reset))
+ return 0;
-
- active_high = of_property_read_bool(np, "phy-reset-active-high");
+ return phy_reset;
err = devm_gpio_request_one(&pdev->dev, phy_reset,
active_high ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,
- "phy-reset");
- if (err) {
- dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err);
-- return;
-+ return err;
+@@ -3244,14 +3263,7 @@ static int fec_reset_phy(struct platform
+ return err;
}
- if (msec > 20)
@@ -105,13 +104,15 @@ Index: linux-4.9.59/drivers/net/ethernet/freescale/fec_main.c
- usleep_range(msec * 1000, msec * 1000 + 1000);
-
- gpio_set_value_cansleep(phy_reset, !active_high);
+-
+- return 0;
+ return phy_reset;
}
#else /* CONFIG_OF */
- static void fec_reset_phy(struct platform_device *pdev)
-@@ -3250,6 +3263,11 @@ static void fec_reset_phy(struct platfor
- * by machine code.
+ static int fec_reset_phy(struct platform_device *pdev)
+@@ -3262,6 +3274,11 @@ static int fec_reset_phy(struct platform
*/
+ return 0;
}
+
+static inline int fec_get_reset_gpio(struct platform_device *pdev)
@@ -121,7 +122,7 @@ Index: linux-4.9.59/drivers/net/ethernet/freescale/fec_main.c
#endif /* CONFIG_OF */
static void
-@@ -3348,6 +3366,11 @@ fec_probe(struct platform_device *pdev)
+@@ -3360,6 +3377,11 @@ fec_probe(struct platform_device *pdev)
if (of_get_property(np, "fsl,magic-packet", NULL))
fep->wol_flag |= FEC_WOL_HAS_MAGIC_PACKET;
@@ -133,7 +134,7 @@ Index: linux-4.9.59/drivers/net/ethernet/freescale/fec_main.c
phy_node = of_parse_phandle(np, "phy-handle", 0);
if (!phy_node && of_phy_is_fixed_link(np)) {
ret = of_phy_register_fixed_link(np);
-@@ -3501,6 +3524,7 @@ failed_clk:
+@@ -3518,6 +3540,7 @@ failed_clk:
of_phy_deregister_fixed_link(np);
failed_phy:
of_node_put(phy_node);
diff --git a/patches/linux/4.9/0703-armadeus-mxs-uart-add-rs485-support.patch b/patches/linux/4.9/0703-armadeus-mxs-uart-add-rs485-support.patch
index 10baad640..f5622703e 100644
--- a/patches/linux/4.9/0703-armadeus-mxs-uart-add-rs485-support.patch
+++ b/patches/linux/4.9/0703-armadeus-mxs-uart-add-rs485-support.patch
@@ -1,7 +1,7 @@
-Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
+Index: linux-4.9.152/drivers/tty/serial/mxs-auart.c
===================================================================
---- linux-4.9.59.orig/drivers/tty/serial/mxs-auart.c
-+++ linux-4.9.59/drivers/tty/serial/mxs-auart.c
+--- linux-4.9.152.orig/drivers/tty/serial/mxs-auart.c
++++ linux-4.9.152/drivers/tty/serial/mxs-auart.c
@@ -76,6 +76,7 @@
#define AUART_CTRL1_XFER_COUNT(v) ((v) & 0xffff)
@@ -187,7 +187,7 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
return 0;
}
-@@ -1685,6 +1761,8 @@ static int mxs_auart_probe(struct platfo
+@@ -1689,6 +1765,8 @@ static int mxs_auart_probe(struct platfo
s->port.fifosize = MXS_AUART_FIFO_SIZE;
s->port.uartclk = clk_get_rate(s->clk);
s->port.type = PORT_IMX;
@@ -196,10 +196,10 @@ Index: linux-4.9.59/drivers/tty/serial/mxs-auart.c
mxs_init_regs(s);
-Index: linux-4.9.59/include/uapi/linux/serial.h
+Index: linux-4.9.152/include/uapi/linux/serial.h
===================================================================
---- linux-4.9.59.orig/include/uapi/linux/serial.h
-+++ linux-4.9.59/include/uapi/linux/serial.h
+--- linux-4.9.152.orig/include/uapi/linux/serial.h
++++ linux-4.9.152/include/uapi/linux/serial.h
@@ -124,7 +124,8 @@ struct serial_rs485 {
#define SER_RS485_RX_DURING_TX (1 << 4)
__u32 delay_rts_before_send; /* Delay before send (milliseconds) */
diff --git a/patches/linux/4.9/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch b/patches/linux/4.9/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
index 51da20bd8..19077c70a 100644
--- a/patches/linux/4.9/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
+++ b/patches/linux/4.9/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
@@ -16,10 +16,10 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
create mode 100644 arch/arm/boot/dts/imx6ul-opos6ul.dtsi
create mode 100644 arch/arm/boot/dts/imx6ul-opos6uldev.dts
-Index: linux-4.9.33/arch/arm/boot/dts/Makefile
+Index: linux-4.9.152/arch/arm/boot/dts/Makefile
===================================================================
---- linux-4.9.33.orig/arch/arm/boot/dts/Makefile
-+++ linux-4.9.33/arch/arm/boot/dts/Makefile
+--- linux-4.9.152.orig/arch/arm/boot/dts/Makefile
++++ linux-4.9.152/arch/arm/boot/dts/Makefile
@@ -420,6 +420,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-14x14-evk.dtb \
@@ -28,10 +28,10 @@ Index: linux-4.9.33/arch/arm/boot/dts/Makefile
imx6ul-pico-hobbit.dtb \
imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \
-Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+Index: linux-4.9.152/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
===================================================================
--- /dev/null
-+++ linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
++++ linux-4.9.152/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2016 Armadeus Systems <su...@ar...>
@@ -225,10 +225,10 @@ Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+ >;
+ };
+};
-Index: linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+Index: linux-4.9.152/arch/arm/boot/dts/imx6ul-opos6uldev.dts
===================================================================
--- /dev/null
-+++ linux-4.9.33/arch/arm/boot/dts/imx6ul-opos6uldev.dts
++++ linux-4.9.152/arch/arm/boot/dts/imx6ul-opos6uldev.dts
@@ -0,0 +1,450 @@
+/*
+ * Copyright 2016 Armadeus Systems <su...@ar...>
diff --git a/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch b/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
index 3577be5b2..db1ccf839 100644
--- a/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
+++ b/patches/linux/4.9/0801-ARM-dts-add-Armadeus-Systems-OPOS6UL-and-OPOS6ULDEV-.patch
@@ -20,10 +20,10 @@ Signed-off-by: Sébastien Szymanski <seb...@ar...>
create mode 100644 arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
create mode 100644 arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
-Index: linux-4.9.35/arch/arm/boot/dts/Makefile
+Index: linux-4.9.152/arch/arm/boot/dts/Makefile
===================================================================
---- linux-4.9.35.orig/arch/arm/boot/dts/Makefile
-+++ linux-4.9.35/arch/arm/boot/dts/Makefile
+--- linux-4.9.152.orig/arch/arm/boot/dts/Makefile
++++ linux-4.9.152/arch/arm/boot/dts/Makefile
@@ -421,6 +421,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-14x14-evk.dtb \
imx6ul-geam-kit.dtb \
@@ -32,10 +32,10 @@ Index: linux-4.9.35/arch/arm/boot/dts/Makefile
imx6ul-pico-hobbit.dtb \
imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \
-Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+Index: linux-4.9.152/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
===================================================================
--- /dev/null
-+++ linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
++++ linux-4.9.152/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -229,10 +229,10 @@ Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+ >;
+ };
+};
-Index: linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+Index: linux-4.9.152/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
===================================================================
--- /dev/null
-+++ linux-4.9.35/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
++++ linux-4.9.152/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2017 Armadeus Systems <su...@ar...>
diff --git a/patches/linux/4.9/0802-mainline-iio-si7020-add-devicetree-support-and-trivial-bindings.patch b/patches/linux/4.9/0802-mainline-iio-si7020-add-devicetree-support-and-trivial-bindings.patch
index 2d6d899fa..8ab9fb8c6 100644
--- a/patches/linux/4.9/0802-mainline-iio-si7020-add-devicetree-support-and-trivial-bindings.patch
+++ b/patches/linux/4.9/0802-mainline-iio-si7020-add-devicetree-support-and-trivial-bindings.patch
@@ -12,7 +12,7 @@ diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documen
index 5c70ce9..6afba26 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
-@@ -145,6 +145,7 @@ ricoh,rv5c387a I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
+@@ -146,6 +146,7 @@ ricoh,rv5c387a I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
samsung,24ad0xd1 S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)
sgx,vz89x SGX Sensortech VZ89X Sensors
sii,s35390a 2-wire CMOS real-time clock
hooks/post-receive
--
armadeus
|