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

Commit d41ef540 authored by Chao Xie's avatar Chao Xie Committed by Michael Turquette
Browse files

arm: mmp: Make use of the DT supported clock 



Change the dtsi and dts file, soc initialization code to make
use of DT support clock.
So now in the code we do only need call of_clk_init to initialize
the clocks.

Signed-off-by: default avatarChao Xie <chao.xie@marvell.com>
Acked-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarMichael Turquette <mturquette@linaro.org>
parent 51454eb4

arch/arm/boot/dts/mmp2.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include "skeleton.dtsi"

#include <dt-bindings/clock/marvell,mmp2.h>



/ {

	aliases {
@@ -135,6 +136,8 @@ 
				compatible = "mrvl,mmp-uart";

				reg = <0xd4030000 0x1000>;

				interrupts = <27>;

				clocks = <&soc_clocks MMP2_CLK_UART0>;

				resets = <&soc_clocks MMP2_CLK_UART0>;

				status = "disabled";

			};
@@ -142,6 +145,8 @@ 
				compatible = "mrvl,mmp-uart";

				reg = <0xd4017000 0x1000>;

				interrupts = <28>;

				clocks = <&soc_clocks MMP2_CLK_UART1>;

				resets = <&soc_clocks MMP2_CLK_UART1>;

				status = "disabled";

			};
@@ -149,6 +154,8 @@ 
				compatible = "mrvl,mmp-uart";

				reg = <0xd4018000 0x1000>;

				interrupts = <24>;

				clocks = <&soc_clocks MMP2_CLK_UART2>;

				resets = <&soc_clocks MMP2_CLK_UART2>;

				status = "disabled";

			};
@@ -156,6 +163,8 @@ 
				compatible = "mrvl,mmp-uart";

				reg = <0xd4016000 0x1000>;

				interrupts = <46>;

				clocks = <&soc_clocks MMP2_CLK_UART3>;

				resets = <&soc_clocks MMP2_CLK_UART3>;

				status = "disabled";

			};
@@ -168,6 +177,8 @@ 
				#gpio-cells = <2>;

				interrupts = <49>;

				interrupt-names = "gpio_mux";

				clocks = <&soc_clocks MMP2_CLK_GPIO>;

				resets = <&soc_clocks MMP2_CLK_GPIO>;

				interrupt-controller;

				#interrupt-cells = <1>;

				ranges;
@@ -201,6 +212,8 @@ 
				compatible = "mrvl,mmp-twsi";

				reg = <0xd4011000 0x1000>;

				interrupts = <7>;

				clocks = <&soc_clocks MMP2_CLK_TWSI0>;

				resets = <&soc_clocks MMP2_CLK_TWSI0>;

				#address-cells = <1>;

				#size-cells = <0>;

				mrvl,i2c-fast-mode;
@@ -211,6 +224,8 @@ 
				compatible = "mrvl,mmp-twsi";

				reg = <0xd4025000 0x1000>;

				interrupts = <58>;

				clocks = <&soc_clocks MMP2_CLK_TWSI1>;

				resets = <&soc_clocks MMP2_CLK_TWSI1>;

				status = "disabled";

			};
@@ -220,8 +235,20 @@ 
				interrupts = <1 0>;

				interrupt-names = "rtc 1Hz", "rtc alarm";

				interrupt-parent = <&intcmux5>;

				clocks = <&soc_clocks MMP2_CLK_RTC>;

				resets = <&soc_clocks MMP2_CLK_RTC>;

				status = "disabled";

			};

		};



		soc_clocks: clocks{

			compatible = "marvell,mmp2-clock";

			reg = <0xd4050000 0x1000>,

			      <0xd4282800 0x400>,

			      <0xd4015000 0x1000>;

			reg-names = "mpmu", "apmu", "apbc";

			#clock-cells = <1>;

			#reset-cells = <1>;

		};

	};

};

arch/arm/boot/dts/pxa168.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include "skeleton.dtsi"

#include <dt-bindings/clock/marvell,pxa168.h>



/ {

	aliases {
@@ -59,6 +60,8 @@ 
				compatible = "mrvl,mmp-uart";

				reg = <0xd4017000 0x1000>;

				interrupts = <27>;

				clocks = <&soc_clocks PXA168_CLK_UART0>;

				resets = <&soc_clocks PXA168_CLK_UART0>;

				status = "disabled";

			};
@@ -66,6 +69,8 @@ 
				compatible = "mrvl,mmp-uart";

				reg = <0xd4018000 0x1000>;

				interrupts = <28>;

				clocks = <&soc_clocks PXA168_CLK_UART1>;

				resets = <&soc_clocks PXA168_CLK_UART1>;

				status = "disabled";

			};
@@ -73,6 +78,8 @@ 
				compatible = "mrvl,mmp-uart";

				reg = <0xd4026000 0x1000>;

				interrupts = <29>;

				clocks = <&soc_clocks PXA168_CLK_UART2>;

				resets = <&soc_clocks PXA168_CLK_UART2>;

				status = "disabled";

			};
@@ -84,6 +91,8 @@ 
				gpio-controller;

				#gpio-cells = <2>;

				interrupts = <49>;

				clocks = <&soc_clocks PXA168_CLK_GPIO>;

				resets = <&soc_clocks PXA168_CLK_GPIO>;

				interrupt-names = "gpio_mux";

				interrupt-controller;

				#interrupt-cells = <1>;
@@ -110,6 +119,8 @@ 
				compatible = "mrvl,mmp-twsi";

				reg = <0xd4011000 0x1000>;

				interrupts = <7>;

				clocks = <&soc_clocks PXA168_CLK_TWSI0>;

				resets = <&soc_clocks PXA168_CLK_TWSI0>;

				mrvl,i2c-fast-mode;

				status = "disabled";

			};
@@ -118,6 +129,8 @@ 
				compatible = "mrvl,mmp-twsi";

				reg = <0xd4025000 0x1000>;

				interrupts = <58>;

				clocks = <&soc_clocks PXA168_CLK_TWSI1>;

				resets = <&soc_clocks PXA168_CLK_TWSI1>;

				status = "disabled";

			};
@@ -126,8 +139,20 @@ 
				reg = <0xd4010000 0x1000>;

				interrupts = <5 6>;

				interrupt-names = "rtc 1Hz", "rtc alarm";

				clocks = <&soc_clocks PXA168_CLK_RTC>;

				resets = <&soc_clocks PXA168_CLK_RTC>;

				status = "disabled";

			};

		};



		soc_clocks: clocks{

			compatible = "marvell,pxa168-clock";

			reg = <0xd4050000 0x1000>,

			      <0xd4282800 0x400>,

			      <0xd4015000 0x1000>;

			reg-names = "mpmu", "apmu", "apbc";

			#clock-cells = <1>;

			#reset-cells = <1>;

		};

	};

};

arch/arm/boot/dts/pxa910.dtsi

+26 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include "skeleton.dtsi"

#include <dt-bindings/clock/marvell,pxa910.h>



/ {

	aliases {
@@ -71,6 +72,8 @@ 
				compatible = "mrvl,mmp-uart";

				reg = <0xd4017000 0x1000>;

				interrupts = <27>;

				clocks = <&soc_clocks PXA910_CLK_UART0>;

				resets = <&soc_clocks PXA910_CLK_UART0>;

				status = "disabled";

			};
@@ -78,6 +81,8 @@ 
				compatible = "mrvl,mmp-uart";

				reg = <0xd4018000 0x1000>;

				interrupts = <28>;

				clocks = <&soc_clocks PXA910_CLK_UART1>;

				resets = <&soc_clocks PXA910_CLK_UART1>;

				status = "disabled";

			};
@@ -85,6 +90,8 @@ 
				compatible = "mrvl,mmp-uart";

				reg = <0xd4036000 0x1000>;

				interrupts = <59>;

				clocks = <&soc_clocks PXA910_CLK_UART2>;

				resets = <&soc_clocks PXA910_CLK_UART2>;

				status = "disabled";

			};
@@ -97,6 +104,8 @@ 
				#gpio-cells = <2>;

				interrupts = <49>;

				interrupt-names = "gpio_mux";

				clocks = <&soc_clocks PXA910_CLK_GPIO>;

				resets = <&soc_clocks PXA910_CLK_GPIO>;

				interrupt-controller;

				#interrupt-cells = <1>;

				ranges;
@@ -124,6 +133,8 @@ 
				#size-cells = <0>;

				reg = <0xd4011000 0x1000>;

				interrupts = <7>;

				clocks = <&soc_clocks PXA910_CLK_TWSI0>;

				resets = <&soc_clocks PXA910_CLK_TWSI0>;

				mrvl,i2c-fast-mode;

				status = "disabled";

			};
@@ -134,6 +145,8 @@ 
				#size-cells = <0>;

				reg = <0xd4037000 0x1000>;

				interrupts = <54>;

				clocks = <&soc_clocks PXA910_CLK_TWSI1>;

				resets = <&soc_clocks PXA910_CLK_TWSI1>;

				status = "disabled";

			};
