From: Arnd Bergmann Date: Thu, 21 Mar 2013 16:25:13 +0000 (+0100) Subject: Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=42dd8d53ced84ed6b6378d632a5fcab49d91dfde;p=deliverable%2Flinux.git Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt From Nicolas Ferre : DT modifications for at91rm9200 and at91sam9x5 SoCs, mainly around I2C. Also some cleanup of some unneeded properties and conflicting nodes. One more DT-only board based on at91rm9200. * tag 'at91-dt' of git://github.com/at91linux/linux-at91: ARM: at91/at91sam9x5cm: add 1-wire chip on CM board ARM: at91/at91sam9x5ek: i2c1 and i2c2 conflict with macb and lcd ARM: at91/dt: gpio-keys: remove address-cells and size-cells properties ARM: at91: add MPA 1600 DT board ARM: at91: add pinctrl nodes to i2c-gpio on RM92000 DT ARM: at91: add TWI bindings to RM9200 DT ARM: at91: dt: at91sam9x5: add i2c-gpio pinctrl ARM: at91: dt: at91sam9x5: add i2c pinctrl Signed-off-by: Arnd Bergmann --- 42dd8d53ced84ed6b6378d632a5fcab49d91dfde