From patchwork Tue Apr 23 13:36:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10913029 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 27CD814DB for ; Tue, 23 Apr 2019 13:37:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 182BA237A5 for ; Tue, 23 Apr 2019 13:37:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C4042887D; Tue, 23 Apr 2019 13:37:18 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 09CC3237A5 for ; Tue, 23 Apr 2019 13:37:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=54iyHd3B8MdcNqzTIcWjPSnBCna67eEOk2hIesnnstA=; b=ZFsgSKhIZuc7dC 5EuLHGDERKDLInFam/d6y1Maz1QgihVpo0PCAm2udLwnr/sBIOTohPEVBl+vYPK7v/Ma2Tauu1opi O8FvbrAuVFQhW/TOUQqM84znFl0X4f1GPYPpXYsYGzpbO+dR3oQeC4L40cfFuxy2aKQfG+D8LNik2 SMbflUjQHjcOD/FHMuY0JdOdzyO1u68rrpyecEhLgng4ORT8X/oOWvFDtUz7bnAmK5YxAe8/b1Ijb brVx4KUkx2UZlGoy9V9veZMiuz6QJ978Tlq/a9ClcI2j8BOhQ5axRGNUxmmWWH9Eqj5ePOOYZxNCU iLF55HE4fGujPenaDqww==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIvbk-0004pe-BG; Tue, 23 Apr 2019 13:37:12 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIvbS-0004V7-2H for linux-arm-kernel@lists.infradead.org; Tue, 23 Apr 2019 13:36:56 +0000 Received: by mail-wm1-x341.google.com with SMTP id v14so105459wmf.2 for ; Tue, 23 Apr 2019 06:36:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VQSrVwDmr1HQ9kqxMmTwk0XWGEyd+c093hBjiuVx8bc=; b=h/k0chIlrjXZFfVJZKzNRU/7VBPvmFG9hAc5gMMfpvxauD7MWhes4IPd7aNUpCqiuX UIqiNilu0rFTR84vow/iSOghmYHt5pjC1batpLbDTxiCh4hFsdHpYsH4mVTwYcKbTe+J kK6eElSduZr0YbsGgNy28tqk7jb91hvIoV3CfySgdDZwD4LFeDTvEgu4tjJ4ffpedPFs Ln5tr4zyZy1mxjnFydoZDhSNr4ChimkWKvztgrrdCjLf5Y7yst0YTIWgRCNL+Usnngv8 Pp4vaTnbr4EEAZ94zZkuTvohrOYg0ySFm+XlPqhENoxLrHdUuzVfaQMDxz+o47KtxxUT j0ew== 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=VQSrVwDmr1HQ9kqxMmTwk0XWGEyd+c093hBjiuVx8bc=; b=l2Gcom4JuIdEGhOdYcYYrcbWN4Jsyibc1klYC+kQ1035ngEWAcw0ayQAnSjtxfDzAq ktw32XPpq8zFAFYcaGr5L7lbCXDG/dXBQBfPMYC1FDIskXvCjcJ23qSDdkpfkNXov/yv KCdZVA7i0T/y8Y3KYDpvi/Ohe9GEsnGwHSabbZvlbPRWXjpuzH9unrLizNG5udx+q1we qYQAoJMVpCddeVzGscZg3Nw4WOYR4WwEj67jlG54Ou354D6P9F5DvD1vGqDYUVhhHzD1 NaMaB9aofHAwov2ZVlcS+lcVmMDIWrqxiWt0DhtDjJ1oPYYhc8OVSvnhPifmbf740vk0 sk4g== X-Gm-Message-State: APjAAAX0cZWwJ76L1N31PDDFDXah3LmhDErsZf6vOYmZwdHm3vbNifsR kmlfp+OShbidDS/4mH9HpSCZVA== X-Google-Smtp-Source: APXvYqwXBniYbjKTahnNsFqXrgbfaflk3GyG8hY1CXhuQ0SZHSCMjNvpkF3z2GsuVULZicC6rUWdcg== X-Received: by 2002:a7b:ca51:: with SMTP id m17mr2129980wml.25.1556026612681; Tue, 23 Apr 2019 06:36:52 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id z20sm13509543wmf.34.2019.04.23.06.36.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 06:36:51 -0700 (PDT) From: Neil Armstrong To: thierry.reding@gmail.com, devicetree@vger.kernel.org Subject: [PATCH v2 1/3] dt-bindings: pwm: Update bindings for the Meson G12A Family Date: Tue, 23 Apr 2019 15:36:44 +0200 Message-Id: <20190423133646.5705-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190423133646.5705-1-narmstrong@baylibre.com> References: <20190423133646.5705-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190423_063654_223549_00E767AD X-CRM114-Status: GOOD ( 11.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, Neil Armstrong , baylibre-upstreaming@groups.io, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Update the doc to explicitly support Meson G12A Family. The 2 first (A & B) AO PWM uses different clock source than the last 2 (C & D) AO PWM modules, thus we need to differentiate them. Signed-off-by: Neil Armstrong Reviewed-by: Martin Blumenstingl Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/pwm/pwm-meson.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/pwm/pwm-meson.txt b/Documentation/devicetree/bindings/pwm/pwm-meson.txt index 1fa3f7182133..891632354065 100644 --- a/Documentation/devicetree/bindings/pwm/pwm-meson.txt +++ b/Documentation/devicetree/bindings/pwm/pwm-meson.txt @@ -7,6 +7,9 @@ Required properties: or "amlogic,meson-gxbb-ao-pwm" or "amlogic,meson-axg-ee-pwm" or "amlogic,meson-axg-ao-pwm" + or "amlogic,meson-g12a-ee-pwm" + or "amlogic,meson-g12a-ao-pwm-ab" + or "amlogic,meson-g12a-ao-pwm-cd" - #pwm-cells: Should be 3. See pwm.txt in this directory for a description of the cells format. From patchwork Tue Apr 23 13:36:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10913031 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 09DC11515 for ; Tue, 23 Apr 2019 13:37:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDDF8237A5 for ; Tue, 23 Apr 2019 13:37:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1B802887D; Tue, 23 Apr 2019 13:37:24 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7FFDA237A5 for ; Tue, 23 Apr 2019 13:37:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SjOiA0eI6Q/BxWvkK0xF5ffZD06JmqX0iBO00gLWkBE=; b=P2lxbpGg5WgZn0 o+SAVicUxrT6QeEe5qAznQFgNFUx2hteSPYaCojBrdOFQCbsEkabPyFxWiqd+xnxDALQQ4HgYwTyN Mwn2vnBeNn0uS550cN1berLNu/EO9L3ARAHkwlCgl62CX//8llX1Omq89sERAscUBr8uY7qsCwWVz VhVI/Kl/kaOcocy7rIurKz0mj0cUll/xQCGEcpfDQVKGZwKgsH2y44n2UdfzSlqscIlyvhHQ296J6 lpVebmzKkq5T+vovY4OcmxB/usm8HVoOojHCuskAaYQ35p/3lJi5wrR2DVgLas6V9Z8y3O8W1t8UI a0L80FpRZ3yMQDAdLqag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIvbq-0004zL-Pe; Tue, 23 Apr 2019 13:37:18 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIvbU-0004Vj-96 for linux-arm-kernel@lists.infradead.org; Tue, 23 Apr 2019 13:37:00 +0000 Received: by mail-wm1-x342.google.com with SMTP id y197so121975wmd.0 for ; Tue, 23 Apr 2019 06:36:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GyIwurtaQrYXM2ZMvHhJOtIlHoFi3EeiRaMRxuyOY5A=; b=u3zZtz5sFySkpfmLlMM2+qPIPYjsS1x2MbKbjd/6XHeBt7UGtzwLcVeGRCcuXWUpNg Z6qEWd1UOYpVkB+jVJp2lALjEEDH2Aivt2mQmQpP1USZoqi2TEeVTmMZqD22B3f1DbHR YlwkIoPBDC8w/8dvfCyC8jc8BN0CUkJhPjf310EBWvsG9yJgGRj2XmSf5cIl5XZGI00e kLUoajMrbt4mZmUFJxYeYmYNkrq3qyPsOg/3UaxDIMePVClxkeLN+ZMoJ826Wpiy6EZb c1hdRbpII1lS9wu9vYnWx7r7RCa2s74WEGScGrf7TS4eocFg5VdrXN/QZTmRvt3lfJCc mjSA== 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=GyIwurtaQrYXM2ZMvHhJOtIlHoFi3EeiRaMRxuyOY5A=; b=d8vKXhNW0XPpNkkSd4tndHMN2XpgpQZKC7Bi0LO7VtqzEBQCLieuY5ydegUPQGPlSD wgQ5z0zaJQYr4Z2qcKoB+d2N1EiET5zqhzb9Shfr+CHnl9CoUCayv7jRuGARsRrj2Bnp t44txg4zEvE8cohNRUOVWw//CBdVNPyfEd/dniNP+bJ9Q4lSKy+/GlCEbu4QNgys40am QacnhgPKYW96vHI9iSXwLXVHvz6LT/XMnbDY6xle+aHldd/jSvGpYC87jOgGSuwJDzBs 9N3vsv8h1+YTonaSxDc/KV4bTpW4b+hVhtEYmguHtuk7w2piRM8RH6WvY8WM9lEu0iYH zGYw== X-Gm-Message-State: APjAAAVcxquc7elAREdp8tw8Ce2g9kWVSPWpveNgaG2DvFHP9JsFoDIg nKPY8XXuo1LQCzVoNcMvr65HFQ== X-Google-Smtp-Source: APXvYqzxnHz5TKORqYjOKr1Gnz2ldQm6TU7EG8p0lZZBtL8k0/i+klnj7GmE/20OoQmset/OJJy/dA== X-Received: by 2002:a7b:c40c:: with SMTP id k12mr2337950wmi.2.1556026614420; Tue, 23 Apr 2019 06:36:54 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id z20sm13509543wmf.34.2019.04.23.06.36.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 06:36:53 -0700 (PDT) From: Neil Armstrong To: thierry.reding@gmail.com Subject: [PATCH v2 2/3] pwm: meson: Add clock source configuration for Meson G12A Date: Tue, 23 Apr 2019 15:36:45 +0200 Message-Id: <20190423133646.5705-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190423133646.5705-1-narmstrong@baylibre.com> References: <20190423133646.5705-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190423_063656_549148_72FA9CDD X-CRM114-Status: GOOD ( 11.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, Neil Armstrong , baylibre-upstreaming@groups.io, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP For the PWM controller in the Meson G12A SoC, the EE domain and AO domain have different clock sources. This patch tries to describe them in the DT compatible data. The two AO PWM controller has different clock source, but the first AO controller (A & B) can reuse the AXG parents name. Signed-off-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- drivers/pwm/pwm-meson.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 2b03938039b6..bdf1b367e391 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -434,6 +434,24 @@ static const struct meson_pwm_data pwm_axg_ao_data = { .num_parents = ARRAY_SIZE(pwm_axg_ao_parent_names), }; +static const char * const pwm_g12a_ao_cd_parent_names[] = { + "aoclk81", "xtal", +}; + +static const struct meson_pwm_data pwm_g12a_ao_cd_data = { + .parent_names = pwm_g12a_ao_cd_parent_names, + .num_parents = ARRAY_SIZE(pwm_g12a_ao_cd_parent_names), +}; + +static const char * const pwm_g12a_ee_parent_names[] = { + "xtal", "hdmi_pll", "fclk_div4", "fclk_div3" +}; + +static const struct meson_pwm_data pwm_g12a_ee_data = { + .parent_names = pwm_g12a_ee_parent_names, + .num_parents = ARRAY_SIZE(pwm_g12a_ee_parent_names), +}; + static const struct of_device_id meson_pwm_matches[] = { { .compatible = "amlogic,meson8b-pwm", @@ -455,6 +473,18 @@ static const struct of_device_id meson_pwm_matches[] = { .compatible = "amlogic,meson-axg-ao-pwm", .data = &pwm_axg_ao_data }, + { + .compatible = "amlogic,meson-g12a-ee-pwm", + .data = &pwm_g12a_ee_data + }, + { + .compatible = "amlogic,meson-g12a-ao-pwm-ab", + .data = &pwm_axg_ao_data + }, + { + .compatible = "amlogic,meson-g12a-ao-pwm-cd", + .data = &pwm_g12a_ao_cd_data + }, {}, }; MODULE_DEVICE_TABLE(of, meson_pwm_matches); From patchwork Tue Apr 23 13:36:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10913037 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 8C0891515 for ; Tue, 23 Apr 2019 13:37:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AD58237A5 for ; Tue, 23 Apr 2019 13:37:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F35C2887D; Tue, 23 Apr 2019 13:37:41 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1392D237A5 for ; Tue, 23 Apr 2019 13:37:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TfIJBVwwK18Lv/PXjZIQ8dexnhghZU3mM2KJBeP9lK8=; b=Fxi8ZhwjoqzlVB 3mbEZ1QSd19QohjXvgwYtmXqBs+8cYwo/oTXZWlJPtFR2DyGMq2JrWW9u9R5cfuZ+HNju4Qxj96Ur U3Lg5w5DbXXKz3FT9qP4XsKErOOzlVIuuMNbJXIzAQHxe0cPyl/onczUgJPLS0L9OP7IF02W4S+CA cioEoMZsRygBc+1JISExXSarxWW420B9Lb9bVOH8PhK0TuFOQQhm7AHVuLlk9sQvVCTooVSDhwgz+ PkoIPbU7Ayv6khny3gczxqlYzqcJRstuNrhJecp3D2AtbpFnafrBHyrVr8eC2L9Jzs7U0mG8EYlEj 7CV+RAozDuwFLlhNcD8g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIvc9-0005NT-HW; Tue, 23 Apr 2019 13:37:37 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIvbV-0004W0-87 for linux-arm-kernel@lists.infradead.org; Tue, 23 Apr 2019 13:37:00 +0000 Received: by mail-wm1-x343.google.com with SMTP id 4so108103wmf.1 for ; Tue, 23 Apr 2019 06:36:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gRRPPW+odTXhFAsU3nebrJ3pOmtPg3fz+kt7pkJ+hYg=; b=gJzTtPJglsNGltcuceOwdXvOWFbCDbmX747W7KKaMS3ah7BRPXloumV42Gcz31twrI vLF3guTu/Gj9LL9+JRBnnPynnexpUE3RM2MtyZ/at+BWmm/Oo1eWoYXHGw8LrpDcp8vp zafctJYCwhDa37OgvOcEKGEl7pww7qYgX+P666OtM8SUn2AM8XdTyT++njYpMGakVh5N 2bxEiYcjA+WGB0cwnkT/t9ATkkFqfSY3fswWO6XI5Wl5/jIzyUR7MCHbcRcyzMbUm6n4 7zxDLrrAbSXwsdMRBi0/VHKwW90VrV0D22+bk4EevE2u7VsupA/qlfmNcX3nYQvngd8b 4cQQ== 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=gRRPPW+odTXhFAsU3nebrJ3pOmtPg3fz+kt7pkJ+hYg=; b=Rz4YtA0aVBUIVRsYC1PB8MczJEE6PwRAvV1nvq8M/z119uKXUCaNOqAhAYM2Mnb3f/ k4OMncTRA96wVOGkCNHJFyRO6pG3gfzSLIKbnNgWIpLNNjNtQCKbZ/+jnRoLeFXuz0fr zAOpNKTLI3P66FyFcsEPIeCE2wevACW92Br/FFNHtkizeTxPY9EItnP2Xk3vhlP6GDAp oP28pCULxpZQgKM7Jt8dteRn4KwcX4UsQdLs0mYv9euJx0ZhcRmmUqcZRCI3hzB3BzLv 2O3CzkdNGyGHD3bMApzY3YNVctkVXvVwIa2Aqt4/M/1m3xi4/3hHJDkmLRWd6hq8mM+C L4nw== X-Gm-Message-State: APjAAAWMhUNetkZkxqXxwZxCjbFpp9bxZW6+av37fJ6Uhl7lqRzbgnPp eK/XXZyHU+S++TWfnc+KsbLCOw== X-Google-Smtp-Source: APXvYqwUIV2m/OArUl29VTuMNyASRUnqvFVA1Fu4IdEoT3PxqLHfOe86tDQJBu9mpqHGoGeury9v9Q== X-Received: by 2002:a1c:20c1:: with SMTP id g184mr2464872wmg.137.1556026615465; Tue, 23 Apr 2019 06:36:55 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id z20sm13509543wmf.34.2019.04.23.06.36.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 06:36:54 -0700 (PDT) From: Neil Armstrong To: thierry.reding@gmail.com Subject: [PATCH v2 3/3] arm64: dts: meson-g12a: Add PWM nodes Date: Tue, 23 Apr 2019 15:36:46 +0200 Message-Id: <20190423133646.5705-4-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190423133646.5705-1-narmstrong@baylibre.com> References: <20190423133646.5705-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190423_063657_539641_4CB4E323 X-CRM114-Status: GOOD ( 10.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, Neil Armstrong , baylibre-upstreaming@groups.io, linux-kernel@vger.kernel.org, Martin Blumenstingl , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This adds the EE and AO PWM nodes and the possible pinctrl settings. Signed-off-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 179 ++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 9f72396ba710..efadd78aa747 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -202,6 +202,94 @@ }; }; + pwm_a_pins: pwm-a { + mux { + groups = "pwm_a"; + function = "pwm_a"; + bias-disable; + }; + }; + + pwm_b_x7_pins: pwm-b-x7 { + mux { + groups = "pwm_b_x7"; + function = "pwm_b"; + bias-disable; + }; + }; + + pwm_b_x19_pins: pwm-b-x19 { + mux { + groups = "pwm_b_x19"; + function = "pwm_b"; + bias-disable; + }; + }; + + pwm_c_c_pins: pwm-c-c { + mux { + groups = "pwm_c_c"; + function = "pwm_c"; + bias-disable; + }; + }; + + pwm_c_x5_pins: pwm-c-x5 { + mux { + groups = "pwm_c_x5"; + function = "pwm_c"; + bias-disable; + }; + }; + + pwm_c_x8_pins: pwm-c-x8 { + mux { + groups = "pwm_c_x8"; + function = "pwm_c"; + bias-disable; + }; + }; + + pwm_d_x3_pins: pwm-d-x3 { + mux { + groups = "pwm_d_x3"; + function = "pwm_d"; + bias-disable; + }; + }; + + pwm_d_x6_pins: pwm-d-x6 { + mux { + groups = "pwm_d_x6"; + function = "pwm_d"; + bias-disable; + }; + }; + + pwm_e_pins: pwm-e { + mux { + groups = "pwm_e"; + function = "pwm_e"; + bias-disable; + }; + }; + + pwm_f_x_pins: pwm-f-x { + mux { + groups = "pwm_f_x"; + function = "pwm_f"; + bias-disable; + }; + }; + + pwm_f_h_pins: pwm-f-h { + mux { + groups = "pwm_f_h"; + function = "pwm_f"; + bias-disable; + }; + }; + uart_a_pins: uart-a { mux { groups = "uart_a_tx", @@ -418,6 +506,62 @@ bias-disable; }; }; + + pwm_ao_a_pins: pwm-ao-a { + mux { + groups = "pwm_ao_a"; + function = "pwm_ao_a"; + bias-disable; + }; + }; + + pwm_ao_b_pins: pwm-ao-b { + mux { + groups = "pwm_ao_b"; + function = "pwm_ao_b"; + bias-disable; + }; + }; + + pwm_ao_c_4_pins: pwm-ao-c-4 { + mux { + groups = "pwm_ao_c_4"; + function = "pwm_ao_c"; + bias-disable; + }; + }; + + pwm_ao_c_6_pins: pwm-ao-c-6 { + mux { + groups = "pwm_ao_c_6"; + function = "pwm_ao_c"; + bias-disable; + }; + }; + + pwm_ao_d_5_pins: pwm-ao-d-5 { + mux { + groups = "pwm_ao_d_5"; + function = "pwm_ao_d"; + bias-disable; + }; + }; + + pwm_ao_d_10_pins: pwm-ao-d-10 { + mux { + groups = "pwm_ao_d_10"; + function = "pwm_ao_d"; + bias-disable; + }; + }; + + pwm_ao_d_e_pins: pwm-ao-d-e { + mux { + groups = "pwm_ao_d_e"; + function = "pwm_ao_d"; + bias-disable; + }; + }; }; }; @@ -445,6 +589,13 @@ status = "disabled"; }; + pwm_AO_cd: pwm@2000 { + compatible = "amlogic,meson-g12a-ao-pwm-cd"; + reg = <0x0 0x2000 0x0 0x20>; + #pwm-cells = <3>; + status = "disabled"; + }; + uart_AO: serial@3000 { compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; @@ -465,6 +616,13 @@ status = "disabled"; }; + pwm_AO_ab: pwm@7000 { + compatible = "amlogic,meson-g12a-ao-pwm-ab"; + reg = <0x0 0x7000 0x0 0x20>; + #pwm-cells = <3>; + status = "disabled"; + }; + saradc: adc@9000 { compatible = "amlogic,meson-g12a-saradc", "amlogic,meson-saradc"; @@ -533,6 +691,27 @@ #reset-cells = <1>; }; + pwm_ef: pwm@19000 { + compatible = "amlogic,meson-g12a-ee-pwm"; + reg = <0x0 0x19000 0x0 0x20>; + #pwm-cells = <3>; + status = "disabled"; + }; + + pwm_cd: pwm@1a000 { + compatible = "amlogic,meson-g12a-ee-pwm"; + reg = <0x0 0x1a000 0x0 0x20>; + #pwm-cells = <3>; + status = "disabled"; + }; + + pwm_ab: pwm@1b000 { + compatible = "amlogic,meson-g12a-ee-pwm"; + reg = <0x0 0x1b000 0x0 0x20>; + #pwm-cells = <3>; + status = "disabled"; + }; + clk_msr: clock-measure@18000 { compatible = "amlogic,meson-g12a-clk-measure"; reg = <0x0 0x18000 0x0 0x10>;