From: Olof Johansson Date: Tue, 29 Jan 2013 17:55:20 +0000 (-0800) Subject: Merge tag 'bcm2835-for-3.9-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarr... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e28c99a85b3e9ab09944fb285c0c035fa997fa33;p=linux-beck.git Merge tag 'bcm2835-for-3.9-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/dt From Stephen Warren: ARM: bcm2835: device tree updates The SoC's SDHCI and MMC controllers are added to device tree, and enabled in the Raspberry Pi board device tree. Some fixed clocks are added to the device tree to support these drivers. These could be replaced by real clocks in the future. A hard-coded memreserve is removed from device tree; the bootloader should specify the correct memory node content instead, since the memory layout is dynamic. This branch is based on v3.8-rc3. * tag 'bcm2835-for-3.9-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: fix clock node aliasing in device tree ARM: bcm2835: add I2C controllers to DT ARM: bcm2835: add SDHCI node to DT ARM: bcm2835 rpi: remove hard-coded memreserve from DT Signed-off-by: Olof Johansson --- e28c99a85b3e9ab09944fb285c0c035fa997fa33