[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-394-g26c3aaa

[Sébastien S. <ss...@sf...>]

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  26c3aaa34580d7acc064c205e2e125b43e764378 (commit)
      from  5f528f74c476ed028ef15693c1ba998481f60b85 (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 26c3aaa34580d7acc064c205e2e125b43e764378
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Mar 16 18:03:02 2018 +0100

    [LINUX] opos6ulnano: dts: fix ethernet pin muxing (once again...)

-----------------------------------------------------------------------

Summary of changes:
 ...s-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch | 29 +++++++++-------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch b/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
index 5354dd4..b9dedb1 100644
--- a/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
+++ b/patches/linux/4.14/0801-ARM-dts-add-Armadeus-Systems-OPOS6ULNano-and-OPOS6ULNanoDev-.patch
@@ -20,11 +20,11 @@ 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
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 9c5e1d9..dcbb2b0 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -467,6 +467,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+Index: linux-4.14.19/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-4.14.19.orig/arch/arm/boot/dts/Makefile
++++ linux-4.14.19/arch/arm/boot/dts/Makefile
+@@ -479,6 +479,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
  	imx6ul-isiot-nand.dtb \
  	imx6ul-liteboard.dtb \
  	imx6ul-opos6uldev.dtb \
@@ -32,11 +32,10 @@ index 9c5e1d9..dcbb2b0 100644
  	imx6ul-pico-hobbit.dtb \
  	imx6ul-tx6ul-0010.dtb \
  	imx6ul-tx6ul-0011.dtb \
-diff --git a/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi b/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
-new file mode 100644
-index 0000000..cb89eba
+Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
+===================================================================
 --- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
++++ linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnano.dtsi
 @@ -0,0 +1,192 @@
 +/*
 + * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -176,7 +175,7 @@ index 0000000..cb89eba
 +			MX6UL_PAD_GPIO1_IO07__ENET2_MDC		0x1b0b0
 +			MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER	0x130b0
 +			MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN	0x130b0
-+			MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01	0x130b0
++			MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01	0x130b0
 +			MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00	0x130b0
 +			MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00	0x1b0b0
 +			MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01	0x1b0b0
@@ -230,11 +229,10 @@ index 0000000..cb89eba
 +		>;
 +	};
 +};
-diff --git a/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts b/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
-new file mode 100644
-index 0000000..1a542d1
+Index: linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
+===================================================================
 --- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
++++ linux-4.14.19/arch/arm/boot/dts/imx6ul-opos6ulnanodev.dts
 @@ -0,0 +1,251 @@
 +/*
 + * Copyright 2017 Armadeus Systems <su...@ar...>
@@ -487,6 +485,3 @@ index 0000000..1a542d1
 +		>;
 +	};
 +};
--- 
-2.7.3
-


hooks/post-receive
-- 
armadeus