[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-370-g98ff779
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-370-g98ff779
|
From: Julien B a. A. <ar...@us...> - 2014-08-08 11:07:07
|
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 98ff779657e244d570fd8cf77ad3c03e0a3cdd70 (commit)
from bb584aa76e09ab8b0f2ecf4109790017e21e00be (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 98ff779657e244d570fd8cf77ad3c03e0a3cdd70
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 8 13:06:32 2014 +0200
[LINUX] APF6 (3.10-legacy): Add support for HDMI, USB, SD & ETH to device tree files
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 123 +++++++++++++++-----
1 files changed, 96 insertions(+), 27 deletions(-)
diff --git a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index a08603e..7f755f6 100644
--- a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dts 2014-02-17 11:22:26.647139601 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dts 2014-08-08 11:51:35.269075208 +0200
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -33,10 +33,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dts
+ status = "okay";
+};
+*/
-Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6.dtsi 2014-02-17 11:42:29.341103441 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6.dtsi 2014-08-08 11:51:35.269075208 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -94,11 +94,11 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi 2014-02-17 11:45:51.374105275 +0100
-@@ -0,0 +1,138 @@
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
+@@ -0,0 +1,182 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -111,6 +111,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ */
+
+/ {
++ aliases {
++ mxcfb0 = &mxcfb1;
++ };
++
+ regulators {
+ compatible = "simple-bus";
+
@@ -129,6 +133,14 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
++
++ reg_usb_otg_vbus: usb_otg_vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usb_otg_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ regulator-always-on;
++ };
+ };
+
+ leds {
@@ -151,14 +163,43 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ linux,code = <100>;
+ };
+ };
++
++ mxcfb1: fb@0 {
++ compatible = "fsl,mxc_sdc_fb";
++ disp_dev = "hdmi";
++ interface_pix_fmt = "RGB24";
++ mode_str ="1920x1080M@60";
++ default_bpp = <24>;
++ int_clk = <0>;
++ late_init = <0>;
++ status = "okay";
++ };
+};
+
-+/*
-+&hdmi {
-+ ddc = <&i2c1>;
++&hdmi_core {
++ ipu_id = <0>;
++ disp_id = <0>;
+ status = "okay";
+};
-+*/
++
++&hdmi_video {
++ fsl,phy_reg_vlev = <0x0294>;
++ fsl,phy_reg_cksymtx = <0x800d>;
++ status = "okay";
++};
++
++&i2c3 {
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c3_1>;
++ status = "okay";
++
++ hdmi: edid@50 {
++ compatible = "fsl,imx6-hdmi-i2c";
++ reg = <0x50>;
++ };
++};
++
+/*
+&i2c1 {
+ clock-frequency = <100000>;
@@ -174,12 +215,15 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ status = "okay";
+};
+*/
++
+&fec {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_1>;
++ pinctrl-0 = <&pinctrl_enet_3>;
+ phy-mode = "rgmii";
++ phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
++
+/*
+&pcie {
+ reset-gpio = <&gpio6 2 0>;
@@ -218,29 +262,29 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ status = "okay";
+};
+
-+/*
+&usbotg {
++ vbus-supply = <®_usb_otg_vbus>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbotg_1>;
+ disable-over-current;
-+ dr_mode = "otg";
++ dr_mode = "peripheral";
+ status = "okay";
+};
-+*/
+
+/* microSD */
-+/*
+&usdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2_2>;
++ bus-width = <4>;
++ vmmc-supply = <®_3p3v>;
+ cd-gpios = <&gpio1 2 0>;
+ status = "okay";
+};
-+*/
-Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dts
++
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dts 2014-02-17 10:58:09.335913198 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts 2014-08-08 11:51:35.273075229 +0200
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -266,10 +310,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dts
+ reg = <0x10000000 0x40000000>;
+ };
+};
-Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi 2014-02-17 10:57:17.391655619 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6.dtsi 2014-08-08 11:51:35.273075229 +0200
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -305,10 +349,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi 2014-02-17 11:00:14.108531917 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -353,10 +397,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
+ };
+ };
+};
-Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi 2014-02-17 11:25:55.484175170 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6.dtsi 2014-08-08 11:51:35.273075229 +0200
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -392,10 +436,10 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi 2014-02-17 11:33:41.270484892 +0100
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6q-apf6dev.dtsi 2014-08-08 11:51:35.273075229 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -440,3 +484,28 @@ Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+ };
+ };
+};
+Index: linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi
+===================================================================
+--- linux-wandboard_imx_3.10.17_1.0.0_ga.orig/arch/arm/boot/dts/imx6qdl.dtsi 2014-07-11 21:53:12.000000000 +0200
++++ linux-wandboard_imx_3.10.17_1.0.0_ga/arch/arm/boot/dts/imx6qdl.dtsi 2014-08-08 12:42:33.948242320 +0200
+@@ -1166,6 +1166,7 @@
+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
+ MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
++ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
+ >;
+ };
+ };
+@@ -1354,6 +1355,12 @@
+ MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+ >;
+ };
++ pinctrl_i2c3_5: i2c3grp-5 {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
++ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
++ >;
++ };
+ };
+
+ ipu1 {
hooks/post-receive
--
armadeus
|