From patchwork Mon Sep 26 05:44:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 609942 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 BEA7FC32771 for ; Mon, 26 Sep 2022 05:44:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229561AbiIZFoZ (ORCPT ); Mon, 26 Sep 2022 01:44:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229526AbiIZFoY (ORCPT ); Mon, 26 Sep 2022 01:44:24 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A3DE25EB4; Sun, 25 Sep 2022 22:44:24 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id o99-20020a17090a0a6c00b002039c4fce53so11328493pjo.2; Sun, 25 Sep 2022 22:44:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=LmEtACextzjMs9rgRkVC6wxNN5ZO8mUWrZVgnP50qzk=; b=ooR2BQrjlGLdjZKiZLqx+ltIssLpQE8HzfDEywq+P0dxB2AWsayKt2bo4tugkn/Z5W 2Fpot46178CF2AkEWNV7oRoDGxwXDdTXdX47w710jqL5R0e3qEFBh02M3UkZ3/K5W3YD PnlJTvWlxvoLerSZm0HPEb/dDTjt9bZe8M1NGyj+UDSmLBZo32vIcl6tB/VKPKthAZ/8 1Rpbk7m7RO6q3svbmjy8OmqRjOzcH2btaM4Ys9H8Gfuv6Que9DjqxEBap7Qb0ESAM92T jewX0U7YHyIMSt7Xvpc2BPeBfQGlqik1gbJ2kXy91wHDIxFZ2c1xQep/EFvYYCuGWYpg Fxww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=LmEtACextzjMs9rgRkVC6wxNN5ZO8mUWrZVgnP50qzk=; b=Rxwfr9RAPkyP7jQM2o3YgGquE43kaCopJt7bu8kHXYdvJj63NPOsSoeBbx2Io1Xoys 3z0YkuThpqkth0bS0abUdz9kBtzQaeVedXWVLYwEoQ3WCCIFvethHDwn6x0yRHXbaYRe XlV3C559Z305HDL8uE0IIhI+9F9gyeuqH11EDVZFjUrkYvZrNZrdNVxsVKa5wuvSaii4 IszHVwEXXyLrZEOEJC/quWFTYhyiaOgCyEZ3JNj9zZHaYvKzgnLfRUVDk/h9A+83jLTU JF1EASfD1md/wgj7DA7eNbs9VogbKvs+gIFhYHPkzROaBgTRbYqRFF1xahR90x7L6Acw uTBg== X-Gm-Message-State: ACrzQf2mJwcz00N+DTIMXeHrfO0zjptSfb/91hTfLa2YyhrJ8yZqadRG 5agN+1kciHy4p9XpNxxUt3s= X-Google-Smtp-Source: AMsMyM6ddVumC3trczj55x6enEXoPq6YD7qL19brT8nwgnKnLY/t9axEuh+FzYWijjEm4Bw9VAyQ7w== X-Received: by 2002:a17:902:e801:b0:178:11e9:2ba2 with SMTP id u1-20020a170902e80100b0017811e92ba2mr19384754plg.26.1664171063543; Sun, 25 Sep 2022 22:44:23 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:9d:2:7e1b:858c:19dc:934]) by smtp.gmail.com with ESMTPSA id r11-20020a170902be0b00b00176c0e055f8sm10110489pls.64.2022.09.25.22.44.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 22:44:23 -0700 (PDT) From: Dmitry Torokhov To: Lee Jones Cc: Tony Lindgren , Charles Keepax , Richard Fitzgerald , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 1/5] mfd: mc13xxx: stop including of_gpio.h Date: Sun, 25 Sep 2022 22:44:17 -0700 Message-Id: <20220926054421.1546436-1-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Neither SPI nor I2C variant uses any APIs from of_gpio.h so let's stop including it. Signed-off-by: Dmitry Torokhov --- drivers/mfd/mc13xxx-i2c.c | 1 - drivers/mfd/mc13xxx-spi.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c index eb94f3004cf3..89ab01105460 100644 --- a/drivers/mfd/mc13xxx-i2c.c +++ b/drivers/mfd/mc13xxx-i2c.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c index f803527e5819..2809fbeb317c 100644 --- a/drivers/mfd/mc13xxx-spi.c +++ b/drivers/mfd/mc13xxx-spi.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include From patchwork Mon Sep 26 05:44:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 609537 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 0138AC07E9D for ; Mon, 26 Sep 2022 05:44:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233277AbiIZFo2 (ORCPT ); Mon, 26 Sep 2022 01:44:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232566AbiIZFo0 (ORCPT ); Mon, 26 Sep 2022 01:44:26 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B260925EB4; Sun, 25 Sep 2022 22:44:25 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id a80so5617117pfa.4; Sun, 25 Sep 2022 22:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=3nZUhNbViybhmYD0MhKu9JuoHfiHk4b0Rj6jyo4az0Y=; b=bcD9RuCCB0XGv9sYjvGu5Gb85JgKYL5bYn2gH7H9Bfy+PF3fRNh5jTVr4nndQqoLGx E68IJA3dAJgofhhnDxocagKMv04U+8ua5KqJTV4Mx2mrp5i9xWKudCZzgtFEoO7AzVqP +iWe2zBkyWXQ0ZYKkfNumnpMdfxOPnE3oY8WHgFCdSEdwNyUXQNa5CNyrho+1WKB40eY m/vLfoDTBcRcsweoJ44eGXx642ejX+XcAkmG0jAO5AATS8Mz2wKNAL1kES8jj8gRvqQd JE5VUdxNJHHmz7CWO4AsD3423EfOuBtNPCQIgVHYbaA5k7Wiq5Z3AVS+OI0tw0ZttkAw wurg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=3nZUhNbViybhmYD0MhKu9JuoHfiHk4b0Rj6jyo4az0Y=; b=bOZvGwb1mUZKR/MFQSIOiCTtaU1erfkbGKjGW3IszxSJpzBeAG43fpN+4jbYvQkuaP TE9BmaX907qKexleIpuCe05/SoJ0M+tKh4XCSxOzpUegFG7198NTovsufZ2qwvvnnwKX BcrQfNBJO+mWKl1BmH6Y89IvVJDYQZe7XpM2Tqv+cDQqN2X0z64VGAeq17LGSPAM6RX3 vWThr3aIzhJxzgqfhR1yY0fOhJ7gd1sKHKbcIG5Ew1LO6v0kQ5FVt/LRqQya8RdriMj6 vQ0OTIUpS5XxMP06jQ7OEevz/rgOuhEY7b8XhhgxSRHRAIva/7MH+eJvfVbj53q+AHv4 qi+w== X-Gm-Message-State: ACrzQf2+e6lDYlP/D+GFB2tIfi8J5BuSXIA1wXDoRScxzNJOoajDqHi+ kwFEzyVXEasP4a7USsv8Ia5UTrCHODU= X-Google-Smtp-Source: AMsMyM4NpakFGuRrEBIpxqgleALCtlcrWpC1KRBSruG7B4YPaKbtbKxU9MqMgCVaQZ9tKd0kDXUyQA== X-Received: by 2002:a63:d603:0:b0:43c:6762:20d9 with SMTP id q3-20020a63d603000000b0043c676220d9mr11323075pgg.68.1664171065007; Sun, 25 Sep 2022 22:44:25 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:9d:2:7e1b:858c:19dc:934]) by smtp.gmail.com with ESMTPSA id r11-20020a170902be0b00b00176c0e055f8sm10110489pls.64.2022.09.25.22.44.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 22:44:24 -0700 (PDT) From: Dmitry Torokhov To: Lee Jones Cc: Tony Lindgren , Charles Keepax , Richard Fitzgerald , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 2/5] mfd: madera: include correct gpio API Date: Sun, 25 Sep 2022 22:44:18 -0700 Message-Id: <20220926054421.1546436-2-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog In-Reply-To: <20220926054421.1546436-1-dmitry.torokhov@gmail.com> References: <20220926054421.1546436-1-dmitry.torokhov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The driver is using gpiod API and therefore should include linux/gpio/consumer.h, not linux/gpio.h. Also, the driver does not use any of the APIs from of_gpio.h, so we should not be including it. Signed-off-by: Dmitry Torokhov --- drivers/mfd/madera-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c index a2abc0094def..bdbd5bfc9714 100644 --- a/drivers/mfd/madera-core.c +++ b/drivers/mfd/madera-core.c @@ -8,13 +8,12 @@ #include #include #include -#include +#include #include #include #include #include #include -#include #include #include #include From patchwork Mon Sep 26 05:44:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 609941 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 A6752C6FA82 for ; Mon, 26 Sep 2022 05:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229526AbiIZFo2 (ORCPT ); Mon, 26 Sep 2022 01:44:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230169AbiIZFo1 (ORCPT ); Mon, 26 Sep 2022 01:44:27 -0400 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1AD725EB4; Sun, 25 Sep 2022 22:44:26 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id q9-20020a17090a178900b0020265d92ae3so11300250pja.5; Sun, 25 Sep 2022 22:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=tYfnxulldj171ixk25F2gMZ3H1v7kdiDVADiAeKVB2w=; b=dKkCvrI3++CEhnNBVVhNi379RVaSByu+G5rn7BoaLCQ7JHDrdeX6elVjqvLWk4J0yj 9V+66r6y1AUP8tQYPYZVdbEo1n5NbBb7u6QHfZtJb/HRdqoovcc07bF4MRIbJg3xXj1l MVgcEqwBN0pDqQ1VD1eMnQ1cWN/e2w29F2rCxExZhjLq0vQWHKCW32zKya4Go88x/CnN APgKSZXoLscYCO7QbyOXRREryfTSA9nQYkqa5W28bUO9Qe/EFYvGLKtGqjsMopTWCOug xe/j+T6dE9wJwMW1YbMWnhVAlPZgmc193WwoU9b7wz9LSeHktQoglD9vH/56AwQibUQX 4tWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=tYfnxulldj171ixk25F2gMZ3H1v7kdiDVADiAeKVB2w=; b=1tIZeR4NNni0oKcP9UGV7z81R2zFeTDSARdkwK13AKKI2xbpavDV7oEIo/Tsqh766P 5INjLknr8d23O4XDHh2ohpFudw78wHi2ewNyG90aBQCTUP5S6W1sC+u3CyPuPeMiSAAO J9SFmre4YDEiSmrcbS6PgZmIDPdB8A9wuqQWeWaPqqMQqSYaecuRG0LBkyieV7ezwkZH KxzFi9adEKYacmGKMJmsl+PWUYvkXFlw0fua0rBqfqwVNzs76JCDPbrquANGsp9IN8K2 7Q2V0a/9T7FogeGM2DIfqUUXo5SkkRewdEMWla/oedKEAbMTLbHcpmCObt/p4/9FlGvJ mDNQ== X-Gm-Message-State: ACrzQf0Q8wTQU5uwlJdw2GskrUyZbs+/3Nk9yJd+JHm2+XAw+wDeTod5 sGpqAnkIrH3ou1sWSTAnc28= X-Google-Smtp-Source: AMsMyM7xvlNRzqXXwVgnEGnQFpWzpscQ+XxEN4fT2nWBhp6a3WuCSN35BCMjQCiR/A2a2qk8qEeKqQ== X-Received: by 2002:a17:902:db0f:b0:176:e70f:6277 with SMTP id m15-20020a170902db0f00b00176e70f6277mr20276684plx.13.1664171066256; Sun, 25 Sep 2022 22:44:26 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:9d:2:7e1b:858c:19dc:934]) by smtp.gmail.com with ESMTPSA id r11-20020a170902be0b00b00176c0e055f8sm10110489pls.64.2022.09.25.22.44.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 22:44:25 -0700 (PDT) From: Dmitry Torokhov To: Lee Jones Cc: Tony Lindgren , Charles Keepax , Richard Fitzgerald , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 3/5] mfd: palmas: stop including of_gpio.h Date: Sun, 25 Sep 2022 22:44:19 -0700 Message-Id: <20220926054421.1546436-3-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog In-Reply-To: <20220926054421.1546436-1-dmitry.torokhov@gmail.com> References: <20220926054421.1546436-1-dmitry.torokhov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org It does not appear that any of palmas sub-drivers are using OF-based gpio APIs, so let's stop including this header. Signed-off-by: Dmitry Torokhov --- include/linux/mfd/palmas.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index 1e61c7e9f50d..117d02708439 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #define PALMAS_NUM_CLIENTS 3 From patchwork Mon Sep 26 05:44:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 609536 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 7A260C32771 for ; Mon, 26 Sep 2022 05:44:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233303AbiIZFoa (ORCPT ); Mon, 26 Sep 2022 01:44:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233287AbiIZFo3 (ORCPT ); Mon, 26 Sep 2022 01:44:29 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63CCF25EB4; Sun, 25 Sep 2022 22:44:28 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id a5-20020a17090aa50500b002008eeb040eso11857681pjq.1; Sun, 25 Sep 2022 22:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=rmZyxvqJS4w1YWyS2TPCQ1j0LXsRQHSN+Zm/YuUv3a8=; b=gT3voX5F2D8qbASe1iVUSB8yWCqIarzamN2aZnk1f3Mdcmqm7z4P0fWhkKa+RzxYB3 HzJaL7J97hpJJoQG09AvMymrvAqbM+VSWuSy7FgPE5HMRK7oj0SGzFVQOuRrwczICdem gDhEGE/U9MxK3gmiqARnQ0N9fh2vomz9eU4PoP06Tzj9z6FTJg+oaoM/2Qe9W8KEoJfT QKjYjQfIf+T1tbprGuksXWbfElgFlBLMG+k6rFr1yz8Wm8AalANbA3Xxsvv6EA+BQZee 7wMfCXR1iXxpn1AQ9A7EO4NTRQHdAIbBxdbFoID7OT/1wEkuBtVhpJ6vm03+LQx2BjoB RYnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=rmZyxvqJS4w1YWyS2TPCQ1j0LXsRQHSN+Zm/YuUv3a8=; b=gJxugA2yJokEmhJgsRX9x5MFAS8f2fg9T1xHouewTDIP0SIvFXOj5jUYWuqGIKzq8P 0df3J6aTozEvEq+rxm58jbpEeBuyo5f3sf2D38HKEZxOmUe6pHuy4cyiTOFmrLoo+mVb rVxYXbXKCcESpP2LqgrhNzEvdPXmcKaAjaTzo1z6YTSrnrOyVM/LImZo62ybV6ZQRorI cpPZ7Paee3IBAh/+tEkPubLjGu2riQn3zmTQoTh0ef5iIYA1zSzvQwOA0ifEkqiOhIRb tyqJOdUhEWTptiKAdysEdVtyqunqo8ZpYdPFLrVkRWpRUUzJxs9DNz5r3DNy3tIi9Tf6 9QsA== X-Gm-Message-State: ACrzQf2wiVLyp5G9mSVX72HKVIRFYkcb5UTA+WizHvsWQtjwdgJ/pPff mJeozXcoMEwkBo4DhnOWpw0= X-Google-Smtp-Source: AMsMyM42JEQj/WD9RW+9fbeDVH0vFY1tQ41Vb31wAlXZWaf16qfoBB+9ZIOMmPs5AffajTDl3ZuRBg== X-Received: by 2002:a17:90b:38c5:b0:202:98df:208c with SMTP id nn5-20020a17090b38c500b0020298df208cmr34459962pjb.129.1664171067571; Sun, 25 Sep 2022 22:44:27 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:9d:2:7e1b:858c:19dc:934]) by smtp.gmail.com with ESMTPSA id r11-20020a170902be0b00b00176c0e055f8sm10110489pls.64.2022.09.25.22.44.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 22:44:26 -0700 (PDT) From: Dmitry Torokhov To: Lee Jones Cc: Tony Lindgren , Charles Keepax , Richard Fitzgerald , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 4/5] mfd: twl6040: switch to using gpiod API Date: Sun, 25 Sep 2022 22:44:20 -0700 Message-Id: <20220926054421.1546436-4-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog In-Reply-To: <20220926054421.1546436-1-dmitry.torokhov@gmail.com> References: <20220926054421.1546436-1-dmitry.torokhov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This patch switches the dirver from legacy gpio API to a newer gpiod API so that we can eventually drop the former. Signed-off-by: Dmitry Torokhov --- drivers/mfd/twl6040.c | 29 +++++++++++++---------------- include/linux/mfd/twl6040.h | 5 +++-- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c index f429b8f00db6..4a7cdac5e10d 100644 --- a/drivers/mfd/twl6040.c +++ b/drivers/mfd/twl6040.c @@ -17,9 +17,8 @@ #include #include #include -#include #include -#include +#include #include #include #include @@ -251,7 +250,7 @@ static int twl6040_power_up_automatic(struct twl6040 *twl6040) { int time_left; - gpio_set_value(twl6040->audpwron, 1); + gpiod_set_value_cansleep(twl6040->audpwron, 1); time_left = wait_for_completion_timeout(&twl6040->ready, msecs_to_jiffies(144)); @@ -262,7 +261,7 @@ static int twl6040_power_up_automatic(struct twl6040 *twl6040) intid = twl6040_reg_read(twl6040, TWL6040_REG_INTID); if (!(intid & TWL6040_READYINT)) { dev_err(twl6040->dev, "automatic power-up failed\n"); - gpio_set_value(twl6040->audpwron, 0); + gpiod_set_value_cansleep(twl6040->audpwron, 0); return -ETIMEDOUT; } } @@ -290,7 +289,7 @@ int twl6040_power(struct twl6040 *twl6040, int on) /* Allow writes to the chip */ regcache_cache_only(twl6040->regmap, false); - if (gpio_is_valid(twl6040->audpwron)) { + if (twl6040->audpwron) { /* use automatic power-up sequence */ ret = twl6040_power_up_automatic(twl6040); if (ret) { @@ -337,9 +336,9 @@ int twl6040_power(struct twl6040 *twl6040, int on) if (--twl6040->power_count) goto out; - if (gpio_is_valid(twl6040->audpwron)) { + if (twl6040->audpwron) { /* use AUDPWRON line */ - gpio_set_value(twl6040->audpwron, 0); + gpiod_set_value_cansleep(twl6040->audpwron, 0); /* power-down sequence latency */ usleep_range(500, 700); @@ -712,18 +711,16 @@ static int twl6040_probe(struct i2c_client *client, } /* ERRATA: Automatic power-up is not possible in ES1.0 */ - if (twl6040_get_revid(twl6040) > TWL6040_REV_ES1_0) - twl6040->audpwron = of_get_named_gpio(node, - "ti,audpwron-gpio", 0); - else - twl6040->audpwron = -EINVAL; - - if (gpio_is_valid(twl6040->audpwron)) { - ret = devm_gpio_request_one(&client->dev, twl6040->audpwron, - GPIOF_OUT_INIT_LOW, "audpwron"); + if (twl6040_get_revid(twl6040) > TWL6040_REV_ES1_0) { + twl6040->audpwron = devm_gpiod_get_optional(&client->dev, + "ti,audpwron", + GPIOD_OUT_LOW); + ret = PTR_ERR_OR_ZERO(twl6040->audpwron); if (ret) goto gpio_err; + gpiod_set_consumer_name(twl6040->audpwron, "audpwron"); + /* Clear any pending interrupt */ twl6040_reg_read(twl6040, TWL6040_REG_INTID); } diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index 1fc7450bd8ab..cb1e7a9ce317 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h @@ -196,13 +196,14 @@ struct twl6040_gpo_data { }; struct twl6040_platform_data { - int audpwron_gpio; /* audio power-on gpio */ + struct gpio_desc *audpwron_gpio; /* audio power-on gpio */ struct twl6040_codec_data *codec; struct twl6040_vibra_data *vibra; struct twl6040_gpo_data *gpo; }; +struct gpio_desc; struct regmap; struct regmap_irq_chips_data; @@ -218,7 +219,7 @@ struct twl6040 { struct mfd_cell cells[TWL6040_CELLS]; struct completion ready; - int audpwron; + struct gpio_desc *audpwron; int power_count; int rev; From patchwork Mon Sep 26 05:44:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 609940 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 CAFEAC32771 for ; Mon, 26 Sep 2022 05:44:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233316AbiIZFoj (ORCPT ); Mon, 26 Sep 2022 01:44:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233274AbiIZFob (ORCPT ); Mon, 26 Sep 2022 01:44:31 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A925125EB4; Sun, 25 Sep 2022 22:44:29 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id l10so5227243plb.10; Sun, 25 Sep 2022 22:44:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=8lLdHYxGi9wvCMlavsF7WnFaRiE9i2ATJ5/GJDTh2SI=; b=Htl7PBQcJL99NRcPej+Sgy0bU6SqcQoNLBxX1Ub9O+zZEQt8dwIdpaVfo6MMnVId+v sNGTdGaPrE5prrvgURUthS8rPx5mzDYFeQj3ni1nnMuGHd4ECKjKDULfXiFdB+TM+SsA 7/M42PxfdLrstVUSG3AR10da1tbU/XF/f3numXa8HrUS0ib3VTGP+8aYn9uz1CC1sZGo LccZs4JhQ7KmSOQMq1JOuQxi88NYGJloRrnf2QzJ680bZjIxUi6ErTV3qjwXdMOSFOM+ C5xZDvJVGsqHnVykM02GSew3GUZjBombglJOxNhbEd/aLvmb9DpXFVtIF2QBNUyOAYuC PIVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=8lLdHYxGi9wvCMlavsF7WnFaRiE9i2ATJ5/GJDTh2SI=; b=23b5Sopn+XltPTJCTAvrT/ndmq/Gs18UbAYQiGxoQaI9hUV4CHDXEzVcvdGl0WcGNH ZFx0HRP7Ve7teVQZEkDGvNXP4b6o48RlzTrCAg4340kjx28riPVbaQpw+VMrrWkEVyJ8 dcgHnG+6ie96iCavzKYjv4fej87CHuxgUcpsVnts9plkYTI3rCIAdiMOqV2RqkaPqoa3 sNsA1h94HxHmPtK/KK31X2zp4IwNPYsXVBgZaNtM4e57SXGmhYWlYpVHYmOW8yjtOv3+ CNsYorQYVt6onyBIUCK3oCHuVgETmWoHtLANX9UPtNRRBSV59ftWW5Gsv+VaRSkf3pS2 N3Cg== X-Gm-Message-State: ACrzQf3PhG4guIXyFJbS3rGP1ilOm2pV3XevXnOeiWnq84BMuqyIa3ov MdqMVy0DomUMyiw8n2tQOCuZ3xFaaf8= X-Google-Smtp-Source: AMsMyM5DlIxcaGtF1MBCgHTmLvJ4igmSxzL+Gp+PcosNrnUr37PL3SAy/xKyF366FiSAi+QopT39+A== X-Received: by 2002:a17:90b:4c0c:b0:203:1407:809c with SMTP id na12-20020a17090b4c0c00b002031407809cmr22842060pjb.193.1664171068599; Sun, 25 Sep 2022 22:44:28 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([2620:15c:9d:2:7e1b:858c:19dc:934]) by smtp.gmail.com with ESMTPSA id r11-20020a170902be0b00b00176c0e055f8sm10110489pls.64.2022.09.25.22.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 22:44:28 -0700 (PDT) From: Dmitry Torokhov To: Lee Jones Cc: Tony Lindgren , Charles Keepax , Richard Fitzgerald , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 5/5] mfd: twl6040: drop twl6040_platform_data and associated definitions Date: Sun, 25 Sep 2022 22:44:21 -0700 Message-Id: <20220926054421.1546436-5-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog In-Reply-To: <20220926054421.1546436-1-dmitry.torokhov@gmail.com> References: <20220926054421.1546436-1-dmitry.torokhov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org As of df04b6242a58 ("mfd: twl6040: Remove support for legacy (pdata) mode") the driver no longer references the platform data, so we can drop its definition, as well as definitions of related structures. Signed-off-by: Dmitry Torokhov --- include/linux/mfd/twl6040.h | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index cb1e7a9ce317..286a724e379a 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h @@ -174,35 +174,6 @@ #define TWL6040_GPO_MAX 3 -/* TODO: All platform data struct can be removed */ -struct twl6040_codec_data { - u16 hs_left_step; - u16 hs_right_step; - u16 hf_left_step; - u16 hf_right_step; -}; - -struct twl6040_vibra_data { - unsigned int vibldrv_res; /* left driver resistance */ - unsigned int vibrdrv_res; /* right driver resistance */ - unsigned int viblmotor_res; /* left motor resistance */ - unsigned int vibrmotor_res; /* right motor resistance */ - int vddvibl_uV; /* VDDVIBL volt, set 0 for fixed reg */ - int vddvibr_uV; /* VDDVIBR volt, set 0 for fixed reg */ -}; - -struct twl6040_gpo_data { - int gpio_base; -}; - -struct twl6040_platform_data { - struct gpio_desc *audpwron_gpio; /* audio power-on gpio */ - - struct twl6040_codec_data *codec; - struct twl6040_vibra_data *vibra; - struct twl6040_gpo_data *gpo; -}; - struct gpio_desc; struct regmap; struct regmap_irq_chips_data;