aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-11-21ARM: kirkwood: Add support for the MPL CEC4Stefan Peter8-0/+219
Signed-off-by: Stefan Peter <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21arm: kirkwood: add support for ZyXEL NSA310Tero Jaasko7-0/+269
Hello, Andrew > > +#define NSA310_GPIO_LED_ESATA_GREEN 12 > > <..> > > +#define NSA310_GPIO_POWER_OFF 48 > > It looks like most of these are not used. Please remove them. True. Fixed. > > +static struct mtd_partition nsa310_mtd_parts[] = { > > + { > > + .name = "uboot", > > + .offset = 0, > > + .size = 0x100000, > > + .mask_flags = MTD_WRITEABLE, > > + }, { > > <..> > You should be able to put all that into DT. Take a look at Correct. I did the conversion and tested that the partitions can be read with dd and produce exactly the same data before and after conversion. So, the partition offsets at least should be fine. > > +static struct i2c_board_info __initdata nsa310_i2c_info[] = { > > + { I2C_BOARD_INFO("adt7476", 0x2e) }, > > +}; > > You can also do this in DT as well. kirkwood-ts219.dtsi has > > i2c@11000 { > status = "okay"; > clock-frequency = <400000>; Ok, I did convert the i2c definition to use the devicetree. The adt7476 device itself is not at reach of device tree, AFAIK and requires more work at there? Thanks for your valuable comments. Following is a new patch that should address the problems and mistakes you pointed and also some of the pointed by Jason Cooper. The nand and i2c are now defined at DT and I also removed the pointless defines and ARM_APPENDED_DTB. It is based against the Linus' official 3.6 version. Best regards, Tero Signed-off-by: Jason Cooper <[email protected]>
2012-11-21ARM: Kirkwood: new board USI TopkickJason Cooper8-0/+187
This is a new kirkwood box made by Universal Scientific Industrial, Inc. The product description is here: http://www.usish.com/english/products_topkick1281p2.php It is very similar to the dreamplug and other plug devices, with the exception that it has room for a 2.5" SATA HDD internally. Signed-off-by: Jason Cooper <[email protected]> Acked-by: Andrew Lunn <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]>
2012-11-21ARM: kirkwood: use gpio-fan DT binding on lsxlMichael Walle2-51/+11
Remove board specific gpio-fan driver registration. Moved into device tree. Signed-off-by: Michael Walle <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21ARM: Kirkwood: add Netspace boards to defconfigJason Cooper1-0/+5
Signed-off-by: Jason Cooper <[email protected]>
2012-11-21ARM: kirkwood: DT board setup for Network Space Mini v2Simon Guinot8-4/+67
This patch adds DT board setup for the LaCie NAS Network Space Mini v2 (aka SafeBox). The hardware characteristics are very close to those of the Network Space Lite v2. The main difference are: - A GPIO fan which is only available on the NS2 Mini. - A single USB host port is wired on the NS2 Mini. The NS2 Lite provides an additional dual-mode USB port (host/device). Signed-off-by: Simon Guinot <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21ARM: kirkwood: DT board setup for Network Space Lite v2Simon Guinot7-2/+47
This patch adds DT board setup for the LaCie NAS Network Space Lite v2. This board is derived from the Network Space v2 and a lot of hardware characteristics are shared. - CPU: Marvell 88F6192 800Mhz - SDRAM memory: 128MB DDR2 200Mhz - 1 SATA port: internal - Gigabit ethernet: PHY Marvell 88E1318 - Flash memory: SPI NOR 512KB (Macronix MX25L4005A) - i2c EEPROM: 512 bytes (24C04 type) - 2 USB2 ports: host and host/device - 1 push button - 1 SATA LED (bi-color, blue and red) Note that the SATA LED is not compatible with the driver leds-ns2. The LED behaviour ("on", "off" or "SATA activity blink") is controlled via a single MPP (21). Signed-off-by: Simon Guinot <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21ARM: kirkwood: DT board setup for Network Space v2 and parentsSimon Guinot11-1/+301
This patch adds DT board setup for LaCie Network Space v2 and parents, based on the Marvell Kirkwood 6281 SoC. This includes Network Space v2 (Max) and Internet Space v2. Signed-off-by: Simon Guinot <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21leds: leds-ns2: add device tree bindingSimon Guinot2-3/+101
Signed-off-by: Simon Guinot <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21ARM: Kirkwood: Enable the second I2C busJason Gunthorpe2-0/+3
mv64xxx_of_config requires that the tclk frequency be found through the clk stuff rather than through device tree, so add another override for the 2nd controller. Signed-off-by: Jason Gunthorpe <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scanJason Gunthorpe1-17/+1
The kirkwood_pcie_scan_bus function duplicates the common code in bios32.c, passing ops in will use the common code.. Signed-off-by: Jason Gunthorpe <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21Merge branch 'next/dt-samsung' of ↵Olof Johansson33-704/+2319
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt From Kukjin Kim: Here is Samsung DT for v3.8 and this is including DT for EXYNOS4X12 SoC, SMDK4412 board, pinctrl for exynos4x12, TMU, MFC, SATA and SATA PHY. As I commented on [4/7], this branch merged pinctrl/samsung to support pinctrl for exynos4x12 without useless merge conflicts. * 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (32 commits) ARM: EXYNOS: DT Support for SATA and SATA PHY ARM: dts: Remove broken-voltage property from sdhci node for exynos4210-trats ARM: dts: Add node for touchscreen for exynos4210-trats ARM: dts: Add node for touchscreen voltage regulator for exynos4210-trats ARM: dts: Add node for i2c3 bus for exynos4210-trats ARM: dts: Add nodes for GPIO keys available on Trats ARM: dts: Update for pinctrl-samsung driver for exynos4210-trats ARM: dts: Add nodes for pin controllers for exynos4x12 pinctrl: samsung: Add support for EXYNOS4X12 gpio: samsung: Skip registration if pinctrl driver is present on EXYNOS4X12 ARM: EXYNOS: Skip wakeup-int setup if pinctrl driver is used on EXYNOS4X12 ARM: dts: add board dts file for EXYNOS4412 based SMDK board ARM: dts: Add support for EXYNOS4X12 SoCs ARM: EXYNOS: Add devicetree node for TMU driver for exynos5 ARM: EXYNOS: Add devicetree node for TMU driver for exynos4 ARM: EXYNOS: Add MFC device tree support ARM: dts: Enable serial controllers on Origen and SMDKV310 Documentation: Update samsung-pinctrl device tree bindings documentation pinctrl: samsung: Add GPIO to IRQ translation pinctrl: exynos: Set pin function to EINT in irq_set_type of wake-up EINT ... Add/add conflicts in: arch/arm/boot/dts/exynos5250-smdk5250.dts arch/arm/boot/dts/exynos5250.dtsi arch/arm/mach-exynos/mach-exynos5-dt.c Signed-off-by: Olof Johansson <[email protected]>
2012-11-21Merge branch 'next/hdmi-samsung' of ↵Olof Johansson16-50/+124
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt From Kukjin Kim: This is for adding support for DT based exynos5250 hdmi and it adds device node for hdmi, mixer, hdmiphy and hdmiddc. * 'next/hdmi-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: removing exynos-drm device registration from non-dt platforms ARM: EXYNOS: add clocks for exynos5 hdmi ARM: dts: add device tree support for exynos5 hdmiddc ARM: dts: add device tree support for exynos5 hdmiphy ARM: dts: add device tree support for exynos5 mixer ARM: dts: add device tree support for exynos5 hdmi
2012-11-22ARM: dts: Use drive strength 3 for SD pins for exynos4Tomasz Figa2-56/+56
This patch modifies pin control groups of SD pins on EXYNOS4210 and EXYNOS4X12 to use drive strength 3 as a default value which corresponds to S5P_GPIO_DRVSTR_LV4 in legacy non-DT code. This is needed at least on Origen board for sdhci2 to work and if any other drive strength is required on each board, we can overide it. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> [[email protected]: edited commit message] Signed-off-by: Kukjin Kim <[email protected]>
2012-11-22ARM: dts: Set up power domains for exynos4Tomasz Figa2-0/+35
This patch adds device tree nodes for power domains available on EXYNOS4 SoCs. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-22ARM: EXYNOS: Bind devices to power domains using DTTomasz Figa2-1/+94
This patch adds a way to specify bindings between devices and power domains using device tree. A device can be bound to particular power domain by adding a power-domain property containing a phandle to the domain. The device will be bound to the domain before binding a driver to it and unbound after unbinding a driver from it. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-22ARM: EXYNOS: Fix power domain name initializationTomasz Figa1-1/+2
This patch adds initialization of name field in generic power domain struct. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-22ARM: EXYNOS: Detect power domain state on registration from DTTomasz Figa2-7/+5
Initial state of power domains might vary on different boards and with different bootloaders. This patch adds detection of initial state of power domains when being registered from DT. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-22ARM: dts: Add vmmc fixed voltage regulator for exynos4210-origenTomasz Figa1-0/+11
This patch adds fixed voltage vmmc regulator to dts file of Origen board. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-22ARM: dts: Update sdhci nodes for current bindings for exynos4210-origenTomasz Figa1-6/+2
This patch modifies sdhci nodes present in Origen device tree source to use current generic mmc bindings. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-22ARM: dts: Update for pinctrl-samsung driver for exynos4210-origenTomasz Figa1-20/+10
This patch updates all parts of Origen dts related to pin configuration to use new GPIO and pinctrl bindings, instead of (now unsupported on Exynos4) legacy gpio-samsung bindings. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-22ARM: dts: Split memory sections for exynos4210-origenTomasz Figa1-1/+4
This patch changes memory configuration defined in dts file of Origen board from single 1 GiB section into four 256 MiB sections to match section size limit. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-22ARM: EXYNOS: add all i2c busses to auxdata for DTOlof Johansson1-0/+10
Needed to match device ids for clocks, etc. Signed-off-by: Olof Johansson <[email protected]> Signed-off-by: Doug Anderson <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-22ARM: dts: Add aliases for i2c controller for exynos4Doug Anderson1-8/+16
This is similar to a recent commit for exynos5250 titled: ARM: EXYNOS: Add aliases for i2c controller Adding aliases will be useful to prevent warnings in a future change. See: i2c: s3c2410: Get the i2c bus number from alias id Signed-off-by: Doug Anderson <[email protected]> Acked-by: Olof Johansson <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-21Merge branch 'ste-dt-for-next' of ↵Olof Johansson3-2/+249
git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt From Lee Jones. It's an update of the previous ux500/dt branch with a few more patches: * 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500: ARM: ux500: Describe UART platform registering issues more accurately ARM: ux500: Enable all MMC devices on the u9540 when booting with DT ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree ARM: ux500: Add UART support to the u9540 Device Tree ARM: ux500: Add skeleton DTS file for the u9540 ARM: ux500: Add SDI (MMC) support to the HREF Device Tree ARM: ux500: Move regulator-name properties out to board DTS files Signed-off-by: Olof Johansson <[email protected]>
2012-11-21Merge tag 'lpc32xx-dts-for-3.7' of git://git.antcom.de/linux-2.6 into next/dtOlof Johansson1-0/+7
From Roland Stigge: DTS updates for the LPC32xx Soc for 3.7 This time, only one patch: Adding the motor PWM to lpc32xx.dtsi * tag 'lpc32xx-dts-for-3.7' of git://git.antcom.de/linux-2.6: ARM: LPC32xx: Add the motor PWM to base dts file Signed-off-by: Olof Johansson <[email protected]>
2012-11-21Merge tag 'tegra-for-3.8-dt' of ↵Olof Johansson62-524/+1447
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt From Stephen Warren: ARM: tegra: device tree changes A wide variety of device tree additions are made across many Tegra boards: * WiFi is supported on Seaboard, Ventana, and Cardhu. * An I2C mux is added for Ventana, and Tamonten. * SPI flash is added to Cardhu, and TrimSlice. * Temperature sensors are added to Harmony, Tamonten, and Ventana. * host1x (graphics/display controller) is added to the SoC include files. * HDMI displays are enabled on Harmony, TrimSlice, Tamonten, Plutux, Tec, and Whistler. This pull request is based on tegra-for-3.8-soc. * tag 'tegra-for-3.8-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (47 commits) ARM: tegra: whistler: enable HDMI port ARM: tegra: tec: Enable HDMI output ARM: tegra: plutux: Enable HDMI output ARM: tegra: tamonten: Add host1x support ARM: tegra: trimslice: enable HDMI port ARM: tegra: harmony: enable HDMI port ARM: tegra: Add Tegra30 host1x support ARM: tegra: Add Tegra20 host1x support ARM: tegra: trimslice: enable SPI flash ARM: tegra: dts: add sflash controller dt entry ARM: tegra: ventana: Add NCT1008 temperature sensor ARM: tegra: tamonten: Add NCT1008 temperature sensor ARM: tegra: harmony: Add ADT7641 temperature sensor ARM: tegra: tec: Remove redundant DT properties ARM: tegra: tamonten: Add DDC/PTA pinmux ARM: tegra: dts: cardhu: enable SLINK4 ARM: tegra: dts: add slink controller dt entry ARM: dt: tegra: ventana: define pinmux for ddc ARM: dt: t30 cardhu: set pinmux and power for wlan ARM: dt: t20 ventana: set pinmux and power for wlan ...
2012-11-20Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into ↵Olof Johansson6-0/+56
next/dt From Nicolas Ferre: More DT material for AT91: - conversion of watchdog to DT - usart definition for evk-pro3 board * tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91: ARM: at91/dts: evk-pro3: enable watchdog ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45 watchdog: at91sam9_wdt: add device tree support ARM: at91: dt: evk-pro3: enable uart0 and uart2
2012-11-21ARM: dts: Add board dts file for Snow board (ARM Chromebook)Doug Anderson3-1/+229
This dts file is based on the Snow dts file in the Chromium OS kernel tree with the following changes: * Some details have been updated to match the exynos5250-smdk5250.dts file from linux-next (as of c11068538994430547722dc9fb515a0ceefd5cb9). * This file doesn't include references to hardware whose upstream support isn't quite there yet. That includes most i2c devices. Note that most i2c busses have been included with no devices. The Snow dts file is mostly just an include of the "cros5250" dts file which describes a class of similar boards. Support for other boards has not yet been send upstream. With this file and a change to use UART3 for serial output I can: * Boot to a command line using either SD or EMMC as a root filesystem * See the power button and lid switch using evtest. Signed-off-by: Doug Anderson <[email protected]> Acked-by: Olof Johansson <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-21ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynosDoug Anderson2-12/+12
The aliases for dwmmc were placed in the SMDK5250 dts file but really should be common for all exynos5250 boards. Move it to the common CPU file. Signed-off-by: Doug Anderson <[email protected]> Acked-by: Olof Johansson <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-20ARM: ux500: Describe UART platform registering issues more accuratelyLee Jones1-2/+1
UARTs no longer require call-back information, since the reset call-back was removed in 43b5f0d69291374f602ad8e1817f329573a59010. The only AUXDATA dependencies remaining for UARTs are DMA settings. Acked-by: Linus Walleij <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-11-20ARM: ux500: Enable all MMC devices on the u9540 when booting with DTLee Jones1-1/+26
The u9540 supports 3 MMC devices. This patch enables two of them and updates the configuration of the already enabled SDI4 port. Acked-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-11-20ARM: ux500: Enable SDI4 port on the u9540 when booting with Device TreeLee Jones1-1/+11
Here we add the device node for the SDI4 (MMC) port to the u9540 Device Tree source file. This will allow successful probing of the internal MMC storage device when booting with DT enabled. Acked-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-11-20ARM: ux500: Add UART support to the u9540 Device TreeLee Jones1-1/+12
Add the 3 UART nodes required to enable serial ports on the u9540. Acked-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-11-20ARM: ux500: Add skeleton DTS file for the u9540Lee Jones1-0/+26
This patch sees the creation of a sparse Device Tree file for ST-Ericsson's latest development board supporting the latest dual-core Cortex-a9 u9540 SoC. Acked-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-11-20ARM: ux500: Add SDI (MMC) support to the HREF Device TreeLee Jones1-0/+44
Here we add the Device Tree nodes which are required to successfully probe the MMCI driver which will enable the four cards available on ST-Ericsson's HREF hardware development platform. Acked-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-11-20ARM: ux500: Move regulator-name properties out to board DTS filesLee Jones1-0/+132
Regulator supply names should be allocated by board rather than per SoC, as the same SoC could be wired differently on varying hardware. Here we push all regulator-name allocation out to the dbx5x0 subordinate board files; HREF and Snowball. Requested-by: Mark Brown <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Lee Jones <[email protected]>
2012-11-20ARM: mxs: Add SchulerControl SPS1 DTS fileMarek Vasut3-0/+177
Add DTS file for this custom board. Signed-off-by: Marek Vasut <[email protected]> Cc: Fabio Estevam <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-20ARM: imx23-olinuxino: Add spi supportFadil Berisha2-0/+22
imx23-olinuxino board has spi pins exposed on external connector. This patch add spi support. Signed-off-by: Fadil Berisha <[email protected]> Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-20ARM: EXYNOS: DT Support for SATA and SATA PHYVasanth Ananthan5-0/+70
This patch adds Device Nodes for SATA and SATA PHY device. Signed-off-by: Vasanth Ananthan <[email protected]> [[email protected]: removed address definitions as per comments] Signed-off-by: Kukjin Kim <[email protected]>
2012-11-20ARM: dts: Remove broken-voltage property from sdhci node for exynos4210-tratsTomasz Figa1-1/+0
The broken voltage property has been replaced with auto detection based on voltages available on vmmc voltage regulator, so there is no use for it now. This patch removes the now unused property from Trats Device Tree sources. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-20ARM: dts: Add node for touchscreen for exynos4210-tratsTomasz Figa1-0/+11
This patch adds a device tree node for the Melfas MMS114-controlled touchscreen present on Samsung Trats board. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-20ARM: dts: Add node for touchscreen voltage regulator for exynos4210-tratsTomasz Figa1-0/+9
This patch adds device tree node for a fixed voltage regulator used for touchscreen on Samsung Trats board. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-20ARM: dts: Add node for i2c3 bus for exynos4210-tratsTomasz Figa1-0/+9
This patch adds device tree node for i2c3 bus to device tree source of Samsung Trats board. This bus is used by mms114 touchscreen controller, for which support will be added in separate patch. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-20ARM: dts: Add nodes for GPIO keys available on TratsTomasz Figa1-0/+33
This patch extends dts file of Samsung Trats board to add support for available GPIO keys using gpio-keys driver. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-20ARM: dts: Update for pinctrl-samsung driver for exynos4210-tratsTomasz Figa1-16/+8
This patch updates all parts of Trats dts related to pin configuration to use new GPIO and pinctrl bindings, instead of (now unsupported on Exynos4) legacy gpio-samsung bindings. Signed-off-by: Tomasz Figa <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-19ARM: davinci: move dtb targets to common locationOlof Johansson2-2/+2
The dtb targets belong in arch/arm/boot/dts/Makefile now, so move the newly added davinci targets there. Signed-off-by: Olof Johansson <[email protected]>
2012-11-19Merge tag 'davinci-for-v3.8/dt' of ↵Olof Johansson30-68/+378
git://gitorious.org/linux-davinci/linux-davinci into next/dt From Sekhar Nori: These changes add DT boot support to DaVinci DA850 SoC. * tag 'davinci-for-v3.8/dt' of git://gitorious.org/linux-davinci/linux-davinci: ARM: davinci: da850: generate dtbs for da850 boards ARM: davinci: add support for am1808 based EnBW CMC board ARM: davinci: da850 evm: add DT data ARM: davinci: da850: add SoC DT data ARM: davinci: da850: add DT boot support ARM: davinci: da8xx: add DA850 PRUSS support ARM: davinci: add platform hook to fetch the SRAM pool ARM: davinci: da850: changed SRAM allocator to shared ram. ARM: davinci: sram: switch from iotable to ioremapped regions uio: uio_pruss: replace private SRAM API with genalloc ARM: davinci: serial: provide API to initialze UART clocks ARM: davinci: convert platform code to use clk_prepare/clk_unprepare Signed-off-by: Olof Johansson <[email protected]>
2012-11-19Merge branch 'next/dt-exynos4x12' into next/dt-samsungKukjin Kim1199-13402/+18310
Conflicts: arch/arm/boot/dts/exynos4210.dtsi
2012-11-19ARM: Kirkwood: checkpatch cleanupsAndrew Lunn11-31/+27
Mostly printk to pr_{err|info} changes and a few strings split over multiple lines are combined. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>