Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92d4fc1a authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Wim Van Sebroeck
Browse files

watchdog: orion: Introduce a SoC-specific RSTOUT mapping 



Separate the RSTOUT register mapping for the different compatible strings
supported by the driver. This allows to use devm_ioremap on SoC variants that
share the RSTOUT register, and devm_ioremap_resource (which requests the MMIO
region) on SoCs that have a dedicated RSTOUT register.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Tested-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent aaaac9ec

drivers/watchdog/orion_wdt.c

+20 −7
Original line number Diff line number Diff line
@@ -262,10 +262,6 @@ static void __iomem *orion_wdt_ioremap_rstout(struct platform_device *pdev, 
		return devm_ioremap(&pdev->dev, res->start,

				    resource_size(res));



	/* This workaround works only for "orion-wdt", DT-enabled */

	if (!of_device_is_compatible(pdev->dev.of_node, "marvell,orion-wdt"))

		return NULL;



	rstout = internal_regs + ORION_RSTOUT_MASK_OFFSET;



	WARN(1, FW_BUG "falling back to harcoded RSTOUT reg %pa\n", &rstout);
@@ -316,6 +312,7 @@ MODULE_DEVICE_TABLE(of, orion_wdt_of_match_table); 
static int orion_wdt_get_regs(struct platform_device *pdev,

			      struct orion_watchdog *dev)

{

	struct device_node *node = pdev->dev.of_node;

	struct resource *res;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -326,11 +323,27 @@ static int orion_wdt_get_regs(struct platform_device *pdev, 
	if (!dev->reg)

		return -ENOMEM;



	/* Each supported compatible has some RSTOUT register quirk */

	if (of_device_is_compatible(node, "marvell,orion-wdt")) {



		dev->rstout = orion_wdt_ioremap_rstout(pdev, res->start &

						       INTERNAL_REGS_MASK);

		if (!dev->rstout)

			return -ENODEV;



	} else if (of_device_is_compatible(node, "marvell,armada-370-wdt") ||

		   of_device_is_compatible(node, "marvell,armada-xp-wdt")) {



		/* Dedicated RSTOUT register, can be requested. */

		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

		dev->rstout = devm_ioremap_resource(&pdev->dev, res);

		if (IS_ERR(dev->rstout))

			return PTR_ERR(dev->rstout);



	} else {

		return -ENODEV;

	}



	return 0;

}