Message ID | 20170816175617.okb3mj6a2rhptkz4@xps13.dannf |
---|---|
State | New |
Headers | show |
On Wed, Aug 16, 2017 at 11:56:17AM -0600, dann frazier wrote: > From: Hanjun Guo <hanjun.guo@linaro.org> > > BugLink: https://bugs.launchpad.net/bugs/1711182 > > ACPI HID for Hisilicon Hip07/08 should be HISI02A1/2, > not HISI0A21/2, HISI02A1/2 was tested ok but was modified > by the stupid typo when upstream the patches (by me), > correct them to the right IDs (matching the IDs in > drivers/i2c/busses/i2c-designware-platdrv.c). > > Fixes: 6e14cf361a0c (ACPI / APD: Add clock frequency for Hisilicon Hip07/08 I2C controller) > Reported-by: Tao Tian <tiantao6@huawei.com> > Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > (backported from commit f7f3dd5b4cbb138ed4559b0d096bab76a8f476de) > Signed-off-by: dann frazier <dann.frazier@canonical.com> Clean cherry pick, simple fix with limited scope. Acked-by: Seth Forshee <seth.forshee@canonical.com>
On 08/16/17 19:56, dann frazier wrote: > From: Hanjun Guo <hanjun.guo@linaro.org> > > BugLink: https://bugs.launchpad.net/bugs/1711182 > > ACPI HID for Hisilicon Hip07/08 should be HISI02A1/2, > not HISI0A21/2, HISI02A1/2 was tested ok but was modified > by the stupid typo when upstream the patches (by me), > correct them to the right IDs (matching the IDs in > drivers/i2c/busses/i2c-designware-platdrv.c). > > Fixes: 6e14cf361a0c (ACPI / APD: Add clock frequency for Hisilicon Hip07/08 I2C controller) > Reported-by: Tao Tian <tiantao6@huawei.com> > Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > (backported from commit f7f3dd5b4cbb138ed4559b0d096bab76a8f476de) > Signed-off-by: dann frazier <dann.frazier@canonical.com> > --- > drivers/acpi/acpi_apd.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c > index 8f57648f318b..34f304827aa0 100644 > --- a/drivers/acpi/acpi_apd.c > +++ b/drivers/acpi/acpi_apd.c > @@ -179,8 +179,8 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { > #ifdef CONFIG_ARM64 > { "APMC0D0F", APD_ADDR(xgene_i2c_desc) }, > { "BRCM900D", APD_ADDR(vulcan_spi_desc) }, > - { "HISI0A21", APD_ADDR(hip07_i2c_desc) }, > - { "HISI0A22", APD_ADDR(hip08_i2c_desc) }, > + { "HISI02A1", APD_ADDR(hip07_i2c_desc) }, > + { "HISI02A2", APD_ADDR(hip08_i2c_desc) }, > #endif > { } > }; > Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Applied to zesty/master-next branch. Thanks.
diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c index 8f57648f318b..34f304827aa0 100644 --- a/drivers/acpi/acpi_apd.c +++ b/drivers/acpi/acpi_apd.c @@ -179,8 +179,8 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { #ifdef CONFIG_ARM64 { "APMC0D0F", APD_ADDR(xgene_i2c_desc) }, { "BRCM900D", APD_ADDR(vulcan_spi_desc) }, - { "HISI0A21", APD_ADDR(hip07_i2c_desc) }, - { "HISI0A22", APD_ADDR(hip08_i2c_desc) }, + { "HISI02A1", APD_ADDR(hip07_i2c_desc) }, + { "HISI02A2", APD_ADDR(hip08_i2c_desc) }, #endif { } };