[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-431-g503311327
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-431-g503311327
|
From: Sébastien S. <ss...@us...> - 2018-07-03 09:40:43
|
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 503311327929a488cc7c6f8fd9aefff46c5b3d6f (commit)
from 9d0e52c1475bbd76a26d683b92d59db5b5e4b879 (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 503311327929a488cc7c6f8fd9aefff46c5b3d6f
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jul 3 11:50:00 2018 +0200
[LINUX] 4.17/4.9.legacy: opos6uldev: add SGTL5000 support on JTAG header
-----------------------------------------------------------------------
Summary of changes:
.../opos6ul-linux-4.1.legacy.config.fragment | 3 +
.../armadeus/opos6ul/opos6ul-linux-4.17.config | 1 +
...adeus-dts-opos6uldev-add-sgtl5000-support.patch | 113 +++++++++++++++++++++
...adeus-dts-opos6uldev-add-sgtl5000-support.patch | 113 +++++++++++++++++++++
4 files changed, 230 insertions(+)
create mode 100644 patches/linux/4.17/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
create mode 100644 patches/linux/4.9.mx6_legacy/0809-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment
index a7c3a239f..3999253e6 100644
--- a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment
+++ b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.1.legacy.config.fragment
@@ -1 +1,4 @@
CONFIG_SPI_SPIDEV=m
+# CONFIG_SND_SOC_IMX_SGTL5000 is not set
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SIMPLE_CARD=y
diff --git a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config
index e5b726274..1289aed2b 100644
--- a/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config
+++ b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.17.config
@@ -251,6 +251,7 @@ CONFIG_SND_SOC_FSL_ASRC=y
CONFIG_SND_IMX_SOC=y
CONFIG_SND_SOC_IMX_SPDIF=y
CONFIG_SND_SOC_FSL_ASOC_CARD=y
+CONFIG_SND_SOC_SGTL5000=m
CONFIG_SND_SIMPLE_CARD=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
diff --git a/patches/linux/4.17/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch b/patches/linux/4.17/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
new file mode 100644
index 000000000..a95b6faff
--- /dev/null
+++ b/patches/linux/4.17/0804-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
@@ -0,0 +1,113 @@
+Index: linux-4.17.2/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+===================================================================
+--- linux-4.17.2.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-4.17.2/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+@@ -91,6 +91,13 @@
+ gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
+ };
+
++ reg_1v8: regulator-1v8 {
++ compatible = "regulator-fixed";
++ regulator-name = "1V8";
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ };
++
+ reg_5v: regulator-5v {
+ compatible = "regulator-fixed";
+ regulator-name = "5V";
+@@ -119,6 +126,31 @@
+ gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
++
++ sound {
++ compatible = "simple-audio-card";
++ simple-audio-card,name = "imx6ul-opos6ul-sgtl5000-audio";
++ simple-audio-card,widgets =
++ "Microphone", "Mic Jack",
++ "Line", "Line In",
++ "Line", "Line Out",
++ "Headphone", "Headphone Jack";
++ simple-audio-card,routing =
++ "MIC_IN", "Mic Jack",
++ "Mic Jack", "Mic Bias",
++ "Headphone Jack", "HP_OUT";
++
++ simple-audio-card,format = "i2s";
++ simple-audio-card,bitclock-master = <&codec_dai>;
++ simple-audio-card,frame-master = <&codec_dai>;
++ simple-audio-card,cpu {
++ sound-dai = <&sai2>;
++ };
++ codec_dai: simple-audio-card,codec {
++ sound-dai = <&sgtl5000>;
++ clocks = <&clks IMX6UL_CLK_SAI2>;
++ };
++ };
+ };
+
+ &adc1 {
+@@ -140,6 +172,11 @@
+ status = "okay";
+ };
+
++&clks {
++ assigned-clocks = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
++ assigned-clock-rates = <786432000>;
++};
++
+ &ecspi4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi4>;
+@@ -164,6 +201,16 @@
+ pinctrl-0 = <&pinctrl_i2c1>;
+ clock_frequency = <400000>;
+ status = "okay";
++
++ sgtl5000: codec@0a {
++ compatible = "fsl,sgtl5000";
++ reg = <0x0a>;
++ #sound-dai-cells = <0>;
++ VDDD-supply = <®_1v8>;
++ VDDA-supply = <®_3v3>;
++ VDDIO-supply = <®_3v3>;
++ clocks = <&clks IMX6UL_CLK_SAI2>;
++ };
+ };
+
+ &i2c2 {
+@@ -224,6 +271,16 @@
+ status = "okay";
+ };
+
++&sai2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_sai2>;
++ assigned-clocks = <&clks IMX6UL_CLK_SAI2_SEL>, <&clks IMX6UL_CLK_SAI2>;
++ assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
++ assigned-clock-rates = <0>, <24576000>;
++ fsl,sai-mclk-direction-output;
++ status = "okay";
++};
++
+ &snvs_pwrkey {
+ status = "disabled";
+ };
+@@ -390,6 +447,16 @@
+ >;
+ };
+
++ pinctrl_sai2: sai2grp {
++ fsl,pins = <
++ MX6UL_PAD_JTAG_TMS__SAI2_MCLK 0x17088
++ MX6UL_PAD_JTAG_TDI__SAI2_TX_BCLK 0x17088
++ MX6UL_PAD_JTAG_TDO__SAI2_TX_SYNC 0x17088
++ MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA 0x11088
++ MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA 0x11088
++ >;
++ };
++
+ pinctrl_tsc: tscgrp {
+ fsl,pins = <
+ MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
diff --git a/patches/linux/4.9.mx6_legacy/0809-armadeus-dts-opos6uldev-add-sgtl5000-support.patch b/patches/linux/4.9.mx6_legacy/0809-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
new file mode 100644
index 000000000..a95b6faff
--- /dev/null
+++ b/patches/linux/4.9.mx6_legacy/0809-armadeus-dts-opos6uldev-add-sgtl5000-support.patch
@@ -0,0 +1,113 @@
+Index: linux-4.17.2/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+===================================================================
+--- linux-4.17.2.orig/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
++++ linux-4.17.2/arch/arm/boot/dts/imx6ul-imx6ull-opos6uldev.dtsi
+@@ -91,6 +91,13 @@
+ gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
+ };
+
++ reg_1v8: regulator-1v8 {
++ compatible = "regulator-fixed";
++ regulator-name = "1V8";
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ };
++
+ reg_5v: regulator-5v {
+ compatible = "regulator-fixed";
+ regulator-name = "5V";
+@@ -119,6 +126,31 @@
+ gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
++
++ sound {
++ compatible = "simple-audio-card";
++ simple-audio-card,name = "imx6ul-opos6ul-sgtl5000-audio";
++ simple-audio-card,widgets =
++ "Microphone", "Mic Jack",
++ "Line", "Line In",
++ "Line", "Line Out",
++ "Headphone", "Headphone Jack";
++ simple-audio-card,routing =
++ "MIC_IN", "Mic Jack",
++ "Mic Jack", "Mic Bias",
++ "Headphone Jack", "HP_OUT";
++
++ simple-audio-card,format = "i2s";
++ simple-audio-card,bitclock-master = <&codec_dai>;
++ simple-audio-card,frame-master = <&codec_dai>;
++ simple-audio-card,cpu {
++ sound-dai = <&sai2>;
++ };
++ codec_dai: simple-audio-card,codec {
++ sound-dai = <&sgtl5000>;
++ clocks = <&clks IMX6UL_CLK_SAI2>;
++ };
++ };
+ };
+
+ &adc1 {
+@@ -140,6 +172,11 @@
+ status = "okay";
+ };
+
++&clks {
++ assigned-clocks = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
++ assigned-clock-rates = <786432000>;
++};
++
+ &ecspi4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi4>;
+@@ -164,6 +201,16 @@
+ pinctrl-0 = <&pinctrl_i2c1>;
+ clock_frequency = <400000>;
+ status = "okay";
++
++ sgtl5000: codec@0a {
++ compatible = "fsl,sgtl5000";
++ reg = <0x0a>;
++ #sound-dai-cells = <0>;
++ VDDD-supply = <®_1v8>;
++ VDDA-supply = <®_3v3>;
++ VDDIO-supply = <®_3v3>;
++ clocks = <&clks IMX6UL_CLK_SAI2>;
++ };
+ };
+
+ &i2c2 {
+@@ -224,6 +271,16 @@
+ status = "okay";
+ };
+
++&sai2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_sai2>;
++ assigned-clocks = <&clks IMX6UL_CLK_SAI2_SEL>, <&clks IMX6UL_CLK_SAI2>;
++ assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
++ assigned-clock-rates = <0>, <24576000>;
++ fsl,sai-mclk-direction-output;
++ status = "okay";
++};
++
+ &snvs_pwrkey {
+ status = "disabled";
+ };
+@@ -390,6 +447,16 @@
+ >;
+ };
+
++ pinctrl_sai2: sai2grp {
++ fsl,pins = <
++ MX6UL_PAD_JTAG_TMS__SAI2_MCLK 0x17088
++ MX6UL_PAD_JTAG_TDI__SAI2_TX_BCLK 0x17088
++ MX6UL_PAD_JTAG_TDO__SAI2_TX_SYNC 0x17088
++ MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA 0x11088
++ MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA 0x11088
++ >;
++ };
++
+ pinctrl_tsc: tscgrp {
+ fsl,pins = <
+ MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0
hooks/post-receive
--
armadeus
|