Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle: "Boston platform support: - Document DT bindings - Add CLK driver for board clocks CM: - Avoid per-core locking with CM3 & higher - WARN on attempt to lock invalid VP, not BUG CPS: - Select CONFIG_SYS_SUPPORTS_SCHED_SMT for MIPSr6 - Prevent multi-core with dcache aliasing - Handle cores not powering down more gracefully - Handle spurious VP starts more gracefully DSP: - Add lwx & lhx missaligned access support eBPF: - Add MIPS support along with many supporting change to add the required infrastructure Generic arch code: - Misc sysmips MIPS_ATOMIC_SET fixes - Drop duplicate HAVE_SYSCALL_TRACEPOINTS - Negate error syscall return in trace - Correct forced syscall errors - Traced negative syscalls should return -ENOSYS - Allow samples/bpf/tracex5 to access syscall arguments for sane traces - Cleanup from old Kconfig options in defconfigs - Fix PREF instruction usage by memcpy for MIPS R6 - Fix various special cases in the FPU eulation - Fix some special cases in MIPS16e2 support - Fix MIPS I ISA /proc/cpuinfo reporting - Sort MIPS Kconfig alphabetically - Fix minimum alignment requirement of IRQ stack as required by ABI / GCC - Fix special cases in the module loader - Perform post-DMA cache flushes on systems with MAARs - Probe the I6500 CPU - Cleanup cmpxchg and add support for 1 and 2 byte operations - Use queued read/write locks (qrwlock) - Use queued spinlocks (qspinlock) - Add CPU shared FTLB feature detection - Handle tlbex-tlbp race condition - Allow storing pgd in C0_CONTEXT for MIPSr6 - Use current_cpu_type() in m4kc_tlbp_war() - Support Boston in the generic kernel Generic platform: - yamon-dt: Pull YAMON DT shim code out of SEAD-3 board - yamon-dt: Support > 256MB of RAM - yamon-dt: Use serial* rather than uart* aliases - Abstract FDT fixup application - Set RTC_ALWAYS_BCD to 0 - Add a MAINTAINERS entry core kernel: - qspinlock.c: include linux/prefetch.h Loongson 3: - Add support Perf: - Add I6500 support SEAD-3: - Remove GIC timer from DT - Set interrupt-parent per-device, not at root node - Fix GIC interrupt specifiers SMP: - Skip IPI setup if we only have a single CPU VDSO: - Make comment match reality - Improvements to time code in VDSO" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (86 commits) locking/qspinlock: Include linux/prefetch.h MIPS: Fix MIPS I ISA /proc/cpuinfo reporting MIPS: Fix minimum alignment requirement of IRQ stack MIPS: generic: Support MIPS Boston development boards MIPS: DTS: img: Don't attempt to build-in all .dtb files clk: boston: Add a driver for MIPS Boston board clocks dt-bindings: Document img,boston-clock binding MIPS: Traced negative syscalls should return -ENOSYS MIPS: Correct forced syscall errors MIPS: Negate error syscall return in trace MIPS: Drop duplicate HAVE_SYSCALL_TRACEPOINTS select MIPS16e2: Provide feature overrides for non-MIPS16 systems MIPS: MIPS16e2: Report ASE presence in /proc/cpuinfo MIPS: MIPS16e2: Subdecode extended LWSP/SWSP instructions MIPS: MIPS16e2: Identify ASE presence MIPS: VDSO: Fix a mismatch between comment and preprocessor constant MIPS: VDSO: Add implementation of gettimeofday() fallback MIPS: VDSO: Add implementation of clock_gettime() fallback MIPS: VDSO: Fix conversions in do_monotonic()/do_monotonic_coarse() MIPS: Use current_cpu_type() in m4kc_tlbp_war() ...
This commit is contained in:
@@ -221,6 +221,7 @@ config COMMON_CLK_VC5
|
||||
|
||||
source "drivers/clk/bcm/Kconfig"
|
||||
source "drivers/clk/hisilicon/Kconfig"
|
||||
source "drivers/clk/imgtec/Kconfig"
|
||||
source "drivers/clk/keystone/Kconfig"
|
||||
source "drivers/clk/mediatek/Kconfig"
|
||||
source "drivers/clk/meson/Kconfig"
|
||||
|
@@ -60,6 +60,7 @@ obj-y += bcm/
|
||||
obj-$(CONFIG_ARCH_BERLIN) += berlin/
|
||||
obj-$(CONFIG_H8300) += h8300/
|
||||
obj-$(CONFIG_ARCH_HISI) += hisilicon/
|
||||
obj-y += imgtec/
|
||||
obj-$(CONFIG_ARCH_MXC) += imx/
|
||||
obj-$(CONFIG_MACH_INGENIC) += ingenic/
|
||||
obj-$(CONFIG_ARCH_KEYSTONE) += keystone/
|
||||
|
9
drivers/clk/imgtec/Kconfig
Normal file
9
drivers/clk/imgtec/Kconfig
Normal file
@@ -0,0 +1,9 @@
|
||||
config COMMON_CLK_BOSTON
|
||||
bool "Clock driver for MIPS Boston boards"
|
||||
depends on MIPS || COMPILE_TEST
|
||||
select MFD_SYSCON
|
||||
---help---
|
||||
Enable this to support the system & CPU clocks on the MIPS Boston
|
||||
development board from Imagination Technologies. These are simple
|
||||
fixed rate clocks whose rate is determined by reading a platform
|
||||
provided register.
|
1
drivers/clk/imgtec/Makefile
Normal file
1
drivers/clk/imgtec/Makefile
Normal file
@@ -0,0 +1 @@
|
||||
obj-$(CONFIG_COMMON_CLK_BOSTON) += clk-boston.o
|
103
drivers/clk/imgtec/clk-boston.c
Normal file
103
drivers/clk/imgtec/clk-boston.c
Normal file
@@ -0,0 +1,103 @@
|
||||
/*
|
||||
* Copyright (C) 2016-2017 Imagination Technologies
|
||||
* Author: Paul Burton <paul.burton@imgtec.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) "clk-boston: " fmt
|
||||
|
||||
#include <linux/clk-provider.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/mfd/syscon.h>
|
||||
|
||||
#include <dt-bindings/clock/boston-clock.h>
|
||||
|
||||
#define BOSTON_PLAT_MMCMDIV 0x30
|
||||
# define BOSTON_PLAT_MMCMDIV_CLK0DIV (0xff << 0)
|
||||
# define BOSTON_PLAT_MMCMDIV_INPUT (0xff << 8)
|
||||
# define BOSTON_PLAT_MMCMDIV_MUL (0xff << 16)
|
||||
# define BOSTON_PLAT_MMCMDIV_CLK1DIV (0xff << 24)
|
||||
|
||||
#define BOSTON_CLK_COUNT 3
|
||||
|
||||
static u32 ext_field(u32 val, u32 mask)
|
||||
{
|
||||
return (val & mask) >> (ffs(mask) - 1);
|
||||
}
|
||||
|
||||
static void __init clk_boston_setup(struct device_node *np)
|
||||
{
|
||||
unsigned long in_freq, cpu_freq, sys_freq;
|
||||
uint mmcmdiv, mul, cpu_div, sys_div;
|
||||
struct clk_hw_onecell_data *onecell;
|
||||
struct regmap *regmap;
|
||||
struct clk_hw *hw;
|
||||
int err;
|
||||
|
||||
regmap = syscon_node_to_regmap(np->parent);
|
||||
if (IS_ERR(regmap)) {
|
||||
pr_err("failed to find regmap\n");
|
||||
return;
|
||||
}
|
||||
|
||||
err = regmap_read(regmap, BOSTON_PLAT_MMCMDIV, &mmcmdiv);
|
||||
if (err) {
|
||||
pr_err("failed to read mmcm_div register: %d\n", err);
|
||||
return;
|
||||
}
|
||||
|
||||
in_freq = ext_field(mmcmdiv, BOSTON_PLAT_MMCMDIV_INPUT) * 1000000;
|
||||
mul = ext_field(mmcmdiv, BOSTON_PLAT_MMCMDIV_MUL);
|
||||
|
||||
sys_div = ext_field(mmcmdiv, BOSTON_PLAT_MMCMDIV_CLK0DIV);
|
||||
sys_freq = mult_frac(in_freq, mul, sys_div);
|
||||
|
||||
cpu_div = ext_field(mmcmdiv, BOSTON_PLAT_MMCMDIV_CLK1DIV);
|
||||
cpu_freq = mult_frac(in_freq, mul, cpu_div);
|
||||
|
||||
onecell = kzalloc(sizeof(*onecell) +
|
||||
(BOSTON_CLK_COUNT * sizeof(struct clk_hw *)),
|
||||
GFP_KERNEL);
|
||||
if (!onecell)
|
||||
return;
|
||||
|
||||
onecell->num = BOSTON_CLK_COUNT;
|
||||
|
||||
hw = clk_hw_register_fixed_rate(NULL, "input", NULL, 0, in_freq);
|
||||
if (IS_ERR(hw)) {
|
||||
pr_err("failed to register input clock: %ld\n", PTR_ERR(hw));
|
||||
return;
|
||||
}
|
||||
onecell->hws[BOSTON_CLK_INPUT] = hw;
|
||||
|
||||
hw = clk_hw_register_fixed_rate(NULL, "sys", "input", 0, sys_freq);
|
||||
if (IS_ERR(hw)) {
|
||||
pr_err("failed to register sys clock: %ld\n", PTR_ERR(hw));
|
||||
return;
|
||||
}
|
||||
onecell->hws[BOSTON_CLK_SYS] = hw;
|
||||
|
||||
hw = clk_hw_register_fixed_rate(NULL, "cpu", "input", 0, cpu_freq);
|
||||
if (IS_ERR(hw)) {
|
||||
pr_err("failed to register cpu clock: %ld\n", PTR_ERR(hw));
|
||||
return;
|
||||
}
|
||||
onecell->hws[BOSTON_CLK_CPU] = hw;
|
||||
|
||||
err = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, onecell);
|
||||
if (err)
|
||||
pr_err("failed to add DT provider: %d\n", err);
|
||||
}
|
||||
|
||||
/*
|
||||
* Use CLK_OF_DECLARE so that this driver is probed early enough to provide the
|
||||
* CPU frequency for use with the GIC or cop0 counters/timers.
|
||||
*/
|
||||
CLK_OF_DECLARE(clk_boston, "img,boston-clock", clk_boston_setup);
|
Reference in New Issue
Block a user