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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> 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@xxxxxxxxxxxxxxxx
> 
> 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@44e0d000 {
>  +			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@48080000 {
> + 			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@50000000 {
>   			compatible = "ti,am3352-gpmc";
>   			ti,hwmods = "gpmc";

with regards, pekon
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux