[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-745-g58ad409
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-745-g58ad409
|
From: Sébastien S. <ss...@us...> - 2015-05-20 08:32:03
|
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 58ad4097f9fe9da9fe5e46cd44f2ab56c3a4f4aa (commit)
via faecc8dbd92e3b84d5b6a1cd6b9be89cf02cc5f1 (commit)
from e6d8a90c8885e5efe9f8ff6e79f4ea786a169070 (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 58ad4097f9fe9da9fe5e46cd44f2ab56c3a4f4aa
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed May 20 10:37:37 2015 +0200
[LINUX] 4.0: apf6: dts: add backlight and uart5
commit faecc8dbd92e3b84d5b6a1cd6b9be89cf02cc5f1
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed May 20 10:34:52 2015 +0200
[LINUX] 3.10 (legacy): apf6: dts: add backlight and uart5
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 27 ++++++++++++++-
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 35 +++++++++++++++++++-
2 files changed, 60 insertions(+), 2 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 b6fa626..aa65fb7 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
@@ -174,7 +174,7 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
===================================================================
--- /dev/null
+++ linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,518 @@
+@@ -0,0 +1,543 @@
+/*
+ * Copyright 2015 Armadeus Systems
+ *
@@ -192,6 +192,15 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+ mxcfb1 = &mxcfb2;
+ };
+
++ backlight_lcd {
++ compatible = "pwm-backlight";
++ pwms = <&pwm3 0 191000>;
++ brightness-levels = <0 4 8 16 32 64 128 255>;
++ default-brightness-level = <0>;
++ power-supply = <®_1p8v>;
++ status = "okay";
++ };
++
+ gpio-keys {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
@@ -483,6 +492,13 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+ status = "okay";
+};
+
++&uart5 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart5>;
++ fsl,uart-has-rtscts;
++ status = "okay";
++};
++
+&usbh1 {
+ dr_mode = "host";
+ phy_type = "utmi";
@@ -663,6 +679,15 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+ >;
+ };
+
++ pinctrl_uart5: uart5grp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT14__UART5_TX_DATA 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT15__UART5_RX_DATA 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT18__UART5_RTS_B 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT19__UART5_CTS_B 0x1b0b0
++ >;
++ };
++
+ pinctrl_usbotg: usbotggrp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x1b0b0
diff --git a/patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 92ff286..51dec81 100644
--- a/patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -173,7 +173,7 @@ Index: linux-3.19.3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
+++ linux-3.19.3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,522 @@
+@@ -0,0 +1,555 @@
+/*
+ * Copyright 2015 Armadeus Systems
+ *
@@ -190,6 +190,15 @@ Index: linux-3.19.3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
++ backlight_lcd {
++ compatible = "pwm-backlight";
++ pwms = <&pwm3 0 191000>;
++ brightness-levels = <0 4 8 16 32 64 128 255>;
++ default-brightness-level = <0>;
++ power-supply = <®_1p8v>;
++ status = "okay";
++ };
++
+ display@di0 {
+ compatible = "fsl,imx-parallel-display";
+ interface-pix-fmt = "bgr666";
@@ -250,6 +259,14 @@ Index: linux-3.19.3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ regulators {
+ compatible = "simple-bus";
+
++ reg_1p8v: 1p8v {
++ compatible = "regulator-fixed";
++ regulator-name = "1P8V";
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ regulator-always-on;
++ };
++
+ reg_3p3v: 3p3v {
+ compatible = "regulator-fixed";
+ regulator-name = "3P3V";
@@ -474,6 +491,13 @@ Index: linux-3.19.3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ status = "okay";
+};
+
++&uart5 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart5>;
++ fsl,uart-has-rtscts;
++ status = "okay";
++};
++
+&usbh1 {
+ vbus-supply = <®_usbh1_vbus>;
+ dr_mode = "host";
@@ -666,6 +690,15 @@ Index: linux-3.19.3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ >;
+ };
+
++ pinctrl_uart5: uart5grp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT14__UART5_TX_DATA 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT15__UART5_RX_DATA 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT18__UART5_RTS_B 0x1b0b0
++ MX6QDL_PAD_CSI0_DAT19__UART5_CTS_B 0x1b0b0
++ >;
++ };
++
+ pinctrl_usbotg: usbotggrp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x1b0b0
hooks/post-receive
--
armadeus
|