diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2023-04-12 16:44:30 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2023-04-13 12:14:22 +0200 |
| commit | ba5941c2266b40bf3e85d779f3e4d2f700bd9ad2 (patch) | |
| tree | f50d998626b9b0bed7e8de2c11e22f815514b784 | |
| parent | ee6d6dbc7bffd07c11b5855404ecdaa0cbb8dd97 (diff) | |
arm64: dts: ti: k3-am625-verdin-dev: use audio_ext_refclk1 as audio system-clock
Drop separate I2S_1_MCLK oscillator support and use SoC generated
AUDIO_EXT_REFCLK1 as audio system-clock instead.
Upstream-Status: Pending
Initial DTS to be used for bring-up an validation of the V1.0 design,
we'll decide on the step forward to mainline this once the bring-up
and validation will be done.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | arch/arm64/boot/dts/ti/k3-am625-verdin-dev.dtsi | 9 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/ti/k3-am625-verdin.dtsi | 31 |
2 files changed, 15 insertions, 25 deletions
diff --git a/arch/arm64/boot/dts/ti/k3-am625-verdin-dev.dtsi b/arch/arm64/boot/dts/ti/k3-am625-verdin-dev.dtsi index 6559d21615ec..aae8c5c1a0a1 100644 --- a/arch/arm64/boot/dts/ti/k3-am625-verdin-dev.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am625-verdin-dev.dtsi @@ -29,7 +29,7 @@ "Line", "Line In"; dailink_master: simple-audio-card,codec { - clocks = <&clk_i2s1_mclk>; + clocks = <&k3_clks 157 10>; sound-dai = <&nau8822_1a>; }; @@ -95,8 +95,15 @@ /* Audio Codec */ nau8822_1a: audio-codec@1a { compatible = "nuvoton,nau8822"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2s1_mclk>; /* Configure AUDIO_EXT_REFCLK1 pin as output */ reg = <0x1a>; #sound-dai-cells = <0>; + + /* POSTDIV4_16FF_MAIN_2_HSDIVOUT8_CLK -> AUDIO_EXT_REFCLK1 */ + assigned-clocks = <&k3_clks 157 10>; + assigned-clock-parents = <&k3_clks 157 18>; + assigned-clock-rates = <25000000>; /* for 48KHz +/- 1.7% */ }; /* IO Expander */ diff --git a/arch/arm64/boot/dts/ti/k3-am625-verdin.dtsi b/arch/arm64/boot/dts/ti/k3-am625-verdin.dtsi index cc0e4a2d35d5..0160d6d20d89 100644 --- a/arch/arm64/boot/dts/ti/k3-am625-verdin.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am625-verdin.dtsi @@ -63,23 +63,6 @@ enable-gpios = <&main_gpio0 28 GPIO_ACTIVE_HIGH>; }; - /* I2S_1_MCLK */ - clk_i2s1_mclk_fixed: clock-i2s-mclk-fixed { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <24576000>; - }; - - clk_i2s1_mclk: clock-i2s-mclk { - compatible = "gpio-gate-clock"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2s1_mclk_en>; - #clock-cells = <0>; - clocks = <&clk_i2s1_mclk_fixed>; - /* I2S_1_MCLK_EN */ - enable-gpios = <&main_gpio0 39 GPIO_ACTIVE_HIGH>; - }; - extcon_usb0: extcon-usb0 { compatible = "linux,extcon-usb-gpio"; id-gpios = <&main_gpio1 19 GPIO_ACTIVE_HIGH>; @@ -406,13 +389,6 @@ >; }; - /* I2S_1_MCLK_EN */ - pinctrl_i2s1_mclk_en: main-gpio0-a-pins-default { - pinctrl-single,pins = < - AM62X_IOPAD(0x00a0, PIN_INPUT, 7) /* (K25) GPMC0_WPn.GPIO0_39 */ - >; - }; - /* Verdin GPIO_5 */ pinctrl_gpio_5: main-gpio0-40-pins-default { pinctrl-single,pins = < @@ -501,6 +477,13 @@ >; }; + /* I2S_1_MCLK */ + pinctrl_i2s1_mclk: main-system-audio-ext-reflock1-pins-default { + pinctrl-single,pins = < + AM62X_IOPAD(0x00a0, PIN_OUTPUT, 1) /* (K25) GPMC0_WPn.AUDIO_EXT_REFCLK1 */ /* SODIMM 38 */ + >; + }; + /* Verdin I2S_1 */ pinctrl_mcasp0: main-mcasp0-pins-default { pinctrl-single,pins = < |