Commit 8bd99a05 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-drivers-5.12' of... 

Merge tag 'samsung-drivers-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc

Samsung SoC drivers changes for v5.12

1. Adjust deferred probe and handle regmap_read() errors in Exynos ASV
   driver.
2. Convert the ChipID code into a driver (from a early initcall) and
   merge it into the Exynos ASV.
3. Convert the PM domains code into a driver. This is necessary for
   upcoming code enabling fw_devlinks.

* tag 'samsung-drivers-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  soc: samsung: pm_domains: Convert to regular platform driver
  soc: samsung: exynos-chipid: correct helpers __init annotation
  soc: samsung: exynos-chipid: convert to driver and merge exynos-asv
  soc: samsung: exynos-asv: handle reading revision register error
  soc: samsung: exynos-asv: don't defer early on not-supported SoCs

Link: https://lore.kernel.org/r/20210125191240.11278-2-krzk@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7c53f6b6 c09a3e6c

arch/arm/mach-exynos/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ menuconfig ARCH_EXYNOS 
	select ARM_GIC

	select EXYNOS_IRQ_COMBINER

	select COMMON_CLK_SAMSUNG

	select EXYNOS_ASV

	select EXYNOS_CHIPID

	select EXYNOS_THERMAL

	select EXYNOS_PMU

drivers/soc/samsung/Kconfig

+5 −7
Original line number Diff line number Diff line
@@ -7,21 +7,19 @@ menuconfig SOC_SAMSUNG 


if SOC_SAMSUNG



config EXYNOS_ASV

	bool "Exynos Adaptive Supply Voltage support" if COMPILE_TEST

	depends on (ARCH_EXYNOS && EXYNOS_CHIPID) || COMPILE_TEST

	select EXYNOS_ASV_ARM if ARM && ARCH_EXYNOS



# There is no need to enable these drivers for ARMv8

config EXYNOS_ASV_ARM

	bool "Exynos ASV ARMv7-specific driver extensions" if COMPILE_TEST

	depends on EXYNOS_ASV

	depends on EXYNOS_CHIPID



config EXYNOS_CHIPID

	bool "Exynos Chipid controller driver" if COMPILE_TEST

	bool "Exynos ChipID controller and ASV driver" if COMPILE_TEST

	depends on ARCH_EXYNOS || COMPILE_TEST

	select EXYNOS_ASV_ARM if ARM && ARCH_EXYNOS

	select MFD_SYSCON

	select SOC_BUS

	help

	  Support for Samsung Exynos SoC ChipID and Adaptive Supply Voltage.



config EXYNOS_PMU

	bool "Exynos PMU controller driver" if COMPILE_TEST

drivers/soc/samsung/Makefile

+1 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



obj-$(CONFIG_EXYNOS_ASV)	+= exynos-asv.o

obj-$(CONFIG_EXYNOS_ASV_ARM)	+= exynos5422-asv.o



obj-$(CONFIG_EXYNOS_CHIPID)	+= exynos-chipid.o

obj-$(CONFIG_EXYNOS_CHIPID)	+= exynos-chipid.o exynos-asv.o

obj-$(CONFIG_EXYNOS_PMU)	+= exynos-pmu.o



obj-$(CONFIG_EXYNOS_PMU_ARM_DRIVERS)	+= exynos3250-pmu.o exynos4-pmu.o \

drivers/soc/samsung/exynos-asv.c

+20 −37
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ 
/*

 * Copyright (c) 2019 Samsung Electronics Co., Ltd.

 *	      http://www.samsung.com/

 * Copyright (c) 2020 Krzysztof Kozlowski <krzk@kernel.org>

 * Author: Sylwester Nawrocki <s.nawrocki@samsung.com>

 * Author: Krzysztof Kozlowski <krzk@kernel.org>

 *

 * Samsung Exynos SoC Adaptive Supply Voltage support

 */
@@ -10,12 +12,7 @@ 
#include <linux/cpu.h>

