From patchwork Tue Mar 1 22:04:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 8470821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 70607C0553 for ; Tue, 1 Mar 2016 22:07:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2B7E2017D for ; Tue, 1 Mar 2016 22:07:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C18B9201EC for ; Tue, 1 Mar 2016 22:06:59 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aasPw-00085F-1S; Tue, 01 Mar 2016 22:05:20 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aasPm-0006tQ-5V for linux-arm-kernel@lists.infradead.org; Tue, 01 Mar 2016 22:05:11 +0000 Received: by mail-wm0-x243.google.com with SMTP id 1so6436089wmg.2 for ; Tue, 01 Mar 2016 14:04:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=XJKUi1xzviK7Tn0iOVMu8y+G2gg7HzZl8jvsnUwZvaI=; b=bR+3hJHFElemUQkN/9GTcO2LaPNxA4zHpv6hbHRujTj0kvS3QU4isiBk5JiFbvFAC+ ZDxm/l+m7YGnb8gUMT6CF9uioEwHZfeyeJfvJ+4VyACRA/+TpNMbMgS4fNBzwtIG2tc6 mYdVrL8tE1tkejs1dsxBz8aT1ZLqwz0A6E47GiLaErefI6aGXPc8xikC6cVSJAPJ+wpm HAta/sIMHH3fKXr4i3lIAjPkj6XvuMWUlMzngMs8U2Ar7J/ZSL5ivBwM02eGLdB4XOYU lolxjDNF4tOheyVkrZ/BWkOacANBXQQCwe8hs0Xs1h7xSAOpLVR0N0pwrx8TNC0aXys1 DgYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=XJKUi1xzviK7Tn0iOVMu8y+G2gg7HzZl8jvsnUwZvaI=; b=a6KIRBCVyWjml5I5sKJWQDXl38sLNUUyH/okMDfbbaVb9zJmYiiAxz31nC45119l/0 dUQemPjDBjsYdPNc8YB8Z4uqGgQgDfLQzWRIdsSzDuSQdhP004/VwQCrTQfJJvD6Admt x8LuDFprxyZ23AiWe+xVbUgmhZgr/7k0+GanPRurxiE1ShIiPsCoe4rmDxnjQD2zwufL TLepdOg+pYVGBQ67npk0dS52z3WrheN6oG6waN+GreNmJcKD3KHYYDKzu+B0szUOLCWV a+cpUNknpVMMTJGB1N6DPGy/aI1dd5lzYqiwY5qkpbZzktYQ1j3pzcpmLSzow3QjMuXN eoUg== X-Gm-Message-State: AD7BkJJRGb3T03AI2/g2RBOvUCc+GnSzbzXMJpvm0iyAL/dL3OwUfwtS9E/GT0ZaQ/HD7g== X-Received: by 10.28.148.207 with SMTP id w198mr1245082wmd.66.1456869888566; Tue, 01 Mar 2016 14:04:48 -0800 (PST) Received: from localhost.localdomain (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by smtp.gmail.com with ESMTPSA id 63sm1136107wms.1.2016.03.01.14.04.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Mar 2016 14:04:47 -0800 (PST) From: Carlo Caione To: linus.walleij@linaro.org, b.galvani@gmail.com, linux-arm-kernel@lists.infradead.org, linux-meson@googlegroups.com, robh+dt@kernel.org, devicetree@vger.kernel.org, linux@endlessm.com, arnd@arndb.de Subject: [PATCH 1/4] pinctrl: amlogic: Separate some pin functions for Meson8 / Meson8b Date: Tue, 1 Mar 2016 23:04:33 +0100 Message-Id: <1456869876-19320-2-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456869876-19320-1-git-send-email-carlo@caione.org> References: <1456869876-19320-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160301_140510_426331_4B42CFCA X-CRM114-Status: GOOD ( 11.84 ) X-Spam-Score: -2.4 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlo Caione MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Carlo Caione Separate functions for pins controlled by different pin controllers. Signed-off-by: Carlo Caione --- drivers/pinctrl/meson/pinctrl-meson8b.c | 35 +++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c index 9677807..0c9572e 100644 --- a/drivers/pinctrl/meson/pinctrl-meson8b.c +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c @@ -694,7 +694,10 @@ static const char * const i2c_c_groups[] = { }; static const char * const hdmi_groups[] = { - "hdmi_hpd", "hdmi_sda", "hdmi_scl", "hdmi_cec_0", + "hdmi_hpd", "hdmi_sda", "hdmi_scl", "hdmi_cec_0" +}; + +static const char * const hdmi_cec_groups[] = { "hdmi_cec_1" }; @@ -770,12 +773,20 @@ static const char * const i2c_mst_ao_groups[] = { "i2c_mst_sck_ao", "i2c_mst_sda_ao" }; -static const char * const clk_groups[] = { - "clk_24m_out", "clk_32k_in_out" +static const char * const clk_24m_groups[] = { + "clk_24m_out", +}; + +static const char * const clk_32k_groups[] = { + "clk_32k_in_out", }; -static const char * const spdif_groups[] = { - "spdif_out_1", "spdif_out_0" +static const char * const spdif_0_groups[] = { + "spdif_out_0" +}; + +static const char * const spdif_1_groups[] = { + "spdif_out_1" }; static const char * const i2s_groups[] = { @@ -789,7 +800,11 @@ static const char * const pwm_b_groups[] = { }; static const char * const pwm_c_groups[] = { - "pwm_c0", "pwm_c1", "pwm_c2" + "pwm_c0", "pwm_c1" +}; + +static const char * const pwm_c_ao_groups[] = { + "pwm_c2" }; static const char * const pwm_d_groups[] = { @@ -827,6 +842,7 @@ static struct meson_pmx_func meson8b_functions[] = { FUNCTION(uart_c), FUNCTION(i2c_c), FUNCTION(hdmi), + FUNCTION(hdmi_cec), FUNCTION(spi), FUNCTION(ethernet), FUNCTION(i2c_a), @@ -842,16 +858,19 @@ static struct meson_pmx_func meson8b_functions[] = { FUNCTION(i2c_slave_ao), FUNCTION(uart_ao_b), FUNCTION(i2c_mst_ao), - FUNCTION(clk), - FUNCTION(spdif), + FUNCTION(clk_32k), + FUNCTION(spdif_0), + FUNCTION(spdif_1), FUNCTION(i2s), FUNCTION(pwm_b), FUNCTION(pwm_c), + FUNCTION(pwm_c_ao), FUNCTION(pwm_d), FUNCTION(pwm_e), FUNCTION(pwm_vs), FUNCTION(tsin_a), FUNCTION(tsin_b), + FUNCTION(clk_24m), }; static struct meson_bank meson8b_banks[] = {