Commit 7c170260 authored by Angus Ainslie's avatar Angus Ainslie

Merge branch 'clocks-cleanup' into 'imx8-4.18-wip'

Clocks cleanup

See merge request !21
parents a895838e b0bd648d
Pipeline #5023 passed with stage
in 41 minutes and 48 seconds
......@@ -82,20 +82,6 @@
#reset-cells = <0>;
};
sound_osc: oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <12000000>;
clock-output-names = "sound_osc";
};
mclk: mclk {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <26000000>;
clock-output-names = "mclk";
};
sound {
compatible = "simple-audio-card";
simple-audio-card,name = "sgtl5000";
......@@ -969,9 +955,7 @@
sgtl5000: sgtl5000@a {
compatible = "fsl,sgtl5000";
clocks = <&clk IMX8MQ_CLK_SAI2_DIV>;
// <&clk IMX8MQ_CLK_SAI2_ROOT>
clock-names = "mclk";
clocks = <&clk IMX8MQ_CLK_SAI2_ROOT>;
#sound-dai-cells = <0>;
reg = <0x0a>;
VDDD-supply = <&buck7_reg>;
......@@ -1101,9 +1085,9 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sai2>;
#sound-dai-cells = <0>;
assigned-clocks = <&clk IMX8MQ_CLK_SAI2_SRC>,
assigned-clocks = <&clk IMX8MQ_CLK_SAI2_ROOT>,
<&clk IMX8MQ_CLK_SAI2_DIV>;
assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>;
assigned-clock-parents = <&clk IMX8MQ_CLK_SAI2_DIV>;
assigned-clock-rates = <0>, <24576000>;
status = "okay";
......@@ -1112,9 +1096,9 @@
&sai5 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sai5>;
assigned-clocks = <&clk IMX8MQ_CLK_SAI5_SRC>,
assigned-clocks = <&clk IMX8MQ_CLK_SAI5_ROOT>,
<&clk IMX8MQ_CLK_SAI5_DIV>;
assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>;
assigned-clock-parents = <&clk IMX8MQ_CLK_SAI5_DIV>;
assigned-clock-rates = <0>, <24576000>;
status = "okay";
......@@ -1124,9 +1108,9 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sai6>;
assigned-clocks = <&clk IMX8MQ_CLK_SAI6_SRC>,
assigned-clocks = <&clk IMX8MQ_CLK_SAI6_ROOT>,
<&clk IMX8MQ_CLK_SAI6_DIV>;
assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>;
assigned-clock-parents = <&clk IMX8MQ_CLK_SAI6_DIV>;
assigned-clock-rates = <0>, <24576000>;
status = "okay";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment