From patchwork Tue Aug 20 09:46:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171784 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4167053ily; Tue, 20 Aug 2019 02:46:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqzT1qQGPW2COEmOJxFvpX0ykfYCmoRLlPom4pj+uduPUFa1HUacZGD7wTaCT09t8uNHHiSJ X-Received: by 2002:a63:df06:: with SMTP id u6mr22964112pgg.96.1566294398583; Tue, 20 Aug 2019 02:46:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566294398; cv=none; d=google.com; s=arc-20160816; b=kQBzrUsRoD1NB6IQO5pHNuhMo/TWKbFIKcGSdSqprUnUHI1qij6Uljrc9tE/1CQc/r xONQpiLCcvLCD5U8d1NcYyY858OChAv8UUI9AlvgvE4FozsO6ph0rzPjXVT5foRTM6e5 XycvnpldQETJoqgSyKBoAvOcLmjnMiNQZGjnlsd1gcdKwYYHUQlrRPqxPGcSzP0fk7zZ HXpWwMcw9Yxwgl2Krme/f1qhLDdum8lFcgZGT2kkpmaPbg04fkRjV64VRZnOiOZgN7H2 0+RWKlMFo5HBDHpD+t2yJfwjyl/FCb7sbGTbQrJP7vmYljIwQNASwCU3xp+YK5zE4ka0 xTTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Wu+Hc1WycBhYeKR1pHbRQ6nVmuPzQ42/00GPF9ACS0U=; b=SowQT9h0Qsbte2afv0kReHeOoH7xpMVLHoMERz7oXK+U1TFuFZSBSMq95vgJTha/2e NGNltGHFg0rodemHoIwFMoEkE3fZzVxlbbMzatH3L3k64vMDIs7DgO6/FqFnXGTJzuyA aNVnTBfkdK9TPpjJ8rImDXDhal/8DVO/eqdvowG7pTXxNPGALd+sqH+Jiqi1EkSYQHvk 2Y4F7dYwYRJD+ek2hzTBCJ56tTdvYLN7lLljruiR8wbkHoQE6uvfvypUKQWx2tRe1Nuc TkioPCgLi9vMFRRZ4OKsrbezeNLywgAfurLVkjdAuGkuvr2ApNmQAInZ00q1IaCIiiDx TXgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=skd+6wLZ; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b30si11871951pla.368.2019.08.20.02.46.38; Tue, 20 Aug 2019 02:46:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=skd+6wLZ; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728426AbfHTJqd (ORCPT + 8 others); Tue, 20 Aug 2019 05:46:33 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:39560 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729553AbfHTJqc (ORCPT ); Tue, 20 Aug 2019 05:46:32 -0400 Received: by mail-wr1-f65.google.com with SMTP id t16so11672213wra.6 for ; Tue, 20 Aug 2019 02:46:31 -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=Wu+Hc1WycBhYeKR1pHbRQ6nVmuPzQ42/00GPF9ACS0U=; b=skd+6wLZFaGGAnwwAVlawhB0YB3fgyzkrfNxyIbQmuSYzcxK1m5LRcV3YMhTHl6xnT WQqyOczqznGQEwtngKkgVihlcWs6C+BPd2XjqYCCBde1YcFH7Ju+HioxY4GbB/T3TldC 4/mI7j1o3rv8VLZFhgDYPIHlj5zH/Wt0FcRcXvzoMYw0br9N/d/GrnjfUsUgFsJHpw4s 1zOFffK4RCWzi2hPVSHMbacYWjw2IHnt56AP0qZnWpzopOBzLMlna1tkorQWvv817zOw g+PzR3AE/PwtO4klH7y1MkabhZFOhE5XHJsk02tpaym8JiNbkZx8t6dZxllpdtgfTp2/ wI9Q== 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=Wu+Hc1WycBhYeKR1pHbRQ6nVmuPzQ42/00GPF9ACS0U=; b=B/Mk/AaP513DLIq6UJ7v6MYAJx0QRl7McnHqhS7NoA54kbm0X2XBdEH/oMLP56Vpl/ GawHaFmMgI3lk4uPxpUu9vp2Y6UJ0TYxlId1WpN6cxntp8sf8fMWu4p111TSGcbNbXfG MuLSWbaOJVK/XEzurkb3iAjmni/vnu8S1e558lPbg4t0pUkUKkr563DcXb2sJcGWIInL n+UYBmnuTmG7LiIC/JIs7s6nRS3tIrBgESUwJwFimlexuAr2+AoyJFp3FzhWhuha2/ZS FwASXH7fZ3+oRWJY04ygfFwvkWBDZLXsam91XOpiduiMk8jlrckqzauLcAwnQB93D6Wu hyjQ== X-Gm-Message-State: APjAAAXa4Iq8Mwv7vLx+b1eA8aTZbkzE5sEglVaFjEVsdegMcLZA54dH /DbsdEYo1llv9CyBFMt/eb5Dew== X-Received: by 2002:adf:f386:: with SMTP id m6mr32999738wro.313.1566294390507; Tue, 20 Aug 2019 02:46:30 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id o17sm15958305wrx.60.2019.08.20.02.46.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 02:46:30 -0700 (PDT) From: Jerome Brunet To: Philipp Zabel Cc: Jerome Brunet , Kevin Hilman , linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] reset: dt-bindings: meson: update arb bindings for sm1 Date: Tue, 20 Aug 2019 11:46:24 +0200 Message-Id: <20190820094625.13455-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190820094625.13455-1-jbrunet@baylibre.com> References: <20190820094625.13455-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org SM1 SoC family adds two new audio FIFOs with the related arb reset lines Signed-off-by: Jerome Brunet --- .../devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt | 3 ++- include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.21.0 diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt b/Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt index 26e542eb96df..43e580ef64ba 100644 --- a/Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt @@ -4,7 +4,8 @@ The Amlogic Audio ARB is a simple device which enables or disables the access of Audio FIFOs to DDR on AXG based SoC. Required properties: -- compatible: 'amlogic,meson-axg-audio-arb' +- compatible: 'amlogic,meson-axg-audio-arb' or + 'amlogic,meson-sm1-audio-arb' - reg: physical base address of the controller and length of memory mapped region. - clocks: phandle to the fifo peripheral clock provided by the audio diff --git a/include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h b/include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h index 05c36367875c..1ef807856cb8 100644 --- a/include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h +++ b/include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h @@ -13,5 +13,7 @@ #define AXG_ARB_FRDDR_A 3 #define AXG_ARB_FRDDR_B 4 #define AXG_ARB_FRDDR_C 5 +#define AXG_ARB_TODDR_D 6 +#define AXG_ARB_FRDDR_D 7 #endif /* _DT_BINDINGS_AMLOGIC_MESON_AXG_AUDIO_ARB_H */ From patchwork Tue Aug 20 09:46:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 171783 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4166988ily; Tue, 20 Aug 2019 02:46:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqzFF7mMjxAJkRYptp5AxLzqPaHAVHram7s74waXcwT/gBzk8vHXKn75xqqj6Nnlbaikhx+y X-Received: by 2002:a62:dbc6:: with SMTP id f189mr29446593pfg.237.1566294394678; Tue, 20 Aug 2019 02:46:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566294394; cv=none; d=google.com; s=arc-20160816; b=dCDCowfkz1NnCHqQNZq7PYPgWrcIj3RhTt5eZjZaB7YagdG6G4tMFc0a+IRcJdMKre Zn/stcJJAg8yixdGYe4mt15kmbGVW60hxzle0kDuDglHSVkShMtyqf/HDY+/NNwMslpg +IXqB0urMQjFGbUqQHfDUVD2VoSyirhnT7c5NiWq9df8iLvw6Pc+XL4j0QMQqaFrXTAQ EKHJYpQFBoUiowcsm7tWEQ3T+2FJl3Mjag9Ih1IZwNSBHNKEUmkEaLSOnXCTLxSQI3Ve t6LZ37YkCz5I5vvopPzpxNtKrJruklyIyQO9nxm5FSzTSILkzp1P5RgQRIPUvnI2NOrx K3vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OCqVb1b3ky6iQzAtUB0i7OFFbduthR84Csc9ahGaOQU=; b=SQuS1ByTtyVirdS4C2in+2dqWqE9j1HsJwaNJ0xBvIqZR5ll8xt6hCZiMzhKJTFf3Z cITp2DW1NVm2RmoScZHIwbQ9fqql0hcoCgPdkJaKgf0xywSfZFDliLj/lbT6EYpqqvTV JeqJtjTxMzhFp+zbn2DAPWOf6DIfIWxXwRsxcXQ+K2pDo5+mglxVvs6muyaMgPrb3Yo8 2L1kjsRRCvRt4KqdYhH/YcsPSCNlDAE8ZF0MzNFJo47fLNRmFIDf0WIaAUEMcRaHz0Kc 1oBdKUSBD4tvYSLKPiIbvXFmiSp+B3to77w3OX6C8OAvFBmyEeapk9wMdMSqLf3vK/Gi g2bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Sc66PKmn; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fr17si10761997pjb.36.2019.08.20.02.46.34; Tue, 20 Aug 2019 02:46:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Sc66PKmn; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729631AbfHTJqd (ORCPT + 8 others); Tue, 20 Aug 2019 05:46:33 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43794 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729606AbfHTJqd (ORCPT ); Tue, 20 Aug 2019 05:46:33 -0400 Received: by mail-wr1-f68.google.com with SMTP id y8so11669885wrn.10 for ; Tue, 20 Aug 2019 02:46:32 -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=OCqVb1b3ky6iQzAtUB0i7OFFbduthR84Csc9ahGaOQU=; b=Sc66PKmnhvSczvFG4A+2IsY4y788+71RHz17he6fqbGBB7lV2eetN+bT1iC6s+Nt+I oJASVWmdfkn7D49IDGS3xpbFWAe29TgnxL50murfoXlijNtsx86Ii1AdRSK/WoGfEIOb 5DSIIYeFO6ud7bPIe6OaDxaPP6l8lGhXajospvzpWeUst3j1/MMgVdsO2QO0NrRIh7dl ACu8TT71vzZ4AIRTucs2hPUGGUzWHSyV68rlhNpZHwXoRRZFm+1G3VoPkwmFsvQj8XcO MKxIW4NC7LyvMlfcU3kHRADKDeuleLnsmwJ+AEf38aMAW9o8qZhQdbm1N9KPMY40XrAS uT7w== 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=OCqVb1b3ky6iQzAtUB0i7OFFbduthR84Csc9ahGaOQU=; b=U17xMabhE5urfyJpk7xZ3MGGrihkS3YuAehQtBnXO6gVs54+xRs2nEgWOoWJatAu70 PPUCmRaRpLwM+sImLhYF6cZ8hDl/eqkhkSKPXHPX20r+UkpGhSqMO0o8kC5L404h+2OZ xACdXhscZsNU+1GzdSAJS3elYGJ6qlwgIHmUPvw8CjIXjYVCafmgoE8e7U/pcf/ueWa2 meAMb+nTEf8mg8kBhiDFePDXfgH/ZQsmY4ZHpCXJ+ztt7zkMGyHGBDW7ALxh17QaOJ7+ HJTO8wUQFqf6tbMmo+sFiVIWzT6SxF0Tp9fFXLpjF5qW2oOtDULkBGcglltVKZ9yqdjK Sg/g== X-Gm-Message-State: APjAAAU8wBK2tWXdU4JueMQb+mHi3kMYi9B9Q4fdjd46P19xW8ON3yzB xYKXntRyHVpS9mmKsjrZy5iPPw== X-Received: by 2002:a5d:6ad0:: with SMTP id u16mr33820477wrw.84.1566294391450; Tue, 20 Aug 2019 02:46:31 -0700 (PDT) Received: from starbuck.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id o17sm15958305wrx.60.2019.08.20.02.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 02:46:31 -0700 (PDT) From: Jerome Brunet To: Philipp Zabel Cc: Jerome Brunet , Kevin Hilman , linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] reset: meson-audio-arb: add sm1 support Date: Tue, 20 Aug 2019 11:46:25 +0200 Message-Id: <20190820094625.13455-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190820094625.13455-1-jbrunet@baylibre.com> References: <20190820094625.13455-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add the new arb reset lines of the SM1 SoC family Signed-off-by: Jerome Brunet --- drivers/reset/reset-meson-audio-arb.c | 28 ++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) -- 2.21.0 diff --git a/drivers/reset/reset-meson-audio-arb.c b/drivers/reset/reset-meson-audio-arb.c index c53a2185a039..72d29dbca45a 100644 --- a/drivers/reset/reset-meson-audio-arb.c +++ b/drivers/reset/reset-meson-audio-arb.c @@ -30,6 +30,17 @@ static const unsigned int axg_audio_arb_reset_bits[] = { [AXG_ARB_FRDDR_C] = 6, }; +static const unsigned int sm1_audio_arb_reset_bits[] = { + [AXG_ARB_TODDR_A] = 0, + [AXG_ARB_TODDR_B] = 1, + [AXG_ARB_TODDR_C] = 2, + [AXG_ARB_FRDDR_A] = 4, + [AXG_ARB_FRDDR_B] = 5, + [AXG_ARB_FRDDR_C] = 6, + [AXG_ARB_TODDR_D] = 3, + [AXG_ARB_FRDDR_D] = 7, +}; + static int meson_audio_arb_update(struct reset_controller_dev *rcdev, unsigned long id, bool assert) { @@ -82,8 +93,14 @@ static const struct reset_control_ops meson_audio_arb_rstc_ops = { }; static const struct of_device_id meson_audio_arb_of_match[] = { - { .compatible = "amlogic,meson-axg-audio-arb", }, - {} + { + .compatible = "amlogic,meson-axg-audio-arb", + .data = axg_audio_arb_reset_bits, + }, + { + .compatible = "amlogic,meson-sm1-audio-arb", + .data = sm1_audio_arb_reset_bits + }, {} }; MODULE_DEVICE_TABLE(of, meson_audio_arb_of_match); @@ -104,10 +121,15 @@ static int meson_audio_arb_remove(struct platform_device *pdev) static int meson_audio_arb_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + const unsigned int *data; struct meson_audio_arb_data *arb; struct resource *res; int ret; + data = of_device_get_match_data(dev); + if (!data) + return -EINVAL; + arb = devm_kzalloc(dev, sizeof(*arb), GFP_KERNEL); if (!arb) return -ENOMEM; @@ -126,7 +148,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev) return PTR_ERR(arb->regs); spin_lock_init(&arb->lock); - arb->reset_bits = axg_audio_arb_reset_bits; + arb->reset_bits = data; arb->rstc.nr_resets = ARRAY_SIZE(axg_audio_arb_reset_bits); arb->rstc.ops = &meson_audio_arb_rstc_ops; arb->rstc.of_node = dev->of_node;