Commit a5565cf2 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Rafael J. Wysocki

ACPI / LPSS: Provide build-in properties of the UART

The UART driver, dw8250.c, needs some details regarding the
Designware UART. For ACPI enumerated devices the values are
hard-coded, but since the driver also reads the values from
device properties, providing them with build-in properties.
This allows us to later remove the hard-coded values from
the driver.
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7ff55d17
...@@ -75,6 +75,7 @@ struct lpss_device_desc { ...@@ -75,6 +75,7 @@ struct lpss_device_desc {
const char *clk_con_id; const char *clk_con_id;
unsigned int prv_offset; unsigned int prv_offset;
size_t prv_size_override; size_t prv_size_override;
struct property_entry *properties;
void (*setup)(struct lpss_private_data *pdata); void (*setup)(struct lpss_private_data *pdata);
}; };
...@@ -163,11 +164,19 @@ static const struct lpss_device_desc lpt_i2c_dev_desc = { ...@@ -163,11 +164,19 @@ static const struct lpss_device_desc lpt_i2c_dev_desc = {
.prv_offset = 0x800, .prv_offset = 0x800,
}; };
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 const struct lpss_device_desc lpt_uart_dev_desc = { static const struct lpss_device_desc lpt_uart_dev_desc = {
.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR, .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,
.clk_con_id = "baudclk", .clk_con_id = "baudclk",
.prv_offset = 0x800, .prv_offset = 0x800,
.setup = lpss_uart_setup, .setup = lpss_uart_setup,
.properties = uart_properties,
}; };
static const struct lpss_device_desc lpt_sdio_dev_desc = { static const struct lpss_device_desc lpt_sdio_dev_desc = {
...@@ -189,6 +198,7 @@ static const struct lpss_device_desc byt_uart_dev_desc = { ...@@ -189,6 +198,7 @@ static const struct lpss_device_desc byt_uart_dev_desc = {
.clk_con_id = "baudclk", .clk_con_id = "baudclk",
.prv_offset = 0x800, .prv_offset = 0x800,
.setup = lpss_uart_setup, .setup = lpss_uart_setup,
.properties = uart_properties,
}; };
static const struct lpss_device_desc bsw_uart_dev_desc = { static const struct lpss_device_desc bsw_uart_dev_desc = {
...@@ -197,6 +207,7 @@ static const struct lpss_device_desc bsw_uart_dev_desc = { ...@@ -197,6 +207,7 @@ static const struct lpss_device_desc bsw_uart_dev_desc = {
.clk_con_id = "baudclk", .clk_con_id = "baudclk",
.prv_offset = 0x800, .prv_offset = 0x800,
.setup = lpss_uart_setup, .setup = lpss_uart_setup,
.properties = uart_properties,
}; };
static const struct lpss_device_desc byt_spi_dev_desc = { static const struct lpss_device_desc byt_spi_dev_desc = {
...@@ -440,6 +451,12 @@ static int acpi_lpss_create_device(struct acpi_device *adev, ...@@ -440,6 +451,12 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
goto err_out; goto err_out;
} }
if (dev_desc->properties) {
ret = device_add_properties(&adev->dev, dev_desc->properties);
if (ret)
goto err_out;
}
adev->driver_data = pdata; adev->driver_data = pdata;
pdev = acpi_create_platform_device(adev); pdev = acpi_create_platform_device(adev);
if (!IS_ERR_OR_NULL(pdev)) { if (!IS_ERR_OR_NULL(pdev)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment