From patchwork Fri May 24 18:26:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 13673516 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 75B57C25B74 for ; Fri, 24 May 2024 18:28:23 +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=F8rJZ1OVM3PPKqIHSXwJLjybinAsJ2KQdHEmM2bCGHs=; b=VjBdiIQ4EeEPc4 6mXvNOibib9tA2BfITDoOS4hCn2lh4HyIsCbIxqqMTeQLFWiUOUMN1MGqVHQ0hR0ea/2ec5h45iOq mCmRcLIZY8zkfe9OFrjbiVpNJAug2cr8KaecT7Ef+u1XWqjo1F8p/oRkKUPvQqGdJLQvbU5CGYtRo 9SWG8VqUut76cuURyuoLOBw75RCtoIexpgsByV2WK7xIWZPUIE8GWoO3UVvquEpvBCySWXXNaLQ4G NS0l6zkPfp0ZGIArDu6vag/NQm1+k/lyJOMaUTTQbp6VHL+9priEvhfhty//7QTBhUfu7qK4Qh/Uk CmYqFX1XloOQH1g7M5Nw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZe6-00000009ZCv-3QSX; Fri, 24 May 2024 18:28:02 +0000 Received: from mail-wm1-x361.google.com ([2a00:1450:4864:20::361]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZe2-00000009Z8L-30DF for linux-arm-kernel@lists.infradead.org; Fri, 24 May 2024 18:28:00 +0000 Received: by mail-wm1-x361.google.com with SMTP id 5b1f17b1804b1-420180b58c5so32160285e9.3 for ; Fri, 24 May 2024 11:27:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1716575273; x=1717180073; 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=2MV7QZf2fhH+OEhBA38QGxT92fUaASU1Nxo1nxUSVd8=; b=Gcypq2bpnAwT4uVuYZaQqtcdxGQS6CYaiveRuwT77jK0vIg5JuClYknUiryODWyWts iAIiwe7jeXbVL3RpzzBY0gK6q4l7uGpD7/TxlMtwK9s9td3/RozwHRdfV5LOMlNHFDkD SVOP/tE++EE6VFaMSxYDBfNV9IepyNzTUZ22EG6Vgto5xiuTM4jDNVED3asU2rA73r69 5NVmDYQhUdVLS1XS9EHFPBfjmXmLgfwHPLhLYINDf7daccuhzYnDjhX1ZhWgkzmAUdM7 /c/ap525+9EraPY16d2jh/w449rNREMJ1URGO5mUXfiHr4qLjo200UYElDSHvuWFGmCB oOHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716575273; x=1717180073; 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=2MV7QZf2fhH+OEhBA38QGxT92fUaASU1Nxo1nxUSVd8=; b=nKEFfnbe3/nmRIJIuevVYq9nPXywEzFaN1I72V5EWrGq4K3XrnwYjcA6Ekan6S+ub1 hhSTouYGy5yg+LrULmnlvn9xqZptKYtP/TYeR0usVXBulf7zLUrZ4v2z1Uiq68iKrqGC 0/w/+4adE3CHgqbkzma0vFyQgelAmyx9rnV0hpDAMdiYABnL7uLNgdRAe/olp/woV5/p jzC9o2DESu+PzP0aFhBPUpRPQ/pGm1x+oIUKlBuvDmyEhkelbxpPz2yhncSiKgkJ46wA FVzHs+wlseC+QUC/YXaDWD743VCOmviRsTdgqvXxlQvC/GLDcXZhIg9L/drYlu/T74M+ 5Qig== X-Forwarded-Encrypted: i=1; AJvYcCXPPivl875c0feyQUCkBR9U0raD9qZyb1fYdtpxah9W8/WOjO3E3nRgrdYdTdOhbigUtj6pNJJ7OVZQf0Xz38I7r6A2t7OxTWOqflnme15uT9EarGs= X-Gm-Message-State: AOJu0YxJIDOi6aG0OQynYDYfrhzGiPorLSjXWxIkOQJl1XyPIdTiq8Jk p5LeqmZ7BX5+nlTswRiaZjXxICrEQXL2TtrN/nud432ON4EUz4L7B4iaxMe7HDlyP+dpX0B6yRl U0mnfxPgdSn3g1uxSw7EbVEbZftxZIyqF X-Google-Smtp-Source: AGHT+IHWZ0JTRBQwe/XochchvTJaAoc7r7/ijNNUJ35CDCjZA7ALjlPQSMAk7tENe+DW/f85sGYNAcbTrrfr X-Received: by 2002:a05:600c:5799:b0:41b:f2ca:19cc with SMTP id 5b1f17b1804b1-421089f93b7mr26088945e9.34.1716575272958; Fri, 24 May 2024 11:27:52 -0700 (PDT) Received: from raspberrypi.com ([188.39.149.98]) by smtp-relay.gmail.com with ESMTPS id 5b1f17b1804b1-4210891c6edsm1217615e9.20.2024.05.24.11.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 11:27:52 -0700 (PDT) X-Relaying-Domain: raspberrypi.com From: Dave Stevenson To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Vinod Koul , Maxime Ripard , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Ulf Hansson , Mark Brown , Christoph Hellwig , Marek Szyprowski , Robin Murphy , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Vladimir Murzin , Phil Elwell , Stefan Wahren , Serge Semin Cc: devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mmc@vger.kernel.org, linux-spi@vger.kernel.org, iommu@lists.linux.dev, linux-sound@vger.kernel.org, Dave Stevenson Subject: [PATCH 03/18] ARM: dts: bcm283x: Update to use dma-channel-mask Date: Fri, 24 May 2024 19:26:47 +0100 Message-Id: <20240524182702.1317935-4-dave.stevenson@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com> References: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240524_112759_044977_306A7EA0 X-CRM114-Status: GOOD ( 14.73 ) 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 Now the driver looks for the common dma-channel-mask property rather than the vendor-specific brcm,dma-channel-mask, update the dt files to follow suit. Signed-off-by: Dave Stevenson Acked-by: Florian Fainelli --- arch/arm/boot/dts/broadcom/bcm2711.dtsi | 2 +- arch/arm/boot/dts/broadcom/bcm2835-common.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi index e4e42af21ef3..d64bf098b697 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi @@ -103,7 +103,7 @@ dma: dma-controller@7e007000 { "dma9", "dma10"; #dma-cells = <1>; - brcm,dma-channel-mask = <0x07f5>; + dma-channel-mask = <0x07f5>; }; pm: watchdog@7e100000 { diff --git a/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi b/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi index 9261b67dbee1..3ba8db8eed0f 100644 --- a/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi @@ -46,7 +46,7 @@ dma: dma-controller@7e007000 { "dma14", "dma-shared-all"; #dma-cells = <1>; - brcm,dma-channel-mask = <0x7f35>; + dma-channel-mask = <0x7f35>; }; intc: interrupt-controller@7e00b200 {