linux-kernel - RE: linux-next: manual merge of the arm-soc tree with the mfd tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 21 Jun 2013 05:59:50 +0000
From:	"Gupta, Pekon" <pekon@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"Pantelis Antoniou" <panto@...oniou-consulting.com>,
	"Patil, Rachna" <rachna@...com>, "Balbi, Felipe" <balbi@...com>,
	Sebastian Andrzej Siewior <sebastian@...akpoint.cc>,
	Samuel Ortiz <sameo@...ux.intel.com>,
	"Philip, Avinash" <avinashphilip@...com>,
	Benoit Cousson <benoit.cousson@...aro.org>
Subject: RE: linux-next: manual merge of the arm-soc tree with the mfd tree

> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/am33xx.dtsi between commit a82279dd6d3e ("arm:
> am33xx:
> add TSC/ADC mfd device support") from the mfd tree and commit
> 15e8246bd61b ("ARM: dts: AM33XX: Add ELM node") from the arm-soc 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/am33xx.dtsi
> index 37ef320,0d4df90..0000000
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@@ -404,24 -494,14 +494,32 @@@
>   			ti,hwmods = "wkup_m3";
>   		};
> 
>  +		tscadc: tscadc@...0d000 {
>  +			compatible = "ti,am3359-tscadc";
>  +			reg = <0x44e0d000 0x1000>;
>  +			interrupt-parent = <&intc>;
>  +			interrupts = <16>;
>  +			ti,hwmods = "adc_tsc";
>  +			status = "disabled";
>  +
>  +			tsc {
>  +				compatible = "ti,am3359-tsc";
>  +			};
>  +			am335x_adc: adc {
>  +				#io-channel-cells = <1>;
>  +				compatible = "ti,am3359-adc";
>  +			};
>  +
>  +		};
>  +
> + 		elm: elm@...80000 {
> + 			compatible = "ti,am3352-elm";
> + 			reg = <0x48080000 0x2000>;
> + 			interrupts = <4>;
> + 			ti,hwmods = "elm";
> + 			status = "disabled";
> + 		};
> +
[Pekon]: Thanks.. Yes this is ok based on commit "15e8246bd61b ("ARM: dts: AM33XX: Add ELM node")


>   		gpmc: gpmc@...00000 {
>   			compatible = "ti,am3352-gpmc";
>   			ti,hwmods = "gpmc";

with regards, pekon
--
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/