* [PATCH 0/4] dt/bindings & ARM: dts: tegra: updates @ 2018-02-10 1:33 ` Marcel Ziswiler 0 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-tegra, devicetree Cc: Mark Rutland, Marcel Ziswiler, linux-kernel, Rob Herring, Jonathan Hunter, Thierry Reding, Marcel Ziswiler, Russell King, linux-arm-kernel This series fixes the Tegra GMI controller DT/bindings example, a few IRQ type definitions, removes some invalid uses of rsvd1 pin muxes on Beaver and removes a duplicate pcie-1 node on Venice2. Marcel Ziswiler (4): dt/bindings: fix binding examples for tegra gmi controller ARM: dts: tegra: use proper irq type definitions ARM: dts: tegra: beaver: remove invalid uses of rsvd1 ARM: dts: tegra: venice2: remove duplicate pcie-1 node .../devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 6 ++-- arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +- arch/arm/boot/dts/tegra124-venice2.dts | 9 ++---- arch/arm/boot/dts/tegra30-apalis.dtsi | 4 +-- arch/arm/boot/dts/tegra30-beaver.dts | 32 +++++++++++----------- arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- 7 files changed, 25 insertions(+), 32 deletions(-) -- 2.14.3 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 0/4] dt/bindings & ARM: dts: tegra: updates @ 2018-02-10 1:33 ` Marcel Ziswiler 0 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-arm-kernel This series fixes the Tegra GMI controller DT/bindings example, a few IRQ type definitions, removes some invalid uses of rsvd1 pin muxes on Beaver and removes a duplicate pcie-1 node on Venice2. Marcel Ziswiler (4): dt/bindings: fix binding examples for tegra gmi controller ARM: dts: tegra: use proper irq type definitions ARM: dts: tegra: beaver: remove invalid uses of rsvd1 ARM: dts: tegra: venice2: remove duplicate pcie-1 node .../devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 6 ++-- arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +- arch/arm/boot/dts/tegra124-venice2.dts | 9 ++---- arch/arm/boot/dts/tegra30-apalis.dtsi | 4 +-- arch/arm/boot/dts/tegra30-beaver.dts | 32 +++++++++++----------- arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- 7 files changed, 25 insertions(+), 32 deletions(-) -- 2.14.3 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 0/4] dt/bindings & ARM: dts: tegra: updates @ 2018-02-10 1:33 ` Marcel Ziswiler 0 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-tegra, devicetree Cc: Marcel Ziswiler, Thierry Reding, Jonathan Hunter, linux-kernel, Rob Herring, Marcel Ziswiler, Mark Rutland, Russell King, linux-arm-kernel This series fixes the Tegra GMI controller DT/bindings example, a few IRQ type definitions, removes some invalid uses of rsvd1 pin muxes on Beaver and removes a duplicate pcie-1 node on Venice2. Marcel Ziswiler (4): dt/bindings: fix binding examples for tegra gmi controller ARM: dts: tegra: use proper irq type definitions ARM: dts: tegra: beaver: remove invalid uses of rsvd1 ARM: dts: tegra: venice2: remove duplicate pcie-1 node .../devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 6 ++-- arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +- arch/arm/boot/dts/tegra124-venice2.dts | 9 ++---- arch/arm/boot/dts/tegra30-apalis.dtsi | 4 +-- arch/arm/boot/dts/tegra30-beaver.dts | 32 +++++++++++----------- arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- 7 files changed, 25 insertions(+), 32 deletions(-) -- 2.14.3 ^ permalink raw reply [flat|nested] 16+ messages in thread
[parent not found: <20180210013326.27771-1-marcel-mitwqZ+T+m9Wk0Htik3J/w@public.gmane.org>]
* [PATCH 1/4] dt/bindings: fix binding examples for tegra gmi controller 2018-02-10 1:33 ` Marcel Ziswiler @ 2018-02-10 1:33 ` Marcel Ziswiler -1 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-tegra-u79uwXL29TY76Z2rM5mHXA, devicetree-u79uwXL29TY76Z2rM5mHXA Cc: Marcel Ziswiler, Thierry Reding, Jonathan Hunter, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Mark Rutland From: Marcel Ziswiler <marcel.ziswiler-2KBjVHiyJgBBDgjK7y7TUQ@public.gmane.org> 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 <marcel.ziswiler-2KBjVHiyJgBBDgjK7y7TUQ@public.gmane.org> --- 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; -- 2.14.3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 1/4] dt/bindings: fix binding examples for tegra gmi controller @ 2018-02-10 1:33 ` Marcel Ziswiler 0 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-tegra, devicetree Cc: Marcel Ziswiler, Thierry Reding, Jonathan Hunter, linux-kernel, Rob Herring, Mark Rutland From: Marcel Ziswiler <marcel.ziswiler@toradex.com> 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 <marcel.ziswiler@toradex.com> --- 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; -- 2.14.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/4] dt/bindings: fix binding examples for tegra gmi controller 2018-02-10 1:33 ` Marcel Ziswiler (?) @ 2018-02-18 23:52 ` Rob Herring -1 siblings, 0 replies; 16+ messages in thread From: Rob Herring @ 2018-02-18 23:52 UTC (permalink / raw) To: Marcel Ziswiler Cc: linux-tegra, devicetree, Marcel Ziswiler, Thierry Reding, Jonathan Hunter, linux-kernel, Mark Rutland On Sat, Feb 10, 2018 at 02:33:22AM +0100, Marcel Ziswiler wrote: > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > 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 <marcel.ziswiler@toradex.com> > --- > > Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 2/4] ARM: dts: tegra: use proper irq type definitions 2018-02-10 1:33 ` Marcel Ziswiler (?) @ 2018-02-10 1:33 ` Marcel Ziswiler -1 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-tegra, devicetree Cc: Mark Rutland, Marcel Ziswiler, linux-kernel, Rob Herring, Jonathan Hunter, Thierry Reding, Russell King, linux-arm-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> 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 <marcel.ziswiler@toradex.com> --- 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 = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_FALLING>; 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 = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>; 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 = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>; }; }; @@ -859,7 +859,7 @@ reg = <0x9>; interrupt-parent = <&gpio>; interrupts = <TEGRA_GPIO(J, 0) - GPIO_ACTIVE_HIGH>; + 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 = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_LOW>; + interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_RISING>; spi-max-frequency = <10000000>; }; }; @@ -672,7 +672,7 @@ reg = <0>; clocks = <&clk16m>; interrupt-parent = <&gpio>; - interrupts = <TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; + interrupts = <TEGRA_GPIO(W, 2) IRQ_TYPE_EDGE_RISING>; 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 = <TEGRA_GPIO(X, 3) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(X, 3) IRQ_TYPE_EDGE_FALLING>; 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 = <TEGRA_GPIO(S, 0) GPIO_ACTIVE_LOW>; + interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_RISING>; spi-max-frequency = <10000000>; }; spidev0: spi@1 { -- 2.14.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/4] ARM: dts: tegra: use proper irq type definitions @ 2018-02-10 1:33 ` Marcel Ziswiler 0 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-arm-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> 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 <marcel.ziswiler@toradex.com> --- 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 = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_FALLING>; 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 = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>; 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 = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>; }; }; @@ -859,7 +859,7 @@ reg = <0x9>; interrupt-parent = <&gpio>; interrupts = <TEGRA_GPIO(J, 0) - GPIO_ACTIVE_HIGH>; + 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 = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_LOW>; + interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_RISING>; spi-max-frequency = <10000000>; }; }; @@ -672,7 +672,7 @@ reg = <0>; clocks = <&clk16m>; interrupt-parent = <&gpio>; - interrupts = <TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; + interrupts = <TEGRA_GPIO(W, 2) IRQ_TYPE_EDGE_RISING>; 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 = <TEGRA_GPIO(X, 3) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(X, 3) IRQ_TYPE_EDGE_FALLING>; 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 = <TEGRA_GPIO(S, 0) GPIO_ACTIVE_LOW>; + interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_RISING>; spi-max-frequency = <10000000>; }; spidev0: spi at 1 { -- 2.14.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/4] ARM: dts: tegra: use proper irq type definitions @ 2018-02-10 1:33 ` Marcel Ziswiler 0 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-tegra, devicetree Cc: Marcel Ziswiler, Thierry Reding, Jonathan Hunter, linux-kernel, Rob Herring, Mark Rutland, Russell King, linux-arm-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> 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 <marcel.ziswiler@toradex.com> --- 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 = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_FALLING>; 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 = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>; 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 = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>; }; }; @@ -859,7 +859,7 @@ reg = <0x9>; interrupt-parent = <&gpio>; interrupts = <TEGRA_GPIO(J, 0) - GPIO_ACTIVE_HIGH>; + 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 = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_LOW>; + interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_RISING>; spi-max-frequency = <10000000>; }; }; @@ -672,7 +672,7 @@ reg = <0>; clocks = <&clk16m>; interrupt-parent = <&gpio>; - interrupts = <TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; + interrupts = <TEGRA_GPIO(W, 2) IRQ_TYPE_EDGE_RISING>; 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 = <TEGRA_GPIO(X, 3) GPIO_ACTIVE_HIGH>; + interrupts = <TEGRA_GPIO(X, 3) IRQ_TYPE_EDGE_FALLING>; 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 = <TEGRA_GPIO(S, 0) GPIO_ACTIVE_LOW>; + interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_RISING>; spi-max-frequency = <10000000>; }; spidev0: spi@1 { -- 2.14.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/4] ARM: dts: tegra: beaver: remove invalid uses of rsvd1 2018-02-10 1:33 ` Marcel Ziswiler (?) @ 2018-02-10 1:33 ` Marcel Ziswiler -1 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-tegra, devicetree Cc: Mark Rutland, Marcel Ziswiler, linux-kernel, Rob Herring, Jonathan Hunter, Thierry Reding, Russell King, linux-arm-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> 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 <marcel.ziswiler@toradex.com> --- 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 = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; sdmmc3_dat7_pd4 { nvidia,pins = "sdmmc3_dat7_pd4"; - nvidia,function = "rsvd1"; + nvidia,function = "spdif"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -281,14 +281,14 @@ }; vi_vsync_pd6 { nvidia,pins = "vi_vsync_pd6"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; vi_hsync_pd7 { nvidia,pins = "vi_hsync_pd7"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -806,7 +806,7 @@ }; hdmi_int_pn7 { nvidia,pins = "hdmi_int_pn7"; - nvidia,function = "rsvd1"; + nvidia,function = "hdmi"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_ENABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -841,7 +841,7 @@ }; ulpi_data3_po4 { nvidia,pins = "ulpi_data3_po4"; - nvidia,function = "rsvd1"; + nvidia,function = "uarta"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1107,21 +1107,21 @@ }; vi_d10_pt2 { nvidia,pins = "vi_d10_pt2"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; vi_d11_pt3 { nvidia,pins = "vi_d11_pt3"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_UP>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; vi_d0_pt4 { nvidia,pins = "vi_d0_pt4"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1151,7 +1151,7 @@ }; pu0 { nvidia,pins = "pu0"; - nvidia,function = "rsvd1"; + nvidia,function = "owr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1172,7 +1172,7 @@ }; pu3 { nvidia,pins = "pu3"; - nvidia,function = "rsvd1"; + nvidia,function = "pwm0"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1193,7 +1193,7 @@ }; pu6 { nvidia,pins = "pu6"; - nvidia,function = "rsvd1"; + nvidia,function = "pwm3"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1221,7 +1221,7 @@ }; pv3 { nvidia,pins = "pv3"; - nvidia,function = "rsvd1"; + nvidia,function = "clk_12m_out"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_DISABLE>; @@ -1510,7 +1510,7 @@ }; pbb0 { nvidia,pins = "pbb0"; - nvidia,function = "rsvd1"; + nvidia,function = "i2s4"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1575,7 +1575,7 @@ }; pcc1 { nvidia,pins = "pcc1"; - nvidia,function = "rsvd1"; + nvidia,function = "i2s4"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; -- 2.14.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/4] ARM: dts: tegra: beaver: remove invalid uses of rsvd1 @ 2018-02-10 1:33 ` Marcel Ziswiler 0 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-arm-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> 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 <marcel.ziswiler@toradex.com> --- 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 = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; sdmmc3_dat7_pd4 { nvidia,pins = "sdmmc3_dat7_pd4"; - nvidia,function = "rsvd1"; + nvidia,function = "spdif"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -281,14 +281,14 @@ }; vi_vsync_pd6 { nvidia,pins = "vi_vsync_pd6"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; vi_hsync_pd7 { nvidia,pins = "vi_hsync_pd7"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -806,7 +806,7 @@ }; hdmi_int_pn7 { nvidia,pins = "hdmi_int_pn7"; - nvidia,function = "rsvd1"; + nvidia,function = "hdmi"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_ENABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -841,7 +841,7 @@ }; ulpi_data3_po4 { nvidia,pins = "ulpi_data3_po4"; - nvidia,function = "rsvd1"; + nvidia,function = "uarta"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1107,21 +1107,21 @@ }; vi_d10_pt2 { nvidia,pins = "vi_d10_pt2"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; vi_d11_pt3 { nvidia,pins = "vi_d11_pt3"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_UP>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; vi_d0_pt4 { nvidia,pins = "vi_d0_pt4"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1151,7 +1151,7 @@ }; pu0 { nvidia,pins = "pu0"; - nvidia,function = "rsvd1"; + nvidia,function = "owr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1172,7 +1172,7 @@ }; pu3 { nvidia,pins = "pu3"; - nvidia,function = "rsvd1"; + nvidia,function = "pwm0"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1193,7 +1193,7 @@ }; pu6 { nvidia,pins = "pu6"; - nvidia,function = "rsvd1"; + nvidia,function = "pwm3"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1221,7 +1221,7 @@ }; pv3 { nvidia,pins = "pv3"; - nvidia,function = "rsvd1"; + nvidia,function = "clk_12m_out"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_DISABLE>; @@ -1510,7 +1510,7 @@ }; pbb0 { nvidia,pins = "pbb0"; - nvidia,function = "rsvd1"; + nvidia,function = "i2s4"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1575,7 +1575,7 @@ }; pcc1 { nvidia,pins = "pcc1"; - nvidia,function = "rsvd1"; + nvidia,function = "i2s4"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; -- 2.14.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/4] ARM: dts: tegra: beaver: remove invalid uses of rsvd1 @ 2018-02-10 1:33 ` Marcel Ziswiler 0 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-tegra, devicetree Cc: Marcel Ziswiler, Thierry Reding, Jonathan Hunter, linux-kernel, Rob Herring, Mark Rutland, Russell King, linux-arm-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> 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 <marcel.ziswiler@toradex.com> --- 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 = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; sdmmc3_dat7_pd4 { nvidia,pins = "sdmmc3_dat7_pd4"; - nvidia,function = "rsvd1"; + nvidia,function = "spdif"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -281,14 +281,14 @@ }; vi_vsync_pd6 { nvidia,pins = "vi_vsync_pd6"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; vi_hsync_pd7 { nvidia,pins = "vi_hsync_pd7"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -806,7 +806,7 @@ }; hdmi_int_pn7 { nvidia,pins = "hdmi_int_pn7"; - nvidia,function = "rsvd1"; + nvidia,function = "hdmi"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_ENABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -841,7 +841,7 @@ }; ulpi_data3_po4 { nvidia,pins = "ulpi_data3_po4"; - nvidia,function = "rsvd1"; + nvidia,function = "uarta"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1107,21 +1107,21 @@ }; vi_d10_pt2 { nvidia,pins = "vi_d10_pt2"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; vi_d11_pt3 { nvidia,pins = "vi_d11_pt3"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_UP>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; }; vi_d0_pt4 { nvidia,pins = "vi_d0_pt4"; - nvidia,function = "rsvd1"; + nvidia,function = "ddr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1151,7 +1151,7 @@ }; pu0 { nvidia,pins = "pu0"; - nvidia,function = "rsvd1"; + nvidia,function = "owr"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1172,7 +1172,7 @@ }; pu3 { nvidia,pins = "pu3"; - nvidia,function = "rsvd1"; + nvidia,function = "pwm0"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1193,7 +1193,7 @@ }; pu6 { nvidia,pins = "pu6"; - nvidia,function = "rsvd1"; + nvidia,function = "pwm3"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1221,7 +1221,7 @@ }; pv3 { nvidia,pins = "pv3"; - nvidia,function = "rsvd1"; + nvidia,function = "clk_12m_out"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_DISABLE>; @@ -1510,7 +1510,7 @@ }; pbb0 { nvidia,pins = "pbb0"; - nvidia,function = "rsvd1"; + nvidia,function = "i2s4"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; @@ -1575,7 +1575,7 @@ }; pcc1 { nvidia,pins = "pcc1"; - nvidia,function = "rsvd1"; + nvidia,function = "i2s4"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>; -- 2.14.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/4] ARM: dts: tegra: venice2: remove duplicate pcie-1 node 2018-02-10 1:33 ` Marcel Ziswiler @ 2018-02-10 1:33 ` Marcel Ziswiler -1 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-tegra, devicetree Cc: Marcel Ziswiler, Thierry Reding, Jonathan Hunter, linux-kernel, Rob Herring, Mark Rutland, Russell King, linux-arm-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Get rid of duplicate pcie-1 node. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- 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"; - }; }; }; }; -- 2.14.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/4] ARM: dts: tegra: venice2: remove duplicate pcie-1 node @ 2018-02-10 1:33 ` Marcel Ziswiler 0 siblings, 0 replies; 16+ messages in thread From: Marcel Ziswiler @ 2018-02-10 1:33 UTC (permalink / raw) To: linux-arm-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Get rid of duplicate pcie-1 node. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- 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"; - }; }; }; }; -- 2.14.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 0/4] dt/bindings & ARM: dts: tegra: updates 2018-02-10 1:33 ` Marcel Ziswiler @ 2018-03-08 15:07 ` Thierry Reding -1 siblings, 0 replies; 16+ messages in thread From: Thierry Reding @ 2018-03-08 15:07 UTC (permalink / raw) To: Marcel Ziswiler Cc: linux-tegra, devicetree, Jonathan Hunter, linux-kernel, Rob Herring, Marcel Ziswiler, Mark Rutland, Russell King, linux-arm-kernel [-- Attachment #1: Type: text/plain, Size: 1101 bytes --] On Sat, Feb 10, 2018 at 02:33:21AM +0100, Marcel Ziswiler wrote: > > This series fixes the Tegra GMI controller DT/bindings example, a few > IRQ type definitions, removes some invalid uses of rsvd1 pin muxes on > Beaver and removes a duplicate pcie-1 node on Venice2. > > > Marcel Ziswiler (4): > dt/bindings: fix binding examples for tegra gmi controller > ARM: dts: tegra: use proper irq type definitions > ARM: dts: tegra: beaver: remove invalid uses of rsvd1 > ARM: dts: tegra: venice2: remove duplicate pcie-1 node > > .../devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 6 ++-- > arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- > arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +- > arch/arm/boot/dts/tegra124-venice2.dts | 9 ++---- > arch/arm/boot/dts/tegra30-apalis.dtsi | 4 +-- > arch/arm/boot/dts/tegra30-beaver.dts | 32 +++++++++++----------- > arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- > 7 files changed, 25 insertions(+), 32 deletions(-) Applied, thanks. Thierry [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 0/4] dt/bindings & ARM: dts: tegra: updates @ 2018-03-08 15:07 ` Thierry Reding 0 siblings, 0 replies; 16+ messages in thread From: Thierry Reding @ 2018-03-08 15:07 UTC (permalink / raw) To: linux-arm-kernel On Sat, Feb 10, 2018 at 02:33:21AM +0100, Marcel Ziswiler wrote: > > This series fixes the Tegra GMI controller DT/bindings example, a few > IRQ type definitions, removes some invalid uses of rsvd1 pin muxes on > Beaver and removes a duplicate pcie-1 node on Venice2. > > > Marcel Ziswiler (4): > dt/bindings: fix binding examples for tegra gmi controller > ARM: dts: tegra: use proper irq type definitions > ARM: dts: tegra: beaver: remove invalid uses of rsvd1 > ARM: dts: tegra: venice2: remove duplicate pcie-1 node > > .../devicetree/bindings/bus/nvidia,tegra20-gmi.txt | 6 ++-- > arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- > arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +- > arch/arm/boot/dts/tegra124-venice2.dts | 9 ++---- > arch/arm/boot/dts/tegra30-apalis.dtsi | 4 +-- > arch/arm/boot/dts/tegra30-beaver.dts | 32 +++++++++++----------- > arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- > 7 files changed, 25 insertions(+), 32 deletions(-) Applied, thanks. Thierry -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180308/ba9934ae/attachment.sig> ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2018-03-08 15:07 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-10 1:33 [PATCH 0/4] dt/bindings & ARM: dts: tegra: updates Marcel Ziswiler
2018-02-10 1:33 ` Marcel Ziswiler
2018-02-10 1:33 ` Marcel Ziswiler
[not found] ` <20180210013326.27771-1-marcel-mitwqZ+T+m9Wk0Htik3J/w@public.gmane.org>
2018-02-10 1:33 ` [PATCH 1/4] dt/bindings: fix binding examples for tegra gmi controller Marcel Ziswiler
2018-02-10 1:33 ` Marcel Ziswiler
2018-02-18 23:52 ` Rob Herring
2018-02-10 1:33 ` [PATCH 2/4] ARM: dts: tegra: use proper irq type definitions Marcel Ziswiler
2018-02-10 1:33 ` Marcel Ziswiler
2018-02-10 1:33 ` Marcel Ziswiler
2018-02-10 1:33 ` [PATCH 3/4] ARM: dts: tegra: beaver: remove invalid uses of rsvd1 Marcel Ziswiler
2018-02-10 1:33 ` Marcel Ziswiler
2018-02-10 1:33 ` Marcel Ziswiler
2018-02-10 1:33 ` [PATCH 4/4] ARM: dts: tegra: venice2: remove duplicate pcie-1 node Marcel Ziswiler
2018-02-10 1:33 ` Marcel Ziswiler
2018-03-08 15:07 ` [PATCH 0/4] dt/bindings & ARM: dts: tegra: updates Thierry Reding
2018-03-08 15:07 ` Thierry Reding
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.