summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-12-19Merge tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu into next/dtKevin Hilman37-186/+313
From Jason Cooper: mvebu DT changes for v3.14 (incr. #3) - kirkwood - use symbolic names for gpios and key inputs - mvebu - add the pxa nand controller to the ReadyNAS and A370-RD boards * tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Enable NAND controller in A370 Reference Design board ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts file ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts file ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts file ARM: DT: Kirkwood: Use symbolic names from gpio.h ARM: DT: Kirkwood: Use symbolic names from input.h Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-19Merge tag 'nomadik-dt-v3.14' of ↵Kevin Hilman3-38/+2
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt From Linus Walleij: Some Nomadik Device Tree updates for the v3.14 cycle: - Drop 0x prefixes - Get rid of explicit GPIO management * tag 'nomadik-dt-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: nomadik: get rid of explicit ethernet GPIO management ARM: nomadik: Remove '0x's from nomadik stn8815 DTS file
2013-12-12ARM: mvebu: Enable NAND controller in A370 Reference Design boardEzequiel Garcia1-0/+21
Marvell's Armada 370 Reference Design has a NAND flash, so enable it in the devicetree and add the partitions as prepared in the factory images. In order to skip the driver's custom device detection and use only ONFI detection, the "marvell,keep-config" parameter is used. This is needed because we have no support for setting the timings parameters yet. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-12ARM: pxa: add PWM nodes to pxa27x.dtsiMike Dunn1-0/+24
This patch adds PWM nodes for each of the four channels present on the pxa270. Signed-off-by: Mike Dunn <mikedunn@newsguy.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-11Merge tag 'integrator-v3.14-1' of ↵Kevin Hilman4-43/+44
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt From Linus Walleij: Two integrator device tree patches for v3.14: - Delete some static core module mappings. - Move EBI location to the device tree. * tag 'integrator-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: move EBI to the device tree ARM: integrator: delete static core module mappings Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-10Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dtKevin Hilman15-41/+457
From Nicolas Ferre: First DT pull-request for 3.14 - many little corrections and documentation updates - LCD FB Device Tree for at91sam9263 and at91sam9g45 boards - crypto peripherals DT entries + DMA specification - new Cosino board * tag 'at91-dt' of git://github.com/at91linux/linux-at91: (21 commits) ARM: at91/at91rm9200ek.dts: rearrange nodes in address ascending order ARM: at91: dt: at91rm9200ek: add emac and nor flash support ARM: at91: add uart aliases to sama5d3 dtsi ARM: at91: add i2c2 pinctrl speficifation to sama5d3 DT ARM: at91: Animeo IP: fix mtd partition table ARM: at91: at91sam9g45: add i2c pinctrl ARM: at91: at91sam9g45: set default mmc pinctrl-names ARM: at91: sama5d3: enable qt1070 as a wakeup source ARM: at91: add support for Cosino board series by HCE Engineering ARM: at91/dt/sama5d3: add DMA information to SHA/AES/TDES nodes ARM: at91/dt/trivial: before sama5d3, Atmel MPU were using at91 prefix ARM: at91/dt/trivial: use macro for AES irq type ARM: at91: sam9263ek: add dt lcd support ARM: at91: at9sam9m10g45ek: add dt lcd support ARM: at91: sam9263: add fb dt support ARM: at91: sam9g45: add fb dt support ARM: at91/dt: binding: add missing compatibility string in SDRAM/DDR documentation ARM: at91/dt: binding: add precision to AIC documentation ARM: at91/dt: add atmel,pullup-gpio to at91rm9200ek usb1 definition ARM: at91/dt: add ethernet phy to at91rm9200ek board ... Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-10ARM: at91: sama5d3/dt: add sama5d36ek dts filesJosh Wu4-1/+76
Add .dts and .dtsi file to support sama5d36ek board. Also update the the comments for sama5d36 in sama5d3.dtsi. Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Boris BREZILLON <b.brezillon@overkiz.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-10Merge branch 'next/cleanup' into next/dtKevin Hilman110-653/+4904
2013-12-10Merge tag 'mvebu-dt-3.14-2' of git://git.infradead.org/linux-mvebu into next/dtKevin Hilman6-108/+699
From Jason Cooper: mvebu DT changes for v3.14 (set #2) - mvebu - Netgear ReadyNAS cleanup - add Netgear ReadyNAS 2120 - kirkwood - Netgear ReadyNAS cleanup - add Netgear ReadyNAS NV+ v2 * tag 'mvebu-dt-3.14-2' of git://git.infradead.org/linux-mvebu: ARM: kirkwood: Add support for NETGEAR ReadyNAS NV+ v2 ARM: mvebu: Add Netgear ReadyNAS 2120 board ARM: mvebu: Fix whitespace in NETGEAR ReadyNAS .dts files ARM: mvebu: NETGEAR ReadyNAS 104 .dts cleanup ARM: mvebu: NETGEAR ReadyNAS 102 .dts cleanup ARM: kirkwood: NETGEAR ReadyNAS Duo v2 .dts cleanup Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-12-09ARM: at91/at91rm9200ek.dts: rearrange nodes in address ascending orderNicolas Ferre1-15/+15
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
2013-12-09ARM: at91: dt: at91rm9200ek: add emac and nor flash supportJean-Christophe PLAGNIOL-VILLARD1-0/+29
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> [nicolas.ferre@atmel.com: remove one macb node too many] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91: add uart aliases to sama5d3 dtsiNicolas Ferre1-0/+5
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by Boris BREZILLON <b.brezillon@overkiz.com>
2013-12-09ARM: at91: add i2c2 pinctrl speficifation to sama5d3 DTNicolas Ferre1-0/+10
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
2013-12-09ARM: at91: Animeo IP: fix mtd partition tableJean-Christophe PLAGNIOL-VILLARD1-23/+8
Update to production one. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91: at91sam9g45: add i2c pinctrlLudovic Desroches1-0/+20
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91: at91sam9g45: set default mmc pinctrl-namesLudovic Desroches1-0/+2
pinctrl-names property was missing from mmc nodes. Cc: <stable@vger.kernel.org> #3.11+ Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91: sama5d3: enable qt1070 as a wakeup sourceBo Shen1-0/+1
Enable qt1070 keyboard as a wakeup source on sama5d3xek board. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91: add support for Cosino board series by HCE EngineeringRodolfo Giometti3-0/+207
This patch adds the Cosino at91sam9g35 based CPU module and the Cosino Mega 2560 extension board. Web site: http://www.cosino.it Signed-off-by: Rodolfo Giometti <giometti@linux.it> [plagnioj@jcrosoft.com: added "at91-" to files, pinctrl fixed, removed unneeded stuff] Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> [nicolas.ferre@atmel.com: adapted to newer kernel, modified commit message] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91/dt/sama5d3: add DMA information to SHA/AES/TDES nodesNicolas Ferre1-0/+8
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91/dt/trivial: before sama5d3, Atmel MPU were using at91 prefixNicolas Ferre1-3/+3
Change the sha/aes/tdes compatibility string to match common case for the at91sam9g45 family which is to keep the at91 prefix. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91/dt/trivial: use macro for AES irq typeNicolas Ferre1-1/+1
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91: sam9263ek: add dt lcd supportJean-Christophe PLAGNIOL-VILLARD1-0/+30
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91: at9sam9m10g45ek: add dt lcd supportJean-Christophe PLAGNIOL-VILLARD1-0/+29
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91: sam9263: add fb dt supportJean-Christophe PLAGNIOL-VILLARD1-0/+37
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91: sam9g45: add fb dt supportJean-Christophe PLAGNIOL-VILLARD1-0/+45
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91/dt: binding: add missing compatibility string in SDRAM/DDR ↵Nicolas Ferre1-1/+2
documentation The "atmel,at91rm9200-sdramc" was missing from binding documentation. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2013-12-09ARM: at91/dt: binding: add precision to AIC documentationNicolas Ferre1-0/+1
In response to the "undocumented compatible strings" message, here is a patch which is adding the precision of two "chips" that should be used for the "atmel,<chip>-aic" compatibility string. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2013-12-09ARM: at91/dt: add atmel,pullup-gpio to at91rm9200ek usb1 definitionBoris BREZILLON1-0/+1
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91/dt: add ethernet phy to at91rm9200ek boardBoris BREZILLON1-0/+5
Add ethernet phy node in at91rm9200ek.dts. The reg register is not specified, as it may differ depending on the init process of the board: ADDR0/1 phy pins are connected to PA13/14 rm9200 pins. Which means the phy will take its address from these pins during the reset process. The macb driver will launch a full scan on the mdio bus to discover the phy address. Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> [nicolas.ferre@atmel.com: changed to IRQ_TYPE_EDGE_BOTH as asked by Boris] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-12-09ARM: at91/trivial: fix at91rm9200 rts/cts pinctrl definitionsNicolas Ferre1-2/+2
Swap names as they were improperly defined. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2013-12-08ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts fileArnaud Ebalard1-0/+36
Now that NAND controller support is available for Armada XP (cb28e2537a6f: ARM: mvebu: Add support for NAND controller in Armada 370/XP), this patch enables support for ReadyNAS 2120 and defines default partition layout as delivered by NETGEAR. As described in similar commits 2be2bc39c6f0 (ARM: mvebu: Enable NAND controller in Armada XP GP board) and d8c552dddfbf (ARM: mvebu: Enable NAND controller in Armada 370 Mirabox), "marvell,keep-config" parameter is used as current support does not allow for setting of timing parameters yet. Signed-off-by: Arnaud Ebalard <arno@natisbad.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-08ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts fileArnaud Ebalard1-0/+36
Now that NAND controller support is available for Armada 370 (cb28e2537a6f: ARM: mvebu: Add support for NAND controller in Armada 370/XP), this patch enables support for ReadyNAS 104 and defines default partition layout as delivered by NETGEAR. As described in similar commits 2be2bc39c6f0 (ARM: mvebu: Enable NAND controller in Armada XP GP board) and d8c552dddfbf (ARM: mvebu: Enable NAND controller in Armada 370 Mirabox), "marvell,keep-config" parameter is used as current support does not allow for setting of timing parameters yet. Signed-off-by: Arnaud Ebalard <arno@natisbad.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-08ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts fileArnaud Ebalard1-0/+36
Now that NAND controller support is available for Armada 370 (cb28e2537a6f: ARM: mvebu: Add support for NAND controller in Armada 370/XP), this patch enables support for ReadyNAS 102 and defines default partition layout as delivered by NETGEAR. As described in similar commits 2be2bc39c6f0 (ARM: mvebu: Enable NAND controller in Armada XP GP board) and d8c552dddfbf (ARM: mvebu: Enable NAND controller in Armada 370 Mirabox), "marvell,keep-config" parameter is used as current support does not allow for setting of timing parameters yet. Signed-off-by: Arnaud Ebalard <arno@natisbad.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-08ARM: DT: Kirkwood: Use symbolic names from gpio.hAndrew Lunn33-155/+154
Use GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW instead of 0 and 1. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-08ARM: DT: Kirkwood: Use symbolic names from input.hAndrew Lunn17-31/+30
Replace the numeric key value with a symbolic name from <bt-bindings/input/input.h> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2013-12-05Merge tag 'DT-for-v3.14-part-1' of ↵Olof Johansson7-1/+209
http://git.stlinux.com/devel/kernel/linux-sti into next/dt From Srinivas Handagatla, DT updates for STi platforms. * tag 'DT-for-v3.14-part-1' of http://git.stlinux.com/devel/kernel/linux-sti: ARM: STi: Add I2C config to B2000 and B2020 boards ARM: STi: Supply I2C configuration to STiH415 SoC ARM: STi: Supply I2C configuration to STiH416 SoC ARM: STi: OF: Fix a typo in pincfg header Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-05Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into ↵Olof Johansson46-375/+4237
next/cleanup From Nicolas Ferre: AT91: Move to Common Clock Framework and sama5d3 implementation This is the first step to move AT91 to the CCF. - core CCF and drivers for most of the clocks - use of CCF for sama5d3 (100% DT-based) * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: (22 commits) ARM: at91/dt: remove old clk material ARM: at91: move sama5d3 SoC to common clk ARM: at91/dt: define sama5d3xek's main clk frequency ARM: at91/dt: define sama5d3 clocks ARM: at91: prepare common clk transition for sama5d3 SoC ARM: at91: prepare sama5 dt boards transition to common clk ARM: at91: add new compatible strings for pmc driver ARM: at91: move pit timer to common clk framework dt: binding: add at91 clks dt bindings documentation clk: at91: add PMC smd clock clk: at91: add PMC usb clock clk: at91: add PMC utmi clock clk: at91: add PMC programmable clocks clk: at91: add PMC peripheral clocks clk: at91: add PMC system clocks clk: at91: add PMC master clock clk: at91: add PMC pll clocks clk: at91: add PMC main clock clk: at91: add PMC macro file for dt definitions clk: at91: add PMC base support ... Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-05Merge commit 'fixes' into next/cleanupOlof Johansson32-114/+575
Merging in post-rc1 fixes that have gone into rc2/3 to avoid later conflicts. * commit 'fixes': (39 commits) arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk arm: socfpga: Enable ARM_TWD for socfpga ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16 ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support ARM: multi_v7_defconfig: enable network for BeagleBone Black ARM: dts: Fix the name of supplies for smsc911x shared by OMAP ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm ARM: dts: omap3-beagle: Add omap-twl4030 audio support ARM: dts: omap4-sdp: Fix pin muxing for wl12xx ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM ARM: at91: add usart3 alias to dtsi ARM: at91: sama5d3: reduce TWI internal clock frequency mmc: omap: Fix I2C dependency and make driver usable with device tree mmc: omap: Fix DMA configuration to not rely on device id ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13) ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi ARM: dts: AM33XX IGEP0033: add USB support ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support ARM: dts: AM33XX BASE0033: add pinmux and user led support ... Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-04ARM: integrator: move EBI to the device treeLinus Walleij4-28/+43
This moves the External Bus Interface (EBI) over to a device tree node and deletes the static mappings from the platform. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-12-04ARM: integrator: delete static core module mappingsLinus Walleij2-15/+1
Now that the core module base is taken from the device tree both for platform initialization and cpufreq, let's delete the static mappings. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-12-04ARM: STi: Add I2C config to B2000 and B2020 boardsMaxime COQUELIN2-0/+31
This patch supplies I2C configuration to B2000 and B2020 based on either STiH415 or STiH416 SoCs. Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com> Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2013-12-04ARM: STi: Supply I2C configuration to STiH415 SoCMaxime COQUELIN2-0/+89
This patch supplies I2C configuration to STiH415 SoC. Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com> Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2013-12-04ARM: STi: Supply I2C configuration to STiH416 SoCMaxime COQUELIN2-0/+88
This patch supplies I2C configuration to STiH416 SoC. Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com> Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2013-12-04ARM: STi: OF: Fix a typo in pincfg headerSrinivas Kandagatla1-1/+1
This patch fixes a typo for OD define in st-pincfg header file. Reported-by: Maxime Coquelin <maxime.coquelin@st.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2013-12-04Merge tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson25-25/+121
From Jason Cooper: mvebu DT changes for v3.14 - mvebu: - remove unneeded OS-specific properties from led nodes - add NAND controller to Armada boards - add sata leds to readynas 104 - add gpio-poweroff to readynas duo v2 - kirkwood: - comment cleanup in sheevaplug files - default pinctrl for sdio - sdio in guruplug is non-removable - orion5x: - typo fix - dove: - typo fix - add PMU interrupt controller and RTC interrupt via same * tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu: ARM: Dove: Add RTC interrupt via PMU interrupt controller. ARM: Dove: Add DT node for PMU interrupt controller. ARM: mvebu: Add DT entry for ReadyNAS Duo v2 to use gpio-poweroff driver ARM: mvebu: Add RN104 SATA LEDs driven via NXP PCA9554 I2C to GPIO muxer ARM: kirkwood: mark guruplug sdio as non-removable ARM: kirkwood: provide pinctrl default to sdio nodes ARM: dove: Fix typo in device_type property of phy node ARM: orion5x: Fix typo in device_type property of phy node ARM: mvebu: Enable NAND controller in Armada 370 Mirabox ARM: mvebu: Enable NAND controller in Armada XP GP board ARM: mvebu: Add support for NAND controller in Armada 370/XP ARM: kirkwood: Cleanup comments in Sheevaplug dts files ARM: mvebu: dts: remove unneeded linux,default-state from led nodes Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-04Merge tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson20-74/+36
next/cleanup From Jason Cooper: mvebu soc changes for v3.14 - orion: - remove IRQF_DISABLED - directly include some .h files - mvebu: - remove some sparse warnings - orion5x: - include cleanup - warning removal for C=1 - kirkwood: - remove legacy clock workarounds - stop rpinting a TCLK value of 0 for DT boards - dove: - warning removal for C=1 * tag 'mvebu-soc-3.14' of git://git.infradead.org/linux-mvebu: ARM: mvebu: fix some sparse warnings ARM: kirkwood: stop printk TCLK value at boot for DT boards ARM: orion5x: drop unused include from common.c ARM: Dove: Fix compiler warnings with C=1 builds ARM: Orion5x: Fix warnings when using C=1. ARM: Orion: Add missing includes ARM: kirkwood: remove lagacy clk workarounds arm: plat-orion: remove deprecated IRQF_DISABLED Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-04Merge tag 'renesas-cleanup-for-v3.14' of ↵Olof Johansson13-93/+59
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup From Simon Horman: Renesas ARM based SoC cleanups for v3.14 * Tidy up clock table order for r7s72100, r8a7779, r8a7779, r8a7790, sh7372 and sh73a0 SoCs. * Tidy up camera-rcar header for r8a7779 SoC * Tidy up registration of VIN on r8a7779 SoC * Tidy up PFC registration on r8a7790 SoC * Correct typo in clocks for r8a7790 SoC * Don't use named resources for IPMMU, I2C and TMU on sh73a0 SoC * Don't use named resources for MMCIF and SDHI on ape6evm board * Don't use named resources for MMCIF on lager board * Tidy up device registration on lager board * Tidy up headers for bockw board * tag 'renesas-cleanup-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: sh7372: tidyup clock table order ARM: shmobile: r7s72100: tidyup clock table order ARM: shmobile: sh73a0: tidyup clock table order ARM: shmobile: r8a7779: cleanup registration of sh_eth ARM: shmobile: r8a7790: Correct typo in clocks ARM: shmobile: r8a7779: camera-rcar header cleanup ARM: shmobile: Add r8a7790_register_pfc() function ARM: shmobile: Cosmetic update of Lager DT Reference ARM: shmobile: r8a7779: cleanup registration of VIN ARM: shmobile: bockw: header cleanup ARM: shmobile: sh73a0: don't use named resource for IPMMU ARM: shmobile: sh73a0: don't use named resource for I2C ARM: shmobile: sh73a0: don't use named resource for TMU ARM: shmobile: lager: don't use named resource for MMCIF ARM: shmobile: ape6evm: don't use named resource for SDHI ARM: shmobile: ape6evm: don't use named resource for MMCIF Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-04Merge tag 'ux500-devicetree-v3.14-1' of ↵Olof Johansson30-1431/+1850
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt From Linus Walleij: Ux500 device tree patches for v3.14, take one: - Fix up tc3589x bindings so this chip works again. - Remove SSP platform devices, as we now boot from device tree exclusively. - Delete surplus AB8500/DB8500 platform data, not obtained from the device tree. - Add DMA config for the MSP devices. - A series of 21 patches moving pin control config for the on-chip Nomadik pin controller from the board file to the device tree, step by step. - Two patches to the STE DMA40 driver regarding the high-prio DMA channel so this can be moved to the device tree. Both have Vinod's ACK. - Decommission of the non-device tree boot path for the timer initialization code. - Deletion of the non-devicetree probe path from the MTU timer driver, as all platforms using it are now using device tree. This has Daniel Lezcano's ACK. * tag 'ux500-devicetree-v3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (39 commits) ARM: ux500: decomission custom SMP TWD timer init clksrc: delete nomadik MTU non-DT boot path ARM: ux500: decomission the non-DT MTU init sequence dma: ste_dma40: Parse flags property for new 'high priority channel' request dma: ste_dma40: Expand DT binding to accept 'high-priority channel' flag ARM: ux500: Remove checking for DT during timer init ARM: ux500: Clean-up legacy extern prototype ARM: ux500: Remove unused call to register AMBA devices ARM: ux500: Clean-up non-DT IRQ initialisation pinctrl: nomadik: decomission non-DT boot path pinctrl: nomadik: move platform data handling into driver ARM: ux500: get rid of unused header ARM: ux500: delete Nomadik pinctrl AUXDATA ARM: ux500: delete remnant pin config macros ARM: ux500: move snowball pin configs to device tree ARM: ux500: move snowball LED pin control to device tree ARM: ux500: convert Snowball SPI pin reference ARM: ux500: move snowball ethernet config to device tree ARM: ux500: move HREFv60plus pin configs to device tree ARM: ux500: move final HREFv60 LCD pins to device tree ... Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-04arm: dts: socfpga: Change some clocks of gate-clk type to perip-clkDinh Nguyen1-3/+4
Some of the clocks that were designated gate-clk do not have a gate, so change those clocks to be of periph-clk type. Signed-off-by: Dinh Nguyen <dinguyen@altera.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2013-12-04arm: socfpga: Enable ARM_TWD for socfpgaDinh Nguyen1-0/+1
Update Kconfig to enable TWD. Signed-off-by: Dinh Nguyen <dinguyen@altera.com> Reviewed-by: Pavel Machek <pavel@denx.de> Signed-off-by: Olof Johansson <olof@lixom.net>