[GIT PULL] omap device tree changes for v4.6 merge window, part 1
Tony Lindgren
tony at atomide.com
Fri Feb 26 13:58:21 PST 2016
* Arnd Bergmann <arnd at arndb.de> [160226 13:35]:
> On Monday 22 February 2016 13:56:12 Tony Lindgren wrote:
> > Device tree changes for omaps for v4.6 merge window. Mostly just
> > adding board specific devices and few new boards:
>
> Pulled into next/dt, with a trivial conflict resolution:
>
> --- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
> +++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
> @@@ -110,6 -110,19 +110,11 @@@
>
> &i2c3 {
> clock-frequency = <400000>;
> -};
> -
> -&i2c2 {
> - clock-frequency = <400000>;
> -};
> -
> -&i2c3 {
> - clock-frequency = <400000>;
> + at24 at 50 {
> + compatible = "at24,24c02";
> + readonly;
> + reg = <0x50>;
> + };
> };
>
> /*
OK looks god to me thanks.
Tony
More information about the linux-arm-kernel
mailing list