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

Commit d8924c0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devprop-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull device properties framework updates from Rafael Wysocki:
 "This introduces 'software nodes' that are analogous to the DT and ACPI
  firmware nodes except that they can be created by drivers themselves
  and do a couple of assorted cleanups.

  Specifics:

   - Introduce "software nodes", analogous to the DT and ACPI firmware
     nodes except that they can be created by kernel code, in order to
     complement fwnodes representing real firmware nodes when they are
     incomplete (for example missing device properties) and to supply
     the primary fwnode when the firmware lacks hardware description for
     a device completely, and replace the "property_set" struct
     fwnode_handle type with software nodes (Heikki Krogerus).

   - Clean up the just introduced software nodes support and fix a
     commet in the graph-handling code (Colin Ian King, Marco Felsch)"

* tag 'devprop-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  device property: fix fwnode_graph_get_next_endpoint() documentation
  drivers: base: swnode: remove need for a temporary string for the node name
  device property: Remove struct property_set
  device property: Move device_add_properties() to swnode.c
  drivers: base: Introducing software nodes to the firmware node framework
  ACPI / glue: Add acpi_platform_notify() function
  drivers core: Prepare support for multiple platform notifications
  driver core: platform: Remove duplicated device_remove_properties() call
parents 1fbb2dc6 f569da8c

Documentation/ABI/testing/sysfs-devices-software_node

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../software_node/

Date:		January 2019

Contact:	Heikki Krogerus <heikki.krogerus@linux.intel.com>

Description:

		This directory contains the details about the device that are

		assigned in kernel (i.e. software), as opposed to the

		firmware_node directory which contains the details that are

		assigned for the device in firmware. The main attributes in the

		directory will show the properties the device has, and the

		relationship it has to some of the other devices.

drivers/acpi/bus.c

+0 −1
Original line number Diff line number Diff line
@@ -1237,7 +1237,6 @@ static int __init acpi_init(void) 
		acpi_kobj = NULL;

	}



	init_acpi_device_notify();

	result = acpi_bus_init();

	if (result) {

		disable_acpi();

drivers/acpi/glue.c

+13 −8
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ int acpi_unbind_one(struct device *dev) 
}

EXPORT_SYMBOL_GPL(acpi_unbind_one);



static int acpi_platform_notify(struct device *dev)

static int acpi_device_notify(struct device *dev)

{

	struct acpi_bus_type *type = acpi_get_bus_type(dev);

	struct acpi_device *adev;
@@ -343,7 +343,7 @@ static int acpi_platform_notify(struct device *dev) 
	return ret;

}



static int acpi_platform_notify_remove(struct device *dev)

static int acpi_device_notify_remove(struct device *dev)

{

	struct acpi_device *adev = ACPI_COMPANION(dev);

	struct acpi_bus_type *type;
@@ -361,12 +361,17 @@ static int acpi_platform_notify_remove(struct device *dev) 
	return 0;

}



void __init init_acpi_device_notify(void)

int acpi_platform_notify(struct device *dev, enum kobject_action action)

{

	if (platform_notify || platform_notify_remove) {

		printk(KERN_ERR PREFIX "Can't use platform_notify\n");

		return;

	switch (action) {

	case KOBJ_ADD:

		acpi_device_notify(dev);

		break;

	case KOBJ_REMOVE:

		acpi_device_notify_remove(dev);

		break;

	default:

		break;

	}

	platform_notify = acpi_platform_notify;

	platform_notify_remove = acpi_platform_notify_remove;

	return 0;

}

drivers/acpi/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
int early_acpi_osi_init(void);

int acpi_osi_init(void);

acpi_status acpi_os_initialize1(void);

void init_acpi_device_notify(void);

int acpi_scan_init(void);

#ifdef CONFIG_PCI

void acpi_pci_root_init(void);

drivers/base/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ obj-y := component.o core.o bus.o dd.o syscore.o \ 
			   cpu.o firmware.o init.o map.o devres.o \

			   attribute_container.o transport_class.o \

			   topology.o container.o property.o cacheinfo.o \

			   devcon.o

			   devcon.o swnode.o

obj-$(CONFIG_DEVTMPFS)	+= devtmpfs.o

obj-y			+= power/

obj-$(CONFIG_ISA_BUS_API)	+= isa.o