forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/l…
…inux-msm * 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (46 commits) msm: scm: Check for interruption immediately msm: scm: Fix improper register assignment msm: scm: Mark inline asm as volatile msm: iommu: Enable HTW L2 redirection on MSM8960 msm: iommu: Don't read from write-only registers msm: iommu: Remove dependency on IDR msm: iommu: Use ASID tagging instead of VMID tagging msm: iommu: Rework clock logic and add IOMMU bus clock control msm: iommu: Clock control for the IOMMU driver msm: mdp: Set the correct pack pattern for XRGB/ARGB msm_fb: Fix framebuffer console msm: mdp: Add support for RGBX 8888 image format. video: msmfb: Put the partial update magic value into the fix_screen struct. msm: clock: Migrate to clkdev msm: clock: Remove references to clk_ops_pcom msm: headsmp.S: Fix section mismatch msm: Use explicit GPLv2 licenses msm: iommu: Enable IOMMU support for MSM8960 msm: iommu: Generalize platform data for multiple targets msm: iommu: Create a Kconfig item for the IOMMU driver ...
- Loading branch information
Showing
65 changed files
with
1,976 additions
and
1,021 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* Copyright (c) 2011, Code Aurora Forum. All rights reserved. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 and | ||
| * only version 2 as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
| * 02110-1301, USA. | ||
| * | ||
| */ | ||
| #include <linux/kernel.h> | ||
| #include <linux/platform_device.h> | ||
| #include <linux/io.h> | ||
| #include <linux/irq.h> | ||
| #include <linux/clkdev.h> | ||
|
|
||
| #include <asm/mach-types.h> | ||
| #include <asm/mach/arch.h> | ||
| #include <asm/hardware/gic.h> | ||
|
|
||
| #include <mach/board.h> | ||
| #include <mach/msm_iomap.h> | ||
|
|
||
| #include "devices.h" | ||
|
|
||
| static void __init msm8960_map_io(void) | ||
| { | ||
| msm_map_msm8960_io(); | ||
| } | ||
|
|
||
| static void __init msm8960_init_irq(void) | ||
| { | ||
| unsigned int i; | ||
| gic_init(0, GIC_PPI_START, MSM_QGIC_DIST_BASE, | ||
| (void *)MSM_QGIC_CPU_BASE); | ||
|
|
||
| /* Edge trigger PPIs except AVS_SVICINT and AVS_SVICINTSWDONE */ | ||
| writel(0xFFFFD7FF, MSM_QGIC_DIST_BASE + GIC_DIST_CONFIG + 4); | ||
|
|
||
| if (machine_is_msm8960_rumi3()) | ||
| writel(0x0000FFFF, MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_SET); | ||
|
|
||
| /* FIXME: Not installing AVS_SVICINT and AVS_SVICINTSWDONE yet | ||
| * as they are configured as level, which does not play nice with | ||
| * handle_percpu_irq. | ||
| */ | ||
| for (i = GIC_PPI_START; i < GIC_SPI_START; i++) { | ||
| if (i != AVS_SVICINT && i != AVS_SVICINTSWDONE) | ||
| set_irq_handler(i, handle_percpu_irq); | ||
| } | ||
| } | ||
|
|
||
| static struct platform_device *sim_devices[] __initdata = { | ||
| &msm8960_device_uart_gsbi2, | ||
| }; | ||
|
|
||
| static struct platform_device *rumi3_devices[] __initdata = { | ||
| &msm8960_device_uart_gsbi5, | ||
| }; | ||
|
|
||
| static void __init msm8960_sim_init(void) | ||
| { | ||
| platform_add_devices(sim_devices, ARRAY_SIZE(sim_devices)); | ||
| } | ||
|
|
||
| static void __init msm8960_rumi3_init(void) | ||
| { | ||
| platform_add_devices(rumi3_devices, ARRAY_SIZE(rumi3_devices)); | ||
| } | ||
|
|
||
| MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR") | ||
| .map_io = msm8960_map_io, | ||
| .init_irq = msm8960_init_irq, | ||
| .timer = &msm_timer, | ||
| .init_machine = msm8960_sim_init, | ||
| MACHINE_END | ||
|
|
||
| MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3") | ||
| .map_io = msm8960_map_io, | ||
| .init_irq = msm8960_init_irq, | ||
| .timer = &msm_timer, | ||
| .init_machine = msm8960_rumi3_init, | ||
| MACHINE_END | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.