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

Commit 75e0244f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mach: msm: Move clock library headers to include/soc/qcom/"

parents 2fc91239 a4879223

arch/arm/mach-msm/Makefile

+8 −10
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ obj-y += io.o dma.o memory.o 
ifndef CONFIG_ARM_ARCH_TIMER

obj-y += timer.o

endif

obj-y += clock-voter.o

obj-$(CONFIG_USE_OF) += board-dt.o

obj-$(CONFIG_DEBUG_FS) += nohlt.o
@@ -67,7 +66,7 @@ endif 
obj-$(CONFIG_MSM_SYSMON_COMM) += sysmon.o



obj-$(CONFIG_ARCH_FSM9900) += board-fsm9900.o board-fsm9900-gpiomux.o

obj-$(CONFIG_ARCH_FSM9900) += clock-local2.o clock-pll.o clock-fsm9900.o clock-rpm.o clock-voter.o

obj-$(CONFIG_ARCH_FSM9900) += clock-fsm9900.o

obj-$(CONFIG_ARCH_FSM9900) += clock-krait-8974.o

obj-$(CONFIG_ARCH_FSM9900) += rfic-fsm9900.o bbif-fsm9900.o

obj-$(CONFIG_MSM_WATCHDOG_V2) += msm_watchdog_v2.o
@@ -75,24 +74,23 @@ obj-$(CONFIG_MSM_MEMORY_DUMP) += msm_memory_dump.o 
obj-$(CONFIG_QPNP_BMS) += bms-batterydata.o bms-batterydata-desay.o

obj-$(CONFIG_QPNP_BMS) += bms-batterydata-oem.o bms-batterydata-qrd-4v35-2000mah.o bms-batterydata-qrd-4v2-1300mah.o

obj-$(CONFIG_ARCH_APQ8084) += board-8084.o board-8084-gpiomux.o

obj-$(CONFIG_ARCH_APQ8084) += clock-local2.o clock-pll.o clock-8084.o clock-rpm.o clock-voter.o clock-mdss-8974.o

obj-$(CONFIG_ARCH_APQ8084) += clock-8084.o clock-mdss-8974.o

obj-$(CONFIG_ARCH_APQ8084) += clock-krait-8974.o

obj-$(CONFIG_ARCH_MSM8974) += board-8974.o board-8974-gpiomux.o

obj-$(CONFIG_ARCH_MSM8974) += clock-krait-8974.o

obj-$(CONFIG_ARCH_MSM8974) += clock-local2.o clock-pll.o clock-rpm-8974.o clock-gcc-8974.o clock-mmss-8974.o clock-lpass-8974.o clock-rpm.o clock-voter.o clock-mdss-8974.o

obj-$(CONFIG_ARCH_MSM8974) += clock-rpm-8974.o clock-gcc-8974.o clock-mmss-8974.o clock-lpass-8974.o clock-mdss-8974.o

obj-$(CONFIG_KRAIT_REGULATOR) += krait-regulator.o  krait-regulator-pmic.o

obj-$(CONFIG_ARCH_MDM9630) += board-9630.o board-9630-gpiomux.o

obj-$(CONFIG_ARCH_MSMSAMARIUM) += board-samarium.o board-samarium-gpiomux.o

obj-$(CONFIG_ARCH_MSMSAMARIUM) += clock-local2.o clock-pll.o clock-rpm.o clock-samarium.o clock-krait-8974.o clock-mdss-8974.o

obj-$(CONFIG_ARCH_MSMSAMARIUM) += clock-samarium.o clock-krait-8974.o clock-mdss-8974.o

obj-$(CONFIG_ARCH_MPQ8092) += board-8092.o board-8092-gpiomux.o

obj-$(CONFIG_ARCH_MPQ8092) += clock-local2.o clock-pll.o clock-rpm.o clock-voter.o clock-8092.o clock-vcap-8092.o clock-mdss-8974.o

obj-$(CONFIG_ARCH_MPQ8092) += clock-8092.o clock-vcap-8092.o clock-mdss-8974.o

