Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecca8194 authored by David Brown's avatar David Brown
Browse files

Merge branch 'msm-core' into for-next 

* msm-core:
  msm: Clean up useless ifdefs
  msm: clock: Add support for more proc_comm clocks
  msm: clock: Invert debugfs directory layout
  msm: clock: Move debugfs code from clock.c to clock-debug.c
  msm: clock: Remove 7x30 and pcom includes from clock.h
  msm: clock: Remove unused code and definitions
  msm: Warning fix in trout gpio board file
  msm: Remove broken register definition from trout
parents d1f4cec7 07a3cc48

arch/arm/mach-msm/Makefile

+3 −0
Original line number Diff line number Diff line 
obj-y += io.o idle.o timer.o

ifdef CONFIG_MSM_PROC_COMM

obj-$(CONFIG_DEBUG_FS) += clock-debug.o

endif



obj-$(CONFIG_MSM_VIC) += irq-vic.o

arch/arm/mach-msm/board-halibut.c

+0 −2
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ static void __init halibut_map_io(void) 
}



MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= 0x10000100,

	.fixup		= halibut_fixup,

	.map_io		= halibut_map_io,

arch/arm/mach-msm/board-mahimahi.c

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ static void __init mahimahi_map_io(void) 
extern struct sys_timer msm_timer;



MACHINE_START(MAHIMAHI, "mahimahi")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= 0x20000100,

	.fixup		= mahimahi_fixup,

	.map_io		= mahimahi_map_io,

arch/arm/mach-msm/board-msm7x27.c

+0 −8
Original line number Diff line number Diff line
@@ -130,8 +130,6 @@ static void __init msm7x2x_map_io(void) 
}



MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,
@@ -140,8 +138,6 @@ MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") 
MACHINE_END



MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,
@@ -150,8 +146,6 @@ MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") 
MACHINE_END



MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,
@@ -160,8 +154,6 @@ MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") 
MACHINE_END



MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,

arch/arm/mach-msm/board-msm7x30.c

+0 −6
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ static void __init msm7x30_map_io(void) 
}



MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params = PHYS_OFFSET + 0x100,

	.map_io = msm7x30_map_io,

	.init_irq = msm7x30_init_irq,
@@ -115,8 +113,6 @@ MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF") 
MACHINE_END



MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params = PHYS_OFFSET + 0x100,

	.map_io = msm7x30_map_io,

	.init_irq = msm7x30_init_irq,
@@ -125,8 +121,6 @@ MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA") 
MACHINE_END



MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params = PHYS_OFFSET + 0x100,

	.map_io = msm7x30_map_io,

	.init_irq = msm7x30_init_irq,