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

Commit 2a52220c authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

msm: clock: Remove references to clk_ops_pcom 



Not all devices use proc_comm and determining if a clock is local
vs. remote is fragile when done by comparing clk_ops pointers.
Instead, implement an is_local() function for all clk_ops to
determine if the clock is local. Doing this allows us to remove
the last references to clk_ops_pcom from clock.c and compile it
for targets with CONFIG_MSM_PROC_COMM=n.

We don't need to set the clk_ops at runtime until 7x30 local
clock detection comes in. Right now it's just complicating things
so just set the ops pointer statically.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 0693a317

arch/arm/mach-msm/Makefile

+1 −5
Original line number Diff line number Diff line 
obj-y += io.o idle.o timer.o

ifdef CONFIG_MSM_PROC_COMM

obj-y += clock.o

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

endif



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

obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o devices-iommu.o
@@ -9,11 +8,8 @@ obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o devices-iommu.o 
obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o

obj-$(CONFIG_ARCH_MSM7X30) += dma.o

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

obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o

obj-$(CONFIG_ARCH_MSM8960) += clock-dummy.o



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

obj-$(CONFIG_MSM_PROC_COMM) += clock.o



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

obj-$(CONFIG_MSM_SMD) += last_radio_log.o

arch/arm/mach-msm/clock-7x30.h

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ extern int internal_pwr_rail_ctl_auto(unsigned rail_id, bool enable); 
	.flags = clk_flags, \

	.dev = clk_dev, \

	.dbg_name = #l_id, \

	.ops = &clk_ops_pcom, \

	}



#endif

arch/arm/mach-msm/clock-debug.c

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/debugfs.h>

#include <linux/clk.h>

#include "clock.h"

#include "clock-pcom.h"



static int clock_debug_rate_set(void *data, u64 val)

{
@@ -79,7 +78,7 @@ static int clock_debug_local_get(void *data, u64 *val) 
{

	struct clk *clock = data;



	*val = clock->ops != &clk_ops_pcom;

	*val = clock->ops->is_local(clock->id);



	return 0;

}

arch/arm/mach-msm/clock-dummy.c

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
/* Copyright (c) 2010, 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/clk.h>

#include <linux/err.h>

#include <linux/module.h>



struct clk *clk_get(struct device *dev, const char *id)

{

	return ERR_PTR(-ENOENT);

}

EXPORT_SYMBOL(clk_get);



int clk_enable(struct clk *clk)

{

	return -ENOENT;

}

EXPORT_SYMBOL(clk_enable);



void clk_disable(struct clk *clk)

{

}

EXPORT_SYMBOL(clk_disable);



unsigned long clk_get_rate(struct clk *clk)

{

	return 0;

}

EXPORT_SYMBOL(clk_get_rate);



int clk_set_rate(struct clk *clk, unsigned long rate)

{

	return -ENOENT;

}

EXPORT_SYMBOL(clk_set_rate);



void clk_put(struct clk *clk)

{

}

EXPORT_SYMBOL(clk_put);

arch/arm/mach-msm/clock-pcom.c

+6 −0
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ long pc_clk_round_rate(unsigned id, unsigned rate) 
	return rate;

}



static bool pc_clk_is_local(unsigned id)

{

	return false;

}



struct clk_ops clk_ops_pcom = {

	.enable = pc_clk_enable,

	.disable = pc_clk_disable,
@@ -129,4 +134,5 @@ struct clk_ops clk_ops_pcom = { 
	.get_rate = pc_clk_get_rate,

	.is_enabled = pc_clk_is_enabled,

	.round_rate = pc_clk_round_rate,

	.is_local = pc_clk_is_local,

};