#include <linux/device.h>

#include <linux/errno.h>

#include <linux/init.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/pm_opp.h>

#include <linux/regmap.h>

#include <linux/soc/samsung/exynos-chipid.h>
@@ -111,7 +108,7 @@ static int exynos_asv_update_opps(struct exynos_asv *asv) 
	return	0;

}



static int exynos_asv_probe(struct platform_device *pdev)

int exynos_asv_init(struct device *dev, struct regmap *regmap)

{

	int (*probe_func)(struct exynos_asv *asv);

	struct exynos_asv *asv;
@@ -119,39 +116,39 @@ static int exynos_asv_probe(struct platform_device *pdev) 
	u32 product_id = 0;

	int ret, i;



	cpu_dev = get_cpu_device(0);

	ret = dev_pm_opp_get_opp_count(cpu_dev);

	if (ret < 0)

		return -EPROBE_DEFER;



	asv = devm_kzalloc(&pdev->dev, sizeof(*asv), GFP_KERNEL);

	asv = devm_kzalloc(dev, sizeof(*asv), GFP_KERNEL);

	if (!asv)

		return -ENOMEM;



	asv->chipid_regmap = device_node_to_regmap(pdev->dev.of_node);

	if (IS_ERR(asv->chipid_regmap)) {

		dev_err(&pdev->dev, "Could not find syscon regmap\n");

		return PTR_ERR(asv->chipid_regmap);

	asv->chipid_regmap = regmap;

	asv->dev = dev;

	ret = regmap_read(asv->chipid_regmap, EXYNOS_CHIPID_REG_PRO_ID,

			  &product_id);

	if (ret < 0) {

		dev_err(dev, "Cannot read revision from ChipID: %d\n", ret);

		return -ENODEV;

	}



	regmap_read(asv->chipid_regmap, EXYNOS_CHIPID_REG_PRO_ID, &product_id);



	switch (product_id & EXYNOS_MASK) {

	case 0xE5422000:

		probe_func = exynos5422_asv_init;

		break;

	default:

		return -ENODEV;

		dev_dbg(dev, "No ASV support for this SoC\n");

		devm_kfree(dev, asv);

		return 0;

	}



	ret = of_property_read_u32(pdev->dev.of_node, "samsung,asv-bin",

	cpu_dev = get_cpu_device(0);

	ret = dev_pm_opp_get_opp_count(cpu_dev);

	if (ret < 0)

		return -EPROBE_DEFER;



	ret = of_property_read_u32(dev->of_node, "samsung,asv-bin",

				   &asv->of_bin);

	if (ret < 0)

		asv->of_bin = -EINVAL;



	asv->dev = &pdev->dev;

	dev_set_drvdata(&pdev->dev, asv);



	for (i = 0; i < ARRAY_SIZE(asv->subsys); i++)

		asv->subsys[i].asv = asv;
@@ -161,17 +158,3 @@ static int exynos_asv_probe(struct platform_device *pdev) 


	return exynos_asv_update_opps(asv);

}
 


static const struct of_device_id exynos_asv_of_device_ids[] = {

	{ .compatible = "samsung,exynos4210-chipid" },

	{}

};



static struct platform_driver exynos_asv_driver = {

	.driver = {

		.name = "exynos-asv",

		.of_match_table = exynos_asv_of_device_ids,

	},

	.probe	= exynos_asv_probe,

};

module_platform_driver(exynos_asv_driver);

drivers/soc/samsung/exynos-asv.h

+2 −0
Original line number Diff line number Diff line
@@ -68,4 +68,6 @@ static inline u32 exynos_asv_opp_get_frequency(const struct exynos_asv_subsys *s 
	return __asv_get_table_entry(&subsys->table, level, 0);

}



int exynos_asv_init(struct device *dev, struct regmap *regmap);



#endif /* __LINUX_SOC_EXYNOS_ASV_H */