From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Mike Turquette <mturquette@linaro.org>
Cc: Len Brown <lenb@kernel.org>,
Mika Westerberg <mika.westerberg@intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Loic Poulain <loic.poulain@intel.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] ACPI / LPSS: Support for fractional divider clock
Date: Fri, 25 Apr 2014 15:22:21 +0300 [thread overview]
Message-ID: <1398428541-912-3-git-send-email-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <1398428541-912-1-git-send-email-heikki.krogerus@linux.intel.com>
The dividers are available for UART and SPI on both
Lynxpoint and Baytrail. With SPI, handling the dividers is
optional, but in case of UART they should be adjusted
according to the requested baud rate.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/acpi/acpi_lpss.c | 37 ++++++++++++++++++++++++++++++-------
1 file changed, 30 insertions(+), 7 deletions(-)
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 69e29f4..508ac9f 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -58,6 +58,7 @@ struct lpss_device_desc {
unsigned int prv_offset;
size_t prv_size_override;
bool clk_gate;
+ bool clk_divider;
struct lpss_shared_clock *shared_clock;
void (*setup)(struct lpss_private_data *pdata);
};
@@ -119,16 +120,11 @@ static struct lpss_device_desc byt_pwm_dev_desc = {
.shared_clock = &pwm_clock,
};
-static struct lpss_shared_clock uart_clock = {
- .name = "uart_clk",
- .rate = 44236800,
-};
-
static struct lpss_device_desc byt_uart_dev_desc = {
.clk_required = true,
.prv_offset = 0x800,
.clk_gate = true,
- .shared_clock = &uart_clock,
+ .clk_divider = true,
.setup = lpss_uart_setup,
};
@@ -246,8 +242,35 @@ static int register_device_clock(struct acpi_device *adev,
parent = shared_clock->name;
}
+ if (dev_desc->clk_divider) {
+ char *name = kzalloc(strlen(dev_name(&adev->dev)) + 8,
+ GFP_KERNEL);
+ if (!name)
+ return -ENOMEM;
+ strcpy(name, "div_clk-");
+ strcat(name, dev_name(&adev->dev));
+
+ clk = clk_register_fractional_divider(NULL, name, parent, 0,
+ pdata->mmio_base + dev_desc->prv_offset,
+ 1, 15, 16, 15, 0, NULL);
+ parent = name;
+
+ name = kzalloc(strlen(dev_name(&adev->dev)) + 11, GFP_KERNEL);
+ if (!name)
+ return -ENOMEM;
+ strcpy(name, "clk_update-");
+ strcat(name, dev_name(&adev->dev));
+
+ clk = clk_register_gate(NULL, name, parent,
+ CLK_SET_RATE_PARENT | CLK_SET_RATE_GATE,
+ pdata->mmio_base + dev_desc->prv_offset,
+ 31, 0, NULL);
+ parent = name;
+ }
+
if (dev_desc->clk_gate) {
- clk = clk_register_gate(NULL, dev_name(&adev->dev), parent, 0,
+ clk = clk_register_gate(NULL, dev_name(&adev->dev), parent,
+ CLK_SET_RATE_PARENT,
pdata->mmio_base + dev_desc->prv_offset,
0, 0, NULL);
pdata->clk = clk;
--
2.0.0.rc0
next prev parent reply other threads:[~2014-04-25 12:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-25 12:22 [PATCH 0/2] ACPI / LPSS: fractional divider clocks Heikki Krogerus
2014-04-25 12:22 ` [PATCH 1/2] clk: new basic clk type for fractional divider Heikki Krogerus
2014-04-25 12:22 ` Heikki Krogerus [this message]
2014-04-25 13:44 ` [PATCH 2/2] ACPI / LPSS: Support for fractional divider clock Andy Shevchenko
2014-04-25 13:49 ` Heikki Krogerus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398428541-912-3-git-send-email-heikki.krogerus@linux.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.poulain@intel.com \
--cc=mika.westerberg@intel.com \
--cc=mturquette@linaro.org \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).