[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-141-g26f2614
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-141-g26f2614
|
From: Sébastien S. <ss...@us...> - 2016-10-26 15:51:10
|
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, buildroot-update has been updated
via 26f2614f84f30834db73268ed6f6b4f9106c888a (commit)
via c5d6056d97606d7f07b958fe471014bc0e1ab475 (commit)
from 364955c4a9b344fd33ff99b5fabca6bf4aed04cb (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 26f2614f84f30834db73268ed6f6b4f9106c888a
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Oct 26 17:52:11 2016 +0200
[LINUX] opos6ul: bump to 4.8.4
commit c5d6056d97606d7f07b958fe471014bc0e1ab475
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Oct 26 17:40:13 2016 +0200
[LINUX] 4.7: opos6ul: update dts files
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
.../armadeus/opos6ul/opos6ul-linux-4.8.4.config | 1 +
...l-linux-4.7.config => opos6ul-linux-4.8.config} | 0
...pos6ul-and-opos6uldev-add-initial-support.patch | 147 +++++++++-----------
patches/linux/4.8.4 | 1 +
...pos6ul-and-opos6uldev-add-initial-support.patch | 147 +++++++++-----------
6 files changed, 129 insertions(+), 169 deletions(-)
create mode 120000 buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.4.config
copy buildroot/target/device/armadeus/opos6ul/{opos6ul-linux-4.7.config => opos6ul-linux-4.8.config} (100%)
create mode 120000 patches/linux/4.8.4
copy patches/linux/{4.7 => 4.8}/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch (86%)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 5a1371c..0ade81b 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.4"
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"
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.4.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.4.config
new file mode 120000
index 0000000..81956c0
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.4.config
@@ -0,0 +1 @@
+opos6ul-linux-4.8.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.7.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.config
similarity index 100%
copy from buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.7.config
copy to buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.config
diff --git a/patches/linux/4.7/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch b/patches/linux/4.7/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
index df56369..28d1943 100644
--- a/patches/linux/4.7/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
+++ b/patches/linux/4.7/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
@@ -16,23 +16,22 @@ 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
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 414b427..db9729f 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
+Index: linux-4.7.10/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-4.7.10.orig/arch/arm/boot/dts/Makefile
++++ linux-4.7.10/arch/arm/boot/dts/Makefile
@@ -393,6 +393,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
- imx6sx-sdb.dtb
+ imx6sx-sdb.dtb
dtb-$(CONFIG_SOC_IMX6UL) += \
- imx6ul-14x14-evk.dtb \
+ imx6ul-14x14-evk.dtb \
+ imx6ul-opos6uldev.dtb \
- imx6ul-pico-hobbit.dtb \
- imx6ul-tx6ul-0010.dtb \
- imx6ul-tx6ul-0011.dtb \
-diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
-new file mode 100644
-index 0000000..cd7ff48
+ imx6ul-pico-hobbit.dtb \
+ imx6ul-tx6ul-0010.dtb \
+ imx6ul-tx6ul-0011.dtb \
+Index: linux-4.7.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+===================================================================
--- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
++++ linux-4.7.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2016 Armadeus Systems
@@ -84,11 +83,9 @@ index 0000000..cd7ff48
+#include "imx6ul.dtsi"
+
+/ {
-+ reg_3v3: regulator-3v3 {
-+ compatible = "regulator-fixed";
-+ regulator-name = "3V3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
++ usdhc3_pwrseq: usdhc3_pwrseq {
++ compatible = "mmc-pwrseq-simple";
++ reset-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>;
+ };
+};
+
@@ -121,7 +118,7 @@ index 0000000..cd7ff48
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart8>;
+ fsl,uart-has-rtscts;
-+ //status = "okay";
++ status = "okay";
+};
+
+/* eMMC */
@@ -140,7 +137,9 @@ index 0000000..cd7ff48
+ pinctrl-0 = <&pinctrl_usdhc2>;
+ bus-width = <4>;
+ no-1-8-v;
-+ //status = "okay";
++ non-removable;
++ mmc-pwrseq = <&usdhc3_pwrseq>;
++ status = "okay";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
@@ -215,12 +214,11 @@ index 0000000..cd7ff48
+ >;
+ };
+};
-diff --git a/arch/arm/boot/dts/imx6ul-opos6uldev.dts b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-new file mode 100644
-index 0000000..5e786bf
+Index: linux-4.7.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+===================================================================
--- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-@@ -0,0 +1,419 @@
++++ linux-4.7.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+@@ -0,0 +1,402 @@
+/*
+ * Copyright 2016 Armadeus Systems
+ *
@@ -272,7 +270,7 @@ index 0000000..5e786bf
+#include "imx6ul-opos6ul.dtsi"
+
+/ {
-+ model = "Armadeus Systems OPOS6UL Module on OPOS6UL Dev board";
++ model = "Armadeus Systems OPOS6UL SoM on OPOS6ULDev board";
+ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
+
+ chosen {
@@ -280,14 +278,14 @@ index 0000000..5e786bf
+ };
+
+ memory {
-+ reg = <0 0>; /* will be filled by U-Boot */
++ reg = <0x80000000 0>; /* will be filled by U-Boot */
+ };
+
+ backlight {
+ compatible = "gpio-backlight";
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_lcd_backlight>;
-+ gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
++ pinctrl-0 = <&pinctrl_backlight>;
++ gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>;
+ default-on;
+ };
+
@@ -298,7 +296,7 @@ index 0000000..5e786bf
+
+ user-button {
+ label = "User button";
-+ gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;
++ gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
+ linux,code = <BTN_MISC>;
+ wakeup-source;
+ };
@@ -311,11 +309,18 @@ index 0000000..5e786bf
+ label = "User";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_led>;
-+ gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;
++ gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
++ reg_3v3: regulator-3v3 {
++ compatible = "regulator-fixed";
++ regulator-name = "3V3";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ };
++
+ reg_5v: regulator-5v {
+ compatible = "regulator-fixed";
+ regulator-name = "5V";
@@ -360,11 +365,11 @@ index 0000000..5e786bf
+ status = "okay";
+};
+
-+&ecspi1 {
++&ecspi4 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1>;
++ pinctrl-0 = <&pinctrl_ecspi4>;
+ fsl,spi-num-chipselects = <2>;
-+ cs-gpios = <&gpio3 26 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
++ cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
+ status = "okay";
+
+ spidev0: spi@0 {
@@ -380,21 +385,17 @@ index 0000000..5e786bf
+ };
+};
+
-+&fec2 {
++&i2c1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet2>;
-+ phy-mode = "rmii";
-+ phy-reset-duration = <1>;
-+ phy-reset-gpios = <&gpio4 1 GPIO_ACTIVE_LOW>;
-+ phy-handle = <ðphy2>;
-+ phy-supply = <®_3v3>;
-+ status = "disabled";
++ pinctrl-0 = <&pinctrl_i2c1>;
++ clock_frequency = <400000>;
++ status = "okay";
+};
+
+&i2c2 {
-+ clock_frequency = <400000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
++ clock_frequency = <400000>;
+ status = "okay";
+};
+
@@ -429,16 +430,6 @@ index 0000000..5e786bf
+ };
+};
+
-+&mdio {
-+ ethphy2: ethernet-phy@2 {
-+ compatible = "ethernet-phy-ieee802.3-c22";
-+ reg = <2>;
-+ interrupt-parent = <&gpio4>;
-+ interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
-+ status = "okay";
-+ };
-+};
-+
+&snvs_pwrkey {
+ status = "disabled";
+};
@@ -484,30 +475,19 @@ index 0000000..5e786bf
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpios>;
+
-+ pinctrl_ecspi1: ecspi1grp {
++ pinctrl_backlight: backlightgrp {
+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x1b0b0
-+ MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x1b0b0
-+ MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x1b0b0
-+ MX6UL_PAD_LCD_DATA23__ECSPI1_MISO 0x1b0b0
-+ MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
++ MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x1b0b0
+ >;
+ };
+
-+ pinctrl_enet2: enet2grp {
++ pinctrl_ecspi4: ecspi4grp {
+ fsl,pins = <
-+ MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x130b0
-+ MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 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
-+ MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0
-+ /* INT# */
-+ MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x1b0b0
-+ /* RST# */
-+ MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x130b0
-+ MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031
++ MX6UL_PAD_NAND_DATA04__ECSPI4_SCLK 0x1b0b0
++ MX6UL_PAD_NAND_DATA05__ECSPI4_MOSI 0x1b0b0
++ MX6UL_PAD_NAND_DATA06__ECSPI4_MISO 0x1b0b0
++ MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
++ MX6UL_PAD_NAND_DATA07__GPIO4_IO09 0x1b0b0
+ >;
+ };
+
@@ -527,14 +507,14 @@ index 0000000..5e786bf
+
+ pinctrl_gpios: gpiosgrp {
+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x0b0b0
-+ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
++ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
+ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x0b0b0
++ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
+ MX6UL_PAD_NAND_RE_B__GPIO4_IO00 0x0b0b0
+ MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x0b0b0
+ MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x0b0b0
+ MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0b0b0
-+ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
++ MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x0b0b0
+ MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0b0b0
+ MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x0b0b0
+ MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x0b0b0
@@ -549,20 +529,21 @@ index 0000000..5e786bf
+
+ pinctrl_gpio_keys: gpio_keysgrp {
+ fsl,pins = <
-+ MX6UL_PAD_NAND_DATA05__GPIO4_IO07 0x0b0b0
++ MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0b0b0
+ >;
+ };
+
-+ pinctrl_i2c2: i2c2grp {
++ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <
-+ MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
-+ MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
++ MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
++ MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
+ >;
+ };
+
-+ pinctrl_lcd_backlight: lcd_backlightgrp {
++ pinctrl_i2c2: i2c2grp {
+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x0b0b0
++ MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
++ MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
+ >;
+ };
+
@@ -595,7 +576,7 @@ index 0000000..5e786bf
+
+ pinctrl_led: ledgrp {
+ fsl,pins = <
-+ MX6UL_PAD_NAND_DATA04__GPIO4_IO06 0x0b0b0
++ MX6UL_PAD_LCD_RESET__GPIO3_IO04 0x0b0b0
+ >;
+ };
+
@@ -640,5 +621,3 @@ index 0000000..5e786bf
+ >;
+ };
+};
---
-2.3.6
diff --git a/patches/linux/4.8.4 b/patches/linux/4.8.4
new file mode 120000
index 0000000..b6afe80
--- /dev/null
+++ b/patches/linux/4.8.4
@@ -0,0 +1 @@
+4.8
\ No newline at end of file
diff --git a/patches/linux/4.7/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch b/patches/linux/4.8/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
similarity index 86%
copy from patches/linux/4.7/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
copy to patches/linux/4.8/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
index df56369..28d1943 100644
--- a/patches/linux/4.7/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
+++ b/patches/linux/4.8/0800-ARM-dts-opos6ul-and-opos6uldev-add-initial-support.patch
@@ -16,23 +16,22 @@ 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
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 414b427..db9729f 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
+Index: linux-4.7.10/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-4.7.10.orig/arch/arm/boot/dts/Makefile
++++ linux-4.7.10/arch/arm/boot/dts/Makefile
@@ -393,6 +393,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
- imx6sx-sdb.dtb
+ imx6sx-sdb.dtb
dtb-$(CONFIG_SOC_IMX6UL) += \
- imx6ul-14x14-evk.dtb \
+ imx6ul-14x14-evk.dtb \
+ imx6ul-opos6uldev.dtb \
- imx6ul-pico-hobbit.dtb \
- imx6ul-tx6ul-0010.dtb \
- imx6ul-tx6ul-0011.dtb \
-diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
-new file mode 100644
-index 0000000..cd7ff48
+ imx6ul-pico-hobbit.dtb \
+ imx6ul-tx6ul-0010.dtb \
+ imx6ul-tx6ul-0011.dtb \
+Index: linux-4.7.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+===================================================================
--- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
++++ linux-4.7.10/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2016 Armadeus Systems
@@ -84,11 +83,9 @@ index 0000000..cd7ff48
+#include "imx6ul.dtsi"
+
+/ {
-+ reg_3v3: regulator-3v3 {
-+ compatible = "regulator-fixed";
-+ regulator-name = "3V3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
++ usdhc3_pwrseq: usdhc3_pwrseq {
++ compatible = "mmc-pwrseq-simple";
++ reset-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>;
+ };
+};
+
@@ -121,7 +118,7 @@ index 0000000..cd7ff48
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart8>;
+ fsl,uart-has-rtscts;
-+ //status = "okay";
++ status = "okay";
+};
+
+/* eMMC */
@@ -140,7 +137,9 @@ index 0000000..cd7ff48
+ pinctrl-0 = <&pinctrl_usdhc2>;
+ bus-width = <4>;
+ no-1-8-v;
-+ //status = "okay";
++ non-removable;
++ mmc-pwrseq = <&usdhc3_pwrseq>;
++ status = "okay";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
@@ -215,12 +214,11 @@ index 0000000..cd7ff48
+ >;
+ };
+};
-diff --git a/arch/arm/boot/dts/imx6ul-opos6uldev.dts b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-new file mode 100644
-index 0000000..5e786bf
+Index: linux-4.7.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+===================================================================
--- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
-@@ -0,0 +1,419 @@
++++ linux-4.7.10/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+@@ -0,0 +1,402 @@
+/*
+ * Copyright 2016 Armadeus Systems
+ *
@@ -272,7 +270,7 @@ index 0000000..5e786bf
+#include "imx6ul-opos6ul.dtsi"
+
+/ {
-+ model = "Armadeus Systems OPOS6UL Module on OPOS6UL Dev board";
++ model = "Armadeus Systems OPOS6UL SoM on OPOS6ULDev board";
+ compatible = "armadeus,opos6uldev", "armadeus,opos6ul", "fsl,imx6ul";
+
+ chosen {
@@ -280,14 +278,14 @@ index 0000000..5e786bf
+ };
+
+ memory {
-+ reg = <0 0>; /* will be filled by U-Boot */
++ reg = <0x80000000 0>; /* will be filled by U-Boot */
+ };
+
+ backlight {
+ compatible = "gpio-backlight";
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_lcd_backlight>;
-+ gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;
++ pinctrl-0 = <&pinctrl_backlight>;
++ gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>;
+ default-on;
+ };
+
@@ -298,7 +296,7 @@ index 0000000..5e786bf
+
+ user-button {
+ label = "User button";
-+ gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;
++ gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
+ linux,code = <BTN_MISC>;
+ wakeup-source;
+ };
@@ -311,11 +309,18 @@ index 0000000..5e786bf
+ label = "User";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_led>;
-+ gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;
++ gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
++ reg_3v3: regulator-3v3 {
++ compatible = "regulator-fixed";
++ regulator-name = "3V3";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ };
++
+ reg_5v: regulator-5v {
+ compatible = "regulator-fixed";
+ regulator-name = "5V";
@@ -360,11 +365,11 @@ index 0000000..5e786bf
+ status = "okay";
+};
+
-+&ecspi1 {
++&ecspi4 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1>;
++ pinctrl-0 = <&pinctrl_ecspi4>;
+ fsl,spi-num-chipselects = <2>;
-+ cs-gpios = <&gpio3 26 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
++ cs-gpios = <&gpio4 9 GPIO_ACTIVE_LOW>, <&gpio4 3 GPIO_ACTIVE_LOW>;
+ status = "okay";
+
+ spidev0: spi@0 {
@@ -380,21 +385,17 @@ index 0000000..5e786bf
+ };
+};
+
-+&fec2 {
++&i2c1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet2>;
-+ phy-mode = "rmii";
-+ phy-reset-duration = <1>;
-+ phy-reset-gpios = <&gpio4 1 GPIO_ACTIVE_LOW>;
-+ phy-handle = <ðphy2>;
-+ phy-supply = <®_3v3>;
-+ status = "disabled";
++ pinctrl-0 = <&pinctrl_i2c1>;
++ clock_frequency = <400000>;
++ status = "okay";
+};
+
+&i2c2 {
-+ clock_frequency = <400000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
++ clock_frequency = <400000>;
+ status = "okay";
+};
+
@@ -429,16 +430,6 @@ index 0000000..5e786bf
+ };
+};
+
-+&mdio {
-+ ethphy2: ethernet-phy@2 {
-+ compatible = "ethernet-phy-ieee802.3-c22";
-+ reg = <2>;
-+ interrupt-parent = <&gpio4>;
-+ interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
-+ status = "okay";
-+ };
-+};
-+
+&snvs_pwrkey {
+ status = "disabled";
+};
@@ -484,30 +475,19 @@ index 0000000..5e786bf
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpios>;
+
-+ pinctrl_ecspi1: ecspi1grp {
++ pinctrl_backlight: backlightgrp {
+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x1b0b0
-+ MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x1b0b0
-+ MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x1b0b0
-+ MX6UL_PAD_LCD_DATA23__ECSPI1_MISO 0x1b0b0
-+ MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
++ MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x1b0b0
+ >;
+ };
+
-+ pinctrl_enet2: enet2grp {
++ pinctrl_ecspi4: ecspi4grp {
+ fsl,pins = <
-+ MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x130b0
-+ MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 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
-+ MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0
-+ /* INT# */
-+ MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x1b0b0
-+ /* RST# */
-+ MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x130b0
-+ MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031
++ MX6UL_PAD_NAND_DATA04__ECSPI4_SCLK 0x1b0b0
++ MX6UL_PAD_NAND_DATA05__ECSPI4_MOSI 0x1b0b0
++ MX6UL_PAD_NAND_DATA06__ECSPI4_MISO 0x1b0b0
++ MX6UL_PAD_NAND_DATA01__GPIO4_IO03 0x1b0b0
++ MX6UL_PAD_NAND_DATA07__GPIO4_IO09 0x1b0b0
+ >;
+ };
+
@@ -527,14 +507,14 @@ index 0000000..5e786bf
+
+ pinctrl_gpios: gpiosgrp {
+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x0b0b0
-+ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
++ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
+ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x0b0b0
++ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x0b0b0
+ MX6UL_PAD_NAND_RE_B__GPIO4_IO00 0x0b0b0
+ MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x0b0b0
+ MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x0b0b0
+ MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x0b0b0
-+ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x0b0b0
++ MX6UL_PAD_NAND_WE_B__GPIO4_IO01 0x0b0b0
+ MX6UL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0b0b0
+ MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x0b0b0
+ MX6UL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x0b0b0
@@ -549,20 +529,21 @@ index 0000000..5e786bf
+
+ pinctrl_gpio_keys: gpio_keysgrp {
+ fsl,pins = <
-+ MX6UL_PAD_NAND_DATA05__GPIO4_IO07 0x0b0b0
++ MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0b0b0
+ >;
+ };
+
-+ pinctrl_i2c2: i2c2grp {
++ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <
-+ MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
-+ MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
++ MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
++ MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
+ >;
+ };
+
-+ pinctrl_lcd_backlight: lcd_backlightgrp {
++ pinctrl_i2c2: i2c2grp {
+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x0b0b0
++ MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
++ MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
+ >;
+ };
+
@@ -595,7 +576,7 @@ index 0000000..5e786bf
+
+ pinctrl_led: ledgrp {
+ fsl,pins = <
-+ MX6UL_PAD_NAND_DATA04__GPIO4_IO06 0x0b0b0
++ MX6UL_PAD_LCD_RESET__GPIO3_IO04 0x0b0b0
+ >;
+ };
+
@@ -640,5 +621,3 @@ index 0000000..5e786bf
+ >;
+ };
+};
---
-2.3.6
hooks/post-receive
--
armadeus
|