From patchwork Wed Jul 9 02:27:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Rui" X-Patchwork-Id: 4511161 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8935BBEEAA for ; Wed, 9 Jul 2014 02:27:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8DB0A2026D for ; Wed, 9 Jul 2014 02:27:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3859E2021F for ; Wed, 9 Jul 2014 02:27:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751225AbaGIC1i (ORCPT ); Tue, 8 Jul 2014 22:27:38 -0400 Received: from mga01.intel.com ([192.55.52.88]:51326 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751163AbaGIC1i (ORCPT ); Tue, 8 Jul 2014 22:27:38 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 08 Jul 2014 19:27:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,630,1400050800"; d="scan'208";a="567029515" Received: from unknown (HELO [10.255.20.202]) ([10.255.20.202]) by fmsmga002.fm.intel.com with ESMTP; 08 Jul 2014 19:27:26 -0700 Message-ID: <1404872845.26526.2.camel@rzhang1-toshiba> Subject: Re: [PATCH] soc_button_array: fix the issue that button device can't be enumerated since 3.16-rc1 From: Zhang Rui To: "Rafael J. Wysocki" Cc: dmitry.torokhov@gmail.com, yao.jin@intel.com, linux-input Date: Wed, 09 Jul 2014 10:27:25 +0800 In-Reply-To: <2556427.cdnVoQoSXY@vostro.rjw.lan> References: <1404309504.8366.93.camel@rzhang1-toshiba> <1404309713.8366.94.camel@rzhang1-toshiba> <2556427.cdnVoQoSXY@vostro.rjw.lan> X-Mailer: Evolution 3.8.4-0ubuntu1 Mime-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 2014-07-08 at 22:50 +0200, Rafael J. Wysocki wrote: > On Wednesday, July 02, 2014 10:01:53 PM Zhang Rui wrote: > > From c2ee1886ba230d9d93d2ea2f350b1dc1a2d5ead5 Mon Sep 17 00:00:00 2001 > > From: Jin Yao > > Date: Thu, 26 Jun 2014 10:26:44 +0800 > > Subject: [PATCH] soc_button_array: fix the issue that button device can't be > > enumerated since 3.16-rc1 > > Hi Rui, > > For 3.16 I'm afraid we need to add the missing device ID to the PNP list. > It is too late to do the conversion at this point IMO and we can do it later. Okay, then please take the patch below. From 846c16d9d863723ef9a2d9722778bce0633ea24c Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Wed, 9 Jul 2014 10:19:38 +0800 Subject: [PATCH] ACPI: add soc_button_array device id in acpi_pnp id list soc_button_array pnp driver is introduced in 3.15. But in commit eec15edbb0e14485998635ea7c62e30911b465f0, when reworking the PNPACPI device enumeration, we missed the soc_button_array device id. This results in a regression in 3.16-rc1 that soc_button_array pnp device fails to be enumerated. Fix the problem by adding soc_button_array device id into the acpi_pnp scan handler id list. Signed-off-by: Zhang Rui --- drivers/acpi/acpi_pnp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c index 6703c1f..4ddb0dc 100644 --- a/drivers/acpi/acpi_pnp.c +++ b/drivers/acpi/acpi_pnp.c @@ -14,6 +14,8 @@ #include static const struct acpi_device_id acpi_pnp_device_ids[] = { + /* soc_button_array */ + {"PNP0C40"}, /* pata_isapnp */ {"PNP0600"}, /* Generic ESDI/IDE/ATA compatible hard disk controller */ /* floppy */