From patchwork Sat Feb 10 01:33:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 871607 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zdZN70sCzz9ryT for ; Sat, 10 Feb 2018 12:39:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751019AbeBJBjB (ORCPT ); Fri, 9 Feb 2018 20:39:01 -0500 Received: from mout.perfora.net ([74.208.4.196]:59981 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750961AbeBJBjA (ORCPT ); Fri, 9 Feb 2018 20:39:00 -0500 X-Greylist: delayed 309 seconds by postgrey-1.27 at vger.kernel.org; Fri, 09 Feb 2018 20:39:00 EST Received: from localhost.localdomain.ziswiler.net ([178.38.65.171]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPA (Nemesis) id 0MN3r4-1edjOy1q9Y-006c3v; Sat, 10 Feb 2018 02:33:36 +0100 From: Marcel Ziswiler To: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org Cc: Marcel Ziswiler , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, Rob Herring , Mark Rutland Subject: [PATCH 1/4] dt/bindings: fix binding examples for tegra gmi controller Date: Sat, 10 Feb 2018 02:33:22 +0100 Message-Id: <20180210013326.27771-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180210013326.27771-1-marcel@ziswiler.com> References: <20180210013326.27771-1-marcel@ziswiler.com> X-Provags-ID: V03:K0:lQAYfwbY7FHynhNAVCm7+CxINUkOkX/EB3O56fbDYCFEu3lx6ku rIDfNmw3BYXf2h2k+nBlOP46Bcx8vxm9Cca/OtWnWlm3X3R6B23FSIU/3sA6D7kcvseddzr 49sFL+hWUZXKxWD9uqgT364r7knwGq7Qwad49+fXvNY6GQg5Myk1ybHO317ZQ3Lj6f1fgPV RO0eiS9D+dU69XpBMdSCg== X-UI-Out-Filterresults: notjunk:1; V01:K0:UUywKqT77zU=:uvyZADAuMNzlxS51BLaogh 19FCWD5eHd3mlUyi7/K4mjigXS/RCqkwmYJvGcWKdaYnbrS/eLijuaOALNKeEtj6lKj4GtHnD CE8whZYNnicEdnQF8qMIBFUjGwUvnuELPXs71qWc248DVizSVlPdyVMErOGK8ym9NQA3xHT6X JFOnGdXnCySVC/u79UU9Zp9TMxxUwOXDq2Jmb4aS2iTw3ByIdmWofu2BIkcNdyhcOO/XAkDHJ 2WUnZcnO8XMxySUO4oorBadWXv+YSfJ0KahghIwt/vuG4h9SYjuhpGY7gqU5UzPzlW0jsE6IT Iu8a1rQW5CZJ+V6D6IUIwmI8PhPOu2mVwVDlEef8xBC5qB5dzOyntOQ1U2KpKF4kVwjzIoHTc ksv42+2b/33awNOsZMbdnEqVvhxhcUtCxoLE5FbbRUpUKYieJkgy5YjQ3n5/JV4NBT0WDDs1s HUtYlgb9pWTXF4T6OfErerFJ3ZBnEk2rYr1WaiYlj4DLROqCow+lkKMEAR3sbdHc8/DFBMrby usK6W5RT9CAR88OcbD/yNIHq0DazFrDQD/lnBQ0oIroAT+18cVM6dKppY6tUra2O2qn8wAuk4 ytpNndLcnY8zbD0iKPxafgRLNmWQHjcRpeyd+/rzA2maJvkeqdvd+QxtMaim0YELoTKsdmh4N 9lCUhDt7rdz/5Ca6e9pfcLnYKxFu3s9FA5bAWuha/6g1P8bsxYHELTGSkUBsOy2y8/i3F0Nhl ILAML1a0EmU1FlMUc5DWYuiBwkfzVBEwOvsC9w== Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler Fix devicetree binding examples for the Generic Memory Interface (GMI) bus driver found on Tegra SOCs. While at it also remove double new lines as a left over from Rob's commit 4da722ca19f3 ("dt-bindings: Remove "status" from examples"). Signed-off-by: Marcel Ziswiler Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt b/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt index 3e21eb822811..c1e70621799b 100644 --- a/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt +++ b/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt @@ -73,7 +73,7 @@ Example with two SJA1000 CAN controllers connected to the GMI bus. We wrap the controllers with a simple-bus node since they are all connected to the same chip-select (CS4), in this example external address decoding is provided: -gmi@70090000 { +gmi@70009000 { compatible = "nvidia,tegra20-gmi"; reg = <0x70009000 0x1000>; #address-cells = <2>; @@ -84,7 +84,6 @@ gmi@70090000 { reset-names = "gmi"; ranges = <4 0 0xd0000000 0xfffffff>; - bus@4,0 { compatible = "simple-bus"; #address-cells = <1>; @@ -109,7 +108,7 @@ gmi@70090000 { Example with one SJA1000 CAN controller connected to the GMI bus on CS4: -gmi@70090000 { +gmi@70009000 { compatible = "nvidia,tegra20-gmi"; reg = <0x70009000 0x1000>; #address-cells = <2>; @@ -120,7 +119,6 @@ gmi@70090000 { reset-names = "gmi"; ranges = <4 0 0xd0000000 0xfffffff>; - can@4,0 { reg = <4 0 0x100>; nvidia,snor-mux-mode; From patchwork Sat Feb 10 01:33:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 871609 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zdZNX3BR3z9ryT for ; Sat, 10 Feb 2018 12:39:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751700AbeBJBjX (ORCPT ); Fri, 9 Feb 2018 20:39:23 -0500 Received: from mout.perfora.net ([74.208.4.197]:34355 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbeBJBjW (ORCPT ); Fri, 9 Feb 2018 20:39:22 -0500 Received: from localhost.localdomain.ziswiler.net ([178.38.65.171]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPA (Nemesis) id 0Lgnku-1f4rTQ3kCk-00oDor; Sat, 10 Feb 2018 02:33:39 +0100 From: Marcel Ziswiler To: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org Cc: Marcel Ziswiler , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, Rob Herring , Mark Rutland , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/4] ARM: dts: tegra: use proper irq type definitions Date: Sat, 10 Feb 2018 02:33:23 +0100 Message-Id: <20180210013326.27771-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180210013326.27771-1-marcel@ziswiler.com> References: <20180210013326.27771-1-marcel@ziswiler.com> X-Provags-ID: V03:K0:TweU5n4bZEUqKWyWQf5zO8B3GPXYz5/PABh0rpIKz0mEOVEEfuB pe5mzxB/jH5CxhEQs3TQsJlJpO7QS7oBVEowQNzNxvFb96VghOv/msHFEpiI9me9i7XKykG UD5RO3aqLpsWKrHcJoGYiK/FN9rCYQo5eC1zzDv5i10uEcYo3CLY2EI0xFWxFhdcVzoikQ+ xk1y0WMx7A2wvF2FGMzXg== X-UI-Out-Filterresults: notjunk:1; V01:K0:M/4vwavD2HI=:WyNaSJPF9koC1ZQiYPaixO Qs9UGNDaFiHtFs/SXNj90QdvI+oFJcF4LY/0xeEN8aTeoP8hu5iUtvKB0y0B5hH+WZ14ZBwZ4 glV/FvnnGAyQCGrYRhlV8UBsOWLne/R4IISl7YbNurBiQbBvYcvTEdIMD10jLwdqzCrK1LtQ4 HtJ7GnzeIegbf1IDZlLklBqpssdZQmHx6hqx1llCQt5iC+q2iIj42VEQqas5yNhumWfXXNKZF UY1Qn9Mqj52dmudddWwO0eWZChFafkt9up7e+33luOzBo2wkaQnQzLCyGIjeXAt8FkjywuG0k R4i75Sqv2Q0fzBphYTgEwHe7p2641klB6KfMj+YQr4qe9ebN6qq1wzDz4WJDAI2LxtIGjUSa3 jQFrBpJOfzkVcZCi6q3CzDCBzHkV/gP+KedQbWeTcoC5UvZMac1r82VKf7/8azLk/8z0QD/8Z zlcHEB3suZMa4HNmOBNgzdWA3kTLbxekSnhTA4IsAS/ZGewMiSP85GmUd9mlC3AlMLF3brvs9 Dv4DEt5ZZ/P68IqvUnqui+OIb8y/U/1/fXiPVUW+uoGSCM9dBsngA4A1cJ3l28uAAa5tRI+ea Svne59RtEAlQJHntEPI9Sgq5s5NmUjQ7OZd5Bf4Gy2WHsVZ0FV8+dQJuE3cddZyQLHKbfj3U3 yvT0xtVwusa4OX0oWM5ub7MoeBYKCV8BqqZ1AwW3GeFmKs86cVWj4FJT9JqN3uSdinj+3CleU iXjFG8QAWVgo1GDXRNK9YqkT0iW/p1lx8f5+5g== Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler This switches a few interrupt definitions that were using either GPIO_ACTIVE_HIGH or GPIO_ACTIVE_LOW as IRQ type, which is invalid. This is mostly a cosmetic change, that doesn't affect any driver. Analogous to Paul's commit 38333641b6dd ("ARM: tegra: nyan: Use proper IRQ type definitions"). Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +- arch/arm/boot/dts/tegra124-venice2.dts | 4 ++-- arch/arm/boot/dts/tegra30-apalis.dtsi | 4 ++-- arch/arm/boot/dts/tegra30-beaver.dts | 2 +- arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts index acd6cf51b15b..eafff16765b4 100644 --- a/arch/arm/boot/dts/tegra114-dalmore.dts +++ b/arch/arm/boot/dts/tegra114-dalmore.dts @@ -780,7 +780,7 @@ compatible = "realtek,rt5640"; reg = <0x1c>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; realtek,ldo1-en-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts index d112f85e66ed..6dbcf84dafbc 100644 --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts @@ -1418,7 +1418,7 @@ compatible = "realtek,rt5639"; reg = <0x1c>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; realtek,ldo1-en-gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts index 32d9079f025b..c0469ea149d2 100644 --- a/arch/arm/boot/dts/tegra124-venice2.dts +++ b/arch/arm/boot/dts/tegra124-venice2.dts @@ -613,7 +613,7 @@ compatible = "maxim,max98090"; reg = <0x10>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; }; }; @@ -859,7 +859,7 @@ reg = <0x9>; interrupt-parent = <&gpio>; interrupts = ; + IRQ_TYPE_EDGE_BOTH>; ti,ac-detect-gpios = <&gpio TEGRA_GPIO(J, 0) GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi index faa8cd2914e8..bfb7913c0657 100644 --- a/arch/arm/boot/dts/tegra30-apalis.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis.dtsi @@ -657,7 +657,7 @@ reg = <1>; clocks = <&clk16m>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; spi-max-frequency = <10000000>; }; }; @@ -672,7 +672,7 @@ reg = <0>; clocks = <&clk16m>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; spi-max-frequency = <10000000>; }; }; diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts index 5331a8f7dcf8..36b85a0ab0eb 100644 --- a/arch/arm/boot/dts/tegra30-beaver.dts +++ b/arch/arm/boot/dts/tegra30-beaver.dts @@ -1762,7 +1762,7 @@ compatible = "realtek,rt5640"; reg = <0x1c>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; realtek,ldo1-en-gpios = <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts index 3c5fb2430212..b307feb7c330 100644 --- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts @@ -79,7 +79,7 @@ reg = <0>; clocks = <&clk16m>; interrupt-parent = <&gpio>; - interrupts = ; + interrupts = ; spi-max-frequency = <10000000>; }; spidev0: spi@1 { From patchwork Sat Feb 10 01:33:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 871610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zdZP56ZFsz9rxj for ; Sat, 10 Feb 2018 12:39:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752218AbeBJBjj (ORCPT ); Fri, 9 Feb 2018 20:39:39 -0500 Received: from mout.perfora.net ([74.208.4.194]:51173 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751091AbeBJBjf (ORCPT ); Fri, 9 Feb 2018 20:39:35 -0500 Received: from localhost.localdomain.ziswiler.net ([178.38.65.171]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPA (Nemesis) id 0M2v8i-1f0LEB117O-00sfll; Sat, 10 Feb 2018 02:33:41 +0100 From: Marcel Ziswiler To: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org Cc: Marcel Ziswiler , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, Rob Herring , Mark Rutland , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/4] ARM: dts: tegra: beaver: remove invalid uses of rsvd1 Date: Sat, 10 Feb 2018 02:33:24 +0100 Message-Id: <20180210013326.27771-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180210013326.27771-1-marcel@ziswiler.com> References: <20180210013326.27771-1-marcel@ziswiler.com> X-Provags-ID: V03:K0:w3VGbkYbpSMAXMb4SinexKmMpbJT+Bog3YNflyEriju04AbrMZs X9OJsEaHKHUo3sMUO9oxqz/ONcD1JT1yW8Gvj/LFfTnUYrWEqbALDQhaP3J2VWmUihkUdum ctpVY+Fxi006afsUZiMyao5iZ3CAfr/Ag9GZfGxKtByh7tbu0SMJw0S9XfZh8ctp7W0GixI V02nUdkxOBVTW+FVR05xw== X-UI-Out-Filterresults: notjunk:1; V01:K0:M8b2sdutSMQ=:toytnbzTNTSU2esxqTYGwp M4inqfBJpSB7RsBsWPc7o9yH32jV8maUyT94DmYKUlawIlgTdj3ARg0xIafQtmPX4QyPaYHbz zQh7522GYyIwbFWqvG5yMQW8nG1TlMzMbOoPkEnkCKR4RCFxW9d9m2cX9e6cKAwZwzYZ3JXq0 r0IG0gZpSk6gcX7dkIInnGrJJ6ZPkUdaixNVdyZzzaZUM11shwWM/wrD9cf4GZMQrp00ToEaf QWtjpYA1sikpZU4EsLFRK18+NsrSAhJIUmiGTH9vwXwleDYV5yuMLH80P5UFE7rIO+Z80La+q +4ObTGFfmD1UuMvle2dePMZA+AM3LUOHyTJY8nH8n6nRfTfDUpH2Ao+l44xn3eScRfEx6FpoB DWtdyS/lYwTqQu2oFNr0rNRlXDmcYSmzYJAgp+5B7tqRbYCWSRsJ8vMG7pqWLj7KrL9SjUIT+ nQ2EjhINOYS0zWfDloBSIcy1qvrvFcP5vodMs8M/6oJv3LgBUhN1fgFo0Tp8BOZutIEOUU0/m /qNv5J6VTwiQ5dbkjLwThwI/wIB4BXK/7gccAuHc/Q2NtV1PDSYhf3XiROoCfOciqiJGG8CdF 6N3Hyow8Xfp6o3lizcnkmwRBP5zzkPG6msEZVhh2hCPCG8r6Us//OVPhXivxFv8doxDgp71ce qgx24H+wHkcUiO2v/ehieBg7Hy3FhXXIcEq7o9jKmxh8yw2Jrjdx9TYGZfaaAicJEQOfwehrh o6U6k0Q4DL/wZLlJTn6uXJ8YXLBGt5K+umiD2A== Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler Remove invalid uses of rsvd1 from beaver device tree. Replace by actual function names of pinmux option 1. Taken from https://github.com/NVIDIA/tegra-pinmux-scripts commit b0aceda108c0 ("remove invalid uses of rsvd1 from beaver config"). Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/tegra30-beaver.dts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts index 36b85a0ab0eb..ae52a5039506 100644 --- a/arch/arm/boot/dts/tegra30-beaver.dts +++ b/arch/arm/boot/dts/tegra30-beaver.dts @@ -260,14 +260,14 @@ }; sdmmc3_dat6_pd3 { nvidia,pins = "sdmmc3_dat6_pd3"; - nvidia,function = "rsvd1"; + nvidia,function = "spdif"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; }; sdmmc3_dat7_pd4 { nvidia,pins = "sdmmc3_dat7_pd4"; - nvidia,function = "rsvd1"; + nvidia,function = "spdif"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; @@ -281,14 +281,14 @@ }; vi_vsync_pd6 { nvidia,pins = "vi_vsync_pd6"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; }; vi_hsync_pd7 { nvidia,pins = "vi_hsync_pd7"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; @@ -806,7 +806,7 @@ }; hdmi_int_pn7 { nvidia,pins = "hdmi_int_pn7"; - nvidia,function = "rsvd1"; + nvidia,function = "hdmi"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; @@ -841,7 +841,7 @@ }; ulpi_data3_po4 { nvidia,pins = "ulpi_data3_po4"; - nvidia,function = "rsvd1"; + nvidia,function = "uarta"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; @@ -1107,21 +1107,21 @@ }; vi_d10_pt2 { nvidia,pins = "vi_d10_pt2"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; }; vi_d11_pt3 { nvidia,pins = "vi_d11_pt3"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; }; vi_d0_pt4 { nvidia,pins = "vi_d0_pt4"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; @@ -1151,7 +1151,7 @@ }; pu0 { nvidia,pins = "pu0"; - nvidia,function = "rsvd1"; + nvidia,function = "owr"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; @@ -1172,7 +1172,7 @@ }; pu3 { nvidia,pins = "pu3"; - nvidia,function = "rsvd1"; + nvidia,function = "pwm0"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; @@ -1193,7 +1193,7 @@ }; pu6 { nvidia,pins = "pu6"; - nvidia,function = "rsvd1"; + nvidia,function = "pwm3"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; @@ -1221,7 +1221,7 @@ }; pv3 { nvidia,pins = "pv3"; - nvidia,function = "rsvd1"; + nvidia,function = "clk_12m_out"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; @@ -1510,7 +1510,7 @@ }; pbb0 { nvidia,pins = "pbb0"; - nvidia,function = "rsvd1"; + nvidia,function = "i2s4"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; @@ -1575,7 +1575,7 @@ }; pcc1 { nvidia,pins = "pcc1"; - nvidia,function = "rsvd1"; + nvidia,function = "i2s4"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; From patchwork Sat Feb 10 01:33:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 871613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zdZPW3D1Qz9rxj for ; Sat, 10 Feb 2018 12:40:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751343AbeBJBjc (ORCPT ); Fri, 9 Feb 2018 20:39:32 -0500 Received: from mout.perfora.net ([74.208.4.196]:53969 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751091AbeBJBjb (ORCPT ); Fri, 9 Feb 2018 20:39:31 -0500 Received: from localhost.localdomain.ziswiler.net ([178.38.65.171]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPA (Nemesis) id 0MFrWa-1eVWin31Hi-00Et09; Sat, 10 Feb 2018 02:33:44 +0100 From: Marcel Ziswiler To: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org Cc: Marcel Ziswiler , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, Rob Herring , Mark Rutland , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/4] ARM: dts: tegra: venice2: remove duplicate pcie-1 node Date: Sat, 10 Feb 2018 02:33:25 +0100 Message-Id: <20180210013326.27771-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180210013326.27771-1-marcel@ziswiler.com> References: <20180210013326.27771-1-marcel@ziswiler.com> X-Provags-ID: V03:K0:a3smbqBfDzgGe6SRy/GrJHb4Fsacr9bQay8JjiO/eU8zmlPfdJG wWbSEMarIDYk1Q+hWoMpK54z2vBp63zLx5s1ir6zfYzqbwIAh5dDbfUEMsJ6MtuMYUQAkKk Q5EnKL4VoPAId0r86XSxL5RKF2uW+7LwdefO4nueLU/I/guh99cMWtt2v0+kpy+vGNdA4+S 1ErinJwZbCDWcHzA45t3A== X-UI-Out-Filterresults: notjunk:1; V01:K0:gmEUAFBkTyk=:HV6lyfibMDI25zBGwYqLQO cQqxuqASv+NzT9zba4rkCUVl6fmF7rBF5NQn9kvtJX2WZpwij7S2s4k/gas3KvVyGy22XTZV3 mma4Axa9cFQGfXTPCiyLBtChhPO89AOcO33Fbsd0MUrxhTdkz6YUbnw+ll5iUWyho4WBgoQsF O8JyrGejcF/m9MIkOB1QS8DB3lWIDhQkTJkDsr5vLAUSXgni9xrGDFMIBpM/CbrYsSavY+f8l SJKZkl53r6Etzq8Yd2s2y0Rbwk51PGwItgJJL5phZryRLXGritROukWeJV/NcWjx9LTeK+UYI zwo37xIExFy9BSg6HHpnWghE77LxAlx7ADAYWQYszG+gnI5k+B4M6V/sdBCI6c8Wag6VMzFPC hKp2BvQ3QEEiymRpMc4QXKK2Gf2sx3bivnbta8p4LS62MJlUbMYuuWnq9/j30GI2+z11zDFTy szKgvbvLIbMgckNuF3+c/nQV5RpoSqIlDfYoPPNvplDn4KoJClh2puLXSn+U/qPNiBrwWVw33 QfEWjuSMU7T+yNxNK4ETMd23QXz12BH+LEGcWQE0B1yLP9Zk9LyAy87Rer3HBxIKzAnaUeTdz BiJ5nA2qBei2AblqkhiqdzetdfpmtF82tAgx1PaPwe36n5X6SgGzF1fP2NghrU/DuFR2b8uHU jIyW4qr+RFU5AWreIkqmq+McFGqIu4P6cLFLoFgkZ4yJZgh6dmTRNad70KtVXK0/3pAGZV4et jZNFpfHs6bbZf/v9UEmf4JFHsc3U/JAZxwqveg== Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Marcel Ziswiler Get rid of duplicate pcie-1 node. Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/tegra124-venice2.dts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts index c0469ea149d2..89bcc178994d 100644 --- a/arch/arm/boot/dts/tegra124-venice2.dts +++ b/arch/arm/boot/dts/tegra124-venice2.dts @@ -956,11 +956,6 @@ nvidia,function = "usb3-ss"; status = "okay"; }; - - pcie-1 { - nvidia,function = "usb3-ss"; - status = "okay"; - }; }; }; };