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

Commit 9edc6b91 authored by Andrew Donnellan's avatar Andrew Donnellan Committed by Michael Ellerman
Browse files

powerpc/powernv: Remove dead SCOM access code 



Nothing is using scom_map_device() or scom_find_parent(). Remove them.

Also don't export scom_controller, there are no other users of it.

Signed-off-by: default avatarAndrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190509051119.7694-2-ajd@linux.ibm.com
parent 08a456aa

arch/powerpc/platforms/powernv/scom.c

+0 −67
Original line number Diff line number Diff line
@@ -15,73 +15,6 @@ 
#include "scom.h"



const struct scom_controller *scom_controller;

EXPORT_SYMBOL_GPL(scom_controller);



struct device_node *scom_find_parent(struct device_node *node)

{

	struct device_node *par, *tmp;

	const u32 *p;



	for (par = of_node_get(node); par;) {

		if (of_get_property(par, "scom-controller", NULL))

			break;

		p = of_get_property(par, "scom-parent", NULL);

		tmp = par;

		if (p == NULL)

			par = of_get_parent(par);

		else

			par = of_find_node_by_phandle(*p);

		of_node_put(tmp);

	}

	return par;

}

EXPORT_SYMBOL_GPL(scom_find_parent);



scom_map_t scom_map_device(struct device_node *dev, int index)

{

	struct device_node *parent;

	unsigned int cells, size;

	const __be32 *prop, *sprop;

	u64 reg, cnt;

	scom_map_t ret;



	parent = scom_find_parent(dev);



	if (parent == NULL)

		return NULL;



	/*

	 * We support "scom-reg" properties for adding scom registers

	 * to a random device-tree node with an explicit scom-parent

	 *

	 * We also support the simple "reg" property if the device is

	 * a direct child of a scom controller.

	 *

	 * In case both exist, "scom-reg" takes precedence.

	 */

	prop = of_get_property(dev, "scom-reg", &size);

	sprop = of_get_property(parent, "#scom-cells", NULL);

	if (!prop && parent == dev->parent) {

		prop = of_get_property(dev, "reg", &size);

		sprop = of_get_property(parent, "#address-cells", NULL);

	}

	if (!prop)

		return NULL;

	cells = sprop ? be32_to_cpup(sprop) : 1;

	size >>= 2;



	if (index >= (size / (2*cells)))

		return NULL;



	reg = of_read_number(&prop[index * cells * 2], cells);

	cnt = of_read_number(&prop[index * cells * 2 + cells], cells);



	ret = scom_map(parent, reg, cnt);

	of_node_put(parent);



	return ret;

}

EXPORT_SYMBOL_GPL(scom_map_device);



#ifdef CONFIG_SCOM_DEBUGFS

struct scom_debug_entry {

arch/powerpc/platforms/powernv/scom.h

+0 −27
Original line number Diff line number Diff line
@@ -75,33 +75,6 @@ static inline scom_map_t scom_map(struct device_node *ctrl_dev, 
	return scom_controller->map(ctrl_dev, reg, count);

}



/**

 * scom_find_parent - Find the SCOM controller for a device

 * @dev: OF node of the device

 *

 * This is not meant for general usage, but in combination with

 * scom_map() allows to map registers not represented by the

 * device own scom-reg property. Useful for applying HW workarounds

 * on things not properly represented in the device-tree for example.

 */

struct device_node *scom_find_parent(struct device_node *dev);





/**

 * scom_map_device - Map a device's block of SCOM registers

 * @dev: OF node of the device

 * @index: Register bank index (index in "scom-reg" property)

 *

 * This function will use the device-tree binding for SCOM which

 * is to follow "scom-parent" properties until it finds a node with

 * a "scom-controller" property to find the controller. It will then

 * use the "scom-reg" property which is made of reg/count pairs,

 * each of them having a size defined by the controller's #scom-cells

 * property

 */

extern scom_map_t scom_map_device(struct device_node *dev, int index);





/**

 * scom_unmap - Unmap a block of SCOM registers

 * @map: Result of scom_map is to be unmapped