summaryrefslogtreecommitdiff
path: root/arch/arm/boot
AgeCommit message (Collapse)AuthorFilesLines
2013-10-08pinctrl: sirf: add USB1/UART1 pinmux usb/uart shareRong Wang2-0/+24
dn and dp of USB1 can share with UART1(UART1 can route rx,tx to dn and dp pins of USB1). here we add this pinmux capability. USB1/UART1 mode selection has dedicated control register in RSC module, here we attach the register offset of private data of related pin groups. Signed-off-by: Rong Wang <Rong.Wang@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-08pinctrl: sirf: add lost USP-based UART pin groups for prima2Qipan Li1-0/+24
USP(Universal Serial Ports) can be UART as commit 5df831117b85a08e7aa, this patch defines the USP-based UART function pin groups for prima2. Signed-off-by: Qipan Li <Qipan.Li@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-08pinctrl: sirf: add lost uart0-no-stream-control pingroup for prima2Qipan Li1-0/+6
the old codes defined uart0_nostreamctrl_pins, but missed pingroup and padmux definition for it. this patch fixes it. Signed-off-by: Qipan Li <Qipan.Li@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-08ARM: imx27-apf27dev: Add framebuffer supportGwenhael Goavec-Merou1-0/+26
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2013-10-08ARM: imx51-apf51dev: Add parallel display supportGwenhael Goavec-Merou1-0/+27
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2013-10-08ARM: shmobile: bockw: fixup ether node namingKuninori Morimoto1-1/+1
According to the ePAPR spec, the node name should be "ethernet", not "lan0". Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: Remove KZM9D reference DTSMagnus Damm2-59/+1
Now when the legacy DTS file emev2-kzm9d.dts can be used with board-kzm9d.c and board-kzm9d-reference.c proceed with removing emev-kzm9d-reference.dts. Signed-off-by: Magnus Damm <damm@opensource.se> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTSMagnus Damm1-1/+32
Copy the device nodes from KZM9D reference into the KZM9D device tree file. This will allow us to use a single DTS file regarless of kernel configuration. In case of legacy C board code the device nodes may or may not be used, but in the multiplatform case all the DT device nodes are used. Signed-off-by: Magnus Damm <damm@opensource.se> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: Genmai supportMagnus Damm2-0/+32
Genmai base board support making use of 128 MiB of memory, the r7s7211 SoC with the SCIF2 serial port and CA9 core. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08Merge branch 'heads/soc2' into boards2-baseSimon Horman5-13/+10
Conflicts: arch/arm/mach-shmobile/board-lager.c
2013-10-08ARM: shmobile: Initial r7s72100 SoC supportMagnus Damm1-0/+36
Add initial support for the r7272100 SoC including: - Single Cortex-A9 CPU Core - GIC No static virtual mappings are used, all the components make use of ioremap(). DT_MACHINE_START is still wrapped in CONFIG_USE_OF to match other mach-shmobile code. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08Merge tag 'renesas-fixes4-for-v3.12' into soc2-baseSimon Horman5-13/+10
Fourth Round of Renesas ARM based SoC fixes for v3.12 * Remove unused #gpio-ranges-cells DT property * Remove usage of deprecated #gpio-range-cells DT property from GPIO R-Car Property was deprecated in v3.11-rc2 * Correct ether pinctl naming for armadillo800eva board Regression introduced in v3.10-rc5 * Add Micrel KSZ8041 PHY fixup to lager board This resolves a problem that has been present since 3.11-rc2 * Update SDHI DT compatibility string to the <unit>-<soc> format This makes compatibility strings consistent across all renesas hardware which currently supports DT. The bindings which are being updated where intorodiced on a per-SoC basis starting in v3.8-rc7. They may have been internally consistent when originally added.
2013-10-08Merge branch 'heads/soc2' into boards2-baseSimon Horman1-0/+36
2013-10-08ARM: shmobile: Initial r7s72100 SoC supportMagnus Damm1-0/+36
Add initial support for the r7272100 SoC including: - Single Cortex-A9 CPU Core - GIC No static virtual mappings are used, all the components make use of ioremap(). DT_MACHINE_START is still wrapped in CONFIG_USE_OF to match other mach-shmobile code. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7779: add irqpin default status on DTSIKuninori Morimoto1-0/+1
r8a7779 INTC needs IRL pin mode settings to determine behavior of IRQ0 - IRQ3. But it depends on platform. This patch adds status = "disabled" on r8a7779.dtsi as default Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: marzen: fixup SMSC IRQ number on DTSKuninori Morimoto1-2/+6
This patch fixup miss-setting of SMSC IRQ number. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: bockw: add SMSC support on DTSKuninori Morimoto1-1/+26
This patch enables INTC IRQ and SMSC on BockW board via DT. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7778: add renesas_intc_irqpin support on DTSIKuninori Morimoto1-0/+19
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7791 SMP device tree nodeMagnus Damm1-0/+7
Add a device node for the r8a7791 secondary CPU core. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7791 Arch timer device tree nodeMagnus Damm1-0/+8
Add r8a7791 arch timer device tree information. This needs to be used together with r8a7791 support code that ties in the R-Car Gen2 arch timer workarounds. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7791 IRQC device tree nodeMagnus Damm1-0/+18
Enable a r8a7791 IRQC block by adding a device tree node for the IRQC hardware and pins IRQ0 to IRQ9. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: armadillo800eva-reference: add SDHI and MMCIF interfacesGuennadi Liakhovetski2-0/+91
Add SDHI0 and MMCIF interfaces to armadillo800eva-reference with regulators and pin configurations. SDHI1 is not added yet, because the switch, that connects the interface either to an SD slot or to a WiFi SDIO card cannot be described in DT yet. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: armadillo-reference: Add PWM backlight node to DTLaurent Pinchart1-0/+19
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a73a4: add a DT node for the DMACGuennadi Liakhovetski1-0/+43
Add a DT node for the only system DMAC instance on r8a73a4. The RT DMAC can be added later under the same multiplexer, because they can serve the same slaves and use the same MID-RID values. Configuration data is supplied to the driver, using a compatibility match string. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: r8a7790: add I2C DT nodesGuennadi Liakhovetski1-0/+40
Add DT nodes for the four I2C interfacces on r8a7790. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08ARM: shmobile: only enable used I2C interfaces in DT on all Renesas boardsGuennadi Liakhovetski8-0/+25
Currently all I2C interfaces in all *.dtsi files for various Renesas SoCs are enabled by default. Switch them all off and only enable populated I2C interfaces in board-specific *.dts files. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2013-10-08Merge tag 'renesas-soc-for-v3.13' into dt2-baseSimon Horman1-0/+41
Renesas ARM based SoC updates for v3.13 * Add support for r8a7791 SoC * Rename DU device in clock lookups list of r8a7779 SoC * USB and SSI/SRU clock support for r8a7778 SoC * USB phy power control function support for r8a7778 SoC
2013-10-08ARM: dts: Add HDMI related I2C nodes for Arndale boardSachin Kamat1-1/+19
Updated I2C nodes for HDMI-DDC and HDMI-PHY for Arndale board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-10-08ARM: dts: enable hdmi subsystem for exynos5420 smdk boardRahul Sharma1-0/+26
Add pinctrl node for hdmi hpd gpio pin to exynos5420 smdk board file. hpd Gpio property is added to the hdmi node. This patch also adds hdmi ddc node. Both hdmi device and ddc i2c channel are enabled in exynos5420-smdk5420.dts Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-10-08ARM: dts: add dt nodes for hdmi subsystem for exynos5420Rahul Sharma1-0/+19
Add hdmi and mixer device tree nodes for Exynos 5420 SoC. Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-10-08ARM: dts: add i2c device nodes for Exynos5420Andrew Bresticker1-0/+56
This adds device-tree nodes for the i2c busses on Exynos 5420 platforms. Signed-off-by: Andrew Bresticker <abrestic@chromium.org> Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-10-08ARM: dts: add clocks to hdmi dt node for exynos5250Rahul Sharma1-3/+3
Fix wrong clock numbers in hdmi dt node. Removed hdmiphy clock which was a dummy clock earlier and not required now. Also added mux clock to change the clock parent. Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-10-08ARM: dts: add mixer clocks to mixer node for Exynos5250Sean Paul1-0/+2
This patch adds the mixer clocks to the mixer node in the exynos 5250 dts file. Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-10-07ARM: tegra: add vcc supply for nct1008 to CardhuWei Ni1-1/+2
Add vcc-supply property in the nct1008 node, and set it as sys_3v3_reg. change the name of this node to temp-sensor. Signed-off-by: Wei Ni <wni@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2013-10-07ARM: tegra: add DT entry for nct1008 to DalmoreWei Ni1-1/+9
Enable thermal sensor nct1008 for Tegra114 dalmore. Signed-off-by: Wei Ni <wni@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2013-10-07Merge tag 'renesas-dt-for-v3.13' of ↵Olof Johansson2-0/+121
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt From Simon Horman: Renesas ARM-based SoC DT updates for v3.13 * Add CPU cores to DTSI of r8a7790 SoC * Add MMCIF and SDHI DT nodes for reference DTS of ape6evm board * tag 'renesas-dt-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Add r8a7790 CA7 CPU cores to DTSI ARM: shmobile: Add r8a7790 CA15 CPU cores ARM: shmobile: ape6evm-reference: add MMCIF and SDHI DT nodes Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-07Merge tag 'renesas-boards-for-v3.13' of ↵Olof Johansson3-0/+74
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards From Simon Horman: Renesas ARM based SoC board updates for v3.13 * Display Unit support for lager and marzen boards * Update regulators for MMC0, SDHI0 and SDHI1 on ape6evm board * Enable use of FPGA on bockw board * Add sounds support to bockw board * Add USB function support to bockw board * Add Koelsch board * Disable MMCIF command completion signal on ape6evm, armadillo800eva, kzm9g and lager boards. * tag 'renesas-boards-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: lager: disable MMCIF Command Completion Signal, add CLK_CTRL2 ARM: shmobile: kzm9g: disable MMCIF Command Completion Signal ARM: shmobile: armadillo800eva: disable MMCIF Command Completion Signal ARM: shmobile: ape6evm: disable MMCIF Command Completion Signal ARM: shmobile: bockw: add USB Function support ARM: shmobile: Koelsch support ARM: shmobile: bockw: add R-Car sound support (PIO) ARM: shmobile: bockw: enable global use of FPGA ARM: shmobile: lager: Fix Display Unit platform data ARM: shmobile: ape6evm: update MMC0, SDHI0 and SDHI1 with correct regulators ARM: shmobile: lager: Add Display Unit support ARM: shmobile: marzen: Add Display Unit support ARM: shmobile: r8a7778: add usb phy power control function ARM: shmobile: r8a7778: add USBHS clock ARM: shmobile: r8a7791 CMT support ARM: shmobile: r8a7791 SCIF support ARM: shmobile: Initial r8a7791 SoC support ARM: shmobile: r8a7778: add SSI/SRU clock support ARM: shmobile: r8a7790: Add DU and LVDS clocks ARM: shmobile: r8a7779: Rename DU device in clock lookups list Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-07Merge tag 'renesas-soc-for-v3.13' of ↵Olof Johansson1-0/+41
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc From Simon Horman: Renesas ARM based SoC updates for v3.13 * Add support for r8a7791 SoC * Rename DU device in clock lookups list of r8a7779 SoC * USB and SSI/SRU clock support for r8a7778 SoC * USB phy power control function support for r8a7778 SoC * tag 'renesas-soc-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7778: add usb phy power control function ARM: shmobile: r8a7778: add USBHS clock ARM: shmobile: r8a7791 CMT support ARM: shmobile: r8a7791 SCIF support ARM: shmobile: Initial r8a7791 SoC support ARM: shmobile: r8a7778: add SSI/SRU clock support ARM: shmobile: r8a7790: Add DU and LVDS clocks ARM: shmobile: r8a7779: Rename DU device in clock lookups list Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-07Merge tag 'renesas-fixes5-for-v3.12' of ↵Olof Johansson5-13/+10
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup From Simon Horman: * Correct incorrect placement of __initdata tag in ape6evm board code * tag 'renesas-fixes5-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag (+ other patches already present in v3.12-rc4) Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-07Merge tag 'ux500-devicetree-2' of ↵Olof Johansson10-54/+183
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt From Linus Walleij: Second part of the Ux500 devicetree conversion and ATAG deletion: this fixes bugs discovered when switching to a devicetree-only setup, primarily on the HREF prototypes. The biggest change is to split into four DTS variants as the UIB autodetection was lost. * tag 'ux500-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS ARM: ux500: register the tc35892 GPIO on the TVK UIB ARM: ux500: split the HREF DTS files from two to four ARM: ux500: split HREF UIB files ARM: ux500: move TC35892 at 0x42 to hrefprev60 ARM: ux500: correct CD for micro SD on hrev60plus ARM: ux500: fix proximity sensor button ARM: ux500: correct I2C address of ambient light sensor ARM: ux500 enable the AB8500 gpio for all HREFs ARM: ux500: add default trigger on HREF LED Signed-off-by: Olof Johansson <olof@lixom.net>
2013-10-07ARM: dts: Disable Exynos5250 I2S controllers by defaultMark Brown3-8/+7
Rather than requiring each board to explicitly disable the I2S controllers it is not using instead require boards to enable those that they are using. This is required for audio operation on Arndale, one of the unused I2S controllers is pinmuxed with the LDO enable GPIOs for the WM1811A. Signed-off-by: Mark Brown <broonie@linaro.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-10-07Merge 3.12-rc4 into usb-nextGreg Kroah-Hartman12-37/+96
We want the USB fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-10-07Merge 3.12-rc4 into staging-nextGreg Kroah-Hartman12-37/+96
We want the staging fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-10-06ARM: dts: imx53-qsb: Do not use GPIO1_8 as wakeup sourceFabio Estevam1-1/+2
On the mx53qsb board with mc34708 PMIC, GPIO1_8 resets the system, so better not to use it as a wakeup source. Use GPIO 2_14 and 2_15 for wakeup sources instead. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2013-10-06ARM: dts: imx53-qsb: SDHC1 does not have cd-gpiosFabio Estevam1-2/+0
SDHC1 does not have any GPIO for reading the card detection status, so remove 'cd-gpios'. After this change card detection works via the internal SD controller mechanism. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2013-10-06ARM: dts: imx53-qsb: SDHC3 is connected in 8-bit modeFabio Estevam1-0/+1
SDHC3 is 8 bit-wide, so pass the bus-width property to reflect that. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2013-10-06ARM: dts: Add reg property to regulator nodes in exynos5250-arndaleSachin Kamat1-3/+6
For consistency and correctness, since this is a bus, even if not physical, it is worth to add 'reg' property and unit-address to subnodes. The 'reg' property would merely be an index. Also for consistency, use "regulator" as node name as used most commonly across other dts files. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-10-06ARM: dts: Add fixed voltage regulator to simple bus for origenSachin Kamat2-14/+28
This has been done for Arndale board vide commit aa3edb65 ("ARM: dts: Put Arndale fixed voltage regulators on a simple-bus"). Replicate here for consistency and correctness. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-10-06ARM: dts: Add MIPI PHY node to exynos4.dtsiSylwester Nawrocki1-0/+10
Add PHY provider node for the MIPI CSIS and MIPI DSIM PHYs. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Felipe Balbi <balbi@ti.com> Acked-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2013-10-05ARM: sun6i: Fix the APB2 clock gates register sizeMaxime Ripard1-1/+1
The APB2 clocks gates are only a 32 bits register wide, and not 2 as set currently in the DTSI. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>