Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

msm: Rename MSMZINC to APQ8084 

Rename the MSMZINC target to APQ8084, and update all code
references accordingly.

Change-Id: I369211d4898603c4cb93aef52fc7ff3b5e5c971c
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
This commit is contained in:
Stepan Moskovchenko 2013-04-18 12:54:47 -07:00 committed by Stephen Boyd
parent c62ea86e41
commit a70cf2850c
17 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/Makefile
View File

@ -113,7 +113,7 @@ dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \
dtb-$(CONFIG_ARCH_MSM8610) += msm8610-rumi.dtb \
msm8610-sim.dtb
dtb-$(CONFIG_ARCH_MSMKRYPTON) += msmkrypton-sim.dtb
dtb-$(CONFIG_ARCH_MSMZINC) += msmzinc-sim.dtb
dtb-$(CONFIG_ARCH_APQ8084) += apq8084-sim.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
armada-370-mirabox.dtb \
armada-370-rd.dtb \

0
arch/arm/boot/dts/msmzinc-ion.dtsi → arch/arm/boot/dts/apq8084-ion.dtsi
View File

6
arch/arm/boot/dts/msmzinc-sim.dts → arch/arm/boot/dts/apq8084-sim.dts
View File

@ -12,11 +12,11 @@
/dts-v1/;
/include/ "msmzinc.dtsi"
/include/ "apq8084.dtsi"
/ {
model = "Qualcomm MSM ZINC Simulator";
compatible = "qcom,msmzinc-sim", "qcom,msmzinc", "qcom,sim";
model = "Qualcomm APQ 8084 Simulator";
compatible = "qcom,apq8084-sim", "qcom,apq8084", "qcom,sim";
qcom,msm-id = <178 0 0>;
aliases {

6
arch/arm/boot/dts/msmzinc.dtsi → arch/arm/boot/dts/apq8084.dtsi
View File

@ -11,11 +11,11 @@
*/
/include/ "skeleton.dtsi"
/include/ "msmzinc-ion.dtsi"
/include/ "apq8084-ion.dtsi"
/ {
model = "Qualcomm MSM ZINC";
compatible = "qcom,msmzinc";
model = "Qualcomm APQ 8084";
compatible = "qcom,apq8084";
interrupt-parent = <&intc>;
intc: interrupt-controller@f9000000 {

2
arch/arm/configs/msmzinc_defconfig → arch/arm/configs/apq8084_defconfig
View File

@ -34,7 +34,7 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_EFI_PARTITION=y
CONFIG_IOSCHED_TEST=y
CONFIG_ARCH_MSM=y
CONFIG_ARCH_MSMZINC=y
CONFIG_ARCH_APQ8084=y
CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y
CONFIG_MSM_RPM_SMD=y
# CONFIG_MSM_STACKED_MEMORY is not set

14
arch/arm/mach-msm/Kconfig
View File

@ -288,8 +288,8 @@ config ARCH_MSM8974
select MSM_RPM_LOG
select ARCH_WANT_KMAP_ATOMIC_FLUSH
config ARCH_MSMZINC
bool "MSMZINC"
config ARCH_APQ8084
bool "APQ8084"
select ARCH_MSM_KRAITMP
select GPIO_MSM_V3
select ARM_GIC
@ -1092,7 +1092,7 @@ config PHYS_OFFSET
default "0x80200000" if ARCH_MSM8960
default "0x80200000" if ARCH_MSM8930
default "0x00000000" if ARCH_MSM8974
default "0x00000000" if ARCH_MSMZINC
default "0x00000000" if ARCH_APQ8084
default "0x00000000" if ARCH_MPQ8092
default "0x00000000" if ARCH_MSM8226
default "0x00000000" if ARCH_MSM8610
@ -1245,13 +1245,13 @@ choice
Say Y here if you want the debug print routines to direct
their output to the serial port on MPQ8092 devices.
config DEBUG_MSMZINC_UART
bool "Kernel low-level debugging messages via MSMZINC UART"
depends on ARCH_MSMZINC
config DEBUG_APQ8084_UART
bool "Kernel low-level debugging messages via APQ8084 UART"
depends on ARCH_APQ8084
select MSM_HAS_DEBUG_UART_HS_V14
help
Say Y here if you want the debug print routines to direct
their output to the serial port on MSMZINC devices.
their output to the serial port on APQ8084 devices.
endchoice
choice

6
arch/arm/mach-msm/Makefile
View File

@ -113,7 +113,7 @@ ifndef CONFIG_ARCH_MSM8226
ifndef CONFIG_ARCH_MSM9625
ifndef CONFIG_ARCH_MPQ8092
ifndef CONFIG_ARCH_MSM8610
ifndef CONFIG_ARCH_MSMZINC
ifndef CONFIG_ARCH_APQ8084
ifndef CONFIG_ARCH_MSMKRYPTON
obj-y += nand_partitions.o
endif
@ -290,7 +290,7 @@ obj-$(CONFIG_MACH_MPQ8064_HRD) += board-8064-all.o board-8064-regulator.o board-
obj-$(CONFIG_MACH_MPQ8064_DTV) += board-8064-all.o board-8064-regulator.o
obj-$(CONFIG_ARCH_MSM9615) += board-9615.o devices-9615.o board-9615-regulator.o board-9615-gpiomux.o board-9615-storage.o board-9615-display.o
obj-$(CONFIG_ARCH_MSM9615) += clock-local.o clock-9615.o acpuclock-9615.o clock-rpm.o clock-pll.o
obj-$(CONFIG_ARCH_MSMZINC) += board-zinc.o board-zinc-gpiomux.o
obj-$(CONFIG_ARCH_APQ8084) += board-8084.o board-8084-gpiomux.o
obj-$(CONFIG_ARCH_MSM8974) += board-8974.o board-8974-gpiomux.o
obj-$(CONFIG_ARCH_MSM8974) += acpuclock-8974.o
obj-$(CONFIG_ARCH_MSM8974) += clock-local2.o clock-pll.o clock-8974.o clock-rpm.o clock-voter.o clock-mdss-8974.o
@ -368,7 +368,7 @@ obj-$(CONFIG_ARCH_MSMKRYPTON) += gpiomux-v2.o gpiomux.o
obj-$(CONFIG_ARCH_MPQ8092) += gpiomux-v2.o gpiomux.o
obj-$(CONFIG_ARCH_MSM8226) += gpiomux-v2.o gpiomux.o
obj-$(CONFIG_ARCH_MSM8610) += gpiomux-v2.o gpiomux.o
obj-$(CONFIG_ARCH_MSMZINC) += gpiomux-v2.o gpiomux.o
obj-$(CONFIG_ARCH_APQ8084) += gpiomux-v2.o gpiomux.o
obj-$(CONFIG_MSM_SLEEP_STATS_DEVICE) += idle_stats_device.o
obj-$(CONFIG_MSM_DCVS) += msm_dcvs_scm.o msm_dcvs.o msm_mpdecision.o

4
arch/arm/mach-msm/Makefile.boot
View File

@ -48,8 +48,8 @@ endif
# MSM8974
zreladdr-$(CONFIG_ARCH_MSM8974) := 0x00008000
# MSMZINC
zreladdr-$(CONFIG_ARCH_MSMZINC) := 0x00008000
# APQ8084
zreladdr-$(CONFIG_ARCH_APQ8084) := 0x00008000
# MSMKRYPTON
zreladdr-$(CONFIG_ARCH_MSMKRYPTON) := 0x00208000

2
arch/arm/mach-msm/board-zinc-gpiomux.c → arch/arm/mach-msm/board-8084-gpiomux.c
View File

@ -17,7 +17,7 @@
#include <mach/board.h>
#include <mach/gpiomux.h>
void __init msmzinc_init_gpiomux(void)
void __init apq8084_init_gpiomux(void)
{
int rc;

54
arch/arm/mach-msm/board-zinc.c → arch/arm/mach-msm/board-8084.c
View File

@ -31,7 +31,7 @@
#include "devices.h"
#include "platsmp.h"
static struct memtype_reserve msmzinc_reserve_table[] __initdata = {
static struct memtype_reserve apq8084_reserve_table[] __initdata = {
[MEMTYPE_SMI] = {
},
[MEMTYPE_EBI0] = {
@ -42,27 +42,27 @@ static struct memtype_reserve msmzinc_reserve_table[] __initdata = {
},
};
static int msmzinc_paddr_to_memtype(phys_addr_t paddr)
static int apq8084_paddr_to_memtype(phys_addr_t paddr)
{
return MEMTYPE_EBI1;
}
static struct reserve_info msmzinc_reserve_info __initdata = {
.memtype_reserve_table = msmzinc_reserve_table,
.paddr_to_memtype = msmzinc_paddr_to_memtype,
static struct reserve_info apq8084_reserve_info __initdata = {
.memtype_reserve_table = apq8084_reserve_table,
.paddr_to_memtype = apq8084_paddr_to_memtype,
};
void __init msmzinc_reserve(void)
void __init apq8084_reserve(void)
{
reserve_info = &msmzinc_reserve_info;
of_scan_flat_dt(dt_scan_for_memory_reserve, msmzinc_reserve_table);
reserve_info = &apq8084_reserve_info;
of_scan_flat_dt(dt_scan_for_memory_reserve, apq8084_reserve_table);
msm_reserve();
}
static void __init msmzinc_early_memory(void)
static void __init apq8084_early_memory(void)
{
reserve_info = &msmzinc_reserve_info;
of_scan_flat_dt(dt_scan_for_memory_hole, msmzinc_reserve_table);
reserve_info = &apq8084_reserve_info;
of_scan_flat_dt(dt_scan_for_memory_hole, apq8084_reserve_table);
}
static struct clk_lookup msm_clocks_dummy[] = {
@ -81,44 +81,44 @@ static struct clock_init_data msm_dummy_clock_init_data __initdata = {
* into this category, and thus the driver should not be added here. The
* EPROBE_DEFER can satisfy most dependency problems.
*/
void __init msmzinc_add_drivers(void)
void __init apq8084_add_drivers(void)
{
msm_smd_init();
msm_clock_init(&msm_dummy_clock_init_data);
}
static void __init msmzinc_map_io(void)
static void __init apq8084_map_io(void)
{
msm_map_zinc_io();
msm_map_8084_io();
}
void __init msmzinc_init(void)
void __init apq8084_init(void)
{
if (socinfo_init() < 0)
pr_err("%s: socinfo_init() failed\n", __func__);
msmzinc_init_gpiomux();
apq8084_init_gpiomux();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
msmzinc_add_drivers();
apq8084_add_drivers();
}
void __init msmzinc_init_very_early(void)
void __init apq8084_init_very_early(void)
{
msmzinc_early_memory();
apq8084_early_memory();
}
static const char *msmzinc_dt_match[] __initconst = {
"qcom,msmzinc",
static const char *apq8084_dt_match[] __initconst = {
"qcom,apq8084",
NULL
};
DT_MACHINE_START(MSMZINC_DT, "Qualcomm MSM ZINC (Flattened Device Tree)")
.map_io = msmzinc_map_io,
DT_MACHINE_START(APQ8084_DT, "Qualcomm APQ 8084 (Flattened Device Tree)")
.map_io = apq8084_map_io,
.init_irq = msm_dt_init_irq,
.init_machine = msmzinc_init,
.dt_compat = msmzinc_dt_match,
.reserve = msmzinc_reserve,
.init_very_early = msmzinc_init_very_early,
.init_machine = apq8084_init,
.dt_compat = apq8084_dt_match,
.reserve = apq8084_reserve,
.init_very_early = apq8084_init_very_early,
.restart = msm_restart,
.smp = &msm8974_smp_ops,
MACHINE_END

4
arch/arm/mach-msm/include/mach/board.h
View File

@ -600,7 +600,7 @@ void msm_map_apq8064_io(void);
void msm_map_msm7x30_io(void);
void msm_map_fsm9xxx_io(void);
void msm_map_8974_io(void);
void msm_map_zinc_io(void);
void msm_map_8084_io(void);
void msm_map_msmkrypton_io(void);
void msm_map_msm8625_io(void);
void msm_map_msm9625_io(void);
@ -610,7 +610,7 @@ void vic_handle_irq(struct pt_regs *regs);
void msm_8974_reserve(void);
void msm_8974_very_early(void);
void msm_8974_init_gpiomux(void);
void msmzinc_init_gpiomux(void);
void apq8084_init_gpiomux(void);
void msm9625_init_gpiomux(void);
void msmkrypton_init_gpiomux(void);
void msm_map_mpq8092_io(void);

16
arch/arm/mach-msm/include/mach/msm_iomap-zinc.h → arch/arm/mach-msm/include/mach/msm_iomap-8084.h
View File

@ -11,8 +11,8 @@
*/
#ifndef __ASM_ARCH_MSM_IOMAP_zinc_H
#define __ASM_ARCH_MSM_IOMAP_zinc_H
#ifndef __ASM_ARCH_MSM_IOMAP_8084_H
#define __ASM_ARCH_MSM_IOMAP_8084_H
/* Physical base address and size of peripherals.
* Ordered by the virtual base addresses they will be mapped at.
@ -23,15 +23,15 @@
*
*/
#define MSMZINC_SHARED_RAM_PHYS 0x0FA00000
#define APQ8084_SHARED_RAM_PHYS 0x0FA00000
#define MSMZINC_QGIC_DIST_PHYS 0xF9000000
#define MSMZINC_QGIC_DIST_SIZE SZ_4K
#define APQ8084_QGIC_DIST_PHYS 0xF9000000
#define APQ8084_QGIC_DIST_SIZE SZ_4K
#define MSMZINC_TLMM_PHYS 0xFD510000
#define MSMZINC_TLMM_SIZE SZ_16K
#define APQ8084_TLMM_PHYS 0xFD510000
#define APQ8084_TLMM_SIZE SZ_16K
#ifdef CONFIG_DEBUG_MSMZINC_UART
#ifdef CONFIG_DEBUG_APQ8084_UART
#define MSM_DEBUG_UART_BASE IOMEM(0xFA71E000)
#define MSM_DEBUG_UART_PHYS 0xF991E000
#endif

2
arch/arm/mach-msm/include/mach/msm_iomap.h
View File

@ -129,7 +129,7 @@
#include "msm_iomap-8064.h"
#include "msm_iomap-9615.h"
#include "msm_iomap-8974.h"
#include "msm_iomap-zinc.h"
#include "msm_iomap-8084.h"
#include "msm_iomap-9625.h"
#include "msm_iomap-8092.h"
#include "msm_iomap-8226.h"

8
arch/arm/mach-msm/include/mach/socinfo.h
View File

@ -46,8 +46,8 @@
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8610")
#define early_machine_is_mpq8092() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mpq8092")
#define early_machine_is_msmzinc() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmzinc")
#define early_machine_is_apq8084() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,apq8084")
#define early_machine_is_msmkrypton() \
of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmkrypton")
#else
@ -63,7 +63,7 @@
#define early_machine_is_msm8610() 0
#define early_machine_is_mpq8092() 0
#define early_machine_is_msmzinc() 0
#define early_machine_is_apq8084() 0
#define early_machine_is_msmkrypton() 0
#endif
@ -102,7 +102,7 @@ enum msm_cpu {
MSM_CPU_8226,
MSM_CPU_8610,
MSM_CPU_8625Q,
MSM_CPU_ZINC,
MSM_CPU_8084,
MSM_CPU_KRYPTON,
};

18
arch/arm/mach-msm/io.c
View File

@ -327,27 +327,27 @@ void __init msm_map_8974_io(void)
}
#endif /* CONFIG_ARCH_MSM8974 */
#ifdef CONFIG_ARCH_MSMZINC
static struct map_desc msm_zinc_io_desc[] __initdata = {
MSM_CHIP_DEVICE(QGIC_DIST, MSMZINC),
MSM_CHIP_DEVICE(TLMM, MSMZINC),
#ifdef CONFIG_ARCH_APQ8084
static struct map_desc msm_8084_io_desc[] __initdata = {
MSM_CHIP_DEVICE(QGIC_DIST, APQ8084),
MSM_CHIP_DEVICE(TLMM, APQ8084),
{
.virtual = (unsigned long) MSM_SHARED_RAM_BASE,
.length = MSM_SHARED_RAM_SIZE,
.type = MT_DEVICE,
},
#ifdef CONFIG_DEBUG_MSMZINC_UART
#ifdef CONFIG_DEBUG_APQ8084_UART
MSM_DEVICE(DEBUG_UART),
#endif
};
void __init msm_map_zinc_io(void)
void __init msm_map_8084_io(void)
{
msm_shared_ram_phys = MSMZINC_SHARED_RAM_PHYS;
msm_map_io(msm_zinc_io_desc, ARRAY_SIZE(msm_zinc_io_desc));
msm_shared_ram_phys = APQ8084_SHARED_RAM_PHYS;
msm_map_io(msm_8084_io_desc, ARRAY_SIZE(msm_8084_io_desc));
of_scan_flat_dt(msm_scan_dt_map_imem, NULL);
}
#endif /* CONFIG_ARCH_MSMZINC */
#endif /* CONFIG_ARCH_APQ8084 */
#ifdef CONFIG_ARCH_MSM7X30
static struct map_desc msm7x30_io_desc[] __initdata = {

8
arch/arm/mach-msm/socinfo.c
View File

@ -353,8 +353,8 @@ static enum msm_cpu cpu_of_id[] = {
/* 8064AA IDs */
[172] = MSM_CPU_8064AA,
/* zinc IDs */
[178] = MSM_CPU_ZINC,
/* 8084 IDs */
[178] = MSM_CPU_8084,
/* krypton IDs */
[187] = MSM_CPU_KRYPTON,
@ -858,9 +858,9 @@ static void * __init setup_dummy_socinfo(void)
dummy_socinfo.id = 146;
strlcpy(dummy_socinfo.build_id, "mpq8092 - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_msmzinc()) {
} else if (early_machine_is_apq8084()) {
dummy_socinfo.id = 178;
strlcpy(dummy_socinfo.build_id, "msmzinc - ",
strlcpy(dummy_socinfo.build_id, "apq8084 - ",
sizeof(dummy_socinfo.build_id));
} else if (early_machine_is_msmkrypton()) {
dummy_socinfo.id = 187;

2
drivers/iommu/Kconfig
View File

@ -20,7 +20,7 @@ config OF_IOMMU
# MSM IOMMU support
config MSM_IOMMU
bool "MSM IOMMU Support"
depends on ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_APQ8064 || ARCH_MSM8974 || ARCH_MPQ8092 || ARCH_MSM8610 || ARCH_MSM8226 || ARCH_MSMZINC
depends on ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_APQ8064 || ARCH_MSM8974 || ARCH_MPQ8092 || ARCH_MSM8610 || ARCH_MSM8226 || ARCH_APQ8084
select IOMMU_API
help
Support for the IOMMUs found on certain Qualcomm SOCs.