| Message ID | 1364374682-8547-7-git-send-email-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On Wednesday, March 27, 2013 10:58:02 AM Andy Shevchenko wrote: > In Lynxpoint we have to enable clock per each LPSS device. That's why we have > to enumerate them from drivers/acpi/acpi_lpss.c. The DMA controller is one of > such devices. We'll do that after we've sorted out [5/6]. Thanks, Rafael > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/acpi/acpi_lpss.c | 7 +++++++ > drivers/clk/x86/clk-lpt.c | 2 +- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c > index 4015929..d80c81e 100644 > --- a/drivers/acpi/acpi_lpss.c > +++ b/drivers/acpi/acpi_lpss.c > @@ -47,6 +47,10 @@ struct lpss_private_data { > const struct lpss_device_desc *dev_desc; > }; > > +static struct lpss_device_desc lpss_dev_desc = { > + .clk_required = true, > +}; > + > static struct lpss_device_desc lpt_dev_desc = { > .clk_required = true, > .clk_parent = "lpss_clk", > @@ -60,6 +64,9 @@ static struct lpss_device_desc lpt_sdio_dev_desc = { > }; > > static const struct acpi_device_id acpi_lpss_device_ids[] = { > + /* Generic LPSS devices */ > + { "INTL9C60", (unsigned long)&lpss_dev_desc }, > + > /* Lynxpoint LPSS devices */ > { "INT33C0", (unsigned long)&lpt_dev_desc }, > { "INT33C1", (unsigned long)&lpt_dev_desc }, > diff --git a/drivers/clk/x86/clk-lpt.c b/drivers/clk/x86/clk-lpt.c > index 5cf4f46..719817e 100644 > --- a/drivers/clk/x86/clk-lpt.c > +++ b/drivers/clk/x86/clk-lpt.c > @@ -30,7 +30,7 @@ static int lpt_clk_probe(struct platform_device *pdev) > return PTR_ERR(clk); > > /* Shared DMA clock */ > - clk_register_clkdev(clk, "hclk", "INTL9C60.0.auto"); > + clk_register_clkdev(clk, "hclk", "INTL9C60:00"); > return 0; > } > >
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index 4015929..d80c81e 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -47,6 +47,10 @@ struct lpss_private_data { const struct lpss_device_desc *dev_desc; }; +static struct lpss_device_desc lpss_dev_desc = { + .clk_required = true, +}; + static struct lpss_device_desc lpt_dev_desc = { .clk_required = true, .clk_parent = "lpss_clk", @@ -60,6 +64,9 @@ static struct lpss_device_desc lpt_sdio_dev_desc = { }; static const struct acpi_device_id acpi_lpss_device_ids[] = { + /* Generic LPSS devices */ + { "INTL9C60", (unsigned long)&lpss_dev_desc }, + /* Lynxpoint LPSS devices */ { "INT33C0", (unsigned long)&lpt_dev_desc }, { "INT33C1", (unsigned long)&lpt_dev_desc }, diff --git a/drivers/clk/x86/clk-lpt.c b/drivers/clk/x86/clk-lpt.c index 5cf4f46..719817e 100644 --- a/drivers/clk/x86/clk-lpt.c +++ b/drivers/clk/x86/clk-lpt.c @@ -30,7 +30,7 @@ static int lpt_clk_probe(struct platform_device *pdev) return PTR_ERR(clk); /* Shared DMA clock */ - clk_register_clkdev(clk, "hclk", "INTL9C60.0.auto"); + clk_register_clkdev(clk, "hclk", "INTL9C60:00"); return 0; }
In Lynxpoint we have to enable clock per each LPSS device. That's why we have to enumerate them from drivers/acpi/acpi_lpss.c. The DMA controller is one of such devices. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/acpi/acpi_lpss.c | 7 +++++++ drivers/clk/x86/clk-lpt.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)