summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-mx31lilly.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-01 00:38:04 -0700
committerOlof Johansson <olof@lixom.net>2013-06-01 00:38:04 -0700
commitfc20c6ffdd9875c42c9ff0d4233ed8960165633b (patch)
treea36b423c815efc859b833338a27b45011d4ad8c0 /arch/arm/mach-imx/mach-mx31lilly.c
parent3c09f4daeee83b76779dec766f57e9e883402bb1 (diff)
parent028633c238f91dc113520a7ad25d37b2ba9068af (diff)
downloadtalos-obmc-linux-fc20c6ffdd9875c42c9ff0d4233ed8960165633b.tar.gz
talos-obmc-linux-fc20c6ffdd9875c42c9ff0d4233ed8960165633b.zip
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
From Nicolas Ferre: Big DT-centric update for AT91: - Calao boards update, removal of one board C file and associated defconfig, Kconfig Makefile lines - several Acme boards updates - addition of watchdog, uart and pinctrl descriptions for several products - modification of RTC compatible string for 9x5 family * tag 'at91-dt' of git://github.com/at91linux/linux-at91: (21 commits) ARM: at91/dt: add pinctrl definition for at91 tc blocks ARM: at91/dts: add the watchdog nodes for at91 boards ARM: at91/dtsi: add the watchdog nodes for at91 SoC ARM: at91: drop non DT: Calao USB-A96x ARM: at91: dt: add Calao USB-A9G20 low power version ARM: at91: dt: usb-a9263: add dataflash support ARM: at91: dt: usb-a9263: update shutdown controller ARM: at91: dt: usb-a9260: update shutdown controller ARM: at91: dt: sam9260: add i2c gpio pinctrl ARM: at91: switch Fox G20 board .dts to pre-processor defines ARM: at91: add Acme Systems Fox G20 board ARM: at91/at91-ariag25.dts: UART0/1 nodes are disabled ARM: at91/at91sam9x5.dtsi: add UART0/1 nodes ARM: at91/at91-ariag25.dts: add RTC node ARM: at91: at91sam9x5 RTC is not compatible with at91rm9200 one ARM: at91: udpate defconfigs ARM: at91: dt: switch to standard IRQ flag defines ARM: at91: dt: switch to pinctrl to pre-processor ARM: at91: dt: add pinctrl pre-processor define ARM: at91: dt: switch to standard GPIO flag defines. ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lilly.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud