On 12/12/2015 03:59, Nikolay Martynov wrote:
> * Switches clocksource to gic timer.
> * Moves frequency definitions to dtsi since frequency was hardcoded anyway
> Will work on proper frequency detection later.
>
> Signed-off-by: Nikolay Martynov <[email protected]>
thanks, i'll look into moving the rest of the target to common_clock
over the next 1-2 weeks.
> ---
> v2: Fix spi driver clock
> ---
> target/linux/ramips/dts/mt7621.dtsi | 26 +++++++
> target/linux/ramips/mt7621/config-4.3 | 4 +
> .../patches-4.3/0902-mt7621-use-gic-timer.patch | 85
> ++++++++++++++++++++++
> 3 files changed, 115 insertions(+)
> create mode 100644
> target/linux/ramips/patches-4.3/0902-mt7621-use-gic-timer.patch
>
> diff --git a/target/linux/ramips/dts/mt7621.dtsi
> b/target/linux/ramips/dts/mt7621.dtsi
> index a06aee7..9c6f45b 100644
> --- a/target/linux/ramips/dts/mt7621.dtsi
> +++ b/target/linux/ramips/dts/mt7621.dtsi
> @@ -22,6 +22,22 @@
> compatible = "mti,cpu-interrupt-controller";
> };
>
> + cpuclock: cpuclock@0 {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> +
> + /* FIXME: there should be way to detect this */
> + clock-frequency = <880000000>;
> + };
> +
> + sysclock: sysclock@0 {
> + #clock-cells = <0>;
> + compatible = "fixed-clock";
> +
> + /* FIXME: there should be way to detect this */
> + clock-frequency = <50000000>;
> + };
> +
> palmbus@1E000000 {
> compatible = "palmbus";
> reg = <0x1E000000 0x100000>;
> @@ -88,6 +104,8 @@
> compatible = "ns16550a";
> reg = <0xc00 0x100>;
>
> + clocks = <&sysclock>;
> +
> interrupt-parent = <&gic>;
> interrupts = <GIC_SHARED 26 IRQ_TYPE_LEVEL_HIGH>;
>
> @@ -102,6 +120,8 @@
> compatible = "ralink,mt7621-spi";
> reg = <0xb00 0x100>;
>
> + clocks = <&sysclock>;
> +
> resets = <&rstctrl 18>;
> reset-names = "spi";
>
> @@ -243,6 +263,12 @@
> #interrupt-cells = <3>;
>
> mti,reserved-cpu-vectors = <7>;
> +
> + timer {
> + compatible = "mti,gic-timer";
> + interrupts = <GIC_LOCAL 1 IRQ_TYPE_NONE>;
> + clocks = <&cpuclock>;
> + };
> };
>
> nand@1e003000 {
> diff --git a/target/linux/ramips/mt7621/config-4.3
> b/target/linux/ramips/mt7621/config-4.3
> index f25850a..a56395c 100644
> --- a/target/linux/ramips/mt7621/config-4.3
> +++ b/target/linux/ramips/mt7621/config-4.3
> @@ -17,10 +17,13 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
> CONFIG_CEVT_R4K=y
> # CONFIG_CEVT_SYSTICK_QUIRK is not set
> CONFIG_CLKDEV_LOOKUP=y
> +CONFIG_CLKSRC_MIPS_GIC=y
> +CONFIG_CLKSRC_OF=y
> CONFIG_CLONE_BACKWARDS=y
> CONFIG_CMDLINE="rootfstype=squashfs,jffs2"
> CONFIG_CMDLINE_BOOL=y
> # CONFIG_CMDLINE_OVERRIDE is not set
> +CONFIG_COMMON_CLK=y
> CONFIG_CPU_GENERIC_DUMP_TLB=y
> CONFIG_CPU_HAS_PREFETCH=y
> CONFIG_CPU_HAS_SYNC=y
> @@ -78,6 +81,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
> CONFIG_HAVE_BPF_JIT=y
> CONFIG_HAVE_CC_STACKPROTECTOR=y
> CONFIG_HAVE_CLK=y
> +CONFIG_HAVE_CLK_PREPARE=y
> CONFIG_HAVE_CONTEXT_TRACKING=y
> CONFIG_HAVE_C_RECORDMCOUNT=y
> CONFIG_HAVE_DEBUG_KMEMLEAK=y
> diff --git a/target/linux/ramips/patches-4.3/0902-mt7621-use-gic-timer.patch
> b/target/linux/ramips/patches-4.3/0902-mt7621-use-gic-timer.patch
> new file mode 100644
> index 0000000..f7080c8
> --- /dev/null
> +++ b/target/linux/ramips/patches-4.3/0902-mt7621-use-gic-timer.patch
> @@ -0,0 +1,85 @@
> +--- a/arch/mips/ralink/Kconfig
> ++++ b/arch/mips/ralink/Kconfig
> +@@ -52,6 +52,8 @@ choice
> + select SYS_SUPPORTS_SMP
> + select SYS_SUPPORTS_MIPS_CPS
> + select MIPS_GIC
> ++ select COMMON_CLK
> ++ select CLKSRC_MIPS_GIC
> + select HW_HAS_PCI
> + endchoice
> +
> +--- a/arch/mips/ralink/Makefile
> ++++ b/arch/mips/ralink/Makefile
> +@@ -6,14 +6,18 @@
> + # Copyright (C) 2009-2011 Gabor Juhos <[email protected]>
> + # Copyright (C) 2013 John Crispin <[email protected]>
> +
> +-obj-y := prom.o of.o reset.o clk.o timer.o
> ++obj-y := prom.o of.o reset.o
> ++
> ++ifndef CONFIG_MIPS_GIC
> ++ obj-y += clk.o timer.o
> ++endif
> +
> + obj-$(CONFIG_CLKEVT_RT3352) += cevt-rt3352.o
> +
> + obj-$(CONFIG_RALINK_ILL_ACC) += ill_acc.o
> +
> + obj-$(CONFIG_IRQ_INTC) += irq.o
> +-obj-$(CONFIG_MIPS_GIC) += irq-gic.o
> ++obj-$(CONFIG_MIPS_GIC) += irq-gic.o timer-gic.o
> +
> + obj-$(CONFIG_SOC_RT288X) += rt288x.o
> + obj-$(CONFIG_SOC_RT305X) += rt305x.o
> +--- a/arch/mips/ralink/irq-gic.c
> ++++ b/arch/mips/ralink/irq-gic.c
> +@@ -3,13 +3,6 @@
> + #include <linux/of.h>
> + #include <linux/irqchip.h>
> +
> +-#include <linux/irqchip/mips-gic.h>
> +-
> +-unsigned int get_c0_compare_int(void)
> +-{
> +- return gic_get_c0_compare_int();
> +-}
> +-
> + void __init
> + arch_init_irq(void)
> + {
> +--- /dev/null
> ++++ b/arch/mips/ralink/timer-gic.c
> +@@ -0,0 +1,15 @@
> ++#include <linux/init.h>
> ++
> ++#include <linux/of.h>
> ++#include <linux/clk-provider.h>
> ++#include <linux/clocksource.h>
> ++
> ++#include "common.h"
> ++
> ++void __init plat_time_init(void)
> ++{
> ++ ralink_of_remap();
> ++
> ++ of_clk_init(NULL);
> ++ clocksource_of_init();
> ++}
> +--- a/arch/mips/ralink/mt7621.c
> ++++ b/arch/mips/ralink/mt7621.c
> +@@ -152,11 +152,14 @@ void __init ralink_clk_init(void)
> + }
> + break;
> + }
> ++ /*
> ++ FIXME: detect frequency automatically
> + cpu_clk = 880000000;
> + ralink_clk_add("cpu", cpu_clk);
> + ralink_clk_add("1e000b00.spi", 50000000);
> + ralink_clk_add("1e000c00.uartlite", 50000000);
> + ralink_clk_add("1e000d00.uart", 50000000);
> ++ */
> + }
> +
> + void __init ralink_of_remap(void)
>
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
