From patchwork Mon Mar 11 02:03:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Ogorchock X-Patchwork-Id: 10846567 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 438751823 for ; Mon, 11 Mar 2019 02:04:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F23F28D49 for ; Mon, 11 Mar 2019 02:04:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2309E28D52; Mon, 11 Mar 2019 02:04:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8014228D49 for ; Mon, 11 Mar 2019 02:04:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727153AbfCKCEP (ORCPT ); Sun, 10 Mar 2019 22:04:15 -0400 Received: from mail-yw1-f67.google.com ([209.85.161.67]:43800 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726758AbfCKCEO (ORCPT ); Sun, 10 Mar 2019 22:04:14 -0400 Received: by mail-yw1-f67.google.com with SMTP id d129so2617917ywe.10 for ; Sun, 10 Mar 2019 19:04:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cJOLtQZtZEOafRlY/HZ7/9/crk5OhMrCluYfjvlfZjc=; b=eAiaaOjr+/IM64BsGQkvU3jdbI6woK1d5SoTlbWdXH9hQ6v/WukfwmvWG2B7Z4ISJq 9VbM3pFcGUHf/9uuhiSKF/ZW5wGLUFLiEvlIiWsSCFOfFf7ZsrWzXxn67BTPyeP9VOLr leoRDFslOvKE4clmf/VGxNV/KHzoNjzOXoX9+0mYT9gCB9r4ocnOL5zK2rv2xZaW5Wb9 5aC0Myjs1+PWjWxCTWXQ+NcNutLBFQEGa8VV4i7BhN20FxeaOFkrnzzS43lKf53dOsog NDiCzYKU1RAb19luzf+uO3YxqOf7I3XojDIL8SEuNSrK/c0YgOUVs0r3SZTYMAephElz T97g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cJOLtQZtZEOafRlY/HZ7/9/crk5OhMrCluYfjvlfZjc=; b=M/RLHyzINJD2cpitCibYSxhV4S4juhLM6JvhsTDfqed3prXIjYjFCeF2RrOwIpgjRD CaSQWVnuct61fGaL+NzNJZS9ADVs8aczf4ams+xtP0+/pk/dEIF1hV4Urgst4ZKmJmng 44Q8IBMexc7eDtV2sOYHirHQ25SeU8fWIfv7My+ivBKQ/6Jeu+RjDFmB62U+KTSD9KEA q4Ccy8L07fC8r48qO4HJvPYDz3SiVbsmiB9svPXmFa4Gy2elN1DEOCjqQoBQQPwEc4lK EfuTWaOLnfA/V66eLNx47mYwhLyz9RqL5wYTwyZmjrCCCmdQM180/k3/yqgTyCGU79pQ TOEg== X-Gm-Message-State: APjAAAWOytWrPdSwPKhmzssvOrxiRIr1AHgTrX7flyW762dDbXA+ZsNb Iw6tv2EOLIdR6RQNs6oNTUsYJzwriZE= X-Google-Smtp-Source: APXvYqx4MuyuRwCj2bhb4YJuhWdPNP17AQvzUyafENKcrzsjNlzrb1WpIyKerQOfiqke5wRWXHzrqA== X-Received: by 2002:a25:5f01:: with SMTP id t1mr26256713ybb.286.1552269853337; Sun, 10 Mar 2019 19:04:13 -0700 (PDT) Received: from localhost.localdomain ([136.61.179.39]) by smtp.gmail.com with ESMTPSA id r130sm1907088ywr.4.2019.03.10.19.04.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Mar 2019 19:04:12 -0700 (PDT) From: "Daniel J. Ogorchock" To: linux-input@vger.kernel.org Cc: thunderbird2k@gmail.com, blaws05@gmail.com, benjamin.tissoires@redhat.com, jikos@kernel.org, Roderick.Colenbrander@sony.com, peter.hutterer@who-t.net, jbrandst@2ds.eu, hadess@hadess.net, "Daniel J. Ogorchock" Subject: [PATCH v4 3/6] HID: joycon: add power supply support Date: Sun, 10 Mar 2019 21:03:22 -0500 Message-Id: <20190311020324.23619-4-djogorchock@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190311020324.23619-1-djogorchock@gmail.com> References: <20190311020324.23619-1-djogorchock@gmail.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds power_supply functionality to the switch controller driver for its battery. Signed-off-by: Daniel J. Ogorchock --- drivers/hid/Kconfig | 1 + drivers/hid/hid-joycon.c | 132 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index f324ef3face3..15bed99a7fa1 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -450,6 +450,7 @@ config HID_JOYCON depends on HID depends on NEW_LEDS depends on LEDS_CLASS + select POWER_SUPPLY help Adds support for the Nintendo Switch Joy-Cons and Pro Controller. All controllers support bluetooth, and the Pro Controller also supports diff --git a/drivers/hid/hid-joycon.c b/drivers/hid/hid-joycon.c index fde7ae3bb9bf..cfc23e881e4c 100644 --- a/drivers/hid/hid-joycon.c +++ b/drivers/hid/hid-joycon.c @@ -11,6 +11,7 @@ * https://github.com/MTCKC/ProconXInput * hid-wiimote kernel hid driver * hid-logitech-hidpp driver + * hid-sony driver * * This driver supports the Nintendo Switch Joy-Cons and Pro Controllers. The * Pro Controllers can either be used over USB or Bluetooth. @@ -27,6 +28,7 @@ #include #include #include +#include #include /* @@ -195,6 +197,7 @@ struct joycon_ctlr { struct input_dev *input; struct led_classdev leds[JC_NUM_LEDS]; enum joycon_ctlr_state ctlr_state; + spinlock_t lock; /* The following members are used for synchronous sends/receives */ enum joycon_msg_type msg_type; @@ -212,6 +215,12 @@ struct joycon_ctlr { struct joycon_stick_cal right_stick_cal_x; struct joycon_stick_cal right_stick_cal_y; + /* power supply data */ + struct power_supply *battery; + struct power_supply_desc battery_desc; + u8 battery_capacity; + bool battery_charging; + bool host_powered; }; static int __joycon_hid_send(struct hid_device *hdev, u8 *data, size_t len) @@ -415,9 +424,41 @@ static int joycon_map_stick_val(struct joycon_stick_cal *cal, s32 val) static void joycon_parse_report(struct joycon_ctlr *ctlr, u8 *data) { struct input_dev *dev = ctlr->input; + unsigned long flags; + u8 tmp; u32 btns; u32 id = ctlr->hdev->product; + /* Parse the battery status */ + tmp = data[2]; + spin_lock_irqsave(&ctlr->lock, flags); + ctlr->host_powered = tmp & BIT(0); + ctlr->battery_charging = tmp & BIT(4); + tmp = tmp >> 5; + switch (tmp) { + case 0: /* empty */ + ctlr->battery_capacity = POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL; + break; + case 1: /* low */ + ctlr->battery_capacity = POWER_SUPPLY_CAPACITY_LEVEL_LOW; + break; + case 2: /* medium */ + ctlr->battery_capacity = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL; + break; + case 3: /* high */ + ctlr->battery_capacity = POWER_SUPPLY_CAPACITY_LEVEL_HIGH; + break; + case 4: /* full */ + ctlr->battery_capacity = POWER_SUPPLY_CAPACITY_LEVEL_FULL; + break; + default: + ctlr->battery_capacity = POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN; + hid_warn(ctlr->hdev, "Invalid battery status\n"); + break; + } + spin_unlock_irqrestore(&ctlr->lock, flags); + + /* Parse the buttons and sticks */ btns = hid_field_extract(ctlr->hdev, data + 3, 0, 24); if (id != USB_DEVICE_ID_NINTENDO_JOYCONR) { @@ -663,6 +704,89 @@ static int joycon_player_leds_create(struct joycon_ctlr *ctlr) return ret; } +static int joycon_battery_get_property(struct power_supply *supply, + enum power_supply_property prop, + union power_supply_propval *val) +{ + struct joycon_ctlr *ctlr = power_supply_get_drvdata(supply); + unsigned long flags; + int ret = 0; + u8 capacity; + bool charging; + bool powered; + + spin_lock_irqsave(&ctlr->lock, flags); + capacity = ctlr->battery_capacity; + charging = ctlr->battery_charging; + powered = ctlr->host_powered; + spin_unlock_irqrestore(&ctlr->lock, flags); + + switch (prop) { + case POWER_SUPPLY_PROP_PRESENT: + val->intval = 1; + break; + case POWER_SUPPLY_PROP_SCOPE: + val->intval = POWER_SUPPLY_SCOPE_DEVICE; + break; + case POWER_SUPPLY_PROP_CAPACITY_LEVEL: + val->intval = capacity; + break; + case POWER_SUPPLY_PROP_STATUS: + if (charging) + val->intval = POWER_SUPPLY_STATUS_CHARGING; + else if (capacity == 100 && powered) + val->intval = POWER_SUPPLY_STATUS_FULL; + else + val->intval = POWER_SUPPLY_STATUS_DISCHARGING; + break; + default: + ret = -EINVAL; + break; + } + return ret; +} + +static enum power_supply_property joycon_battery_props[] = { + POWER_SUPPLY_PROP_PRESENT, + POWER_SUPPLY_PROP_CAPACITY_LEVEL, + POWER_SUPPLY_PROP_SCOPE, + POWER_SUPPLY_PROP_STATUS, +}; + +static int joycon_power_supply_create(struct joycon_ctlr *ctlr) +{ + struct hid_device *hdev = ctlr->hdev; + struct power_supply_config supply_config = { .drv_data = ctlr, }; + const char * const name_fmt = "nintendo_switch_controller_battery_%s"; + int ret = 0; + + /* Set initially to unknown before receiving first input report */ + ctlr->battery_capacity = POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN; + + /* Configure the battery's description */ + ctlr->battery_desc.properties = joycon_battery_props; + ctlr->battery_desc.num_properties = + ARRAY_SIZE(joycon_battery_props); + ctlr->battery_desc.get_property = joycon_battery_get_property; + ctlr->battery_desc.use_for_apm = 0; + ctlr->battery_desc.name = devm_kasprintf(&hdev->dev, GFP_KERNEL, + name_fmt, + dev_name(&hdev->dev)); + if (!ctlr->battery_desc.name) + return -ENOMEM; + + ctlr->battery = devm_power_supply_register(&hdev->dev, + &ctlr->battery_desc, + &supply_config); + if (IS_ERR(ctlr->battery)) { + ret = PTR_ERR(ctlr->battery); + hid_err(hdev, "Failed to register battery; ret=%d\n", ret); + return ret; + } + power_supply_powers(ctlr->battery, &hdev->dev); + return 0; +} + /* Common handler for parsing inputs */ static int joycon_ctlr_read_handler(struct joycon_ctlr *ctlr, u8 *data, int size) @@ -767,6 +891,7 @@ static int joycon_hid_probe(struct hid_device *hdev, hid_set_drvdata(hdev, ctlr); mutex_init(&ctlr->output_mutex); init_waitqueue_head(&ctlr->wait); + spin_lock_init(&ctlr->lock); ret = hid_parse(hdev); if (ret) { @@ -835,6 +960,13 @@ static int joycon_hid_probe(struct hid_device *hdev, goto err_close; } + /* Initialize the battery power supply */ + ret = joycon_power_supply_create(ctlr); + if (ret) { + hid_err(hdev, "Failed to create power_supply; ret=%d\n", ret); + goto err_close; + } + ctlr->ctlr_state = JOYCON_CTLR_STATE_READ; hid_dbg(hdev, "probe - success\n");