Merge tag 'samsung-drivers-5.11-2' of... (19cf6e6d) · Commits · 戴 / test

drivers/clk/samsung/clk-exynos-clkout.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ static int exynos_clkout_remove(struct platform_device *pdev)
		return 0;
		}

		static int exynos_clkout_suspend(struct device *dev)
		static int __maybe_unused exynos_clkout_suspend(struct device *dev)
		{
		struct exynos_clkout *clkout = dev_get_drvdata(dev);

		@@ -216,7 +216,7 @@ static int exynos_clkout_suspend(struct device *dev)
		return 0;
		}

		static int exynos_clkout_resume(struct device *dev)
		static int __maybe_unused exynos_clkout_resume(struct device *dev)
		{
		struct exynos_clkout *clkout = dev_get_drvdata(dev);

+6 −5

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ static const struct exynos_soc_id {
		const char *name;
		unsigned int id;
		} soc_ids[] = {
		/* List ordered by SoC name */
		{ "EXYNOS3250", 0xE3472000 },
		{ "EXYNOS4210", 0x43200000 }, /* EVT0 revision */
		{ "EXYNOS4210", 0x43210000 },
		@@ -29,10 +30,10 @@ static const struct exynos_soc_id {
		{ "EXYNOS5260", 0xE5260000 },
		{ "EXYNOS5410", 0xE5410000 },
		{ "EXYNOS5420", 0xE5420000 },
		{ "EXYNOS5433", 0xE5433000 },
		{ "EXYNOS5440", 0xE5440000 },
		{ "EXYNOS5800", 0xE5422000 },
		{ "EXYNOS7420", 0xE7420000 },
		{ "EXYNOS5433", 0xE5433000 },
		};

		static const char * __init product_id_to_soc_id(unsigned int product_id)
		@@ -98,8 +99,8 @@ static int __init exynos_chipid_early_init(void)
		goto err;
		}

		/* it is too early to use dev_info() here (soc_dev is NULL) */
		pr_info("soc soc0: Exynos: CPU[%s] PRO_ID[0x%x] REV[0x%x] Detected\n",
		dev_info(soc_device_to_device(soc_dev),
		"Exynos: CPU[%s] PRO_ID[0x%x] REV[0x%x] Detected\n",
		soc_dev_attr->soc_id, product_id, revision);

		return 0;
		@@ -110,4 +111,4 @@ err:
		return ret;
		}

		early_initcall(exynos_chipid_early_init);
		arch_initcall(exynos_chipid_early_init);