Merge "Coresight: add support for device names" (8b38ec16) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/hwtracing/coresight/coresight.c

+9 −9

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012, 2016 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -377,7 +377,7 @@ out:
		}
		EXPORT_SYMBOL_GPL(coresight_disable);

		static ssize_t enable_sink_show(struct device *dev,
		static ssize_t curr_sink_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		struct coresight_device *csdev = to_coresight_device(dev);
		@@ -385,7 +385,7 @@ static ssize_t enable_sink_show(struct device *dev,
		return scnprintf(buf, PAGE_SIZE, "%u\n", (unsigned)csdev->activated);
		}

		static ssize_t enable_sink_store(struct device *dev,
		static ssize_t curr_sink_store(struct device *dev,
		struct device_attribute *attr,
		const char *buf, size_t size)
		{
		@@ -405,9 +405,9 @@ static ssize_t enable_sink_store(struct device *dev,
		return size;

		}
		static DEVICE_ATTR_RW(enable_sink);
		static DEVICE_ATTR_RW(curr_sink);

		static ssize_t enable_source_show(struct device *dev,
		static ssize_t enable_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		struct coresight_device *csdev = to_coresight_device(dev);
		@@ -415,7 +415,7 @@ static ssize_t enable_source_show(struct device *dev,
		return scnprintf(buf, PAGE_SIZE, "%u\n", (unsigned)csdev->enable);
		}

		static ssize_t enable_source_store(struct device *dev,
		static ssize_t enable_store(struct device *dev,
		struct device_attribute *attr,
		const char *buf, size_t size)
		{
		@@ -437,16 +437,16 @@ static ssize_t enable_source_store(struct device *dev,

		return size;
		}
		static DEVICE_ATTR_RW(enable_source);
		static DEVICE_ATTR_RW(enable);

		static struct attribute *coresight_sink_attrs[] = {
		&dev_attr_enable_sink.attr,
		&dev_attr_curr_sink.attr,
		NULL,
		};
		ATTRIBUTE_GROUPS(coresight_sink);

		static struct attribute *coresight_source_attrs[] = {
		&dev_attr_enable_source.attr,
		&dev_attr_enable.attr,
		NULL,
		};
		ATTRIBUTE_GROUPS(coresight_source);

drivers/hwtracing/coresight/of_coresight.c

+11 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012, 2016 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -127,8 +127,11 @@ struct coresight_platform_data *of_get_coresight_platform_data(
		if (!pdata)
		return ERR_PTR(-ENOMEM);

		ret = of_property_read_string(node, "coresight-name", &pdata->name);
		if (ret) {
		/* Use device name as sysfs handle */
		pdata->name = dev_name(dev);
		}

		/* Get the number of input and output port for this component */
		of_coresight_get_ports(node, &pdata->nr_inport, &pdata->nr_outport);
		@@ -178,7 +181,11 @@ struct coresight_platform_data *of_get_coresight_platform_data(
		if (!rdev)
		continue;

		ret = of_property_read_string(rparent, "coresight-name",
		&pdata->child_names[i]);
		if (ret)
		pdata->child_names[i] = dev_name(rdev);

		pdata->child_ports[i] = rendpoint.id;

		i++;