diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-11 23:23:02 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-11-11 23:23:02 +0100 |
commit | 66f5854c6894dc028fc13345838c6f82bfcfef0c (patch) | |
tree | 76ac271549bca0d1199df15e1087dcd0d3c6e911 /drivers/acpi/acpi_platform.c | |
parent | bc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff) | |
parent | 1571875beecd5de9657f73931449bda1b1329b6f (diff) | |
download | op-kernel-dev-66f5854c6894dc028fc13345838c6f82bfcfef0c.zip op-kernel-dev-66f5854c6894dc028fc13345838c6f82bfcfef0c.tar.gz |
Merge branch 'device-properties'
* device-properties:
ACPI / platform: Add support for build-in properties
Diffstat (limited to 'drivers/acpi/acpi_platform.c')
-rw-r--r-- | drivers/acpi/acpi_platform.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index b200ae1..b4c1a6a 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -50,6 +50,7 @@ static void acpi_platform_fill_resource(struct acpi_device *adev, /** * acpi_create_platform_device - Create platform device for ACPI device node * @adev: ACPI device node to create a platform device for. + * @properties: Optional collection of build-in properties. * * Check if the given @adev can be represented as a platform device and, if * that's the case, create and register a platform device, populate its common @@ -57,7 +58,8 @@ static void acpi_platform_fill_resource(struct acpi_device *adev, * * Name of the platform device will be the same as @adev's. */ -struct platform_device *acpi_create_platform_device(struct acpi_device *adev) +struct platform_device *acpi_create_platform_device(struct acpi_device *adev, + struct property_entry *properties) { struct platform_device *pdev = NULL; struct platform_device_info pdevinfo; @@ -106,6 +108,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) pdevinfo.res = resources; pdevinfo.num_res = count; pdevinfo.fwnode = acpi_fwnode_handle(adev); + pdevinfo.properties = properties; if (acpi_dma_supported(adev)) pdevinfo.dma_mask = DMA_BIT_MASK(32); |