[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-166-g506d551
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2014-02-28 09:27:54
|
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 506d5517d8f4da0cb4aed93c368c7f5a41f3d03d (commit)
via b0b705dffb8e0fec004562f53093055c448ddb96 (commit)
from e1e3473ff1c8943b0f556ddadb53ec34134cbe6d (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 506d5517d8f4da0cb4aed93c368c7f5a41f3d03d
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 28 10:28:29 2014 +0100
[LINUX] apf28dev: add linux 3.14-rc4 config file.
commit b0b705dffb8e0fec004562f53093055c448ddb96
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 28 10:26:29 2014 +0100
[LINUX] 3.14-rc4: apf28dev: otg: add PIN ID muxing.
-----------------------------------------------------------------------
Summary of changes:
...3.14-rc2.config => apf28-linux-3.14-rc4.config} | 0
.../3.14-rc4/0420-armadeus-Add-apf28dev-dts.patch | 37 +++++++++++++++++---
2 files changed, 32 insertions(+), 5 deletions(-)
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.14-rc2.config => apf28-linux-3.14-rc4.config} (100%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc4.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc2.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc4.config
diff --git a/patches/linux/3.14-rc4/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.14-rc4/0420-armadeus-Add-apf28dev-dts.patch
index 96dafba..5ce039d 100644
--- a/patches/linux/3.14-rc4/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.14-rc4/0420-armadeus-Add-apf28dev-dts.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix spidev
Signed-off-by: Julien Boibessot <jul...@ar...>
---
-Index: linux-3.13-rc2/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.14-rc4/arch/arm/boot/dts/imx28-apf28dev.dts
===================================================================
---- linux-3.13-rc2.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.13-rc2/arch/arm/boot/dts/imx28-apf28dev.dts
+--- linux-3.14-rc4.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.14-rc4/arch/arm/boot/dts/imx28-apf28dev.dts
@@ -32,6 +32,13 @@
pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_a>;
@@ -32,7 +32,34 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx28-apf28dev.dts
>;
fsl,drive-strength = <MXS_DRIVE_4mA>;
fsl,voltage = <MXS_VOLTAGE_HIGH>;
-@@ -157,6 +166,7 @@
+@@ -66,6 +75,15 @@
+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
+ fsl,pull-up = <MXS_PULL_DISABLE>;
+ };
++
++ apf28dev_usb0_id_pins: apf28dev-usb0-id-pins@0 {
++ reg = <0>;
++ fsl,pinmux-ids = <
++ MX28_PAD_PWM2__USB0_ID
++ >;
++ fsl,voltage = <MXS_VOLTAGE_HIGH>;
++ fsl,pull-up = <MXS_PULL_ENABLE>;
++ };
+ };
+
+ lcdif@80030000 {
+@@ -131,7 +149,10 @@
+
+ ahb@80080000 {
+ usb0: usb@80080000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&apf28dev_usb0_id_pins>;
+ vbus-supply = <®_usb0_vbus>;
++ dr_mode = "otg";
+ status = "okay";
+ };
+
+@@ -157,6 +178,7 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 23 1>;
@@ -40,7 +67,7 @@ Index: linux-3.13-rc2/arch/arm/boot/dts/imx28-apf28dev.dts
};
};
-@@ -177,4 +187,15 @@
+@@ -177,4 +199,15 @@
brightness-levels = <0 4 8 16 32 64 128 255>;
default-brightness-level = <6>;
};
hooks/post-receive
--
armadeus
|