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

Commit 9a9ca16e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'device-properties' 

* device-properties:
  device property: Introduce firmware node type for platform data
  device property: Make it possible to use secondary firmware nodes
  driver core: Implement device property accessors through fwnode ones
  driver core: property: Update fwnode_property_read_string_array()
  driver core: Add comments about returning array counts
  ACPI: Introduce has_acpi_companion()
  driver core / ACPI: Represent ACPI companions using fwnode_handle
parents 34a1b99b 16ba08d5

drivers/acpi/acpi_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) 
	pdevinfo.id = -1;

	pdevinfo.res = resources;

	pdevinfo.num_res = count;

	pdevinfo.acpi_node.companion = adev;

	pdevinfo.fwnode = acpi_fwnode_handle(adev);

	pdevinfo.dma_mask = DMA_BIT_MASK(32);

	pdev = platform_device_register_full(&pdevinfo);

	if (IS_ERR(pdev))

drivers/acpi/dock.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ void acpi_dock_add(struct acpi_device *adev) 
	memset(&pdevinfo, 0, sizeof(pdevinfo));

	pdevinfo.name = "dock";

	pdevinfo.id = dock_station_count;

	pdevinfo.acpi_node.companion = adev;

	pdevinfo.fwnode = acpi_fwnode_handle(adev);

	pdevinfo.data = &ds;

	pdevinfo.size_data = sizeof(ds);

	dd = platform_device_register_full(&pdevinfo);

drivers/acpi/glue.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) 
	unsigned int node_id;

	int retval = -EINVAL;



	if (ACPI_COMPANION(dev)) {

	if (has_acpi_companion(dev)) {

		if (acpi_dev) {

			dev_warn(dev, "ACPI companion already set\n");

			return -EINVAL;
@@ -220,7 +220,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) 
	list_add(&physical_node->node, physnode_list);

	acpi_dev->physical_node_count++;



	if (!ACPI_COMPANION(dev))

	if (!has_acpi_companion(dev))

		ACPI_COMPANION_SET(dev, acpi_dev);



	acpi_physnode_link_name(physical_node_name, node_id);

drivers/base/core.c

+51 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/device.h>

#include <linux/err.h>

#include <linux/fwnode.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/slab.h>
@@ -2133,3 +2134,53 @@ define_dev_printk_level(dev_notice, KERN_NOTICE); 
define_dev_printk_level(_dev_info, KERN_INFO);



#endif



static inline bool fwnode_is_primary(struct fwnode_handle *fwnode)

{

	return fwnode && !IS_ERR(fwnode->secondary);

}



/**

 * set_primary_fwnode - Change the primary firmware node of a given device.

 * @dev: Device to handle.

 * @fwnode: New primary firmware node of the device.

 *

 * Set the device's firmware node pointer to @fwnode, but if a secondary

 * firmware node of the device is present, preserve it.

 */

void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode)

{

	if (fwnode) {

		struct fwnode_handle *fn = dev->fwnode;



		if (fwnode_is_primary(fn))

			fn = fn->secondary;



		fwnode->secondary = fn;

		dev->fwnode = fwnode;

	} else {

		dev->fwnode = fwnode_is_primary(dev->fwnode) ?

			dev->fwnode->secondary : NULL;

	}

}

EXPORT_SYMBOL_GPL(set_primary_fwnode);



/**

 * set_secondary_fwnode - Change the secondary firmware node of a given device.

 * @dev: Device to handle.

 * @fwnode: New secondary firmware node of the device.

 *

 * If a primary firmware node of the device is present, set its secondary

 * pointer to @fwnode.  Otherwise, set the device's firmware node pointer to

 * @fwnode.

 */

void set_secondary_fwnode(struct device *dev, struct fwnode_handle *fwnode)

{

	if (fwnode)

		fwnode->secondary = ERR_PTR(-ENODEV);



	if (fwnode_is_primary(dev->fwnode))

		dev->fwnode->secondary = fwnode;

	else

		dev->fwnode = fwnode;

}

drivers/base/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ struct platform_device *platform_device_register_full( 
		goto err_alloc;



	pdev->dev.parent = pdevinfo->parent;

	ACPI_COMPANION_SET(&pdev->dev, pdevinfo->acpi_node.companion);

	pdev->dev.fwnode = pdevinfo->fwnode;



	if (pdevinfo->dma_mask) {

		/*