imx6/linux: update patches for som v1.5 from solidrun [backport of #1602]

This commit is contained in:
Peter Vicman 2017-05-05 20:52:47 +02:00
parent dd4431b2a0
commit 1bfd8e7f61
3 changed files with 2329 additions and 11 deletions

View File

@ -1,17 +1,20 @@
From 3499e0d1703d361277e65419178152d792bd55dc Mon Sep 17 00:00:00 2001
From 99069dc5c3343339c31337cdc5175b2b527395cb Mon Sep 17 00:00:00 2001
From: Peter Vicman <peter.vicman@gmail.com>
Date: Mon, 4 Jan 2016 19:55:37 +0100
Date: Fri, 31 Mar 2017 19:02:34 +0200
Subject: [PATCH] rename sgtl5000 codec
---
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx6qdl-hummingboard-som-v15.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-hummingboard2-som-v15.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index 2003262..d2446ef 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -62,7 +62,7 @@
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard-som-v15.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard-som-v15.dtsi
index 4efdb27..f889904 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard-som-v15.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard-som-v15.dtsi
@@ -135,7 +135,7 @@
"Mic Jack", "Mic Bias",
"Headphone Jack", "HP_OUT";
compatible = "fsl,imx-audio-sgtl5000";
@ -19,7 +22,46 @@ index 2003262..d2446ef 100644
+ model = "imx-sgtl5000";
mux-ext-port = <5>;
mux-int-port = <1>;
ssi-controller = <&ssi1>;
cpu-dai = <&ssi1>;
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index b58db39..80b376c 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -135,7 +135,7 @@
"Mic Jack", "Mic Bias",
"Headphone Jack", "HP_OUT";
compatible = "fsl,imx-audio-sgtl5000";
- model = "On-board Codec";
+ model = "imx-sgtl5000";
mux-ext-port = <5>;
mux-int-port = <1>;
cpu-dai = <&ssi1>;
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2-som-v15.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2-som-v15.dtsi
index 76ecfa2..6cb5aab 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard2-som-v15.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2-som-v15.dtsi
@@ -168,7 +168,7 @@
"Mic Jack", "Mic Bias",
"Headphone Jack", "HP_OUT";
compatible = "fsl,imx-audio-sgtl5000";
- model = "On-board Codec";
+ model = "imx-sgtl5000";
mux-ext-port = <5>;
mux-int-port = <1>;
cpu-dai = <&ssi1>;
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
index eb9f3c9..fcfc87c 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
@@ -168,7 +168,7 @@
"Mic Jack", "Mic Bias",
"Headphone Jack", "HP_OUT";
compatible = "fsl,imx-audio-sgtl5000";
- model = "On-board Codec";
+ model = "imx-sgtl5000";
mux-ext-port = <5>;
mux-int-port = <1>;
cpu-dai = <&ssi1>;
--
1.8.1.2
2.7.4

View File

@ -8,3 +8,13 @@
};
};
--- a/arch/arm/boot/dts/imx6qdl-cubox-i-som-v15.dtsi 2014-11-25 19:23:06.332485391 +0100
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i-som-v15.dtsi 2014-11-25 19:23:24.675776865 +0100
@@ -31,6 +31,7 @@
label = "imx6:red:front";
max-brightness = <248>;
pwms = <&pwm1 0 50000>;
+ linux,default-trigger = "heartbeat";
};
};

File diff suppressed because it is too large Load Diff