[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-447-ge50ed4eb9
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-447-ge50ed4eb9
|
From: Sébastien S. <ss...@us...> - 2018-07-09 12:24:43
|
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 e50ed4eb9af92e8a91a83356cfac7f3219b6d330 (commit)
from 81d67edea04ac4e8505b666418bf50c185c1672c (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 e50ed4eb9af92e8a91a83356cfac7f3219b6d330
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 9 14:34:59 2018 +0200
[LINUX] opos6ul: add dual ethernet device trees
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
...deus-add-opos6uldev-dual-ethernet-support.patch | 244 +++++++++++++++++++++
2 files changed, 245 insertions(+), 1 deletion(-)
create mode 100644 patches/linux/4.17/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 632678e4e..3599f9e73 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -27,7 +27,7 @@ BR2_LINUX_KERNEL_PATCH="../patches/linux/4.17"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.17.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev imx6ul-opos6uldev-dual-ethernet imx6ull-opos6uldev-dual-ethernet"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
diff --git a/patches/linux/4.17/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch b/patches/linux/4.17/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch
new file mode 100644
index 000000000..3f40b0c3f
--- /dev/null
+++ b/patches/linux/4.17/0105-armadeus-add-opos6uldev-dual-ethernet-support.patch
@@ -0,0 +1,244 @@
+Index: linux-4.17.4/arch/arm/boot/dts/imx6ul-opos6uldev-dual-ethernet.dts
+===================================================================
+--- /dev/null
++++ linux-4.17.4/arch/arm/boot/dts/imx6ul-opos6uldev-dual-ethernet.dts
+@@ -0,0 +1,56 @@
++/*
++ * Copyright 2018 Armadeus Systems <su...@ar...>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This file is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this file; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include "imx6ul.dtsi"
++#include "imx6ul-imx6ull-opos6ul.dtsi"
++#include "imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi"
++
++/ {
++ model = "Armadeus Systems OPOS6UL SoM (i.MX6UL) on OPOS6ULDev dual Ethernet board";
++ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
++};
+Index: linux-4.17.4/arch/arm/boot/dts/imx6ull-opos6uldev-dual-ethernet.dts
+===================================================================
+--- /dev/null
++++ linux-4.17.4/arch/arm/boot/dts/imx6ull-opos6uldev-dual-ethernet.dts
+@@ -0,0 +1,56 @@
++/*
++ * Copyright 2018 Armadeus Systems <su...@ar...>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This file is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this file; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include "imx6ull.dtsi"
++#include "imx6ul-imx6ull-opos6ul.dtsi"
++#include "imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi"
++
++/ {
++ model = "Armadeus Systems OPOS6UL SoM (i.MX6ULL) on OPOS6ULDev dual Ethernet board";
++ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ull";
++};
+Index: linux-4.17.4/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi
+===================================================================
+--- /dev/null
++++ linux-4.17.4/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev-dual-ethernet.dtsi
+@@ -0,0 +1,117 @@
++/*
++ * Copyright 2018 Armadeus Systems <su...@ar...>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ * a) This file is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This file is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this file; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ *
++ * Or, alternatively,
++ *
++ * b) Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation
++ * files (the "Software"), to deal in the Software without
++ * restriction, including without limitation the rights to use,
++ * copy, modify, merge, publish, distribute, sublicense, and/or
++ * sell copies of the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the following
++ * conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++#include "imx6ul-imx6ull-opos6uldev.dtsi"
++
++/ {
++ /delete-node/ gpio-keys;
++ /delete-node/ sound;
++};
++
++&fec2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet2>;
++ phy-mode = "rmii";
++ phy-reset-duration = <1>;
++ phy-reset-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
++ phy-handle = <ðphy2>;
++ phy-supply = <®_3v3>;
++ status = "okay";
++};
++
++&mdio {
++ ethphy2: ethernet-phy@2 {
++ compatible = "ethernet-phy-ieee802.3-c22";
++ reg = <2>;
++ interrupt-parent = <&gpio1>;
++ interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
++ status = "okay";
++ };
++};
++
++&sai2 {
++ /delete-property/ pinctrl-names;
++ /delete-property/ pinctrl-0;
++ status = "disabled";
++};
++
++&uart8 {
++ /delete-property/ pinctrl-names;
++ /delete-property/ pinctrl-0;
++ status = "disabled";
++};
++
++&usdhc2 {
++ /delete-property/ pinctrl-names;
++ /delete-property/ pinctrl-0;
++ status = "disabled";
++
++ /delete-node/ wifi;
++};
++
++&iomuxc {
++ /delete-node/ gpiokeysgrp;
++ /delete-node/ uart8grp;
++ /delete-node/ usdhc2grp;
++
++ pinctrl_enet2: enet2grp {
++ fsl,pins = <
++ MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031
++ MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x130b0
++ MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x130b0
++ MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x130b0
++ MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 0x130b0
++ MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0
++ MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0
++ MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0
++ /* INT# */
++ MX6UL_PAD_JTAG_TDI__GPIO1_IO13 0x1b0b0
++ /* RST# */
++ MX6UL_PAD_JTAG_TDO__GPIO1_IO12 0x130b0
++ >;
++ };
++};
hooks/post-receive
--
armadeus
|