@@ -142,8 +155,21 @@ 
				reg = <0xd4010000 0x1000>;

				interrupts = <5 6>;

				interrupt-names = "rtc 1Hz", "rtc alarm";

				clocks = <&soc_clocks PXA910_CLK_RTC>;

				resets = <&soc_clocks PXA910_CLK_RTC>;

				status = "disabled";

			};

		};



		soc_clocks: clocks{

			compatible = "marvell,pxa910-clock";

			reg = <0xd4050000 0x1000>,

			      <0xd4282800 0x400>,

			      <0xd4015000 0x1000>,

			      <0xd403b000 0x1000>;

			reg-names = "mpmu", "apmu", "apbc", "apbcp";

			#clock-cells = <1>;

			#reset-cells = <1>;

		};

	};

};

arch/arm/mach-mmp/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -86,11 +86,12 @@ config MACH_GPLUGD 


config MACH_MMP_DT

	bool "Support MMP (ARMv5) platforms from device tree"

	select CPU_PXA168

	select CPU_PXA910

	select USE_OF

	select PINCTRL

	select PINCTRL_SINGLE

	select COMMON_CLK

	select ARCH_HAS_RESET_CONTROLLER

	select CPU_MOHAWK

	help

	  Include support for Marvell MMP2 based platforms using

	  the device tree. Needn't select any other machine while
@@ -99,10 +100,12 @@ config MACH_MMP_DT 
config MACH_MMP2_DT

	bool "Support MMP2 (ARMv7) platforms from device tree"

	depends on !CPU_MOHAWK

	select CPU_MMP2

	select USE_OF

	select PINCTRL

	select PINCTRL_SINGLE

	select COMMON_CLK

	select ARCH_HAS_RESET_CONTROLLER

	select CPU_PJ4

	help

	  Include support for Marvell MMP2 based platforms using

	  the device tree.
@@ -111,21 +114,18 @@ endmenu 


config CPU_PXA168

	bool

	select COMMON_CLK

	select CPU_MOHAWK

	help

	  Select code specific to PXA168



config CPU_PXA910

	bool

	select COMMON_CLK

	select CPU_MOHAWK

	help

	  Select code specific to PXA910



config CPU_MMP2

	bool

	select COMMON_CLK

	select CPU_PJ4

	help

	  Select code specific to MMP2. MMP2 is ARMv7 compatible.

arch/arm/mach-mmp/mmp-dt.c

+18 −39
Original line number Diff line number Diff line
@@ -11,63 +11,42 @@ 


#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <linux/clk-provider.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/hardware/cache-tauros2.h>



#include "common.h"



extern void __init mmp_dt_init_timer(void);



static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = {

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4026000, "pxa2xx-uart.2", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", NULL),

	OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),

	{}

static const char *pxa168_dt_board_compat[] __initdata = {

	"mrvl,pxa168-aspenite",

	NULL,

};



static const struct of_dev_auxdata pxa910_auxdata_lookup[] __initconst = {

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", NULL),

	OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp-gpio", NULL),

	OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),

	{}

static const char *pxa910_dt_board_compat[] __initdata = {

	"mrvl,pxa910-dkb",

	NULL,

};



static void __init pxa168_dt_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table,

			     pxa168_auxdata_lookup, NULL);

}



static void __init pxa910_dt_init(void)

static void __init mmp_init_time(void)

{

	of_platform_populate(NULL, of_default_bus_match_table,

			     pxa910_auxdata_lookup, NULL);

#ifdef CONFIG_CACHE_TAUROS2

	tauros2_init(0);

#endif

	mmp_dt_init_timer();

	of_clk_init(NULL);

}



static const char *mmp_dt_board_compat[] __initdata = {

	"mrvl,pxa168-aspenite",

	"mrvl,pxa910-dkb",

	NULL,

};



DT_MACHINE_START(PXA168_DT, "Marvell PXA168 (Device Tree Support)")

	.map_io		= mmp_map_io,

	.init_time	= mmp_dt_init_timer,

	.init_machine	= pxa168_dt_init,

	.dt_compat	= mmp_dt_board_compat,

	.init_time	= mmp_init_time,

	.dt_compat	= pxa168_dt_board_compat,

MACHINE_END



DT_MACHINE_START(PXA910_DT, "Marvell PXA910 (Device Tree Support)")

	.map_io		= mmp_map_io,

	.init_time	= mmp_dt_init_timer,

	.init_machine	= pxa910_dt_init,

	.dt_compat	= mmp_dt_board_compat,

	.init_time	= mmp_init_time,

	.dt_compat	= pxa910_dt_board_compat,

MACHINE_END