Commit 8c3d9138 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'msm-clock-for-3.11b' of... 

Merge tag 'msm-clock-for-3.11b' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/late

From David Brown:
MSM clock updates for 3.11.

Per Stephen Boyd's coverletter:

Resending to collect higher level maintainer acks per Olof's request.
The plan is to push this patchset through MSM to the arm-soc tree.

This patchset moves the existing MSM clock code and affected drivers
to the common clock framework. A prerequisite of moving to the common
clock framework is to use clk_prepare() and clk_enable() so the first
few patches migrate drivers to that call (clk_prepare() is a no-op on
MSM right now). It also removes some custom clock APIs that MSM
provides and finally moves the proc_comm clock code to the common
struct clk.

This patch series will be used as the foundation of the MSM 8660/8960
clock code that I plan to send out after this series.

* tag 'msm-clock-for-3.11b' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm

:
  ARM: msm: Migrate to common clock framework
  ARM: msm: Make proc_comm clock control into a platform driver
  ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
  ARM: msm: Remove clock-7x30.h include file
  ARM: msm: Remove custom clk_set_{max,min}_rate() API
  ARM: msm: Remove custom clk_set_flags() API
  msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
  msm: iommu: Convert to clk_prepare/unprepare
  msm_sdcc: Convert to clk_prepare/unprepare
  usb: otg: msm: Convert to clk_prepare/unprepare
  msm_serial: Use devm_clk_get() and properly return errors
  msm_serial: Convert to clk_prepare/unprepare

Acked-by: Chris Ball <cjb@laptop.org> # for msm_sdcc.c
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fbd1a04b 8cc7f533

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -623,8 +623,8 @@ config ARCH_MSM 
	bool "Qualcomm MSM"

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	help

	  Support for Qualcomm MSM/QSD based systems.  This runs on the

	  apps processor of the MSM/QSD and depends on a shared memory

arch/arm/mach-msm/Makefile

+6 −4
Original line number Diff line number Diff line 
obj-y += io.o timer.o

obj-y += clock.o

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



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

obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o



obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o

obj-$(CONFIG_ARCH_MSM7X30) += dma.o

obj-$(CONFIG_ARCH_QSD8X50) += dma.o sirc.o

obj-$(CONFIG_ARCH_MSM7X00A) += irq.o

obj-$(CONFIG_ARCH_QSD8X50) += sirc.o



obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o



obj-$(CONFIG_ARCH_MSM7X00A) += dma.o

obj-$(CONFIG_ARCH_MSM7X30) += dma.o

obj-$(CONFIG_ARCH_QSD8X50) += dma.o



obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o

obj-$(CONFIG_MSM_SMD) += last_radio_log.o

obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o

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

+1 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static struct platform_device smc91x_device = { 
};



static struct platform_device *devices[] __initdata = {

	&msm_clock_7x01a,

	&msm_device_gpio_7201,

	&msm_device_uart3,

	&msm_device_smd,
@@ -91,7 +92,6 @@ static void __init halibut_fixup(struct tag *tags, char **cmdline, 
static void __init halibut_map_io(void)

{

	msm_map_common_io();

	msm_clock_init(msm_clocks_7x01a, msm_num_clocks_7x01a);

}



static void __init halibut_init_late(void)

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

+1 −1
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = { 
};



static struct platform_device *devices[] __initdata = {

	&msm_clock_7x30,

	&msm_device_gpio_7x30,

#if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER)

        &msm_device_uart2,
@@ -116,7 +117,6 @@ static void __init msm7x30_init(void) 
static void __init msm7x30_map_io(void)

{

	msm_map_msm7x30_io();

	msm_clock_init(msm_clocks_7x30, msm_num_clocks_7x30);

}



static void __init msm7x30_init_late(void)

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

+1 −1
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static struct msm_otg_platform_data msm_otg_pdata = { 
};



static struct platform_device *devices[] __initdata = {

	&msm_clock_8x50,

	&msm_device_gpio_8x50,

	&msm_device_uart3,

	&msm_device_smd,
@@ -172,7 +173,6 @@ static void __init qsd8x50_init_mmc(void) 
static void __init qsd8x50_map_io(void)

{

	msm_map_qsd8x50_io();

	msm_clock_init(msm_clocks_8x50, msm_num_clocks_8x50);

}



static void __init qsd8x50_init_irq(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE