lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 2 Nov 2015 01:16:19 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Linus Walleij <linus.walleij@...aro.org>, Nicolas Ferre <nicolas.ferre@...el.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Ludovic Desroches <ludovic.desroches@...el.com>, Alexandre Belloni <alexandre.belloni@...e-electrons.com>, Cyrille Pitchen <cyrille.pitchen@...el.com> Subject: linux-next: manual merge of the pinctrl tree with the at91 tree Hi Linus, Today's linux-next merge of the pinctrl tree got a conflict in: arch/arm/boot/dts/sama5d2.dtsi between commit: 512fc048e4fd ("ARM: at91/dt: sama5d2: add missing devices") from the at91 tree and commit: f6c804b08ca5 ("ARM: at91/dt: sama5d2: add pio controller node") from the pinctrl tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@...b.auug.org.au diff --cc arch/arm/boot/dts/sama5d2.dtsi index c1f0cba40289,cc05cde0f9a4..000000000000 --- a/arch/arm/boot/dts/sama5d2.dtsi +++ b/arch/arm/boot/dts/sama5d2.dtsi @@@ -1054,21 -922,19 +1054,35 @@@ status = "disabled"; }; + tdes@...44000 { + compatible = "atmel,at91sam9g46-tdes"; + reg = <0xfc044000 0x100>; + interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>; + dmas = <&dma0 + (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | + AT91_XDMAC_DT_PERID(28))>, + <&dma0 + (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | + AT91_XDMAC_DT_PERID(29))>; + dma-names = "tx", "rx"; + clocks = <&tdes_clk>; + clock-names = "tdes_clk"; + status = "okay"; + }; ++ + pioA: pinctrl@...38000 { + compatible = "atmel,sama5d2-pinctrl"; + reg = <0xfc038000 0x600>; + interrupts = <18 IRQ_TYPE_LEVEL_HIGH 7>, + <68 IRQ_TYPE_LEVEL_HIGH 7>, + <69 IRQ_TYPE_LEVEL_HIGH 7>, + <70 IRQ_TYPE_LEVEL_HIGH 7>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + clocks = <&pioA_clk>; + }; }; }; }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists