From patchwork Wed Jul 24 04:10:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 2832547 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0D732C0319 for ; Wed, 24 Jul 2013 04:39:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D4F152026D for ; Wed, 24 Jul 2013 04:39:47 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 544E12024C for ; Wed, 24 Jul 2013 04:39:46 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1qRI-0002We-Ao; Wed, 24 Jul 2013 04:12:37 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1qQf-00006T-Tn; Wed, 24 Jul 2013 04:11:57 +0000 Received: from hqemgate14.nvidia.com ([216.228.121.143]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1qPa-0008QV-Hd for linux-arm-kernel@lists.infradead.org; Wed, 24 Jul 2013 04:10:54 +0000 Received: from hqnvupgp07.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com id ; Tue, 23 Jul 2013 21:10:12 -0700 Received: from hqemhub01.nvidia.com ([172.20.12.94]) by hqnvupgp07.nvidia.com (PGP Universal service); Tue, 23 Jul 2013 21:10:18 -0700 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Tue, 23 Jul 2013 21:10:18 -0700 Received: from hkemhub02.nvidia.com (10.18.67.13) by hqemhub01.nvidia.com (172.20.150.30) with Microsoft SMTP Server (TLS) id 8.3.298.1; Tue, 23 Jul 2013 21:10:18 -0700 Received: from rizhao-lap.nvidia.com (10.18.67.5) by hkemhub02.nvidia.com (10.18.67.13) with Microsoft SMTP Server (TLS) id 8.3.298.1; Wed, 24 Jul 2013 12:10:12 +0800 From: Richard Zhao To: , , , , , , , Subject: [PATCH 8/9] ARM: dts: tegra: remove legacy nvidia, dma-request-selector properties Date: Wed, 24 Jul 2013 12:10:01 +0800 Message-ID: <1374639002-16753-9-git-send-email-rizhao@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1374639002-16753-1-git-send-email-rizhao@nvidia.com> References: <1374639002-16753-1-git-send-email-rizhao@nvidia.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130724_001050_886151_48FF6D56 X-CRM114-Status: UNSURE ( 7.49 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: dev@lynxeye.de, swarren@wwwdotorg.org, vinod.koul@intel.com, gregkh@linuxfoundation.org, lgirdwood@gmail.com, rob.herring@calxeda.com, broonie@kernel.org, ldewangan@nvidia.com, rob@landley.net, djbw@fb.com, grant.likely@linaro.org, rizhao@nvidia.com, linuxzsc@gmail.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 All tegra dma client drivers have moved to generic dma binding. Signed-off-by: Richard Zhao --- arch/arm/boot/dts/tegra114.dtsi | 14 -------------- arch/arm/boot/dts/tegra20.dtsi | 13 ------------- arch/arm/boot/dts/tegra30.dtsi | 12 ------------ 3 files changed, 39 deletions(-) diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index b133c62..e696cbce 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -125,7 +125,6 @@ reg = <0x70006000 0x40>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 8>; dmas = <&apbdma 8>; dma-names = "rx-tx"; status = "disabled"; @@ -137,7 +136,6 @@ reg = <0x70006040 0x40>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 9>; dmas = <&apbdma 9>; dma-names = "rx-tx"; status = "disabled"; @@ -149,7 +147,6 @@ reg = <0x70006200 0x100>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 10>; dmas = <&apbdma 10>; dma-names = "rx-tx"; status = "disabled"; @@ -161,7 +158,6 @@ reg = <0x70006300 0x100>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 19>; dmas = <&apbdma 19>; dma-names = "rx-tx"; status = "disabled"; @@ -235,7 +231,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000d400 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 15>; dmas = <&apbdma 15>; dma-names = "rx-tx"; #address-cells = <1>; @@ -249,7 +244,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000d600 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 16>; dmas = <&apbdma 16>; dma-names = "rx-tx"; #address-cells = <1>; @@ -263,7 +257,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000d800 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 17>; dmas = <&apbdma 17>; dma-names = "rx-tx"; #address-cells = <1>; @@ -277,7 +270,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000da00 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 18>; dmas = <&apbdma 18>; dma-names = "rx-tx"; #address-cells = <1>; @@ -291,7 +283,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000dc00 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 27>; dmas = <&apbdma 27>; dma-names = "rx-tx"; #address-cells = <1>; @@ -305,7 +296,6 @@ compatible = "nvidia,tegra114-spi"; reg = <0x7000de00 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 28>; dmas = <&apbdma 28>; dma-names = "rx-tx"; #address-cells = <1>; @@ -354,10 +344,6 @@ <0x70080200 0x100>, <0x70081000 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 1>, <&apbdma 2>, - <&apbdma 3>, <&apbdma 4>, <&apbdma 6>, <&apbdma 7>, - <&apbdma 12>, <&apbdma 13>, <&apbdma 14>, - <&apbdma 29>; dmas = <&apbdma 1>, <&apbdma 2>, <&apbdma 3>, <&apbdma 4>, <&apbdma 6>, <&apbdma 7>, <&apbdma 12>, <&apbdma 13>, <&apbdma 14>, <&apbdma 29>; diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 0fe7f37..7ca0ccb 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -223,7 +223,6 @@ compatible = "nvidia,tegra20-ac97"; reg = <0x70002000 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 12>; dmas = <&apbdma 12>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA20_CLK_AC97>; @@ -234,7 +233,6 @@ compatible = "nvidia,tegra20-i2s"; reg = <0x70002800 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 2>; dmas = <&apbdma 2>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA20_CLK_I2S1>; @@ -245,7 +243,6 @@ compatible = "nvidia,tegra20-i2s"; reg = <0x70002a00 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 1>; dmas = <&apbdma 1>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA20_CLK_I2S2>; @@ -264,7 +261,6 @@ reg = <0x70006000 0x40>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 8>; dmas = <&apbdma 8>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA20_CLK_UARTA>; @@ -276,7 +272,6 @@ reg = <0x70006040 0x40>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 9>; dmas = <&apbdma 9>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA20_CLK_UARTB>; @@ -288,7 +283,6 @@ reg = <0x70006200 0x100>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 10>; dmas = <&apbdma 10>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA20_CLK_UARTC>; @@ -300,7 +294,6 @@ reg = <0x70006300 0x100>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 19>; dmas = <&apbdma 19>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA20_CLK_UARTD>; @@ -312,7 +305,6 @@ reg = <0x70006400 0x100>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 20>; dmas = <&apbdma 20>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA20_CLK_UARTE>; @@ -350,7 +342,6 @@ compatible = "nvidia,tegra20-sflash"; reg = <0x7000c380 0x80>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 11>; dmas = <&apbdma 11>; dma-names = "rx-tx"; #address-cells = <1>; @@ -399,7 +390,6 @@ compatible = "nvidia,tegra20-slink"; reg = <0x7000d400 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 15>; dmas = <&apbdma 15>; dma-names = "rx-tx"; #address-cells = <1>; @@ -412,7 +402,6 @@ compatible = "nvidia,tegra20-slink"; reg = <0x7000d600 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 16>; dmas = <&apbdma 16>; dma-names = "rx-tx"; #address-cells = <1>; @@ -425,7 +414,6 @@ compatible = "nvidia,tegra20-slink"; reg = <0x7000d800 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 17>; dmas = <&apbdma 17>; dma-names = "rx-tx"; #address-cells = <1>; @@ -438,7 +426,6 @@ compatible = "nvidia,tegra20-slink"; reg = <0x7000da00 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 18>; dmas = <&apbdma 18>; dma-names = "rx-tx"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index c266316..729c853 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -245,7 +245,6 @@ reg = <0x70006000 0x40>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 8>; dmas = <&apbdma 8>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA30_CLK_UARTA>; @@ -257,7 +256,6 @@ reg = <0x70006040 0x40>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 9>; dmas = <&apbdma 9>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA30_CLK_UARTB>; @@ -269,7 +267,6 @@ reg = <0x70006200 0x100>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 10>; dmas = <&apbdma 10>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA30_CLK_UARTC>; @@ -281,7 +278,6 @@ reg = <0x70006300 0x100>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 19>; dmas = <&apbdma 19>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA30_CLK_UARTD>; @@ -293,7 +289,6 @@ reg = <0x70006400 0x100>; reg-shift = <2>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 20>; dmas = <&apbdma 20>; dma-names = "rx-tx"; clocks = <&tegra_car TEGRA30_CLK_UARTE>; @@ -379,7 +374,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000d400 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 15>; dmas = <&apbdma 15>; dma-names = "rx-tx"; #address-cells = <1>; @@ -392,7 +386,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000d600 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 16>; dmas = <&apbdma 16>; dma-names = "rx-tx"; #address-cells = <1>; @@ -405,7 +398,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000d800 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 17>; dmas = <&apbdma 17>; dma-names = "rx-tx"; #address-cells = <1>; @@ -418,7 +410,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000da00 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 18>; dmas = <&apbdma 18>; dma-names = "rx-tx"; #address-cells = <1>; @@ -431,7 +422,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000dc00 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 27>; dmas = <&apbdma 27>; dma-names = "rx-tx"; #address-cells = <1>; @@ -444,7 +434,6 @@ compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; reg = <0x7000de00 0x200>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 28>; dmas = <&apbdma 28>; dma-names = "rx-tx"; #address-cells = <1>; @@ -492,7 +481,6 @@ reg = <0x70080000 0x200 0x70080200 0x100>; interrupts = ; - nvidia,dma-request-selector = <&apbdma 1>; dmas = <&apbdma 1>, <&apbdma 2>, <&apbdma 3>, <&apbdma 4>; dma-names = "channel0", "channel1", "channel2", "channel3"; clocks = <&tegra_car TEGRA30_CLK_D_AUDIO>,