* [PATCH 1/3] ARM: dts: imx7-colibri: move SD-card to module level
@ 2016-08-29 5:13 Stefan Agner
2016-08-29 5:13 ` [PATCH 2/3] ARM: dts: imx7-colibri: add basic supply regulators Stefan Agner
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stefan Agner @ 2016-08-29 5:13 UTC (permalink / raw)
To: shawnguo, kernel
Cc: max.krummenacher, marcel.ziswiler, fabio.estevam, galak,
ijc+devicetree, mark.rutland, pawel.moll, robh+dt, grinberg,
devicetree, linux-arm-kernel, linux-kernel, Stefan Agner
Move SD-card definition to module level. While at it, also disable
write-protect since the Colibri standard does not define a pin for
SD-Card write-protection.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 4 ----
arch/arm/boot/dts/imx7-colibri.dtsi | 8 ++++++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index 1545661..373ee19 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -138,10 +138,6 @@
};
&usdhc1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>;
- no-1-8-v;
- cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
keep-power-in-suspend;
wakeup-source;
status = "okay";
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 0a9d3a8..044b83e 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -251,6 +251,14 @@
dr_mode = "host";
};
+&usdhc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>;
+ no-1-8-v;
+ cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+ disable-wp;
+};
+
&iomuxc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4>;
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] ARM: dts: imx7-colibri: add basic supply regulators
2016-08-29 5:13 [PATCH 1/3] ARM: dts: imx7-colibri: move SD-card to module level Stefan Agner
@ 2016-08-29 5:13 ` Stefan Agner
2016-08-29 5:13 ` [PATCH 3/3] ARM: dts: imx7-colibri: add Audio support Stefan Agner
2016-08-29 14:26 ` [PATCH 1/3] ARM: dts: imx7-colibri: move SD-card to module level Shawn Guo
2 siblings, 0 replies; 4+ messages in thread
From: Stefan Agner @ 2016-08-29 5:13 UTC (permalink / raw)
To: shawnguo, kernel
Cc: max.krummenacher, marcel.ziswiler, fabio.estevam, galak,
ijc+devicetree, mark.rutland, pawel.moll, robh+dt, grinberg,
devicetree, linux-arm-kernel, linux-kernel, Stefan Agner
Colibri modules need to be powered using the power pins 3V3 and
AVDD_AUDIO. Add fixed regulators which represent this power rails.
Potentially, those power rails could be switched on a carrier
board. A carrier board device tree could add a own regulator with
a GPIO, and reference that regulator in a vin-supply property of
those new module level system regulators. This also synchronize
the name of the +3.3V regulator with the one used in the Colibri
VF50/VF61 device tree.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx7-colibri.dtsi | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 044b83e..06fb567 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -46,12 +46,18 @@
pwms = <&pwm1 0 5000000>;
};
- reg_3p3v: regulator-3p3v {
+ reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
- regulator-name = "3P3V";
+ regulator-name = "+V3.3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ };
+
+ reg_module_3v3_avdd: regulator-module-3v3-avdd {
+ compatible = "regulator-fixed";
+ regulator-name = "+V3.3_AVDD_AUDIO";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-always-on;
};
reg_vref_1v8: regulator-vref-1v8 {
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] ARM: dts: imx7-colibri: add Audio support
2016-08-29 5:13 [PATCH 1/3] ARM: dts: imx7-colibri: move SD-card to module level Stefan Agner
2016-08-29 5:13 ` [PATCH 2/3] ARM: dts: imx7-colibri: add basic supply regulators Stefan Agner
@ 2016-08-29 5:13 ` Stefan Agner
2016-08-29 14:26 ` [PATCH 1/3] ARM: dts: imx7-colibri: move SD-card to module level Shawn Guo
2 siblings, 0 replies; 4+ messages in thread
From: Stefan Agner @ 2016-08-29 5:13 UTC (permalink / raw)
To: shawnguo, kernel
Cc: max.krummenacher, marcel.ziswiler, fabio.estevam, galak,
ijc+devicetree, mark.rutland, pawel.moll, robh+dt, grinberg,
devicetree, linux-arm-kernel, linux-kernel, Stefan Agner
Add audio support via on module I2S SGTL5000 codec.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx7-colibri.dtsi | 41 ++++++++++++++++++++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 06fb567..a9cc657 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -66,6 +66,22 @@
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
+
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "imx7-sgtl5000";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,bitclock-master = <&dailink_master>;
+ simple-audio-card,frame-master = <&dailink_master>;
+ simple-audio-card,cpu {
+ sound-dai = <&sai1>;
+ };
+
+ dailink_master: simple-audio-card,codec {
+ sound-dai = <&codec>;
+ clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+ };
+ };
};
&adc1 {
@@ -103,6 +119,18 @@
pinctrl-0 = <&pinctrl_i2c1 &pinctrl_i2c1_int>;
status = "okay";
+ codec: sgtl5000@0a {
+ compatible = "fsl,sgtl5000";
+ #sound-dai-cells = <0>;
+ reg = <0x0a>;
+ clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sai1_mclk>;
+ VDDA-supply = <®_module_3v3_avdd>;
+ VDDIO-supply = <®_module_3v3>;
+ VDDD-supply = <®_DCDC3>;
+ };
+
ad7879@2c {
compatible = "adi,ad7879-1";
reg = <0x2c>;
@@ -223,6 +251,12 @@
vin-supply = <®_DCDC3>;
};
+&sai1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sai1>;
+ status = "okay";
+};
+
&snvs_pwrkey {
status = "disabled";
};
@@ -542,13 +576,18 @@
pinctrl_sai1: sai1-grp {
fsl,pins = <
- MX7D_PAD_SAI1_MCLK__SAI1_MCLK 0x1f
MX7D_PAD_ENET1_RX_CLK__SAI1_TX_BCLK 0x1f
MX7D_PAD_SAI1_TX_SYNC__SAI1_TX_SYNC 0x1f
MX7D_PAD_ENET1_COL__SAI1_TX_DATA0 0x30
MX7D_PAD_ENET1_TX_CLK__SAI1_RX_DATA0 0x1f
>;
};
+
+ pinctrl_sai1_mclk: sai1grp_mclk {
+ fsl,pins = <
+ MX7D_PAD_SAI1_MCLK__SAI1_MCLK 0x1f
+ >;
+ };
};
&iomuxc_lpsr {
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] ARM: dts: imx7-colibri: move SD-card to module level
2016-08-29 5:13 [PATCH 1/3] ARM: dts: imx7-colibri: move SD-card to module level Stefan Agner
2016-08-29 5:13 ` [PATCH 2/3] ARM: dts: imx7-colibri: add basic supply regulators Stefan Agner
2016-08-29 5:13 ` [PATCH 3/3] ARM: dts: imx7-colibri: add Audio support Stefan Agner
@ 2016-08-29 14:26 ` Shawn Guo
2 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2016-08-29 14:26 UTC (permalink / raw)
To: Stefan Agner
Cc: kernel, max.krummenacher, marcel.ziswiler, fabio.estevam, galak,
ijc+devicetree, mark.rutland, pawel.moll, robh+dt, grinberg,
devicetree, linux-arm-kernel, linux-kernel
On Sun, Aug 28, 2016 at 10:13:22PM -0700, Stefan Agner wrote:
> Move SD-card definition to module level. While at it, also disable
> write-protect since the Colibri standard does not define a pin for
> SD-Card write-protection.
>
> Signed-off-by: Stefan Agner <stefan@agner.ch>
Applied all, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-29 14:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-29 5:13 [PATCH 1/3] ARM: dts: imx7-colibri: move SD-card to module level Stefan Agner
2016-08-29 5:13 ` [PATCH 2/3] ARM: dts: imx7-colibri: add basic supply regulators Stefan Agner
2016-08-29 5:13 ` [PATCH 3/3] ARM: dts: imx7-colibri: add Audio support Stefan Agner
2016-08-29 14:26 ` [PATCH 1/3] ARM: dts: imx7-colibri: move SD-card to module level Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).