~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,22 +1,13 @@
	1	+// SPDX-License-Identifier: GPL-2.0-only
1	2	/*
2	3	* Copyright (c) 2016, The Linux Foundation. All rights reserved.
3	4	* Copyright (C) 2013 Red Hat
4	5	* Author: Rob Clark <robdclark@gmail.com>
5		- *
6		- * This program is free software; you can redistribute it and/or modify it
7		- * under the terms of the GNU General Public License version 2 as published by
8		- * the Free Software Foundation.
9		- *
10		- * This program is distributed in the hope that it will be useful, but WITHOUT
11		- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12		- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13		- * more details.
14		- *
15		- * You should have received a copy of the GNU General Public License along with
16		- * this program. If not, see <http://www.gnu.org/licenses/>.
17	6	*/
18	7
19	8	#include <linux/clk-provider.h>
	9	+#include <linux/delay.h>
	10	+
20	11	#include "hdmi.h"
21	12
22	13	struct hdmi_pll_8960 {
..	..	@@ -445,7 +436,7 @@
445	436
446	437	pll->mmio = msm_ioremap(pdev, "hdmi_pll", "HDMI_PLL");
447	438	if (IS_ERR(pll->mmio)) {
448		- dev_err(dev, "failed to map pll base\n");
	439	+ DRM_DEV_ERROR(dev, "failed to map pll base\n");
449	440	return -ENOMEM;
450	441	}
451	442
..	..	@@ -454,7 +445,7 @@
454	445
455	446	clk = devm_clk_register(dev, &pll->clk_hw);
456	447	if (IS_ERR(clk)) {
457		- dev_err(dev, "failed to register pll clock\n");
	448	+ DRM_DEV_ERROR(dev, "failed to register pll clock\n");
458	449	return -EINVAL;
459	450	}
460	451