Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1214337 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-08-27 08:30 +0200 |
| Last post | 2015-08-28 10:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the rtc tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-27 08:30 +0200
Re: linux-next: manual merge of the rtc tree with the arm-soc tree Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-08-28 10:10 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-27 08:30 +0200 |
| Subject | linux-next: manual merge of the rtc tree with the arm-soc tree |
| Message-ID | <q1YRb-4FI-7@gated-at.bofh.it> |
Hi Alexandre,
Today's linux-next merge of the rtc tree got a conflict in:
arch/arm/boot/dts/am437x-gp-evm.dts
between commits:
d3d92af19e99 ("ARM: dts: am437x-gp-evm: McASP1 node for audio support")
cf9a4850e995 ("ARM: dts: am437x-gp-evm: Enable analog audio via simple-card")
from the arm-soc tree and commit:
f7331bad0fa4 ("ARM: dts: AM437x: Add the internal and external clock nodes for rtc")
from the rtc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/boot/dts/am437x-gp-evm.dts
index 215775dc6948,1d5733751fd4..000000000000
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@@ -112,32 -124,12 +112,39 @@@
clock-frequency = <12000000>;
};
+ sound0: sound@0 {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "AM437x-GP-EVM";
+ simple-audio-card,widgets =
+ "Headphone", "Headphone Jack",
+ "Line", "Line In";
+ simple-audio-card,routing =
+ "Headphone Jack", "HPLOUT",
+ "Headphone Jack", "HPROUT",
+ "LINE1L", "Line In",
+ "LINE1R", "Line In";
+ simple-audio-card,format = "dsp_b";
+ simple-audio-card,bitclock-master = <&sound0_master>;
+ simple-audio-card,frame-master = <&sound0_master>;
+ simple-audio-card,bitclock-inversion;
+
+ simple-audio-card,cpu {
+ sound-dai = <&mcasp1>;
+ system-clock-frequency = <12000000>;
+ };
+
+ sound0_master: simple-audio-card,codec {
+ sound-dai = <&tlv320aic3106>;
+ system-clock-frequency = <12000000>;
+ };
+ };
++
+ /* fixed 32k external oscillator clock */
+ clk_32k_rtc: clk_32k_rtc {
+ #clock-cells = <0>;
+ compatible = "fixed-clock";
+ clock-frequency = <32768>;
+ };
};
&am43xx_pinmux {
@@@ -924,20 -797,8 +931,26 @@@
};
};
+&mcasp1 {
+ #sound-dai-cells = <0>;
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&mcasp1_pins>;
+ pinctrl-1 = <&mcasp1_sleep_pins>;
+
+ status = "okay";
+
+ op-mode = <0>; /* MCASP_IIS_MODE */
+ tdm-slots = <2>;
+ /* 4 serializers */
+ serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
+ 0 0 1 2
+ >;
+ tx-num-evt = <32>;
+ rx-num-evt = <32>;
+};
++
+ &rtc {
+ clocks = <&clk_32k_rtc>, <&clk_32768_ck>;
+ clock-names = "ext-clk", "int-clk";
+ status = "okay";
+ };
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Alexandre Belloni <alexandre.belloni@free-electrons.com> |
|---|---|
| Date | 2015-08-28 10:10 +0200 |
| Message-ID | <q2mTw-5Oh-19@gated-at.bofh.it> |
| In reply to | #1214337 |
Hi Stephen,
On 27/08/2015 at 16:22:29 +1000, Stephen Rothwell wrote :
> clock-frequency = <12000000>;
> };
>
> + sound0: sound@0 {
> + compatible = "simple-audio-card";
> + simple-audio-card,name = "AM437x-GP-EVM";
> + simple-audio-card,widgets =
> + "Headphone", "Headphone Jack",
> + "Line", "Line In";
> + simple-audio-card,routing =
> + "Headphone Jack", "HPLOUT",
> + "Headphone Jack", "HPROUT",
> + "LINE1L", "Line In",
> + "LINE1R", "Line In";
> + simple-audio-card,format = "dsp_b";
> + simple-audio-card,bitclock-master = <&sound0_master>;
> + simple-audio-card,frame-master = <&sound0_master>;
> + simple-audio-card,bitclock-inversion;
> +
> + simple-audio-card,cpu {
> + sound-dai = <&mcasp1>;
> + system-clock-frequency = <12000000>;
> + };
> +
> + sound0_master: simple-audio-card,codec {
> + sound-dai = <&tlv320aic3106>;
> + system-clock-frequency = <12000000>;
> + };
> + };
> ++
> + /* fixed 32k external oscillator clock */
> + clk_32k_rtc: clk_32k_rtc {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> + clock-frequency = <32768>;
> + };
It is just a matter of taste but maybe both oscillators/clocks can be
grouped.
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web