Commit 89a71e79 authored by Angus Ainslie's avatar Angus Ainslie
Browse files

Merge branch 'imx8-4.18-fixes' into 'imx8-4.18-wip'

Imx8 4.18 fixes

See merge request !24
parents 25a8cc5f 6595aea7
Pipeline #6384 passed with stage
in 40 minutes and 23 seconds
......@@ -109,31 +109,6 @@
};
};
#if TODO
sound-hdmi {
compatible = "fsl,imx-audio-cdnhdmi";
model = "imx-audio-hdmi";
audio-cpu = <&sai4>;
protocol = <1>;
};
sound-spdif {
compatible = "fsl,imx-audio-spdif";
model = "imx-spdif";
spdif-controller = <&spdif1>;
spdif-out;
spdif-in;
status = "disabled";
};
sound-hdmi-arc {
compatible = "fsl,imx-audio-spdif";
model = "imx-hdmi-arc";
spdif-controller = <&spdif2>;
spdif-in;
};
#endif
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
......@@ -234,7 +209,6 @@
};
&iomuxc {
imx8m-som {
pinctrl_nc: ncgrp {
fsl,pins = <
MX8MQ_IOMUXC_SAI1_MCLK_SAI1_MCLK 0x00
......@@ -617,8 +591,6 @@
MX8MQ_IOMUXC_GPIO1_IO05_GPIO1_IO5 0x19 /* TOUCH RST */
>;
};
};
};
&ecspi1 {
......@@ -917,11 +889,6 @@
compatible = "ovti,ov5640";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_csi1>;
// TODO : add these back in at some point
/*
reset = <&gpio1 6 GPIO_ACTIVE_LOW>;
powerdown = <&gpio1 7 GPIO_ACTIVE_HIGH>;
*/
reg = <0x3c>;
status = "okay";
clocks = <&clk IMX8MQ_CLK_CLKO1_DIV>;
......@@ -1064,7 +1031,6 @@
&usb3_0 {
status = "okay";
// power-supply = <&reg_pwr_en>;
power-domains = <&usb_otg1_pd>;
};
......@@ -1086,7 +1052,6 @@
&usb3_1 {
status = "okay";
// power-supply = <&reg_pwr_en>;
power-domains = <&usb_otg2_pd>;
};
......@@ -1130,40 +1095,6 @@
status = "okay";
};
#ifdef TODO
&spdif1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spdif1>;
assigned-clocks = <&clk IMX8MQ_CLK_SPDIF1_SRC>,
<&clk IMX8MQ_CLK_SPDIF1_DIV>;
assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>;
assigned-clock-rates = <0>, <24576000>;
status = "disabled";
};
&spdif2 {
assigned-clocks = <&clk IMX8MQ_CLK_SPDIF2_SRC>,
<&clk IMX8MQ_CLK_SPDIF2_DIV>;
assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>;
assigned-clock-rates = <0>, <24576000>;
status = "okay";
};
&gpu_pd {
// TBD: define correct power supply
// power-supply = <&sw1a_reg>;
};
&vpu_pd {
// TBD: define correct power supply
// power-supply = <&sw1c_reg>;
};
&vpu {
status = "okay";
};
#endif
&gpu_3d {
status = "okay";
......@@ -1194,9 +1125,7 @@
operating-points = <
/* kHz uV */
1500000 1000000
1300000 1000000
1000000 900000
800000 900000
>;
dc-supply = <&buck2_reg>;
};
......
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