[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-58-g40e03e0

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

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  40e03e09572b671a640bed0ec5ec88a3995bbe04 (commit)
       via  1fd6239f432d3662e7b2a64e2902c3dc368b07ca (commit)
      from  982f033e6d888ec2d31011cc3c29b21f91173f96 (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 40e03e09572b671a640bed0ec5ec88a3995bbe04
Author: Sébastien Szymanski <ss...@us...>
Date:   Mon Jan 20 17:23:55 2014 +0100

    [LINUX] 3.13: apf6q: enable watchdog nowayout option in default config

commit 1fd6239f432d3662e7b2a64e2902c3dc368b07ca
Author: Sébastien Szymanski <ss...@us...>
Date:   Mon Jan 20 14:46:58 2014 +0100

    [LINUX] 3.13: apf6q: add usb otg to device tree

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

Summary of changes:
 .../device/armadeus/apf6q/apf6q-linux-3.13.config  |    1 +
 .../3.13/0450-armadeus-add-apf6q-devicetree.patch  |   20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
index c43a2e1..1e8d6ae 100644
--- a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
@@ -152,6 +152,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MC9S08DZ60=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_IMX2_WDT=y
 CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_MC13XXX_SPI=y
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
index 82c17db..bf1fdb4 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
+++ b/patches/linux/3.13/0450-armadeus-add-apf6q-devicetree.patch
@@ -1,8 +1,8 @@
-Index: linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
+Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
 ===================================================================
 --- /dev/null
-+++ linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
-@@ -0,0 +1,203 @@
++++ linux-3.13/arch/arm/boot/dts/imx6q-apf6.dts
+@@ -0,0 +1,211 @@
 +/*
 + * Copyright 2014 Armadeus Systems
 + *
@@ -184,6 +184,14 @@ Index: linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
 +        status = "okay";
 +};
 +
++&usbotg {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_usbotg_1>;
++	disable-over-current;
++	dr_mode = "otg";
++	status = "okay";
++};
++
 +/* Wi-Fi */
 +&usdhc1 {
 +        pinctrl-names = "default";
@@ -206,10 +214,10 @@ Index: linux-3.13-rc8/arch/arm/boot/dts/imx6q-apf6.dts
 +        //non-removable;
 +        status = "okay";
 +};
-Index: linux-3.13-rc8/arch/arm/boot/dts/Makefile
+Index: linux-3.13/arch/arm/boot/dts/Makefile
 ===================================================================
---- linux-3.13-rc8.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.13-rc8/arch/arm/boot/dts/Makefile
+--- linux-3.13.orig/arch/arm/boot/dts/Makefile
++++ linux-3.13/arch/arm/boot/dts/Makefile
 @@ -139,6 +139,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
  	imx6dl-sabreauto.dtb \
  	imx6dl-sabresd.dtb \


hooks/post-receive
-- 
armadeus