[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-63-g59624fbb5
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2019-05-24 20:47:33
|
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 59624fbb50bb95a813de353db27eb368b36faa3a (commit)
from a2e9ab094ba08c5f1b149e341be5171bb9e595cb (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 59624fbb50bb95a813de353db27eb368b36faa3a
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri May 24 22:46:42 2019 +0200
[LINUX]Â 3.19, 4.1 legacy: fixes apf6dev device tree to allow apf6 dts overload
-----------------------------------------------------------------------
Summary of changes:
.../linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch | 4 +---
.../0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/patches/linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 36161ee88..d5941a1d4 100644
--- a/patches/linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -172,7 +172,7 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
+++ linux-3.19.8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,561 @@
+@@ -0,0 +1,559 @@
+/*
+ * Copyright 2015 Armadeus Systems
+ *
@@ -542,7 +542,6 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpios>;
+
-+ apf6dev {
+ pinctrl_audmux: audmuxgrp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x1b0b0
@@ -732,7 +731,6 @@ Index: linux-3.19.8/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x1b0b0
+ >;
+ };
-+ };
+};
Index: linux-3.19.8/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
diff --git a/patches/linux/4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index a2dba49ff..d2bc71f2b 100644
--- a/patches/linux/4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/4.1.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -188,7 +188,7 @@ Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
+++ linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,562 @@
+@@ -0,0 +1,560 @@
+/*
+ * Copyright 2015 Armadeus Systems
+ *
@@ -558,7 +558,6 @@ Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpios>;
+
-+ apf6dev {
+ pinctrl_audmux: audmuxgrp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x1b0b0
@@ -749,7 +748,6 @@ Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x1b0b0
+ >;
+ };
-+ };
+};
Index: linux-imx_4.1.15_2.0.0_ga/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
hooks/post-receive
--
armadeus
|