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

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

Merge "msm: clock-8092: Add clock driver for MPQ8092"

parents 371b9c69 7d2a32eb

arch/arm/mach-msm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ obj-$(CONFIG_ARCH_MSMSAMARIUM) += clock-local2.o clock-pll.o clock-rpm.o clock-s 
obj-$(CONFIG_ARCH_MSM9625) += board-9625.o board-9625-gpiomux.o

obj-$(CONFIG_ARCH_MSM9625) += clock-local2.o clock-pll.o clock-9625.o clock-rpm.o clock-voter.o acpuclock-9625.o acpuclock-cortex.o

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

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

obj-$(CONFIG_ARCH_MPQ8092) += clock-local2.o clock-pll.o clock-rpm.o clock-voter.o clock-8092.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) += acpuclock-8226.o acpuclock-cortex.o

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

+4 −1
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ void __init mpq8092_add_drivers(void) 
	msm_rpm_driver_init();

	rpm_regulator_smd_driver_init();

	qpnp_regulator_init();

	if (of_board_is_rumi())

		msm_clock_init(&mpq8092_rumi_clock_init_data);

	else

		msm_clock_init(&mpq8092_clock_init_data);

}

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

+4952 −9

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-msm/clock.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ extern struct clock_init_data msm8226_rumi_clock_init_data; 
extern struct clock_init_data apq8084_clock_init_data;

extern struct clock_init_data apq8084_rumi_clock_init_data;

extern struct clock_init_data mpq8092_clock_init_data;

extern struct clock_init_data mpq8092_rumi_clock_init_data;

extern struct clock_init_data msmkrypton_clock_init_data;

extern struct clock_init_data msmsamarium_clock_init_data;

extern struct clock_init_data msmsamarium_rumi_clock_init_data;