+ else
+ syscon = of_syscon_register_mmio(np,
check_clk); +
+ if (!IS_ERR(syscon))
+ syscon_add(syscon);
+ }
if (IS_ERR(syscon))
return ERR_CAST(syscon);
@@ -176,16 +232,19 @@ static struct regmap
*device_node_get_regmap(struct device_node *np,
struct regmap *device_node_to_regmap(struct device_node *np)
{
- return device_node_get_regmap(np, false);
+ return device_node_get_regmap(np, false, false);
}
EXPORT_SYMBOL_GPL(device_node_to_regmap);
struct regmap *syscon_node_to_regmap(struct device_node *np)
{
- if (!of_device_is_compatible(np, "syscon"))
- return ERR_PTR(-EINVAL);
+ if (of_device_is_compatible(np, "syscon"))
+ return device_node_get_regmap(np, true, false);
+
+ if (of_device_is_compatible(np, "syscon-smc"))
+ return device_node_get_regmap(np, true, true);
- return device_node_get_regmap(np, true);
+ return ERR_PTR(-EINVAL);
}
EXPORT_SYMBOL_GPL(syscon_node_to_regmap);
@@ -273,19 +332,19 @@ struct regmap
*syscon_regmap_lookup_by_phandle_optional(struct device_node *np, }
EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_phandle_optional);
-static int syscon_probe(struct platform_device *pdev)
+struct syscon_driver_data {
+ int (*probe_func)(struct platform_device *pdev, struct
device *dev,
+ struct syscon *syscon);
+};
+
+static int syscon_probe_mmio(struct platform_device *pdev,
+ struct device *dev,
+ struct syscon *syscon)
{
- struct device *dev = &pdev->dev;
- struct syscon_platform_data *pdata = dev_get_platdata(dev);
- struct syscon *syscon;
struct regmap_config syscon_config = syscon_regmap_config;
struct resource *res;
void __iomem *base;
- syscon = devm_kzalloc(dev, sizeof(*syscon), GFP_KERNEL);
- if (!syscon)
- return -ENOMEM;
-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
return -ENOENT;@@ -295,23 +354,84 @@ static int syscon_probe(struct
platform_device *pdev) return -ENOMEM;
syscon_config.max_register = resource_size(res) - 4;
- if (pdata)
- syscon_config.name = pdata->label;
+
syscon->regmap = devm_regmap_init_mmio(dev, base,
&syscon_config); if (IS_ERR(syscon->regmap)) {
dev_err(dev, "regmap init failed\n");
return PTR_ERR(syscon->regmap);
}
- platform_set_drvdata(pdev, syscon);
+ dev_dbg(dev, "regmap_mmio %pR registered\n", res);
+
+ return 0;
+}
+
+static const struct syscon_driver_data syscon_mmio_data = {
+ .probe_func = &syscon_probe_mmio,
+};
+
+#ifdef CONFIG_REGMAP_SMCCC
+
+static int syscon_probe_smc(struct platform_device *pdev,
+ struct device *dev,
+ struct syscon *syscon)
+{
+ struct regmap_config syscon_config = syscon_regmap_config;
+ int smc_id, ret;
+
+ ret = of_property_read_u32(dev->of_node, "arm,smc-id",
&smc_id);
+ if (!ret)
+ return -ENODEV;
+
+ syscon->regmap = devm_regmap_init_smccc(dev, smc_id,
&syscon_config);
+ if (IS_ERR(syscon->regmap)) {
+ dev_err(dev, "regmap init failed\n");
+ return PTR_ERR(syscon->regmap);
+ }
- dev_dbg(dev, "regmap %pR registered\n", res);
+ dev_dbg(dev, "regmap_smccc %x registered\n", smc_id);
+
+ return 0;
+}
+
+static const struct syscon_driver_data syscon_smc_data = {
+ .probe_func = &syscon_probe_smc,
+};
+#endif
+
+static int syscon_probe(struct platform_device *pdev)
+{
+ int ret;
+ struct device *dev = &pdev->dev;
+ struct syscon_platform_data *pdata = dev_get_platdata(dev);
+ struct regmap_config syscon_config = syscon_regmap_config;
+ struct syscon *syscon;
+ const struct syscon_driver_data *driver_data;
+
+ if (pdata)
+ syscon_config.name = pdata->label;
+
+ syscon = devm_kzalloc(dev, sizeof(*syscon), GFP_KERNEL);
+ if (!syscon)
+ return -ENOMEM;
+
+ driver_data = (const struct syscon_driver_data *)
+
platform_get_device_id(pdev)->driver_data; +
+ ret = driver_data->probe_func(pdev, dev, syscon);
+ if (ret)
+ return ret;
+
+ platform_set_drvdata(pdev, syscon);
return 0;
}
static const struct platform_device_id syscon_ids[] = {
- { "syscon", },
+ { .name = "syscon", .driver_data =
(kernel_ulong_t)&syscon_mmio_data}, +#ifdef CONFIG_REGMAP_SMCCC
+ { .name = "syscon-smc", .driver_data =
(kernel_ulong_t)&syscon_smc_data}, +#endif
{ }
};