2015-08-26 08:45:31

by Nicolas Ferre

Subject: [PATCH] ARM: at91/dt: corrections to i2c1 declaration to sama5d4

From: Holger Busse <[email protected]>

Correcting the dma declaration for i2c1 dma.

Signed-off-by: Holger Busse <[email protected]>
Signed-off-by: Nicolas Ferre <[email protected]>
---
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

2015-08-26 09:05:24

by Nicolas Ferre

Subject: Re: [PATCH] ARM: at91/dt: corrections to i2c1 declaration to sama5d4

Le 26/08/2015 10:45, Nicolas Ferre a ?crit :
> From: Holger Busse <[email protected]>
>
> Correcting the dma declaration for i2c1 dma.
>
> Signed-off-by: Holger Busse <[email protected]>
> Signed-off-by: Nicolas Ferre <[email protected]>

Oh, and I forgot to add:

Fixes: 4cc7cdf35c5f ("ARM: at91/dt: add i2c1 declaration to sama5d4")
Cc: [email protected] # 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