From patchwork Sun Dec 4 10:43:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Philipp Klemm X-Patchwork-Id: 631012 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 745B0C4708E for ; Sun, 4 Dec 2022 10:59:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229805AbiLDK67 convert rfc822-to-8bit (ORCPT ); Sun, 4 Dec 2022 05:58:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbiLDK66 (ORCPT ); Sun, 4 Dec 2022 05:58:58 -0500 X-Greylist: delayed 910 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 04 Dec 2022 02:58:57 PST Received: from sender11-of-o51.zoho.eu (sender11-of-o51.zoho.eu [31.186.226.237]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B5BB17E2A; Sun, 4 Dec 2022 02:58:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670150613; cv=none; d=zohomail.eu; s=zohoarc; b=f4CyAkDKBeEjrpQlYw4bgfumrtflaX8kCKP6lbXFFrGZt/XCcxGUx8U+05L5jKzMUEQc0PccNiEF0jweBy+8y7ORiZCnBSLNtQUxgKGp/r67XNOU92jk4SgOPMnkf04lMm/yVq25Ot3RmJExeyGf6HhPgL86H7tqQmtjl0WFwkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1670150613; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=jvvnOVg7mEdcYOEaYthf36cr1JVF4keZCUbF+K/j7nU=; b=TUqIwtjBmnsrOCusfesXvegVD9MDaZxzBs1h8X0Z22Fu9ICCUV1VTp3WOAGc1eht00IFJp0T+7WllC+Tv7A6cv1FahbhXFueOk69xLw8mCDtLtC/QAKqrTHszxNck2I9mEjSzxKMbqPvLtUkXs8Mtau3yTtZm1O17AmoRO3CIwA= ARC-Authentication-Results: i=1; mx.zohomail.eu; spf=pass smtp.mailfrom=philipp@uvos.xyz; dmarc=pass header.from= Received: from localhost.localdomain (ip-095-222-026-199.um34.pools.vodafone-ip.de [95.222.26.199]) by mx.zoho.eu with SMTPS id 1670150611687421.3830626799993; Sun, 4 Dec 2022 11:43:31 +0100 (CET) From: Carl Philipp Klemm To: linux-omap@vger.kernel.org, tony@atomide.com, sre@kernel.org Cc: devicetree@vger.kernel.org, Carl Philipp Klemm Message-ID: <20221204104313.17478-1-philipp@uvos.xyz> Subject: [PATCH 1/4] leds: cpcap: add support for the keyboard light channel Date: Sun, 4 Dec 2022 11:43:10 +0100 X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The keyboard light channel is used on xt875 for the touchscreen button lights. This commit also adds a checks for the sucessfull return of device_get_match_data. Signed-off-by: Carl Philipp Klemm --- drivers/leds/leds-cpcap.c | 15 +++++++++++++++ drivers/mfd/motorola-cpcap.c | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/drivers/leds/leds-cpcap.c b/drivers/leds/leds-cpcap.c index 7d41ce8c9bb1..11a9b857d8ea 100644 --- a/drivers/leds/leds-cpcap.c +++ b/drivers/leds/leds-cpcap.c @@ -58,6 +58,15 @@ static const struct cpcap_led_info cpcap_led_cp = { .init_val = 0x0008, }; +/* keyboard led */ +static const struct cpcap_led_info cpcap_led_kl = { + .reg = CPCAP_REG_KLC, + .mask = 0x0001, + .limit = 1, + .init_mask = 0x07FF, + .init_val = 0x07F0, +}; + struct cpcap_led { struct led_classdev led; const struct cpcap_led_info *info; @@ -152,6 +161,7 @@ static const struct of_device_id cpcap_led_of_match[] = { { .compatible = "motorola,cpcap-led-blue", .data = &cpcap_led_blue }, { .compatible = "motorola,cpcap-led-adl", .data = &cpcap_led_adl }, { .compatible = "motorola,cpcap-led-cp", .data = &cpcap_led_cp }, + { .compatible = "motorola,cpcap-led-kl", .data = &cpcap_led_kl }, {}, }; MODULE_DEVICE_TABLE(of, cpcap_led_of_match); @@ -168,6 +178,11 @@ static int cpcap_led_probe(struct platform_device *pdev) led->info = device_get_match_data(&pdev->dev); led->dev = &pdev->dev; + if (!led->info) { + dev_warn(led->dev, "Can't get match data"); + return -ENODEV; + } + if (led->info->reg == 0x0000) { dev_err(led->dev, "Unsupported LED"); return -ENODEV; diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c index 265464b5d7cc..57b3378a8829 100644 --- a/drivers/mfd/motorola-cpcap.c +++ b/drivers/mfd/motorola-cpcap.c @@ -285,6 +285,10 @@ static const struct mfd_cell cpcap_mfd_devices[] = { .name = "cpcap-led", .id = 4, .of_compatible = "motorola,cpcap-led-cp", + }, { + .name = "cpcap-led", + .id = 5, + .of_compatible = "motorola,cpcap-led-kl", }, { .name = "cpcap-codec", } From patchwork Sun Dec 4 10:43:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Philipp Klemm X-Patchwork-Id: 632116 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03447C4708D for ; Sun, 4 Dec 2022 10:59:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229811AbiLDK7F convert rfc822-to-8bit (ORCPT ); Sun, 4 Dec 2022 05:59:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229917AbiLDK7E (ORCPT ); Sun, 4 Dec 2022 05:59:04 -0500 Received: from sender11-of-o51.zoho.eu (sender11-of-o51.zoho.eu [31.186.226.237]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A719317E2A; Sun, 4 Dec 2022 02:59:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670150627; cv=none; d=zohomail.eu; s=zohoarc; b=ec07gctNe7R/k5thMNk5OBHzQJ2NeGUC4l6vEKG48GQySl5qKMGwU//mYM+a/PAf26AvPyiCRxp4ai8EXFbOi50OLTa6pdJI+C411d/Q0ow3fUH4cM/An4cbZ1nohovoVghc0iwDT/0f38pCpgcyZGgWL/zG/QzNB81Kdzcyq/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1670150627; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=jHe0jGTJmF7m6cDleOyuTXJHSDg7MvwwuBD3IegP5zw=; b=d55LpoLSjWZrEus9peQWyawsEV9D7+A6k++BwKslGOI5XpFGdAWFge3TkTRPpCKvlO/OMcqiHL7IvCY0fpbmVfsXRP0691KUhjQXJ1dL9Vo/7UNlEn3SU6xX59JQANb0zEBthg5s7NnYv5GwHNKNtd9IWCAWP6qK4luuMFbnbZ8= ARC-Authentication-Results: i=1; mx.zohomail.eu; spf=pass smtp.mailfrom=philipp@uvos.xyz; dmarc=pass header.from= Received: from localhost.localdomain (ip-095-222-026-199.um34.pools.vodafone-ip.de [95.222.26.199]) by mx.zoho.eu with SMTPS id 167015062549041.40231813979858; Sun, 4 Dec 2022 11:43:45 +0100 (CET) From: Carl Philipp Klemm To: linux-omap@vger.kernel.org, tony@atomide.com, sre@kernel.org Cc: devicetree@vger.kernel.org, Carl Philipp Klemm Message-ID: <20221204104313.17478-2-philipp@uvos.xyz> Subject: [PATCH 2/4] leds: cpcap: make leds-cpcap an independent platform device to allow varying led setups Date: Sun, 4 Dec 2022 11:43:11 +0100 X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221204104313.17478-1-philipp@uvos.xyz> References: <20221204104313.17478-1-philipp@uvos.xyz> MIME-Version: 1.0 X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Previously led-cpcap devices where defined statically in mfd_cell of the parent mdf device. This causes issues for devices like xt875 that have less and different leds than xt894. Splitting the device like this is posssible, as in reality the cpcap led ip block is totaly independent from the mdf device and cpcap core. Signed-off-by: Carl Philipp Klemm --- drivers/leds/leds-cpcap.c | 19 +++++++++++++++++-- drivers/mfd/motorola-cpcap.c | 24 ------------------------ 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/drivers/leds/leds-cpcap.c b/drivers/leds/leds-cpcap.c index 11a9b857d8ea..7a1dd050fdf0 100644 --- a/drivers/leds/leds-cpcap.c +++ b/drivers/leds/leds-cpcap.c @@ -11,6 +11,7 @@ #include #include #include +#include #define CPCAP_LED_NO_CURRENT 0x0001 @@ -170,6 +171,18 @@ static int cpcap_led_probe(struct platform_device *pdev) { struct cpcap_led *led; int err; + struct device_node *mfd_node; + struct device *cpcap_dev; + + mfd_node = of_parse_phandle(pdev->dev.of_node, "cpcap-phandle", 0); + if (!mfd_node) { + dev_err(&pdev->dev, "cpcap-phandle is missing in device tree\n"); + return -ENODEV; + } + + cpcap_dev = bus_find_device_by_of_node(&spi_bus_type, mfd_node); + if (IS_ERR_OR_NULL(cpcap_dev)) + return -EAGAIN; led = devm_kzalloc(&pdev->dev, sizeof(*led), GFP_KERNEL); if (!led) @@ -188,9 +201,11 @@ static int cpcap_led_probe(struct platform_device *pdev) return -ENODEV; } - led->regmap = dev_get_regmap(pdev->dev.parent, NULL); - if (!led->regmap) + led->regmap = dev_get_regmap(cpcap_dev, NULL); + if (!led->regmap) { + dev_err(led->dev, "Couldn't get regmap from cpcap mdf device"); return -ENODEV; + } led->vdd = devm_regulator_get(&pdev->dev, "vdd"); if (IS_ERR(led->vdd)) { diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c index 57b3378a8829..e1ae14e0e651 100644 --- a/drivers/mfd/motorola-cpcap.c +++ b/drivers/mfd/motorola-cpcap.c @@ -265,30 +265,6 @@ static const struct mfd_cell cpcap_mfd_devices[] = { }, { .name = "cpcap-usb-phy", .of_compatible = "motorola,mapphone-cpcap-usb-phy", - }, { - .name = "cpcap-led", - .id = 0, - .of_compatible = "motorola,cpcap-led-red", - }, { - .name = "cpcap-led", - .id = 1, - .of_compatible = "motorola,cpcap-led-green", - }, { - .name = "cpcap-led", - .id = 2, - .of_compatible = "motorola,cpcap-led-blue", - }, { - .name = "cpcap-led", - .id = 3, - .of_compatible = "motorola,cpcap-led-adl", - }, { - .name = "cpcap-led", - .id = 4, - .of_compatible = "motorola,cpcap-led-cp", - }, { - .name = "cpcap-led", - .id = 5, - .of_compatible = "motorola,cpcap-led-kl", }, { .name = "cpcap-codec", } From patchwork Sun Dec 4 10:43:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Philipp Klemm X-Patchwork-Id: 631011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E3E8C3A5A7 for ; Sun, 4 Dec 2022 10:59:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229994AbiLDK7L convert rfc822-to-8bit (ORCPT ); Sun, 4 Dec 2022 05:59:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229983AbiLDK7J (ORCPT ); Sun, 4 Dec 2022 05:59:09 -0500 Received: from sender11-of-o51.zoho.eu (sender11-of-o51.zoho.eu [31.186.226.237]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B2E117E3D; Sun, 4 Dec 2022 02:59:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670150629; cv=none; d=zohomail.eu; s=zohoarc; b=R3wc7VvQ6r9YL74hp69PHG09VrZwp62uoaTsFzOgkT6orWCPwapq0I9gFgHutFNEZ/oS0o5Gs6dI4eSKOxcdPXRlXHZ7EBull9so/8vd49gU40hrNtqWI6wXwjTBGtSbLoeb18eUDkWZ8ZfztsKFd4NLA3HH6dFXr+BrjsXU56Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1670150629; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=48DdkCN0OqLMIzrs9lU9kiVd4eTRgSFTqFN8kUfEHC4=; b=eipFoOK39b6NAR+6lLZJUNyo0OOQlniyFlxkGeVoaWNAmuT2ZljjsqgparPYz5vZ5HgeJ+Z9ugT0dY5me/zGBB4ZCi1NHnqvmm+hnJR5kKqgItqy+YCIueCYdOvm3gpIC2qLem/m0gPcjZJrsKAQfs0TImUN7pi18MLUBNQIRg8= ARC-Authentication-Results: i=1; mx.zohomail.eu; spf=pass smtp.mailfrom=philipp@uvos.xyz; dmarc=pass header.from= Received: from localhost.localdomain (ip-095-222-026-199.um34.pools.vodafone-ip.de [95.222.26.199]) by mx.zoho.eu with SMTPS id 1670150627490311.84120852644367; Sun, 4 Dec 2022 11:43:47 +0100 (CET) From: Carl Philipp Klemm To: linux-omap@vger.kernel.org, tony@atomide.com, sre@kernel.org Cc: devicetree@vger.kernel.org, Carl Philipp Klemm Message-ID: <20221204104313.17478-3-philipp@uvos.xyz> Subject: [PATCH 3/4] dt-bindings: leds: leds-cpcap Date: Sun, 4 Dec 2022 11:43:12 +0100 X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221204104313.17478-1-philipp@uvos.xyz> References: <20221204104313.17478-1-philipp@uvos.xyz> MIME-Version: 1.0 X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org update bindgins as cpcap-led has been removed from the mdf device Signed-off-by: Carl Philipp Klemm --- Documentation/devicetree/bindings/leds/leds-cpcap.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/leds/leds-cpcap.txt b/Documentation/devicetree/bindings/leds/leds-cpcap.txt index ebf7cdc7f70c..b78a26a0acf0 100644 --- a/Documentation/devicetree/bindings/leds/leds-cpcap.txt +++ b/Documentation/devicetree/bindings/leds/leds-cpcap.txt @@ -17,13 +17,15 @@ Requires node properties: * "motorola,cpcap-led-cp" (Camera Privacy LED) - label: see Documentation/devicetree/bindings/leds/common.txt - vdd-supply: A phandle to the regulator powering the LED +- cpcap-phandle: A phandle to the cpcap mfd device node Example: -&cpcap { +/ { cpcap_led_red: red-led { compatible = "motorola,cpcap-led-red"; label = "cpcap:red"; vdd-supply = <&sw5>; + cpcap-phandle = <&cpcap>; }; }; From patchwork Sun Dec 4 10:43:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Philipp Klemm X-Patchwork-Id: 632115 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7149C4332F for ; Sun, 4 Dec 2022 10:59:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229539AbiLDK7M convert rfc822-to-8bit (ORCPT ); Sun, 4 Dec 2022 05:59:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229938AbiLDK7J (ORCPT ); Sun, 4 Dec 2022 05:59:09 -0500 Received: from sender11-of-o51.zoho.eu (sender11-of-o51.zoho.eu [31.186.226.237]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B00D218344; Sun, 4 Dec 2022 02:59:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670150631; cv=none; d=zohomail.eu; s=zohoarc; b=XV8U0fIewNZMDyRQfh1ndXul/l8myE4FgPeN4LNja3joTSpD4lNJcZOuseOn2/jGzL1R50D3rO6q+AiWnDUWOJ5/ImWPS+wiSVGNc9ixEZu57mfjA0D7Q80aL2emm46nb2IqVMbqmvl2sPQYH5Da68QLWVtssk40JH2eU+YCZrw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1670150631; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tnqaXZrkk+J8/iyv+u9EIdqT2hYanUoFYILAn5CMJ+s=; b=jcM+O5KfnvMwtltAZzCXjVerZB/7026DlMRRtF2PjXnD2UtYHmi0tvBmtEKehDlcOu9Qm2PgrcW4vkO+LLhSqE8KZXWDvibQPxf+iWjY60vueIVIw2VqEQQG76SCv02GMg84YI1RpMRfzqrqy9mFVhADTNEq9K8q08KoXmjhfLI= ARC-Authentication-Results: i=1; mx.zohomail.eu; spf=pass smtp.mailfrom=philipp@uvos.xyz; dmarc=pass header.from= Received: from localhost.localdomain (ip-095-222-026-199.um34.pools.vodafone-ip.de [95.222.26.199]) by mx.zoho.eu with SMTPS id 1670150628750701.5439332715536; Sun, 4 Dec 2022 11:43:48 +0100 (CET) From: Carl Philipp Klemm To: linux-omap@vger.kernel.org, tony@atomide.com, sre@kernel.org Cc: devicetree@vger.kernel.org, Carl Philipp Klemm Message-ID: <20221204104313.17478-4-philipp@uvos.xyz> Subject: [PATCH 4/4] arch: arm: dts: cpcap-mapphone: Move cpcap leds from common dts file to devices as apropriate Date: Sun, 4 Dec 2022 11:43:13 +0100 X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221204104313.17478-1-philipp@uvos.xyz> References: <20221204104313.17478-1-philipp@uvos.xyz> MIME-Version: 1.0 X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Removes non-functional leds from xt875 and adds its touchscreen button light Signed-off-by: Carl Philipp Klemm --- .../arm/boot/dts/motorola-cpcap-mapphone.dtsi | 47 ++++++++----------- .../arm/boot/dts/omap4-droid-bionic-xt875.dts | 7 +++ arch/arm/boot/dts/omap4-droid4-xt894.dts | 14 ++++++ 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi index ea02fd403a9b..f7ddcf122404 100644 --- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi +++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi @@ -115,36 +115,29 @@ cpcap_usb2_phy: phy { io-channel-names = "vbus", "id"; vusb-supply = <&vusb>; }; + }; +}; - led_red: led-red { - compatible = "motorola,cpcap-led-red"; - vdd-supply = <&sw5>; - label = "status-led:red"; - }; - - led_green: led-green { - compatible = "motorola,cpcap-led-green"; - vdd-supply = <&sw5>; - label = "status-led:green"; - }; - - led_blue: led-blue { - compatible = "motorola,cpcap-led-blue"; - vdd-supply = <&sw5>; - label = "status-led:blue"; - }; +/ { + led_red: led-red { + compatible = "motorola,cpcap-led-red"; + vdd-supply = <&sw5>; + label = "status-led:red"; + cpcap-phandle = <&cpcap>; + }; - led_adl: led-adl { - compatible = "motorola,cpcap-led-adl"; - vdd-supply = <&sw5>; - label = "button-backlight"; - }; + led_green: led-green { + compatible = "motorola,cpcap-led-green"; + vdd-supply = <&sw5>; + label = "status-led:green"; + cpcap-phandle = <&cpcap>; + }; - led_cp: led-cp { - compatible = "motorola,cpcap-led-cp"; - vdd-supply = <&sw5>; - label = "shift-key-light"; - }; + led_blue: led-blue { + compatible = "motorola,cpcap-led-blue"; + vdd-supply = <&sw5>; + label = "status-led:blue"; + cpcap-phandle = <&cpcap>; }; }; diff --git a/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts b/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts index ccf03a743678..eae69ec9b3f1 100644 --- a/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts +++ b/arch/arm/boot/dts/omap4-droid-bionic-xt875.dts @@ -6,6 +6,13 @@ / { model = "Motorola Droid Bionic XT875"; compatible = "motorola,droid-bionic", "ti,omap4430", "ti,omap4"; + + led_kl: led-kl { + compatible = "motorola,cpcap-led-kl"; + vdd-supply = <&sw5>; + label = "button-backlight"; + cpcap-phandle = <&cpcap>; + }; }; &keypad { diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts index e833c21f1c01..a590f28edbf6 100644 --- a/arch/arm/boot/dts/omap4-droid4-xt894.dts +++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts @@ -31,6 +31,20 @@ slider { debounce-interval = <10>; }; }; + + led_adl: led-adl { + compatible = "motorola,cpcap-led-adl"; + vdd-supply = <&sw5>; + label = "button-backlight"; + cpcap-phandle = <&cpcap>; + }; + + led_cp: led-cp { + compatible = "motorola,cpcap-led-cp"; + vdd-supply = <&sw5>; + label = "shift-key-light"; + cpcap-phandle = <&cpcap>; + }; }; / {