From nobody Sun Oct 5 21:48:08 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE700275861; Wed, 30 Jul 2025 09:36:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753868173; cv=none; b=Eeulju9TaBm6ehnI4VhPHCCWyUwf1ryjX5dZqaunseb1B/HdIFb0JjZyuGTCrwiirLhtjzIFBxP8AqUJdR7qIoulATlCr7YJzxBo3zmLVYCkHAxMkyNa6sXV64Lh8oRaAJ7cgcsFtsDAobibWAiTqPZ2zRwSRzdc//IJULBhAOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753868173; c=relaxed/simple; bh=U7eQoDwMZXfDwuwVea0w+jYJ1TMWNsXv/5d12PtqCK4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ubiH8ej7ul88+8CzDevhwZXDjOnzPYcv4m8+6+11+9TM3fo36D2cQe2GMX6LdVm+rKbaW3BGTKImsieJh668T8yRiwZFdc5BUkxDFMHn10Gwq8u3fuN8kbdY+3diuqzMbY8CJxG5Jc33kYhJMIYDu2jS8WHxqlIssakksdoK5HU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P3Cze1Sx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="P3Cze1Sx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77134C4CEFB; Wed, 30 Jul 2025 09:35:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753868172; bh=U7eQoDwMZXfDwuwVea0w+jYJ1TMWNsXv/5d12PtqCK4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=P3Cze1SxwkLKbJLG1vfxsWJMSu7uughnp8h8z/jfcLSusC7y2lNnWpwXYSYKof/RI pgw5X2hvPr3vpshyjAg/8KUszmUzrSDqQyU2nzBL0pa8fd1NyQmM2vLnJDW0aiL+6+ bGecyZDOoFtJ2sP0ZoYIV2SZYn5HV1MGiLAdUvBFgrO4m5dcRjK613/Cw+nWCimvDx FL44Q4jW691/RrI0rcDoXytLvMAiIpuARGWDUePZM4GKk2w3vu0gZLKGX4ko774PIW AhQJCP+JzuaiFfueMW+88Y5kZM0abgIUeY26ug1ZfW+RCf6O8hXTEnChataQmCOT3F UHPFgP1QhJTmg== From: Konrad Dybcio Date: Wed, 30 Jul 2025 11:33:33 +0200 Subject: [PATCH RFC 6/6] arm64: dts: qcom: x1e80100: Remove GENI protocol ID from DMA cells Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250730-topic-dma_genise_cookie-v1-6-b505c1238f9f@oss.qualcomm.com> References: <20250730-topic-dma_genise_cookie-v1-0-b505c1238f9f@oss.qualcomm.com> In-Reply-To: <20250730-topic-dma_genise_cookie-v1-0-b505c1238f9f@oss.qualcomm.com> To: Vinod Koul , Sven Peter , Janne Grunau , Alyssa Rosenzweig , Neal Gompa , Ludovic Desroches , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Paul Cercueil , Eugeniy Paltsev , Viresh Kumar , Andy Shevchenko , Frank Li , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Taichi Sugaya , Takao Orito , =?utf-8?q?Andreas_F=C3=A4rber?= , Manivannan Sadhasivam , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Geert Uytterhoeven , Magnus Damm , Patrice Chotard , Linus Walleij , =?utf-8?q?Am=C3=A9lie_Delaunay?= , Maxime Coquelin , Alexandre Torgue , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Laxman Dewangan , Jon Hunter , Thierry Reding , Peter Ujfalusi , Kunihiko Hayashi , Masami Hiramatsu , Michal Simek , Laurent Pinchart , Rob Herring , Saravana Kannan , =?utf-8?q?Martin_Povi=C5=A1er?= , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Kuninori Morimoto , Mukesh Kumar Savaliya , Viken Dadhaniya , Andi Shyti , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio Cc: Marijn Suijten , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-mips@vger.kernel.org, imx@lists.linux.dev, linux-actions@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-sound@vger.kernel.org, linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1753868049; l=18562; i=konrad.dybcio@oss.qualcomm.com; s=20230215; h=from:subject:message-id; bh=eDOVFQ3sSBau28xDU0M0uPPUVN4g8jr8B0d8rvg5egs=; b=xH4jh5rJF8B145J7w0kFZHTYYTom25yvk5j1qw11KTCOGB0+ZcbC18dRuZ105iOgHDfhfDxBn cEAuRlJPY88DvQulmsLTFg0yEf8bqDuTx1ByVsle1gQfPH4q1Ggpi4H X-Developer-Key: i=konrad.dybcio@oss.qualcomm.com; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= From: Konrad Dybcio In preparation for coalescing the duplicate nodes referring to the same GENI serial engines running different protocol firmware, remove the no longer necessary protocol IDs from each of the GPI DMA consumers. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/x1e80100.dtsi | 198 ++++++++++++++++-------------= ---- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/q= com/x1e80100.dtsi index 5e9a8fa3cf96468b12775f91192cbd779d5ce946..0dc055c9660501f3e5e3ba87e15= 60125eba67730 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi +++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi @@ -844,7 +844,7 @@ gpi_dma2: dma-controller@800000 { =20 dma-channels =3D <12>; dma-channel-mask =3D <0x3e>; - #dma-cells =3D <3>; + #dma-cells =3D <2>; =20 iommus =3D <&apps_smmu 0x436 0x0>; =20 @@ -890,8 +890,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma2 0 0 QCOM_GPI_I2C>, - <&gpi_dma2 1 0 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma2 0 0>, + <&gpi_dma2 1 0>; dma-names =3D "tx", "rx"; =20 @@ -926,8 +926,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_120mhz>; =20 - dmas =3D <&gpi_dma2 0 0 QCOM_GPI_SPI>, - <&gpi_dma2 1 0 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma2 0 0>, + <&gpi_dma2 1 0>; dma-names =3D "tx", "rx"; =20 @@ -962,8 +962,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma2 0 1 QCOM_GPI_I2C>, - <&gpi_dma2 1 1 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma2 0 1>, + <&gpi_dma2 1 1>; dma-names =3D "tx", "rx"; =20 @@ -998,8 +998,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_120mhz>; =20 - dmas =3D <&gpi_dma2 0 1 QCOM_GPI_SPI>, - <&gpi_dma2 1 1 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma2 0 1>, + <&gpi_dma2 1 1>; dma-names =3D "tx", "rx"; =20 @@ -1034,8 +1034,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma2 0 2 QCOM_GPI_I2C>, - <&gpi_dma2 1 2 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma2 0 2>, + <&gpi_dma2 1 2>; dma-names =3D "tx", "rx"; =20 @@ -1070,8 +1070,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma2 0 2 QCOM_GPI_SPI>, - <&gpi_dma2 1 2 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma2 0 2>, + <&gpi_dma2 1 2>; dma-names =3D "tx", "rx"; =20 @@ -1106,8 +1106,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma2 0 3 QCOM_GPI_I2C>, - <&gpi_dma2 1 3 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma2 0 3>, + <&gpi_dma2 1 3>; dma-names =3D "tx", "rx"; =20 @@ -1142,8 +1142,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma2 0 3 QCOM_GPI_SPI>, - <&gpi_dma2 1 3 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma2 0 3>, + <&gpi_dma2 1 3>; dma-names =3D "tx", "rx"; =20 @@ -1178,8 +1178,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma2 0 4 QCOM_GPI_I2C>, - <&gpi_dma2 1 4 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma2 0 4>, + <&gpi_dma2 1 4>; dma-names =3D "tx", "rx"; =20 @@ -1214,8 +1214,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma2 0 4 QCOM_GPI_SPI>, - <&gpi_dma2 1 4 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma2 0 4>, + <&gpi_dma2 1 4>; dma-names =3D "tx", "rx"; =20 @@ -1250,8 +1250,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma2 0 5 QCOM_GPI_I2C>, - <&gpi_dma2 1 5 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma2 0 5>, + <&gpi_dma2 1 5>; dma-names =3D "tx", "rx"; =20 @@ -1286,8 +1286,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma2 0 5 QCOM_GPI_SPI>, - <&gpi_dma2 1 5 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma2 0 5>, + <&gpi_dma2 1 5>; dma-names =3D "tx", "rx"; =20 @@ -1347,8 +1347,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma2 0 6 QCOM_GPI_I2C>, - <&gpi_dma2 1 6 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma2 0 6>, + <&gpi_dma2 1 6>; dma-names =3D "tx", "rx"; =20 @@ -1383,8 +1383,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma2 0 6 QCOM_GPI_SPI>, - <&gpi_dma2 1 6 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma2 0 6>, + <&gpi_dma2 1 6>; dma-names =3D "tx", "rx"; =20 @@ -1419,8 +1419,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma2 0 7 QCOM_GPI_I2C>, - <&gpi_dma2 1 7 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma2 0 7>, + <&gpi_dma2 1 7>; dma-names =3D "tx", "rx"; =20 @@ -1455,8 +1455,8 @@ &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma2 0 7 QCOM_GPI_SPI>, - <&gpi_dma2 1 7 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma2 0 7>, + <&gpi_dma2 1 7>; dma-names =3D "tx", "rx"; =20 @@ -1489,7 +1489,7 @@ gpi_dma1: dma-controller@a00000 { =20 dma-channels =3D <12>; dma-channel-mask =3D <0x3e>; - #dma-cells =3D <3>; + #dma-cells =3D <2>; =20 iommus =3D <&apps_smmu 0x136 0x0>; =20 @@ -1535,8 +1535,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma1 0 0 QCOM_GPI_I2C>, - <&gpi_dma1 1 0 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma1 0 0>, + <&gpi_dma1 1 0>; dma-names =3D "tx", "rx"; =20 @@ -1571,8 +1571,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_120mhz>; =20 - dmas =3D <&gpi_dma1 0 0 QCOM_GPI_SPI>, - <&gpi_dma1 1 0 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma1 0 0>, + <&gpi_dma1 1 0>; dma-names =3D "tx", "rx"; =20 @@ -1607,8 +1607,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma1 0 1 QCOM_GPI_I2C>, - <&gpi_dma1 1 1 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma1 0 1>, + <&gpi_dma1 1 1>; dma-names =3D "tx", "rx"; =20 @@ -1643,8 +1643,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_120mhz>; =20 - dmas =3D <&gpi_dma1 0 1 QCOM_GPI_SPI>, - <&gpi_dma1 1 1 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma1 0 1>, + <&gpi_dma1 1 1>; dma-names =3D "tx", "rx"; =20 @@ -1679,8 +1679,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma1 0 2 QCOM_GPI_I2C>, - <&gpi_dma1 1 2 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma1 0 2>, + <&gpi_dma1 1 2>; dma-names =3D "tx", "rx"; =20 @@ -1715,8 +1715,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma1 0 2 QCOM_GPI_SPI>, - <&gpi_dma1 1 2 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma1 0 2>, + <&gpi_dma1 1 2>; dma-names =3D "tx", "rx"; =20 @@ -1751,8 +1751,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma1 0 3 QCOM_GPI_I2C>, - <&gpi_dma1 1 3 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma1 0 3>, + <&gpi_dma1 1 3>; dma-names =3D "tx", "rx"; =20 @@ -1787,8 +1787,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma1 0 3 QCOM_GPI_SPI>, - <&gpi_dma1 1 3 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma1 0 3>, + <&gpi_dma1 1 3>; dma-names =3D "tx", "rx"; =20 @@ -1823,8 +1823,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma1 0 4 QCOM_GPI_I2C>, - <&gpi_dma1 1 4 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma1 0 4>, + <&gpi_dma1 1 4>; dma-names =3D "tx", "rx"; =20 @@ -1859,8 +1859,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma1 0 4 QCOM_GPI_SPI>, - <&gpi_dma1 1 4 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma1 0 4>, + <&gpi_dma1 1 4>; dma-names =3D "tx", "rx"; =20 @@ -1895,8 +1895,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma1 0 5 QCOM_GPI_I2C>, - <&gpi_dma1 1 5 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma1 0 5>, + <&gpi_dma1 1 5>; dma-names =3D "tx", "rx"; =20 @@ -1931,8 +1931,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma1 0 5 QCOM_GPI_SPI>, - <&gpi_dma1 1 5 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma1 0 5>, + <&gpi_dma1 1 5>; dma-names =3D "tx", "rx"; =20 @@ -1967,8 +1967,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma1 0 6 QCOM_GPI_I2C>, - <&gpi_dma1 1 6 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma1 0 6>, + <&gpi_dma1 1 6>; dma-names =3D "tx", "rx"; =20 @@ -2003,8 +2003,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma1 0 6 QCOM_GPI_SPI>, - <&gpi_dma1 1 6 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma1 0 6>, + <&gpi_dma1 1 6>; dma-names =3D "tx", "rx"; =20 @@ -2064,8 +2064,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma1 0 7 QCOM_GPI_I2C>, - <&gpi_dma1 1 7 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma1 0 7>, + <&gpi_dma1 1 7>; dma-names =3D "tx", "rx"; =20 @@ -2100,8 +2100,8 @@ &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma1 0 7 QCOM_GPI_SPI>, - <&gpi_dma1 1 7 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma1 0 7>, + <&gpi_dma1 1 7>; dma-names =3D "tx", "rx"; =20 @@ -2134,7 +2134,7 @@ gpi_dma0: dma-controller@b00000 { =20 dma-channels =3D <12>; dma-channel-mask =3D <0x3e>; - #dma-cells =3D <3>; + #dma-cells =3D <2>; =20 iommus =3D <&apps_smmu 0x456 0x0>; =20 @@ -2179,8 +2179,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma0 0 0 QCOM_GPI_I2C>, - <&gpi_dma0 1 0 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma0 0 0>, + <&gpi_dma0 1 0>; dma-names =3D "tx", "rx"; =20 @@ -2215,8 +2215,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_120mhz>; =20 - dmas =3D <&gpi_dma0 0 0 QCOM_GPI_SPI>, - <&gpi_dma0 1 0 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma0 0 0>, + <&gpi_dma0 1 0>; dma-names =3D "tx", "rx"; =20 @@ -2251,8 +2251,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma0 0 1 QCOM_GPI_I2C>, - <&gpi_dma0 1 1 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma0 0 1>, + <&gpi_dma0 1 1>; dma-names =3D "tx", "rx"; =20 @@ -2287,8 +2287,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_120mhz>; =20 - dmas =3D <&gpi_dma0 0 1 QCOM_GPI_SPI>, - <&gpi_dma0 1 1 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma0 0 1>, + <&gpi_dma0 1 1>; dma-names =3D "tx", "rx"; =20 @@ -2323,8 +2323,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma0 0 2 QCOM_GPI_I2C>, - <&gpi_dma0 1 2 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma0 0 2>, + <&gpi_dma0 1 2>; dma-names =3D "tx", "rx"; =20 @@ -2384,8 +2384,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma0 0 2 QCOM_GPI_SPI>, - <&gpi_dma0 1 2 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma0 0 2>, + <&gpi_dma0 1 2>; dma-names =3D "tx", "rx"; =20 @@ -2420,8 +2420,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma0 0 3 QCOM_GPI_I2C>, - <&gpi_dma0 1 3 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma0 0 3>, + <&gpi_dma0 1 3>; dma-names =3D "tx", "rx"; =20 @@ -2456,8 +2456,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma0 0 3 QCOM_GPI_SPI>, - <&gpi_dma0 1 3 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma0 0 3>, + <&gpi_dma0 1 3>; dma-names =3D "tx", "rx"; =20 @@ -2492,8 +2492,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma0 0 4 QCOM_GPI_I2C>, - <&gpi_dma0 1 4 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma0 0 4>, + <&gpi_dma0 1 4>; dma-names =3D "tx", "rx"; =20 @@ -2528,8 +2528,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma0 0 4 QCOM_GPI_SPI>, - <&gpi_dma0 1 4 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma0 0 4>, + <&gpi_dma0 1 4>; dma-names =3D "tx", "rx"; =20 @@ -2564,8 +2564,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma0 0 5 QCOM_GPI_I2C>, - <&gpi_dma0 1 5 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma0 0 5>, + <&gpi_dma0 1 5>; dma-names =3D "tx", "rx"; =20 @@ -2600,8 +2600,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma0 0 5 QCOM_GPI_SPI>, - <&gpi_dma0 1 5 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma0 0 5>, + <&gpi_dma0 1 5>; dma-names =3D "tx", "rx"; =20 @@ -2636,8 +2636,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma0 0 6 QCOM_GPI_I2C>, - <&gpi_dma0 1 6 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma0 0 6>, + <&gpi_dma0 1 6>; dma-names =3D "tx", "rx"; =20 @@ -2672,8 +2672,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma0 0 6 QCOM_GPI_SPI>, - <&gpi_dma0 1 6 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma0 0 6>, + <&gpi_dma0 1 6>; dma-names =3D "tx", "rx"; =20 @@ -2708,8 +2708,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; required-opps =3D <&rpmhpd_opp_low_svs>; =20 - dmas =3D <&gpi_dma0 0 7 QCOM_GPI_I2C>, - <&gpi_dma0 1 7 QCOM_GPI_I2C>; + dmas =3D <&gpi_dma0 0 7>, + <&gpi_dma0 1 7>; dma-names =3D "tx", "rx"; =20 @@ -2744,8 +2744,8 @@ &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>, power-domains =3D <&rpmhpd RPMHPD_CX>; operating-points-v2 =3D <&qup_opp_table_100mhz>; =20 - dmas =3D <&gpi_dma0 0 7 QCOM_GPI_SPI>, - <&gpi_dma0 1 7 QCOM_GPI_SPI>; + dmas =3D <&gpi_dma0 0 7>, + <&gpi_dma0 1 7>; dma-names =3D "tx", "rx"; =20 --=20 2.50.1