[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-261-g807c15d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-261-g807c15d
|
From: Sébastien S. <ss...@us...> - 2014-05-12 08:29:57
|
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 807c15de1a0519714e373a0413e18be042b8b33f (commit)
via de15fb9f67dd604238a192bc505516b5e32d4683 (commit)
from 4f0c72f4fcce060b69c1fac5034bd7fd1f680d6c (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 807c15de1a0519714e373a0413e18be042b8b33f
Author: Sébastien Szymanski <ss...@us...>
Date: Mon May 12 10:29:33 2014 +0200
[LINUX] 3.15: dts: apf6: Few fixes in devicetrees
- add phy_type node to usbh1
- add no-1-8-v to the micro sd port
- move iomuxc nodes to the end of files.
commit de15fb9f67dd604238a192bc505516b5e32d4683
Author: Sébastien Szymanski <ss...@us...>
Date: Mon May 12 10:27:51 2014 +0200
[LINUX] 3.15: apf6: move to 3.15-rc5
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
...-3.15-rc4.config => apf6-linux-3.15-rc5.config} | 0
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 202 ++++++++++----------
3 files changed, 104 insertions(+), 100 deletions(-)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.15-rc4.config => apf6-linux-3.15-rc5.config} (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 235b120..dce06cb 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -22,7 +22,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15-rc4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15-rc5"
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/apf6/apf6-linux-3.15-rc4.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc4.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc5.config
diff --git a/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index f9ba889..fdf1e6b 100644
--- a/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.15-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.15-rc5/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.15-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.15-rc5/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,11 +31,11 @@ Index: linux-3.15-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,129 @@
++++ linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,131 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -80,6 +80,30 @@ Index: linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ status = "okay";
+};
+
++/* Bluetooth */
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2>;
++ status = "okay";
++};
++
++/* Wi-Fi */
++&usdhc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc1>;
++ status = "okay";
++};
++
++/* eMMC */
++&usdhc3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc3>;
++ bus-width = <8>;
++ no-1-8-v;
++ non-removable;
++ status = "okay";
++};
++
+&iomuxc {
+ apf6 {
+ pinctrl_enet: enetgrp {
@@ -143,33 +167,11 @@ Index: linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+ };
+};
-+
-+/* Bluetooth */
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+/* Wi-Fi */
-+&usdhc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc1>;
-+ status = "okay";
-+};
-+
-+/* eMMC */
-+&usdhc3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3>;
-+ //non-removable;
-+ status = "okay";
-+};
-Index: linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,443 @@
++++ linux-3.15-rc5/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -0,0 +1,445 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -371,6 +373,75 @@ Index: linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ remote-endpoint = <&display_in>;
+};
+
++&pcie {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pcie>;
++ reset-gpio = <&gpio6 2 GPIO_ACTIVE_HIGH>;
++ status = "okay";
++};
++
++&pwm3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm3>;
++ status = "okay";
++};
++
++/* GPS */
++&uart1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart1>;
++ status = "okay";
++};
++
++/* GSM */
++&uart3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart3>;
++ status = "okay";
++};
++
++/* console */
++&uart4 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart4>;
++ status = "okay";
++};
++
++&usbh1 {
++ vbus-supply = <®_usbh1_vbus>;
++ dr_mode = "host";
++ phy_type = "utmi";
++ status = "okay";
++};
++
++&usbotg {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotg>;
++ vbus-supply = <®_otg_vbus>;
++ dr_mode = "otg";
++ status = "okay";
++};
++
++/* microSD */
++&usdhc2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc2>;
++ cd-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
++ no-1-8-v;
++ status = "okay";
++};
++
++&spdif {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_spdif>;
++ status = "okay";
++};
++
++&ssi1 {
++ fsl,mode = "i2s-slave";
++ status = "okay";
++};
++
+&iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
@@ -546,77 +617,10 @@ Index: linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+ };
+};
-+
-+&pcie {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pcie>;
-+ reset-gpio = <&gpio6 2 GPIO_ACTIVE_HIGH>;
-+ status = "okay";
-+};
-+
-+&pwm3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm3>;
-+ status = "okay";
-+};
-+
-+/* GPS */
-+&uart1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1>;
-+ status = "okay";
-+};
-+
-+/* GSM */
-+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3>;
-+ status = "okay";
-+};
-+
-+/* console */
-+&uart4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart4>;
-+ status = "okay";
-+};
-+
-+&usbh1 {
-+ vbus-supply = <®_usbh1_vbus>;
-+ dr_mode = "host";
-+ status = "okay";
-+};
-+
-+&usbotg {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg>;
-+ vbus-supply = <®_otg_vbus>;
-+ dr_mode = "otg";
-+ status = "okay";
-+};
-+
-+/* microSD */
-+&usdhc2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2>;
-+ cd-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
-+ status = "okay";
-+};
-+
-+&spdif {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_spdif>;
-+ status = "okay";
-+};
-+
-+&ssi1 {
-+ fsl,mode = "i2s-slave";
-+ status = "okay";
-+};
-Index: linux-3.15-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.15-rc5/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.15-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.15-rc5/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
hooks/post-receive
--
armadeus
|
