~hc/RK356X_SDK_RELEASE.git

..	..	@@ -105,27 +105,27 @@
105	105	"sys_pll3_out", "clk_ext4", };
106	106
107	107	static const char * const imx8mn_sai2_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out",
108		- "video_pll1_out", "sys_pll1_133m", "osc_hdmi",
	108	+ "video_pll1_out", "sys_pll1_133m", "dummy",
109	109	"clk_ext3", "clk_ext4", };
110	110
111	111	static const char * const imx8mn_sai3_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out",
112		- "video_pll1_out", "sys_pll1_133m", "osc_hdmi",
	112	+ "video_pll1_out", "sys_pll1_133m", "dummy",
113	113	"clk_ext3", "clk_ext4", };
114	114
115	115	static const char * const imx8mn_sai5_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out",
116		- "video_pll1_out", "sys_pll1_133m", "osc_hdmi",
	116	+ "video_pll1_out", "sys_pll1_133m", "dummy",
117	117	"clk_ext2", "clk_ext3", };
118	118
119	119	static const char * const imx8mn_sai6_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out",
120		- "video_pll1_out", "sys_pll1_133m", "osc_hdmi",
	120	+ "video_pll1_out", "sys_pll1_133m", "dummy",
121	121	"clk_ext3", "clk_ext4", };
122	122
123	123	static const char * const imx8mn_sai7_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out",
124		- "video_pll1_out", "sys_pll1_133m", "osc_hdmi",
	124	+ "video_pll1_out", "sys_pll1_133m", "dummy",
125	125	"clk_ext3", "clk_ext4", };
126	126
127	127	static const char * const imx8mn_spdif1_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out",
128		- "video_pll1_out", "sys_pll1_133m", "osc_hdmi",
	128	+ "video_pll1_out", "sys_pll1_133m", "dummy",
129	129	"clk_ext2", "clk_ext3", };
130	130
131	131	static const char * const imx8mn_enet_ref_sels[] = {"osc_24m", "sys_pll2_125m", "sys_pll2_50m",
..	..	@@ -291,7 +291,7 @@
291	291	void __iomem *base;
292	292	int ret;
293	293
294		- clk_hw_data = kzalloc(struct_size(clk_hw_data, hws,
	294	+ clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws,
295	295	IMX8MN_CLK_END), GFP_KERNEL);
296	296	if (WARN_ON(!clk_hw_data))
297	297	return -ENOMEM;
..	..	@@ -308,10 +308,10 @@
308	308	hws[IMX8MN_CLK_EXT4] = imx_obtain_fixed_clk_hw(np, "clk_ext4");
309	309
310	310	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mn-anatop");
311		- base = of_iomap(np, 0);
	311	+ base = devm_of_iomap(dev, np, 0, NULL);
312	312	of_node_put(np);
313		- if (WARN_ON(!base)) {
314		- ret = -ENOMEM;
	313	+ if (WARN_ON(IS_ERR(base))) {
	314	+ ret = PTR_ERR(base);
315	315	goto unregister_hws;
316	316	}
317	317