ARM: nomadik: register clocksource from device tree
Subsystems (5)
PATCH 4/4 ARM: nomadik: register clocksource from device tree
This switches the Nomadik platform to also registering its clocksource from the device tree, removing unused support code as we go along.
Signed-off-by Linus Walleij <[email protected]>
--- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 11 ++++++++--- arch/arm/mach-nomadik/Kconfig | 1 + arch/arm/mach-nomadik/cpu-8815.c | 6 +++--- drivers/clk/clk-nomadik.c | 15 --------------- 4 files changed, 12 insertions(+), 21 deletions(-)
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +8 -3
@@ -21,18 +21,23 @@ cache-level = <2>; }; - mtu0 { + mtu0: mtu at 101e2000 { /* Nomadik system timer */ + compatible = "st,nomadik-mtu"; reg = <0x101e2000 0x1000>; interrupt-parent = <&vica>; interrupts = <4>; + clocks = <&timclk>, <&pclk>; + clock-names = "timclk", "apb_pclk"; }; - mtu1 { + mtu1: mtu at 101e3000 { /* Secondary timer */ reg = <0x101e3000 0x1000>; interrupt-parent = <&vica>; interrupts = <5>; + clocks = <&timclk>, <&pclk>; + clock-names = "timclk", "apb_pclk"; }; gpio0: gpio at 101e4000 {
@@ -101,7 +106,7 @@ pclk: pclk at 0 { #clock-cells = <0>; compatible = "fixed-clock"; - clock-frequency = <2400000>; + clock-frequency = <0>; }; /* * The 2.4 MHz TIMCLK reference clock is active at
arch/arm/mach-nomadik/Kconfig +1 -0
@@ -6,6 +6,7 @@ config ARCH_NOMADIK select ARM_VIC select CLKSRC_NOMADIK_MTU select CLKSRC_NOMADIK_MTU_SCHED_CLOCK + select CLKSRC_OF select COMMON_CLK select CPU_ARM926T select GENERIC_CLOCKEVENTS
arch/arm/mach-nomadik/cpu-8815.c +3 -3
@@ -29,7 +29,7 @@#include <linux/platform_data/clk-nomadik.h> #include <linux/platform_data/pinctrl-nomadik.h> #include <linux/pinctrl/machine.h> -#include <linux/platform_data/clocksource-nomadik-mtu.h> +#include <linux/clocksource.h> #include <linux/of_irq.h> #include <linux/of_gpio.h> #include <linux/of_address.h>
@@ -172,7 +172,7 @@ static void __init cpu8815_timer_init_of(void)/* We need this to be up now */ nomadik_clk_init (); - mtu =of_find_node_by_path ("/mtu0" ); + mtu =of_find_node_by_path ("/mtu at 101e2000" );if (!mtu)return ; base =of_iomap (mtu,0 );
@@ -188,7 +188,7 @@ static void __init cpu8815_timer_init_of(void) src_cr |=SRC_CR_INIT_VAL ;writel (src_cr, base); -nmdk_timer_init (base, irq); +clocksource_of_init (); }static struct fsmc_nand_timings cpu8815_nand_timings = {
drivers/clk/clk-nomadik.c +0 -15
@@ -17,20 +17,5 @@ static const __initconst struct of_device_id cpu8815_clk_match[] = {void __init nomadik_clk_init (void ) { -struct clk *clk; - - clk =clk_register_fixed_rate (NULL ,"apb_pclk" ,NULL ,CLK_IS_ROOT ,0 ); -clk_register_clkdev (clk,"apb_pclk" ,NULL ); - -/* -* The 2.4 MHz TIMCLK reference clock is active at boot time, this is -* actually the MXTALCLK @19.2 MHz divided by 8. This clock is used -* by the timers and watchdog. See page 105 ff. -*/ - clk =clk_register_fixed_rate (NULL ,"TIMCLK" ,NULL ,CLK_IS_ROOT , -2400000 ); -clk_register_clkdev (clk,NULL ,"mtu0" ); -clk_register_clkdev (clk,NULL ,"mtu1" ); -of_clk_init (cpu8815_clk_match); }
Signature · 1 line
1.8.1.4
PATCH 4/4 ARM: nomadik: register clocksource from device tree
Quoted 43 lines · Linus Walleij
This switches the Nomadik platform to also registering its clocksource from the device tree, removing unused support code as we go along.
Signed-off-by Linus Walleij <[email protected]>--- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 11 ++++++++--- arch/arm/mach-nomadik/Kconfig | 1 + arch/arm/mach-nomadik/cpu-8815.c | 6 +++--- drivers/clk/clk-nomadik.c | 15 --------------- 4 files changed, 12 insertions(+), 21 deletions(-)arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +7
-2@@ -21,18 +21,23 @@ cache-level = <2>; }; - mtu0 { + mtu0: mtu at 101e2000 { /* Nomadik system timer */ + compatible = "st,nomadik-mtu"; reg = <0x101e2000 0x1000>; interrupt-parent = <&vica>; interrupts = <4>; + clocks = <&timclk>, <&pclk>; + clock-names = "timclk", "apb_pclk"; }; - mtu1 { + mtu1: mtu at 101e3000 { /* Secondary timer */ reg = <0x101e3000 0x1000>; interrupt-parent = <&vica>; interrupts = <5>; + clocks = <&timclk>, <&pclk>; + clock-names = "timclk", "apb_pclk"; }; gpio0: gpio at 101e4000 {
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi line 109
Quoted 5 lines
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +1
-1@@ -101,7 +106,7 @@ pclk: pclk at 0 { #clock-cells = <0>; compatible = "fixed-clock"; - clock-frequency = <2400000>; + clock-frequency = <0>;
really 0?
IIRC it's 2.4Mhz
Quoted 79 lines
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +0
-0}; /* * The 2.4 MHz TIMCLK reference clock is active atarch/arm/mach-nomadik/Kconfig +1
-0@@ -6,6 +6,7 @@ config ARCH_NOMADIK select ARM_VIC select CLKSRC_NOMADIK_MTU select CLKSRC_NOMADIK_MTU_SCHED_CLOCK + select CLKSRC_OF select COMMON_CLK select CPU_ARM926T select GENERIC_CLOCKEVENTSarch/arm/mach-nomadik/cpu-8815.c +3
-3@@ -29,7 +29,7 @@#include <linux/platform_data/clk-nomadik.h> #include <linux/platform_data/pinctrl-nomadik.h> #include <linux/pinctrl/machine.h> -#include <linux/platform_data/clocksource-nomadik-mtu.h> +#include <linux/clocksource.h> #include <linux/of_irq.h> #include <linux/of_gpio.h> #include <linux/of_address.h> @@ -172,7 +172,7 @@ static void __init cpu8815_timer_init_of(void)/* We need this to be up now */ nomadik_clk_init (); - mtu =of_find_node_by_path ("/mtu0" ); + mtu =of_find_node_by_path ("/mtu at 101e2000" );if (!mtu)return ; base =of_iomap (mtu,0 );@@ -188,7 +188,7 @@ static void __init cpu8815_timer_init_of(void) src_cr |=SRC_CR_INIT_VAL ;writel (src_cr, base); -nmdk_timer_init (base, irq); +clocksource_of_init (); }static struct fsmc_nand_timings cpu8815_nand_timings = {drivers/clk/clk-nomadik.c +0
-15@@ -17,20 +17,5 @@ static const __initconst struct of_device_id cpu8815_clk_match[] = {void __init nomadik_clk_init (void ) { -struct clk *clk; - - clk =clk_register_fixed_rate (NULL ,"apb_pclk" ,NULL ,CLK_IS_ROOT ,0 ); -clk_register_clkdev (clk,"apb_pclk" ,NULL ); - -/* -* The 2.4 MHz TIMCLK reference clock is active at boot time, this is -* actually the MXTALCLK @19.2 MHz divided by 8. This clock is used -* by the timers and watchdog. See page 105 ff. -*/ - clk =clk_register_fixed_rate (NULL ,"TIMCLK" ,NULL ,CLK_IS_ROOT , -2400000 ); -clk_register_clkdev (clk,NULL ,"mtu0" ); -clk_register_clkdev (clk,NULL ,"mtu1" ); -of_clk_init (cpu8815_clk_match); }Signature · 7 lines
1.8.1.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 4/4 ARM: nomadik: register clocksource from device tree
In reply to Linus WalleijQuoting Linus Walleij (2013-04-20 07:09:43)
Quoted 5 lines
This switches the Nomadik platform to also registering its clocksource from the device tree, removing unused support code as we go along.
Signed-off-by Linus Walleij <[email protected]>
For the clk-nomadik.c part:
Acked-by Mike Turquette <[email protected]>
Quoted 122 lines
--- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 11 ++++++++--- arch/arm/mach-nomadik/Kconfig | 1 + arch/arm/mach-nomadik/cpu-8815.c | 6 +++--- drivers/clk/clk-nomadik.c | 15 --------------- 4 files changed, 12 insertions(+), 21 deletions(-)arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +8
-3@@ -21,18 +21,23 @@ cache-level = <2>; }; - mtu0 { + mtu0: mtu at 101e2000 { /* Nomadik system timer */ + compatible = "st,nomadik-mtu"; reg = <0x101e2000 0x1000>; interrupt-parent = <&vica>; interrupts = <4>; + clocks = <&timclk>, <&pclk>; + clock-names = "timclk", "apb_pclk"; }; - mtu1 { + mtu1: mtu at 101e3000 { /* Secondary timer */ reg = <0x101e3000 0x1000>; interrupt-parent = <&vica>; interrupts = <5>; + clocks = <&timclk>, <&pclk>; + clock-names = "timclk", "apb_pclk"; }; gpio0: gpio at 101e4000 {@@ -101,7 +106,7 @@ pclk: pclk at 0 { #clock-cells = <0>; compatible = "fixed-clock"; - clock-frequency = <2400000>; + clock-frequency = <0>; }; /* * The 2.4 MHz TIMCLK reference clock is active atarch/arm/mach-nomadik/Kconfig +1
-0@@ -6,6 +6,7 @@ config ARCH_NOMADIK select ARM_VIC select CLKSRC_NOMADIK_MTU select CLKSRC_NOMADIK_MTU_SCHED_CLOCK + select CLKSRC_OF select COMMON_CLK select CPU_ARM926T select GENERIC_CLOCKEVENTSarch/arm/mach-nomadik/cpu-8815.c +3
-3@@ -29,7 +29,7 @@#include <linux/platform_data/clk-nomadik.h> #include <linux/platform_data/pinctrl-nomadik.h> #include <linux/pinctrl/machine.h> -#include <linux/platform_data/clocksource-nomadik-mtu.h> +#include <linux/clocksource.h> #include <linux/of_irq.h> #include <linux/of_gpio.h> #include <linux/of_address.h> @@ -172,7 +172,7 @@ static void __init cpu8815_timer_init_of(void)/* We need this to be up now */ nomadik_clk_init (); - mtu =of_find_node_by_path ("/mtu0" ); + mtu =of_find_node_by_path ("/mtu at 101e2000" );if (!mtu)return ; base =of_iomap (mtu,0 );@@ -188,7 +188,7 @@ static void __init cpu8815_timer_init_of(void) src_cr |=SRC_CR_INIT_VAL ;writel (src_cr, base); -nmdk_timer_init (base, irq); +clocksource_of_init (); }static struct fsmc_nand_timings cpu8815_nand_timings = {drivers/clk/clk-nomadik.c +0
-15@@ -17,20 +17,5 @@ static const __initconst struct of_device_id cpu8815_clk_match[] = {void __init nomadik_clk_init (void ) { -struct clk *clk; - - clk =clk_register_fixed_rate (NULL ,"apb_pclk" ,NULL ,CLK_IS_ROOT ,0 ); -clk_register_clkdev (clk,"apb_pclk" ,NULL ); - -/* -* The 2.4 MHz TIMCLK reference clock is active at boot time, this is -* actually the MXTALCLK @19.2 MHz divided by 8. This clock is used -* by the timers and watchdog. See page 105 ff. -*/ - clk =clk_register_fixed_rate (NULL ,"TIMCLK" ,NULL ,CLK_IS_ROOT , -2400000 ); -clk_register_clkdev (clk,NULL ,"mtu0" ); -clk_register_clkdev (clk,NULL ,"mtu1" ); -of_clk_init (cpu8815_clk_match); }Signature · 7 lines
1.8.1.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel