summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-11-22Merge tag 'marvell-openblocks-i2c-sata-for-3.8' of ↵Jason Cooper4-0/+44
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell SATA and I2C enabling for OpenBlocks AX3-4
2012-11-22ARM: mvebu: update defconfig with I2C and RTC supportThomas Petazzoni1-0/+4
Now that we have support for the I2C busses on Armada 370/XP, and support for the RTC on the OpenBlocks AX3-4 platform, include the necessary options in mvebu_defconfig. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-22ARM: mvebu: Add SATA support for OpenBlocks AX3-4Thomas Petazzoni1-0/+4
This patch enables SATA support on the OpenBlocks AX3-4. It has one internal SATA port, and an external eSATA port. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-22ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4Nobuhiro Iwamatsu1-0/+5
The OpenBlocks AX3-4 has a Seiko Instruments S-35390A as the RTC controller. This patch enables this RTC device in the OpenBlocks AX3-4 Device Tree. [Thomas Petazzoni: updated with other OpenBlocks changes, rephrased commit log.] Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-22ARM: mvebu: Add support for I2C on OpenBlocks AX3-4Nobuhiro Iwamatsu1-0/+8
The OpenBlocks AX3-4 board, based on the Armada XP SoC, has an I2C bus. This patch enables this bus and sets the clock frequency of the bus. [Thomas Petazzoni: updated with other changes on OpenBlocks, rephrased commit log.] Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-22ARM: mvebu: Add support for I2C controllers in Armada 370/XPNobuhiro Iwamatsu1-0/+22
The Armada 370 and Armada XP have the same I2C controllers as previous Marvell SoCs, so the existing mv64xxx-i2c driver works fine. [Thomas Petazzoni: updated on top of other Armada 370/XP changes, rephrased the commit log]. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-22Merge tag 'marvell-hwiocc-for-3.8' of ↵Jason Cooper8-6/+93
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Add hardware I/O coherency support for Armada 370/XP The purpose of this patch set is to add hardware I/O Coherency support for Armada 370 and Armada XP. Theses SoCs come with an unit called coherency fabric. A beginning of the support for this unit have been introduced with the SMP patch set. This series extend this support: the coherency fabric unit allows to use the Armada XP and the Armada 370 as nearly coherent architectures. The third patches enables this new feature and register our own set of DMA ops, to benefit this hardware enhancement. The first patches exports a dma operation function needed to register our own set of dma ops. The second patch introduces a new flag for the address decoding configuration in order to be able to set the memory windows as shared memory.
2012-11-22Merge tag 'marvell-armadaxp-smp-for-3.8' of ↵Jason Cooper22-12/+684
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything SMP support for Armada XP The purpose of this series is to add the SMP support for the Armada XP SoCs. Beside the SMP support itself brought by the last 3 commits, this series also adds the support for the coherency fabric unit and the power management service unit. The coherency fabric is responsible for ensuring hardware coherency between all CPUs and between CPUs and I/O masters. This unit is also available for Armada 370 and will be used in an incoming patch set for hardware I/O cache coherency. The power management service unit is responsible for powering down and waking up CPUs and other SOC units.
2012-11-22Merge tag 'marvell-net-xor-defconfig-for-3.8' of ↵Jason Cooper1-0/+7
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell mvebu defconfig updates for 3.8 Conflicts: arch/arm/configs/mvebu_defconfig
2012-11-21Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of ↵Jason Cooper6-23/+158
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell XOR driver DT changes for 3.8 Conflicts: arch/arm/boot/dts/armada-xp.dtsi
2012-11-21Merge tag 'marvell-xor-cleanup-dt-binding-3.8' of ↵Jason Cooper8-347/+366
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell XOR driver cleanup and DT binding for 3.8
2012-11-21Merge tag 'marvell-neta-dt-clk-updates-3.8' of ↵Jason Cooper6-12/+4
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell Ethernet DT update for clk support
2012-11-21Merge tag 'marvell-mvneta-fix-and-clk-support-3.8' of ↵Jason Cooper2-14/+23
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell Ethernet driver fix + clk support
2012-11-21Merge tag 'marvell-net-mdio-checkpatch-fixes-3.8' of ↵Jason Cooper2-46/+44
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell network/MDIO driver checkpatch fixes
2012-11-21Merge tag 'marvell-boards-net-for-3.8' of ↵Jason Cooper7-1/+273
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell boards changes related to Ethernet, for 3.8 Conflicts: arch/arm/boot/dts/armada-370-xp.dtsi arch/arm/boot/dts/armada-xp-db.dts
2012-11-21Merge tag 'marvell-neta-for-3.8' of ↵Jason Cooper7-0/+3159
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell mvneta network driver, for 3.8
2012-11-21Merge tag 'marvell-sata-3.8' of ↵Jason Cooper6-0/+35
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell Armada 370/XP support for 3.8
2012-11-21Merge tag 'marvell-mvebu-clk-3.8' of ↵Jason Cooper34-38/+1696
git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything Marvell MVEBU clk support, for 3.8
2012-11-21arm: mvebu: Add hardware I/O Coherency supportGregory CLEMENT4-3/+85
Armada 370 and XP come with an unit called coherency fabric. This unit allows to use the Armada 370/XP as a nearly coherent architecture. The coherency mechanism uses snoop filters to ensure the coherency between caches, DRAM and devices. This mechanism needs a synchronization barrier which guarantees that all the memory writes initiated by the devices have reached their target and do not reside in intermediate write buffers. That's why the architecture is not totally coherent and we need to provide our own functions for some DMA operations. Beside the use of the coherency fabric, the device units will have to set the attribute flag of the decoding address window to select the accurate coherency process for the memory transaction. This is done each device driver programs the DRAM address windows. The value of the attribute set by the driver is retrieved through the orion_addr_map_cfg struct filled during the early initialization of the platform. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Reviewed-by: Yehuda Yitschak <yehuday@marvell.com> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
2012-11-21arm: plat-orion: Add coherency attribute when setup mbus targetGregory CLEMENT2-0/+5
Recent SoC such as Armada 370/XP came with the possibility to deal with the I/O coherency by hardware. In this case the transaction attribute of the window must be flagged as "Shared transaction". Once this flag is set, then the transactions will be forced to be sent through the coherency block, in other case transaction is driven directly to DRAM. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Reviewed-by: Yehuda Yitschak <yehuday@marvell.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21arm: dma mapping: Export a dma ops function arm_dma_set_maskGregory CLEMENT2-3/+3
Expose another DMA operations function: arm_dma_set_mask. This function will be added to a custom DMA ops for Armada 370/XP. Depending of its configuration Armada 370/XP can be set as a "nearly" coherent architecture. In this case the DMA ops is made of: - specific functions for this architecture - already exposed arm DMA related functions - the arm_dma_set_mask which was not exposed yet. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
2012-11-21arm: mvebu: Add SMP support for Armada XPGregory CLEMENT8-0/+213
This enables SMP support on the Armada XP processor. It adds the mandatory functions to support SMP such as: the SMP initialization functions in platsmp.c, the secondary CPU entry point in headsmp.S and the CPU hotplug initial support in hotplug.c. Signed-off-by: Yehuda Yitschak <yehuday@marvell.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Reviewed-by: Will Deacon <will.deacon@arm.com>
2012-11-21arm: mm: Add support for PJ4B cpu and init routinesGregory CLEMENT3-1/+72
PJ4B is an implementation of the ARMv7 (such as the Cortex A9 for example) released by Marvell. This CPU is currently found in Armada 370 and Armada XP SoCs. This patch provides a support for the specific initialization of this CPU. Signed-off-by: Yehuda Yitschak <yehuday@marvell.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Reviewed-by: Will Deacon <will.deacon@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
2012-11-21arm: mvebu: Add IPI support via doorbellsGregory CLEMENT4-10/+103
This patch enhances the IRQ controller driver to add support for Inter-Processor-Interrupts that are needed to enable SMP support. Signed-off-by: Yehuda Yitschak <yehuday@marvell.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2012-11-21arm: mvebu: Add initial support for power managmement service unitGregory CLEMENT6-1/+119
The Armada 370 and Armada XP SOCs have a power management service unit which is responsible for powering down and waking up CPUs and other SOC units. This patch adds support for this unit. Signed-off-by: Yehuda Yitschak <yehuday@marvell.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
2012-11-21arm: mvebu: Add support for coherency fabric in mach-mvebuGregory CLEMENT7-1/+178
The Armada 370 and Armada XP SOCs have a coherency fabric unit which is responsible for ensuring hardware coherency between all CPUs and between CPUs and I/O masters. This patch provides the basic support needed for SMP. Signed-off-by: Yehuda Yitschak <yehuday@marvell.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Reviewed-by: Will Deacon <will.deacon@arm.com>
2012-11-21Merge tag 'marvell-net-xor-defconfig-for-3.8' of ↵Thomas Petazzoni1-0/+7
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell mvebu defconfig updates for 3.8 Conflicts: arch/arm/configs/mvebu_defconfig Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of ↵Thomas Petazzoni6-23/+158
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell XOR driver DT changes for 3.8 Conflicts: arch/arm/boot/dts/armada-xp.dtsi Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21Merge tag 'marvell-xor-cleanup-dt-binding-3.8' of ↵Thomas Petazzoni8-347/+366
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell XOR driver cleanup and DT binding for 3.8
2012-11-21Merge tag 'marvell-neta-dt-clk-updates-3.8' of ↵Thomas Petazzoni6-12/+4
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell Ethernet DT update for clk support
2012-11-21Merge tag 'marvell-mvneta-fix-and-clk-support-3.8' of ↵Thomas Petazzoni2-14/+23
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell Ethernet driver fix + clk support
2012-11-21Merge tag 'marvell-net-mdio-checkpatch-fixes-3.8' of ↵Thomas Petazzoni2-46/+44
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell network/MDIO driver checkpatch fixes Conflicts: arch/arm/boot/dts/armada-xp-db.dts Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21Merge tag 'marvell-boards-net-for-3.8' of ↵Thomas Petazzoni7-1/+274
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell boards changes related to Ethernet, for 3.8 Conflicts: arch/arm/boot/dts/armada-370-xp.dtsi arch/arm/boot/dts/armada-xp-db.dts Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21Merge tag 'marvell-neta-for-3.8' of ↵Thomas Petazzoni7-0/+3159
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell mvneta network driver, for 3.8
2012-11-21Merge tag 'marvell-sata-3.8' of ↵Thomas Petazzoni6-0/+35
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell Armada 370/XP support for 3.8
2012-11-21Merge tag 'marvell-mvebu-clk-3.8' of ↵Thomas Petazzoni34-38/+1696
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell MVEBU clk support, for 3.8
2012-11-21arm: mvebu: update defconfig to include XOR driverThomas Petazzoni1-0/+2
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21arm: mvebu: update defconfig to include network driverThomas Petazzoni1-0/+5
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21arm: mvebu: remove 'clock-frequency' properties from Armada 370/XP Ethernet ↵Thomas Petazzoni4-12/+0
nodes The mvneta driver for the Marvell Armada 370/XP Ethernet devices has gained proper clock framework integration, and the corresponding Device Tree nodes now have a correct 'clocks' pointer. The 'clock-frequency' properties in the various .dts files for Armada 370/XP boards have therefore become useless. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21arm: mvebu: add 'clocks' property to Ethernet nodes for Armada 370/XP SoCsThomas Petazzoni2-0/+4
The mvneta driver now understands a standard 'clocks' clock pointer property in the Device Tree nodes for the Ethernet devices, so we add the right clock reference for the different Ethernet ports of the Armada 370/XP SoCs. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21net: mvneta: fix section mismatch warning caused by mvneta_deinit()Thomas Petazzoni1-1/+1
mvneta_deinit() can be called from the ->probe() hook in the error path, so it shouldn't be marked as __devexit. It fixes the following section mismatch warning: WARNING: vmlinux.o(.devinit.text+0x239c): Section mismatch in reference from the function mvneta_probe() to the function .devexit.text:mvneta_deinit() The function __devinit mvneta_probe() references a function __devexit mvneta_deinit(). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21net: mvneta: add clk supportThomas Petazzoni2-13/+22
Now that the Armada 370/XP platform has gained proper integration with the clock framework, we add clk support in the Marvell Armada 370/XP Ethernet driver. Since the existing Device Tree binding that exposes a 'clock-frequency' property has never been exposed in any stable kernel release, we take the freedom of removing this property to replace it with the standard 'clocks' clock pointer property. The Device Tree binding documentation is updated accordingly. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21net: mvneta: adjust multiline comments to net/ styleThomas Petazzoni1-42/+42
As reported by checkpatch, the multiline comments for net/ and drivers/net/ have a slightly different format than the one used in the rest of the kernel, so we adjust our multiline comments accordingly. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21net: mvmdio: adjust multiline comment to net/ styleThomas Petazzoni1-2/+1
As reported by checkpatch, the multiline comments for net/ and drivers/net/ have a slightly different format than the one used in the rest of the kernel, so we adjust our multiline comment accordingly. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21net: mvmdio: use <linux/delay.h> instead of <asm/delay.h>Thomas Petazzoni1-2/+1
As suggested by checkpatch, using <linux/delay.h> instead of <asm/delay.h> is appropriate. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-11-21Merge tag 'marvell-boards-net-for-3.8' of ↵Thomas Petazzoni7-1/+273
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell boards changes related to Ethernet, for 3.8 Conflicts: arch/arm/boot/dts/armada-370-xp.dtsi arch/arm/boot/dts/armada-xp-db.dts
2012-11-21Merge tag 'marvell-neta-for-3.8' of ↵Thomas Petazzoni7-0/+3159
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell mvneta network driver, for 3.8
2012-11-21Merge tag 'marvell-sata-3.8' of ↵Thomas Petazzoni6-0/+35
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell Armada 370/XP support for 3.8
2012-11-21Merge tag 'marvell-mvebu-clk-3.8' of ↵Thomas Petazzoni34-38/+1696
github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell MVEBU clk support, for 3.8
2012-11-20arm: mvebu: add XOR engines to Armada XP .dtsiThomas Petazzoni1-0/+40
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
generated by cgit v1.2.3 (git 2.39.0) at 2025-09-27 11:47:44 +0300