From patchwork Wed Mar 13 14:08:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea della Porta X-Patchwork-Id: 13591455 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BC172C54791 for ; Wed, 13 Mar 2024 14:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GJdD5VjoT8W9WmA5fbg1nGBum458DWCMZhOr3RggHbQ=; b=AIp9vm4zJikAEe RSirGacuVc9u0kFH4C7GX+BPxJhEMbDP1BR+EEAVg3LRogMNNBjV2DygGDoNq0CcGlDzjXL2jyaG5 iAEevspvBfF/4m/ye4ADEKduutdpeCiCppDb5GH+7bXn/kRrrGXCcmAfqYDS3vJY8t5T7XML79Mia rd4gcJSW6czFGqLjwfHjAQJEx8NwMVa9INhbyfxdeD5nxph0HKTssirml/cDqWVC8IRBv48qAhBMh flaRHL1w2MWG/c98SuembKx9fEvWFJRHLG3rFSkRwGSMiMUXYdIwWYPb9FkDuO53guSc5USQ4k9KG hSFd4ojvAtVJ2JW+6C5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkPIr-0000000AMpu-07as; Wed, 13 Mar 2024 14:09:57 +0000 Received: from mail-ed1-f45.google.com ([209.85.208.45]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkPI2-0000000AMBw-1tyx for linux-arm-kernel@lists.infradead.org; Wed, 13 Mar 2024 14:09:08 +0000 Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-563cb3ba9daso7937734a12.3 for ; Wed, 13 Mar 2024 07:08:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1710338936; x=1710943736; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sxhFutbq+Y+6CXRWNL6/WkO0dcfzVUrgph3wJP5gbgo=; b=QtGCWLNhOMBnyiG/ML/OHuM5WEnjLVFN9Ik7EwxVLtexLgE8MvJEU75xOERZKGk3VY VFkvvX0WeKwKFwqnWuoUhjiayEeLnue02T+7vp0j8iCAFZC3S3FoS3Jk9TInxCBKF0Rr BJIxzy43i4tVuIRoB1fAzlHVPqrViIcRWZ6ugr0HLM5JU8Gs6ZZs+0oDMY+0O+aWgwdE eBluvhZOiMK7xCdS8Pae/v8/m+AqqLNhYj52XRaI285U0idFyP1pJdaJ9lQqLp4hlRfO SroJWk/FK82wsQhiUi6nIINpZ7c6kpIhOK6XKMexSFRM3GO1wlgcB7geCyiS+sPt0CTu kh9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710338936; x=1710943736; 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:message-id:reply-to; bh=sxhFutbq+Y+6CXRWNL6/WkO0dcfzVUrgph3wJP5gbgo=; b=KjE0iIArS8sf26+PRwFWCGlId7dJJwoJqCfY/CQY/smkmdx8Ysjib3gcREhJBd9u8W FNJBJ0WfFg3Wmr7nY+mor6CE7gDKI0ydaNwNekvJRO4gfgAOdcoO1PSmuLaqBDW94DdL BKYjbQJYY6tmyL71ID0aZz9SuK5AGmha3o60+aq8HMcwjvDRiSTkMaGTmrclTuOCRaYM v3JFYlDp2XEFpZLppc0m9cYX64EosKJednLbG/yCwT+hMhKif6DDX0LoLjGxqrGBcszk 2LiWZzzPy6guGXoC4XmMwi76Wu1u++oBH0D/g3s8zr/16tWYxdey08hqTFdHpNlyBtHI lYdg== X-Forwarded-Encrypted: i=1; AJvYcCWzhM9E4a9HSJg6sh2ms2jmQ1jzw4MGE/HGmJjV8H7hpE60AWc/fJ/JD+kSyBA2sDVkBDBQDGxq2cCNt41YayavMfqApQZIOONthaQ7qTNmhJzFvNM= X-Gm-Message-State: AOJu0YziYpjh2N/TfBuJztB5Z2sNxbLqfsmIda5/FqSyPEhPht9Hqz6x oh5WAwQiuIvlC7+O2ecJxaudHQK3ltHPfL3thbvbMaJDTW8lV6NGZnnEtzr+GAk= X-Google-Smtp-Source: AGHT+IHGhXmShKjT2bgraHVp5n3iw9VUmNLl0npsFuV9YOWwmAyXpR7Lt4bTH+kxGpjAq2xtbLLcbw== X-Received: by 2002:a17:906:55cf:b0:a46:5fd2:f26a with SMTP id z15-20020a17090655cf00b00a465fd2f26amr1116133ejp.65.1710338935915; Wed, 13 Mar 2024 07:08:55 -0700 (PDT) Received: from localhost (host-82-56-173-172.retail.telecomitalia.it. [82.56.173.172]) by smtp.gmail.com with ESMTPSA id ku2-20020a170907788200b00a44936527b5sm4907081ejc.99.2024.03.13.07.08.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 07:08:55 -0700 (PDT) From: Andrea della Porta To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Saenz Julienne , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dave.stevenson@raspberrypi.com Cc: Phil Elwell , Maxime Ripard , Stefan Wahren , Dom Cobley , Andrea della Porta Subject: [PATCH v2 06/15] dmaengine: bcm2835: Support common dma-channel-mask Date: Wed, 13 Mar 2024 15:08:31 +0100 Message-ID: <33415530388855ba8964c1f32dd126cb173e191d.1710226514.git.andrea.porta@suse.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240313_070906_649441_9608D579 X-CRM114-Status: GOOD ( 15.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Nowadays there is a generic property for dma-channel-mask in the DMA controller binding. So prefer this one instead of the old vendor specific one. Print a warning in case the old one is used. Btw use the result of of_property_read_u32() as return code in error case. Signed-off-by: Stefan Wahren Signed-off-by: Andrea della Porta --- drivers/dma/bcm2835-dma.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index 6b8e7461efaf..88aaf7769864 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -986,12 +986,19 @@ static int bcm2835_dma_probe(struct platform_device *pdev) } /* Request DMA channel mask from device tree */ - if (of_property_read_u32(pdev->dev.of_node, - "brcm,dma-channel-mask", - &chans_available)) { - dev_err(&pdev->dev, "Failed to get channel mask\n"); - rc = -EINVAL; - goto err_no_dma; + rc = of_property_read_u32(pdev->dev.of_node, "dma-channel-mask", + &chans_available); + + if (rc) { + /* Try deprecated property */ + if (of_property_read_u32(pdev->dev.of_node, + "brcm,dma-channel-mask", + &chans_available)) { + dev_err(&pdev->dev, "Failed to get channel mask\n"); + goto err_no_dma; + } + + dev_warn(&pdev->dev, "Please update DT blob\n"); } /* get irqs for each channel that we support */