obj-$(CONFIG_ARCH_MSM8226) += board-8226.o board-8226-gpiomux.o

obj-$(CONFIG_ARCH_MSM8226) += clock-local2.o clock-pll.o clock-8226.o clock-rpm.o clock-voter.o clock-mdss-8974.o

obj-$(CONFIG_ARCH_MSM8226) += clock-8226.o clock-mdss-8974.o

obj-$(CONFIG_ARCH_MSM8610) += board-8610.o board-8610-gpiomux.o

obj-$(CONFIG_ARCH_MSM8610) += clock-local2.o clock-pll.o clock-8610.o clock-rpm.o clock-voter.o

obj-$(CONFIG_ARCH_MSM8610) += clock-8610.o

obj-$(CONFIG_ARCH_MSM8610) += clock-dsi-8610.o

obj-$(CONFIG_ARCH_MDM9630) += clock-local2.o clock-pll.o clock-9630.o clock-rpm.o clock-voter.o

obj-$(CONFIG_ARCH_MDM9630) += clock-alpha-pll.o

obj-$(CONFIG_ARCH_MDM9630) += clock-9630.o



obj-$(CONFIG_MSM_PM) += msm-pm.o pm-data.o lpm_levels.o

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

+5 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, The Linux Foundation. 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
@@ -22,14 +22,14 @@ 
#include <linux/regulator/consumer.h>

#include <linux/regulator/rpm-smd-regulator.h>

#include <linux/clk/msm-clock-generic.h>

#include <soc/qcom/clock-local2.h>

#include <soc/qcom/clock-pll.h>

#include <soc/qcom/clock-rpm.h>

#include <soc/qcom/clock-voter.h>



#include <mach/socinfo.h>

#include <mach/rpm-smd.h>



#include "clock-local2.h"

#include "clock-pll.h"

#include "clock-rpm.h"

#include "clock-voter.h"

#include "clock.h"

#include "clock-mdss-8974.h"

#include "clock-krait.h"

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

+4 −4
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@ 
#include <linux/regulator/consumer.h>

#include <linux/regulator/rpm-smd-regulator.h>

#include <linux/clk/msm-clock-generic.h>

#include <soc/qcom/clock-local2.h>

#include <soc/qcom/clock-pll.h>

#include <soc/qcom/clock-rpm.h>

#include <soc/qcom/clock-voter.h>



#include <mach/socinfo.h>

#include <mach/rpm-smd.h>



#include "clock-local2.h"

#include "clock-pll.h"

#include "clock-rpm.h"

#include "clock-voter.h"

#include "clock.h"

#include "clock-mdss-8974.h"

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

+5 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, The Linux Foundation. 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
@@ -22,14 +22,14 @@ 
#include <linux/regulator/consumer.h>

#include <linux/regulator/rpm-smd-regulator.h>

#include <linux/clk/msm-clock-generic.h>

#include <soc/qcom/clock-local2.h>

#include <soc/qcom/clock-pll.h>

#include <soc/qcom/clock-rpm.h>

#include <soc/qcom/clock-voter.h>



#include <mach/socinfo.h>

#include <mach/rpm-smd.h>



#include "clock-local2.h"

#include "clock-pll.h"

#include "clock-rpm.h"

#include "clock-voter.h"

#include "clock-mdss-8974.h"

#include "clock.h"

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

+5 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. 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
@@ -22,14 +22,14 @@ 
#include <linux/regulator/consumer.h>

#include <linux/regulator/rpm-smd-regulator.h>

#include <linux/clk/msm-clock-generic.h>

#include <soc/qcom/clock-local2.h>

#include <soc/qcom/clock-pll.h>

#include <soc/qcom/clock-rpm.h>

#include <soc/qcom/clock-voter.h>



#include <mach/socinfo.h>

#include <mach/rpm-smd.h>



#include "clock-local2.h"

#include "clock-pll.h"

#include "clock-rpm.h"

#include "clock-voter.h"

#include "clock.h"

#include "clock-dsi-8610.h"