[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-353-g548c6e2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-353-g548c6e2
|
From: Julien B a. A. <ar...@us...> - 2017-11-09 10:02:49
|
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 548c6e2aa5eab41e6f7ef3c74195b8a15c005ead (commit)
from 1e42bc2410e7ce922e1cdb02bec768c28dbf01dd (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 548c6e2aa5eab41e6f7ef3c74195b8a15c005ead
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Nov 9 10:57:16 2017 +0100
[BUILDROOT] apf28: bump mainline configuration to Linux 4.9. Add dropbear and lrzsz while we are at it...
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28mainline_defconfig | 13 ++---
...ever-the-enet_out-clock-is-being-enabled.patch} | 65 ++++++++++++++--------
...ng-to-debug-for-mxs_i2c_pio_wait_xfer_end.patch | 54 ++++++++++++++++++
3 files changed, 101 insertions(+), 31 deletions(-)
copy patches/linux/{3.19/0701-v2-2-2-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch => 4.9/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch} (61%)
create mode 100644 patches/linux/4.9/0702-mainline-i2c-mxs-change-error-printing-to-debug-for-mxs_i2c_pio_wait_xfer_end.patch
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 767336d..8d84f0e 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -4,9 +4,7 @@ BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.19.8"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
+BR2_KERNEL_HEADERS_4_9=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
@@ -29,10 +27,9 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.8"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.59"
+BR2_LINUX_KERNEL_PATCH="../patches/linux/4.9"
+BR2_LINUX_KERNEL_DEFCONFIG="mxs"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -54,9 +51,11 @@ BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
BR2_PACKAGE_RPCBIND=y
diff --git a/patches/linux/3.19/0701-v2-2-2-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
similarity index 61%
copy from patches/linux/3.19/0701-v2-2-2-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch
copy to patches/linux/4.9/0701-karo-net-fec-Reset-ethernet-PHY-whenever-the-enet_out-clock-is-being-enabled.patch
index d0e3080..f5889d9 100644
--- a/patches/linux/3.19/0701-v2-2-2-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
@@ -10,24 +10,25 @@ 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-3.19.8/drivers/net/ethernet/freescale/fec.h
+Index: linux-4.9.59/drivers/net/ethernet/freescale/fec.h
===================================================================
---- linux-3.19.8.orig/drivers/net/ethernet/freescale/fec.h
-+++ linux-3.19.8/drivers/net/ethernet/freescale/fec.h
-@@ -514,6 +514,7 @@ struct fec_enet_private {
- bool bufdesc_ex;
+--- linux-4.9.59.orig/drivers/net/ethernet/freescale/fec.h
++++ linux-4.9.59/drivers/net/ethernet/freescale/fec.h
+@@ -534,6 +534,7 @@ struct fec_enet_private {
int pause_flag;
+ int wol_flag;
u32 quirks;
+ int phy_reset_gpio;
struct napi_struct napi;
int csum_flags;
-Index: linux-3.19.8/drivers/net/ethernet/freescale/fec_main.c
+Index: linux-4.9.59/drivers/net/ethernet/freescale/fec_main.c
===================================================================
---- linux-3.19.8.orig/drivers/net/ethernet/freescale/fec_main.c
-+++ linux-3.19.8/drivers/net/ethernet/freescale/fec_main.c
-@@ -65,6 +65,7 @@
+--- linux-4.9.59.orig/drivers/net/ethernet/freescale/fec_main.c
++++ linux-4.9.59/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);
@@ -35,7 +36,7 @@ Index: linux-3.19.8/drivers/net/ethernet/freescale/fec_main.c
#define DRIVER_NAME "fec"
-@@ -1807,6 +1808,8 @@ static int fec_enet_clk_enable(struct ne
+@@ -1845,6 +1846,8 @@ static int fec_enet_clk_enable(struct ne
ret = clk_prepare_enable(fep->clk_enet_out);
if (ret)
goto failed_clk_enet_out;
@@ -44,55 +45,71 @@ Index: linux-3.19.8/drivers/net/ethernet/freescale/fec_main.c
}
if (fep->clk_ptp) {
mutex_lock(&fep->ptp_clk_mutex);
-@@ -3026,11 +3029,12 @@ static int fec_enet_init(struct net_devi
+@@ -3208,12 +3211,13 @@ static int fec_enet_init(struct net_devi
#ifdef CONFIG_OF
static void fec_reset_phy(struct platform_device *pdev)
{
- int err, phy_reset;
+- bool active_high = false;
- int msec = 1;
+ struct net_device *ndev = platform_get_drvdata(pdev);
+ struct fec_enet_private *fep = netdev_priv(ndev);
struct device_node *np = pdev->dev.of_node;
+ int msec = 1;
++ int active_high = 0;
- if (!np)
+ if (!gpio_is_valid(fep->phy_reset_gpio))
return;
of_property_read_u32(np, "phy-reset-duration", &msec);
-@@ -3038,18 +3042,27 @@ static void fec_reset_phy(struct platfor
+@@ -3221,26 +3225,35 @@ static void fec_reset_phy(struct platfor
if (msec > 1000)
msec = 1;
-+ gpio_set_value_cansleep(fep->phy_reset_gpio, 0);
-+ msleep(msec);
-+ gpio_set_value_cansleep(fep->phy_reset_gpio, 1);
++ active_high = of_property_read_bool(np, "phy-reset-active-high");
++
++ gpio_set_value_cansleep(fep->phy_reset_gpio, active_high);
++ if (msec > 20)
++ msleep(msec);
++ else
++ usleep_range(msec * 1000, msec * 1000 + 1000);
++ gpio_set_value_cansleep(fep->phy_reset_gpio, !active_high);
+}
+
+static int fec_get_reset_gpio(struct platform_device *pdev)
+{
+ int err, phy_reset;
+ struct device_node *np = pdev->dev.of_node;
++ int active_high;
+
phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
if (!gpio_is_valid(phy_reset))
- return;
+-
+- active_high = of_property_read_bool(np, "phy-reset-active-high");
+ return phy_reset;
err = devm_gpio_request_one(&pdev->dev, phy_reset,
- GPIOF_OUT_INIT_LOW, "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;
}
-- msleep(msec);
-- gpio_set_value(phy_reset, 1);
+
+- if (msec > 20)
+- msleep(msec);
+- else
+- usleep_range(msec * 1000, msec * 1000 + 1000);
+-
+- gpio_set_value_cansleep(phy_reset, !active_high);
+ return phy_reset;
}
#else /* CONFIG_OF */
static void fec_reset_phy(struct platform_device *pdev)
-@@ -3059,6 +3072,11 @@ static void fec_reset_phy(struct platfor
+@@ -3250,6 +3263,11 @@ static void fec_reset_phy(struct platfor
* by machine code.
*/
}
@@ -104,9 +121,9 @@ Index: linux-3.19.8/drivers/net/ethernet/freescale/fec_main.c
#endif /* CONFIG_OF */
static void
-@@ -3154,6 +3172,11 @@ fec_probe(struct platform_device *pdev)
-
- platform_set_drvdata(pdev, ndev);
+@@ -3348,6 +3366,11 @@ fec_probe(struct platform_device *pdev)
+ if (of_get_property(np, "fsl,magic-packet", NULL))
+ fep->wol_flag |= FEC_WOL_HAS_MAGIC_PACKET;
+ ret = fec_get_reset_gpio(pdev);
+ if (ret == -EPROBE_DEFER)
@@ -116,8 +133,8 @@ Index: linux-3.19.8/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);
-@@ -3283,6 +3306,7 @@ failed_regulator:
- failed_clk:
+@@ -3501,6 +3524,7 @@ failed_clk:
+ of_phy_deregister_fixed_link(np);
failed_phy:
of_node_put(phy_node);
+gpio_defer:
diff --git a/patches/linux/4.9/0702-mainline-i2c-mxs-change-error-printing-to-debug-for-mxs_i2c_pio_wait_xfer_end.patch b/patches/linux/4.9/0702-mainline-i2c-mxs-change-error-printing-to-debug-for-mxs_i2c_pio_wait_xfer_end.patch
new file mode 100644
index 0000000..5bd72a6
--- /dev/null
+++ b/patches/linux/4.9/0702-mainline-i2c-mxs-change-error-printing-to-debug-for-mxs_i2c_pio_wait_xfer_end.patch
@@ -0,0 +1,54 @@
+From f9831bfec7414d8f54f064b6b21de0685f107a47 Mon Sep 17 00:00:00 2001
+From: Michael Thalmeier <mic...@ha...>
+Date: Wed, 31 May 2017 11:40:03 +0200
+Subject: i2c: mxs: change error printing to debug for
+ mxs_i2c_pio_wait_xfer_end
+
+Instead of printing errors after mxs_i2c_pio_wait_xfer_end returns with
+an error code just print a debug message.
+
+NAKs and timeouts can occur in this situation normally, so do not treat
+them as errors.
+
+Signed-off-by: Michael Thalmeier <mic...@ha...>
+Signed-off-by: Wolfram Sang <ws...@th...>
+---
+ drivers/i2c/busses/i2c-mxs.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+(limited to 'drivers/i2c/busses/i2c-mxs.c')
+
+diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c
+index 5738556..d4e8f19 100644
+--- a/drivers/i2c/busses/i2c-mxs.c
++++ b/drivers/i2c/busses/i2c-mxs.c
+@@ -419,7 +419,7 @@ static int mxs_i2c_pio_setup_xfer(struct i2c_adapter *adap,
+
+ ret = mxs_i2c_pio_wait_xfer_end(i2c);
+ if (ret) {
+- dev_err(i2c->dev,
++ dev_dbg(i2c->dev,
+ "PIO: Failed to send SELECT command!\n");
+ goto cleanup;
+ }
+@@ -431,7 +431,7 @@ static int mxs_i2c_pio_setup_xfer(struct i2c_adapter *adap,
+
+ ret = mxs_i2c_pio_wait_xfer_end(i2c);
+ if (ret) {
+- dev_err(i2c->dev,
++ dev_dbg(i2c->dev,
+ "PIO: Failed to send READ command!\n");
+ goto cleanup;
+ }
+@@ -528,7 +528,7 @@ static int mxs_i2c_pio_setup_xfer(struct i2c_adapter *adap,
+ /* Wait for the end of the transfer. */
+ ret = mxs_i2c_pio_wait_xfer_end(i2c);
+ if (ret) {
+- dev_err(i2c->dev,
++ dev_dbg(i2c->dev,
+ "PIO: Failed to finish WRITE cmd!\n");
+ break;
+ }
+--
+cgit v1.1
+
hooks/post-receive
--
armadeus
|