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

Commit ff1930c6 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS,clk: migrate JZ4740 to common clock framework 



Migrate the JZ4740 & the qi_lb60 board to use common clock framework
via the new Ingenic SoC CGU driver. Note that the JZ4740-specific
debugfs code is removed since common clock framework provides its own
debug capabilities.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Co-authored-by: default avatarPaul Cercueil <paul@crapouillou.net>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: devicetree@vger.kernel.org
Cc: linux-clk@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: linux-kernel@vger.kernel.org
Cc: Brian Norris <computersforpeace@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/10151/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b066303f

arch/mips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ config MACH_INGENIC 
	select IRQ_MIPS_CPU

	select ARCH_REQUIRE_GPIOLIB

	select SYS_HAS_EARLY_PRINTK

	select HAVE_CLK

	select COMMON_CLK

	select GENERIC_IRQ_CHIP

	select BUILTIN_DTB

	select USE_OF

arch/mips/boot/dts/ingenic/jz4740.dtsi

+23 −0
Original line number Diff line number Diff line 
#include <dt-bindings/clock/jz4740-cgu.h>



/ {

	#address-cells = <1>;

	#size-cells = <1>;
@@ -20,4 +22,25 @@ 
		interrupt-parent = <&cpuintc>;

		interrupts = <2>;

	};



	ext: ext {

		compatible = "fixed-clock";

		#clock-cells = <0>;

	};



	rtc: rtc {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <32768>;

	};



	cgu: jz4740-cgu@10000000 {

		compatible = "ingenic,jz4740-cgu";

		reg = <0x10000000 0x100>;



		clocks = <&ext>, <&rtc>;

		clock-names = "ext", "rtc";



		#clock-cells = <1>;

	};

};

arch/mips/boot/dts/ingenic/qi_lb60.dts

+4 −0
Original line number Diff line number Diff line
@@ -5,3 +5,7 @@ 
/ {

	compatible = "qi,lb60", "ingenic,jz4740";

};



&ext {

	clock-frequency = <12000000>;

};

arch/mips/jz4740/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
obj-y += prom.o time.o reset.o setup.o \

	gpio.o clock.o platform.o timer.o serial.o



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



# board specific support



obj-$(CONFIG_JZ4740_QI_LB60)	+= board-qi_lb60.o

arch/mips/jz4740/board-qi_lb60.c

+0 −5
Original line number Diff line number Diff line
@@ -497,11 +497,6 @@ static int __init qi_lb60_init_platform_devices(void) 


}



struct jz4740_clock_board_data jz4740_clock_bdata = {

	.ext_rate = 12000000,

	.rtc_rate = 32768,

};



static __init int board_avt2(char *str)

{

	qi_lb60_mmc_pdata.card_detect_active_low = 1;