hwspinlock/omap: add support for dt nodes (65bd4341) · Commits · 戴 / test

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -7095,7 +7095,6 @@ M: Ohad Ben-Cohen <ohad@wizery.com>
		L: linux-omap@vger.kernel.org
		S: Maintained
		F: drivers/hwspinlock/omap_hwspinlock.c
		F: arch/arm/mach-omap2/hwspinlock.c

		OMAP MMC SUPPORT
		M: Jarkko Lavinen <jarkko.lavinen@nokia.com>

arch/arm/mach-omap2/Makefile

+0 −3

Original line number	Diff line number	Diff line
		@@ -277,8 +277,5 @@ obj-y += $(nand-m) $(nand-y)

		smsc911x-$(CONFIG_SMSC911X) := gpmc-smsc911x.o
		obj-y += $(smsc911x-m) $(smsc911x-y)
		ifneq ($(CONFIG_HWSPINLOCK_OMAP),)
		obj-y += hwspinlock.o
		endif

		obj-y += common-board-devices.o twl-common.o dss-common.o

arch/arm/mach-omap2/hwspinlock.c

deleted100644 → 0

+0 −60

Original line number	Diff line number	Diff line
		/*
		* OMAP hardware spinlock device initialization
		*
		* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com
		*
		* Contact: Simon Que <sque@ti.com>
		* Hari Kanigeri <h-kanigeri2@ti.com>
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*/

		#include <linux/kernel.h>
		#include <linux/init.h>
		#include <linux/err.h>
		#include <linux/hwspinlock.h>

		#include "soc.h"
		#include "omap_hwmod.h"
		#include "omap_device.h"

		static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = {
		.base_id = 0,
		};

		static int __init hwspinlocks_init(void)
		{
		int retval = 0;
		struct omap_hwmod *oh;
		struct platform_device *pdev;
		const char *oh_name = "spinlock";
		const char *dev_name = "omap_hwspinlock";

		/*
		* Hwmod lookup will fail in case our platform doesn't support the
		* hardware spinlock module, so it is safe to run this initcall
		* on all omaps
		*/
		oh = omap_hwmod_lookup(oh_name);
		if (oh == NULL)
		return -EINVAL;

		pdev = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
		sizeof(struct hwspinlock_pdata));
		if (IS_ERR(pdev)) {
		pr_err("Can't build omap_device for %s:%s\n", dev_name,
		oh_name);
		retval = PTR_ERR(pdev);
		}

		return retval;
		}
		/* early board code might need to reserve specific hwspinlock instances */
		omap_postcore_initcall(hwspinlocks_init);

drivers/hwspinlock/omap_hwspinlock.c

+14 −4

Original line number	Diff line number	Diff line
		/*
		* OMAP hardware spinlock driver
		*
		* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com
		* Copyright (C) 2010-2015 Texas Instruments Incorporated - http://www.ti.com
		*
		* Contact: Simon Que <sque@ti.com>
		* Hari Kanigeri <h-kanigeri2@ti.com>
		@@ -27,6 +27,7 @@
		#include <linux/slab.h>
		#include <linux/spinlock.h>
		#include <linux/hwspinlock.h>
		#include <linux/of.h>
		#include <linux/platform_device.h>

		#include "hwspinlock_internal.h"
		@@ -80,14 +81,16 @@ static const struct hwspinlock_ops omap_hwspinlock_ops = {

		static int omap_hwspinlock_probe(struct platform_device *pdev)
		{
		struct hwspinlock_pdata *pdata = pdev->dev.platform_data;
		struct device_node *node = pdev->dev.of_node;
		struct hwspinlock_device *bank;
		struct hwspinlock *hwlock;
		struct resource *res;
		void __iomem *io_base;
		int num_locks, i, ret;
		/* Only a single hwspinlock block device is supported */
		int base_id = 0;

		if (!pdata)
		if (!node)
		return -ENODEV;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		@@ -141,7 +144,7 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
		hwlock->priv = io_base + LOCK_BASE_OFFSET + sizeof(u32) * i;

		ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
		pdata->base_id, num_locks);
		base_id, num_locks);
		if (ret)
		goto reg_fail;

		@@ -174,11 +177,18 @@ static int omap_hwspinlock_remove(struct platform_device *pdev)
		return 0;
		}

		static const struct of_device_id omap_hwspinlock_of_match[] = {
		{ .compatible = "ti,omap4-hwspinlock", },
		{ /* end */ },
		};
		MODULE_DEVICE_TABLE(of, omap_hwspinlock_of_match);

		static struct platform_driver omap_hwspinlock_driver = {
		.probe = omap_hwspinlock_probe,
		.remove = omap_hwspinlock_remove,
		.driver = {
		.name = "omap_hwspinlock",
		.of_match_table = of_match_ptr(omap_hwspinlock_of_match),
		},
		};

Admin message