* [PATCH] ARM: at91/dt: corrections to i2c1 declaration to sama5d4
@ 2015-08-26 8:45 Nicolas Ferre
2015-08-26 9:04 ` Nicolas Ferre
0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Ferre @ 2015-08-26 8:45 UTC (permalink / raw)
To: linux-arm-kernel
From: Holger Busse <h.busse@kathrein-sachsen.de>
Correcting the dma declaration for i2c1 dma.
Signed-off-by: Holger Busse <h.busse@kathrein-sachsen.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
arch/arm/boot/dts/sama5d4.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 3ee22ee13c5a..1ba10e495f21 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -939,11 +939,11 @@
reg = <0xf8018000 0x4000>;
interrupts = <33 IRQ_TYPE_LEVEL_HIGH 6>;
dmas = <&dma1
- (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
- AT91_XDMAC_DT_PERID(4)>,
+ (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+ | AT91_XDMAC_DT_PERID(4))>,
<&dma1
- (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
- AT91_XDMAC_DT_PERID(5)>;
+ (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+ | AT91_XDMAC_DT_PERID(5))>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
--
2.1.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: at91/dt: corrections to i2c1 declaration to sama5d4
2015-08-26 8:45 [PATCH] ARM: at91/dt: corrections to i2c1 declaration to sama5d4 Nicolas Ferre
@ 2015-08-26 9:04 ` Nicolas Ferre
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Ferre @ 2015-08-26 9:04 UTC (permalink / raw)
To: linux-arm-kernel
Le 26/08/2015 10:45, Nicolas Ferre a ?crit :
> From: Holger Busse <h.busse@kathrein-sachsen.de>
>
> Correcting the dma declaration for i2c1 dma.
>
> Signed-off-by: Holger Busse <h.busse@kathrein-sachsen.de>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Oh, and I forgot to add:
Fixes: 4cc7cdf35c5f ("ARM: at91/dt: add i2c1 declaration to sama5d4")
Cc: stable at vger.kernel.org # v4.1+
I'll add that when I including it to the "dt" branch.
Bye,
> ---
> arch/arm/boot/dts/sama5d4.dtsi | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
> index 3ee22ee13c5a..1ba10e495f21 100644
> --- a/arch/arm/boot/dts/sama5d4.dtsi
> +++ b/arch/arm/boot/dts/sama5d4.dtsi
> @@ -939,11 +939,11 @@
> reg = <0xf8018000 0x4000>;
> interrupts = <33 IRQ_TYPE_LEVEL_HIGH 6>;
> dmas = <&dma1
> - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
> - AT91_XDMAC_DT_PERID(4)>,
> + (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
> + | AT91_XDMAC_DT_PERID(4))>,
> <&dma1
> - (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
> - AT91_XDMAC_DT_PERID(5)>;
> + (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
> + | AT91_XDMAC_DT_PERID(5))>;
> dma-names = "tx", "rx";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_i2c1>;
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-26 9:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-26 8:45 [PATCH] ARM: at91/dt: corrections to i2c1 declaration to sama5d4 Nicolas Ferre
2015-08-26 9:04 ` Nicolas Ferre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).