drivers: bus: ocp2scp: add pdata support (0133370f) · Commits · 戴 / test

drivers/bus/omap-ocp2scp.c

+65 −3

Original line number	Diff line number	Diff line
		@@ -22,6 +22,26 @@
		#include <linux/pm_runtime.h>
		#include <linux/of.h>
		#include <linux/of_platform.h>
		#include <linux/platform_data/omap_ocp2scp.h>

		/**
		* _count_resources - count for the number of resources
		* @res: struct resource *
		*
		* Count and return the number of resources populated for the device that is
		* connected to ocp2scp.
		*/
		static unsigned _count_resources(struct resource *res)
		{
		int cnt = 0;

		while (res->start != res->end) {
		cnt++;
		res++;
		}

		return cnt;
		}

		static int ocp2scp_remove_devices(struct device dev, void c)
		{
		@@ -35,19 +55,61 @@ static int ocp2scp_remove_devices(struct device dev, void c)
		static int __devinit omap_ocp2scp_probe(struct platform_device *pdev)
		{
		int ret;
		unsigned res_cnt, i;
		struct device_node *np = pdev->dev.of_node;
		struct platform_device *pdev_child;
		struct omap_ocp2scp_platform_data *pdata = pdev->dev.platform_data;
		struct omap_ocp2scp_dev *dev;

		if (np) {
		ret = of_platform_populate(np, NULL, NULL, &pdev->dev);
		if (ret) {
		dev_err(&pdev->dev, "failed to add resources for ocp2scp child\n");
		dev_err(&pdev->dev,
		"failed to add resources for ocp2scp child\n");
		goto err0;
		}
		} else if (pdata) {
		for (i = 0, dev = *pdata->devices; i < pdata->dev_cnt; i++,
		dev++) {
		res_cnt = _count_resources(dev->res);

		pdev_child = platform_device_alloc(dev->drv_name,
		PLATFORM_DEVID_AUTO);
		if (!pdev_child) {
		dev_err(&pdev->dev,
		"failed to allocate mem for ocp2scp child\n");
		goto err0;
		}

		ret = platform_device_add_resources(pdev_child,
		dev->res, res_cnt);
		if (ret) {
		dev_err(&pdev->dev,
		"failed to add resources for ocp2scp child\n");
		goto err1;
		}

		pdev_child->dev.parent = &pdev->dev;

		ret = platform_device_add(pdev_child);
		if (ret) {
		dev_err(&pdev->dev,
		"failed to register ocp2scp child device\n");
		goto err1;
		}
		}
		} else {
		dev_err(&pdev->dev, "OCP2SCP initialized without plat data\n");
		return -EINVAL;
		}

		pm_runtime_enable(&pdev->dev);

		return 0;

		err1:
		platform_device_put(pdev_child);

		err0:
		device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);

include/linux/platform_data/omap_ocp2scp.h

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		/*
		* omap_ocp2scp.h -- ocp2scp header file
		*
		* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* Author: Kishon Vijay Abraham I <kishon@ti.com>
		*
		* 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.
		*
		*/

		#ifndef __DRIVERS_OMAP_OCP2SCP_H
		#define __DRIVERS_OMAP_OCP2SCP_H

		struct omap_ocp2scp_dev {
		const char *drv_name;
		struct resource *res;
		};

		struct omap_ocp2scp_platform_data {
		int dev_cnt;
		struct omap_ocp2scp_dev **devices;
		};
		#endif /* __DRIVERS_OMAP_OCP2SCP_H */

Admin message