From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755552AbcFQKX2 (ORCPT ); Fri, 17 Jun 2016 06:23:28 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:36665 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752059AbcFQKWR (ORCPT ); Fri, 17 Jun 2016 06:22:17 -0400 From: Neil Armstrong To: dmitry.torokhov@gmail.com, andy.gross@linaro.org, david.brown@linaro.org, lee.jones@linaro.org, lgirdwood@gmail.com, broonie@kernel.org, a.zummo@towertech.it, alexandre.belloni@free-electrons.com Cc: Neil Armstrong , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, rtc-linux@googlegroups.com Subject: [PATCH 2/5] input: pmic8xxx-pwrkey: Add support for pm8018 pwrkey Date: Fri, 17 Jun 2016 12:22:06 +0200 Message-Id: <1466158929-19524-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466158929-19524-1-git-send-email-narmstrong@baylibre.com> References: <1466158929-19524-1-git-send-email-narmstrong@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to support pwrkey for Qualcomm MDM9615 SoC, add support for the pm8018 pwrkey in pmic8xxx-pwrkey. Signed-off-by: Neil Armstrong --- Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt | 1 + drivers/input/misc/pmic8xxx-pwrkey.c | 1 + 2 files changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt b/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt index 588536c..9e530e2 100644 --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt +++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-pwrkey.txt @@ -8,6 +8,7 @@ PROPERTIES Definition: must be one of: "qcom,pm8058-pwrkey" "qcom,pm8921-pwrkey" + "qcom,pm8018-pwrkey" - reg: Usage: required diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c index 67aab86..f6f9b87 100644 --- a/drivers/input/misc/pmic8xxx-pwrkey.c +++ b/drivers/input/misc/pmic8xxx-pwrkey.c @@ -446,6 +446,7 @@ static int pmic8xxx_pwrkey_remove(struct platform_device *pdev) } static const struct of_device_id pm8xxx_pwr_key_id_table[] = { + { .compatible = "qcom,pm8018-pwrkey", .data = &pm8921_pwrkey_shutdown }, { .compatible = "qcom,pm8058-pwrkey", .data = &pm8058_pwrkey_shutdown }, { .compatible = "qcom,pm8921-pwrkey", .data = &pm8921_pwrkey_shutdown }, { } -- 1.9.1