mirror of
https://github.com/torvalds/linux
synced 2024-10-19 17:58:44 +00:00
1571875bee
We have a couple of drivers, acpi_apd.c and acpi_lpss.c,
that need to pass extra build-in properties to the devices
they create. Previously the drivers added those properties
to the struct device which is member of the struct
acpi_device, but that does not work. Those properties need
to be assigned to the struct device of the platform device
instead in order for them to become available to the
drivers.
To fix this, this patch changes acpi_create_platform_device
function to take struct property_entry pointer as parameter.
Fixes: 20a875e2e8 (serial: 8250_dw: Add quirk for APM X-Gene SoC)
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: Yazen Ghannam <yazen.ghannam@amd.com>
Tested-by: Jérôme de Bretagne <jerome.debretagne@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
174 lines
4.1 KiB
C
174 lines
4.1 KiB
C
/*
|
|
* AMD ACPI support for ACPI2platform device.
|
|
*
|
|
* Copyright (c) 2014,2015 AMD Corporation.
|
|
* Authors: Ken Xue <Ken.Xue@amd.com>
|
|
* Wu, Jeff <Jeff.Wu@amd.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/pm_domain.h>
|
|
#include <linux/clkdev.h>
|
|
#include <linux/acpi.h>
|
|
#include <linux/err.h>
|
|
#include <linux/pm.h>
|
|
|
|
#include "internal.h"
|
|
|
|
ACPI_MODULE_NAME("acpi_apd");
|
|
struct apd_private_data;
|
|
|
|
/**
|
|
* ACPI_APD_SYSFS : add device attributes in sysfs
|
|
* ACPI_APD_PM : attach power domain to device
|
|
*/
|
|
#define ACPI_APD_SYSFS BIT(0)
|
|
#define ACPI_APD_PM BIT(1)
|
|
|
|
/**
|
|
* struct apd_device_desc - a descriptor for apd device
|
|
* @flags: device flags like %ACPI_APD_SYSFS, %ACPI_APD_PM
|
|
* @fixed_clk_rate: fixed rate input clock source for acpi device;
|
|
* 0 means no fixed rate input clock source
|
|
* @setup: a hook routine to set device resource during create platform device
|
|
*
|
|
* Device description defined as acpi_device_id.driver_data
|
|
*/
|
|
struct apd_device_desc {
|
|
unsigned int flags;
|
|
unsigned int fixed_clk_rate;
|
|
struct property_entry *properties;
|
|
int (*setup)(struct apd_private_data *pdata);
|
|
};
|
|
|
|
struct apd_private_data {
|
|
struct clk *clk;
|
|
struct acpi_device *adev;
|
|
const struct apd_device_desc *dev_desc;
|
|
};
|
|
|
|
#if defined(CONFIG_X86_AMD_PLATFORM_DEVICE) || defined(CONFIG_ARM64)
|
|
#define APD_ADDR(desc) ((unsigned long)&desc)
|
|
|
|
static int acpi_apd_setup(struct apd_private_data *pdata)
|
|
{
|
|
const struct apd_device_desc *dev_desc = pdata->dev_desc;
|
|
struct clk *clk = ERR_PTR(-ENODEV);
|
|
|
|
if (dev_desc->fixed_clk_rate) {
|
|
clk = clk_register_fixed_rate(&pdata->adev->dev,
|
|
dev_name(&pdata->adev->dev),
|
|
NULL, 0, dev_desc->fixed_clk_rate);
|
|
clk_register_clkdev(clk, NULL, dev_name(&pdata->adev->dev));
|
|
pdata->clk = clk;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_X86_AMD_PLATFORM_DEVICE
|
|
static struct apd_device_desc cz_i2c_desc = {
|
|
.setup = acpi_apd_setup,
|
|
.fixed_clk_rate = 133000000,
|
|
};
|
|
|
|
static struct property_entry uart_properties[] = {
|
|
PROPERTY_ENTRY_U32("reg-io-width", 4),
|
|
PROPERTY_ENTRY_U32("reg-shift", 2),
|
|
PROPERTY_ENTRY_BOOL("snps,uart-16550-compatible"),
|
|
{ },
|
|
};
|
|
|
|
static struct apd_device_desc cz_uart_desc = {
|
|
.setup = acpi_apd_setup,
|
|
.fixed_clk_rate = 48000000,
|
|
.properties = uart_properties,
|
|
};
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARM64
|
|
static struct apd_device_desc xgene_i2c_desc = {
|
|
.setup = acpi_apd_setup,
|
|
.fixed_clk_rate = 100000000,
|
|
};
|
|
#endif
|
|
|
|
#else
|
|
|
|
#define APD_ADDR(desc) (0UL)
|
|
|
|
#endif /* CONFIG_X86_AMD_PLATFORM_DEVICE */
|
|
|
|
/**
|
|
* Create platform device during acpi scan attach handle.
|
|
* Return value > 0 on success of creating device.
|
|
*/
|
|
static int acpi_apd_create_device(struct acpi_device *adev,
|
|
const struct acpi_device_id *id)
|
|
{
|
|
const struct apd_device_desc *dev_desc = (void *)id->driver_data;
|
|
struct apd_private_data *pdata;
|
|
struct platform_device *pdev;
|
|
int ret;
|
|
|
|
if (!dev_desc) {
|
|
pdev = acpi_create_platform_device(adev, NULL);
|
|
return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;
|
|
}
|
|
|
|
pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
|
|
if (!pdata)
|
|
return -ENOMEM;
|
|
|
|
pdata->adev = adev;
|
|
pdata->dev_desc = dev_desc;
|
|
|
|
if (dev_desc->setup) {
|
|
ret = dev_desc->setup(pdata);
|
|
if (ret)
|
|
goto err_out;
|
|
}
|
|
|
|
adev->driver_data = pdata;
|
|
pdev = acpi_create_platform_device(adev, dev_desc->properties);
|
|
if (!IS_ERR_OR_NULL(pdev))
|
|
return 1;
|
|
|
|
ret = PTR_ERR(pdev);
|
|
adev->driver_data = NULL;
|
|
|
|
err_out:
|
|
kfree(pdata);
|
|
return ret;
|
|
}
|
|
|
|
static const struct acpi_device_id acpi_apd_device_ids[] = {
|
|
/* Generic apd devices */
|
|
#ifdef CONFIG_X86_AMD_PLATFORM_DEVICE
|
|
{ "AMD0010", APD_ADDR(cz_i2c_desc) },
|
|
{ "AMDI0010", APD_ADDR(cz_i2c_desc) },
|
|
{ "AMD0020", APD_ADDR(cz_uart_desc) },
|
|
{ "AMDI0020", APD_ADDR(cz_uart_desc) },
|
|
{ "AMD0030", },
|
|
#endif
|
|
#ifdef CONFIG_ARM64
|
|
{ "APMC0D0F", APD_ADDR(xgene_i2c_desc) },
|
|
#endif
|
|
{ }
|
|
};
|
|
|
|
static struct acpi_scan_handler apd_handler = {
|
|
.ids = acpi_apd_device_ids,
|
|
.attach = acpi_apd_create_device,
|
|
};
|
|
|
|
void __init acpi_apd_init(void)
|
|
{
|
|
acpi_scan_add_handler(&apd_handler);
|
|
}
|