From: Lee Jones <lee.jones@linaro.org>
To: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Cc: linux-kernel@vger.kernel.org, Paul Liu <paul.liu@canonical.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: Re: [PATCH] mfd: intel-lpss: Add default I2C device properties for Apollo Lake
Date: Tue, 13 Sep 2016 09:59:42 +0100 [thread overview]
Message-ID: <20160913085942.GG24465@dell> (raw)
In-Reply-To: <20160912114133.7038-1-jarkko.nikula@linux.intel.com>
On Mon, 12 Sep 2016, Jarkko Nikula wrote:
> Default I2C device properties for Intel Broxton, especially SDA hold time
> may not be enough on Intel Apollo Lake. These properties are used in case
> we don't get timing parameters from ACPI.
>
> The default SDA hold time for Broxton may fail with arbitration lost errors
> on Apollo Lake:
>
> i2c_designware i2c_designware.1: i2c_dw_handle_tx_abort: lost arbitration
>
> Fix this by using different default device properties on Apollo Lake than
> Broxton.
>
> Reported-by: Paul Liu <paul.liu@canonical.com>
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=156181
> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
> ---
> Hi Paul. This is the same patch I shared you offline but rebased on top
> of mfd.git, essentially on top of commit 19063e1b0aaa ("mfd: lpss: Add
> Intel Kaby Lake PCH-H PCI IDs") and commit log a little bit edited.
> ---
> drivers/mfd/intel-lpss-acpi.c | 14 +++++++++++++-
> drivers/mfd/intel-lpss-pci.c | 28 ++++++++++++++++++++--------
> 2 files changed, 33 insertions(+), 9 deletions(-)
Mika's Ack is good enough.
Applied, thanks.
> diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
> index 7ddc4a9563ea..6bf8d643d942 100644
> --- a/drivers/mfd/intel-lpss-acpi.c
> +++ b/drivers/mfd/intel-lpss-acpi.c
> @@ -52,6 +52,18 @@ static const struct intel_lpss_platform_info bxt_i2c_info = {
> .properties = bxt_i2c_properties,
> };
>
> +static struct property_entry apl_i2c_properties[] = {
> + PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 207),
> + PROPERTY_ENTRY_U32("i2c-sda-falling-time-ns", 171),
> + PROPERTY_ENTRY_U32("i2c-scl-falling-time-ns", 208),
> + { },
> +};
> +
> +static const struct intel_lpss_platform_info apl_i2c_info = {
> + .clk_rate = 133000000,
> + .properties = apl_i2c_properties,
> +};
> +
> static const struct acpi_device_id intel_lpss_acpi_ids[] = {
> /* SPT */
> { "INT3446", (kernel_ulong_t)&spt_i2c_info },
> @@ -61,7 +73,7 @@ static const struct acpi_device_id intel_lpss_acpi_ids[] = {
> { "80860ABC", (kernel_ulong_t)&bxt_info },
> { "80860AC2", (kernel_ulong_t)&bxt_info },
> /* APL */
> - { "80865AAC", (kernel_ulong_t)&bxt_i2c_info },
> + { "80865AAC", (kernel_ulong_t)&apl_i2c_info },
> { "80865ABC", (kernel_ulong_t)&bxt_info },
> { "80865AC2", (kernel_ulong_t)&bxt_info },
> { }
> diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c
> index d19569a0f2f9..3228fd182a99 100644
> --- a/drivers/mfd/intel-lpss-pci.c
> +++ b/drivers/mfd/intel-lpss-pci.c
> @@ -111,6 +111,18 @@ static const struct intel_lpss_platform_info bxt_i2c_info = {
> .properties = bxt_i2c_properties,
> };
>
> +static struct property_entry apl_i2c_properties[] = {
> + PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 207),
> + PROPERTY_ENTRY_U32("i2c-sda-falling-time-ns", 171),
> + PROPERTY_ENTRY_U32("i2c-scl-falling-time-ns", 208),
> + { },
> +};
> +
> +static const struct intel_lpss_platform_info apl_i2c_info = {
> + .clk_rate = 133000000,
> + .properties = apl_i2c_properties,
> +};
> +
> static const struct intel_lpss_platform_info kbl_info = {
> .clk_rate = 120000000,
> };
> @@ -159,14 +171,14 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> { PCI_VDEVICE(INTEL, 0x1aee), (kernel_ulong_t)&bxt_uart_info },
>
> /* APL */
> - { PCI_VDEVICE(INTEL, 0x5aac), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x5aae), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x5ab0), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x5ab2), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x5ab4), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x5ab6), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x5ab8), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x5aba), (kernel_ulong_t)&bxt_i2c_info },
> + { PCI_VDEVICE(INTEL, 0x5aac), (kernel_ulong_t)&apl_i2c_info },
> + { PCI_VDEVICE(INTEL, 0x5aae), (kernel_ulong_t)&apl_i2c_info },
> + { PCI_VDEVICE(INTEL, 0x5ab0), (kernel_ulong_t)&apl_i2c_info },
> + { PCI_VDEVICE(INTEL, 0x5ab2), (kernel_ulong_t)&apl_i2c_info },
> + { PCI_VDEVICE(INTEL, 0x5ab4), (kernel_ulong_t)&apl_i2c_info },
> + { PCI_VDEVICE(INTEL, 0x5ab6), (kernel_ulong_t)&apl_i2c_info },
> + { PCI_VDEVICE(INTEL, 0x5ab8), (kernel_ulong_t)&apl_i2c_info },
> + { PCI_VDEVICE(INTEL, 0x5aba), (kernel_ulong_t)&apl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x5abc), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0x5abe), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0x5ac0), (kernel_ulong_t)&bxt_uart_info },
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
prev parent reply other threads:[~2016-09-13 8:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-12 11:41 [PATCH] mfd: intel-lpss: Add default I2C device properties for Apollo Lake Jarkko Nikula
2016-09-12 13:43 ` Mika Westerberg
2016-09-12 13:56 ` Lee Jones
2016-09-13 8:59 ` Lee Jones [this message]
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=20160913085942.GG24465@dell \
--to=lee.jones@linaro.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=paul.liu@canonical.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.