mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
Driver updates for ARM SoCs. A slew of changes this release cycle. The reset driver tree, that we merge through arm-soc for historical reasons, is also sizable this time around. Among the changes: - clps711x: Treewide changes to compatible strings, merged here for simplicity. - Qualcomm: SCM firmware driver cleanups, move to platform driver - ux500: Major cleanups, removal of old mach-specific infrastructure. - Atmel external bus memory driver - Move of brcmstb platform to the rest of bcm - PMC driver updates for tegra, various fixes and improvements - Samsung platform driver updates to support 64-bit Exynos platforms - Reset controller cleanups moving to devm_reset_controller_register() APIs - Reset controller driver for Amlogic Meson - Reset controller driver for Hisilicon hi6220 - ARM SCPI power domain support -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXnm1XAAoJEIwa5zzehBx35lcP/ApuQarIXeZCQZtjlUBV9McW o3o7FhKFHePmEPeoYCvVeK5D8NykTkQv3WpnCknoxPJzxGJF7jbPWQJcVnXfKOXD kTcyIK15WL2HHtSE3lYyLfyUPz8AbJyRt0l0cxgcg6jvo+uzlWooNz1y78rLIYzg UwRssj7OiHv4dsyYRHZIsjnB8gMWw8rYMk154gP2xy6MnNXXzzOVVnOiVqxSZBm+ EgIIcROMOqkkHuFlClMYKluIgrmgz1Ypjf+FuAg7dqXZd+TGRrmGXeI7SkGThfLu nyvY3N18NViNu7xOUkI9zg7+ifyYM8Si9ylalSICSJdIAxZfiwFqFaLJvVWKU1rY rBOBjKckQI0/X9WYusFNFHcijhIFV8/FgGAnVRRMPdvlCss7Zp03C9mR4AEhmKMX rLG49x81hU1C+LftC59ml3iB8dhZrrRkbxNHjLFHVGWNrKMrmJKa8JhXGRAoNM+u LRauiuJZatqvLfISNvpfcoW2EashVoU3f+uC8ymT3QCyME3wZm0t7T4tllxhMfBl sOgJqNkTKDmPLofwm/dASiLML7ZF1WePScrFyOACnj9K4mUD+OaCnowtWoQPu0eI aNmT84oosJ2S9F/iUDPtFHXdzQ+1QPPfSiQ9FXMoauciVq/2F+pqq68yYgqoxFOG vmkmG2YM4Wyq43u0BONR =O8+y -----END PGP SIGNATURE----- Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC driver updates from Olof Johansson: "Driver updates for ARM SoCs. A slew of changes this release cycle. The reset driver tree, that we merge through arm-soc for historical reasons, is also sizable this time around. Among the changes: - clps711x: Treewide changes to compatible strings, merged here for simplicity. - Qualcomm: SCM firmware driver cleanups, move to platform driver - ux500: Major cleanups, removal of old mach-specific infrastructure. - Atmel external bus memory driver - Move of brcmstb platform to the rest of bcm - PMC driver updates for tegra, various fixes and improvements - Samsung platform driver updates to support 64-bit Exynos platforms - Reset controller cleanups moving to devm_reset_controller_register() APIs - Reset controller driver for Amlogic Meson - Reset controller driver for Hisilicon hi6220 - ARM SCPI power domain support" * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (100 commits) ARM: ux500: consolidate base platform files ARM: ux500: move soc_id driver to drivers/soc ARM: ux500: call ux500_setup_id later ARM: ux500: consolidate soc_device code in id.c ARM: ux500: remove cpu_is_u* helpers ARM: ux500: use CLK_OF_DECLARE() ARM: ux500: move l2x0 init to .init_irq mfd: db8500 stop passing around platform data ASoC: ab8500-codec: remove platform data based probe ARM: ux500: move ab8500_regulator_plat_data into driver ARM: ux500: remove unused regulator data soc: raspberrypi-power: add CONFIG_OF dependency firmware: scpi: add CONFIG_OF dependency video: clps711x-fb: Changing the compatibility string to match with the smallest supported chip input: clps711x-keypad: Changing the compatibility string to match with the smallest supported chip pwm: clps711x: Changing the compatibility string to match with the smallest supported chip serial: clps711x: Changing the compatibility string to match with the smallest supported chip irqchip: clps711x: Changing the compatibility string to match with the smallest supported chip clocksource: clps711x: Changing the compatibility string to match with the smallest supported chip clk: clps711x: Changing the compatibility string to match with the smallest supported chip ...
123 lines
2.9 KiB
C
123 lines
2.9 KiB
C
/*
|
|
* Cirrus Logic CLPS711X clocksource driver
|
|
*
|
|
* Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru>
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/clockchips.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/io.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/sched_clock.h>
|
|
#include <linux/slab.h>
|
|
|
|
enum {
|
|
CLPS711X_CLKSRC_CLOCKSOURCE,
|
|
CLPS711X_CLKSRC_CLOCKEVENT,
|
|
};
|
|
|
|
static void __iomem *tcd;
|
|
|
|
static u64 notrace clps711x_sched_clock_read(void)
|
|
{
|
|
return ~readw(tcd);
|
|
}
|
|
|
|
static int __init _clps711x_clksrc_init(struct clk *clock, void __iomem *base)
|
|
{
|
|
unsigned long rate;
|
|
|
|
if (!base)
|
|
return -ENOMEM;
|
|
if (IS_ERR(clock))
|
|
return PTR_ERR(clock);
|
|
|
|
rate = clk_get_rate(clock);
|
|
|
|
tcd = base;
|
|
|
|
clocksource_mmio_init(tcd, "clps711x-clocksource", rate, 300, 16,
|
|
clocksource_mmio_readw_down);
|
|
|
|
sched_clock_register(clps711x_sched_clock_read, 16, rate);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static irqreturn_t clps711x_timer_interrupt(int irq, void *dev_id)
|
|
{
|
|
struct clock_event_device *evt = dev_id;
|
|
|
|
evt->event_handler(evt);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static int __init _clps711x_clkevt_init(struct clk *clock, void __iomem *base,
|
|
unsigned int irq)
|
|
{
|
|
struct clock_event_device *clkevt;
|
|
unsigned long rate;
|
|
|
|
if (!irq)
|
|
return -EINVAL;
|
|
if (!base)
|
|
return -ENOMEM;
|
|
if (IS_ERR(clock))
|
|
return PTR_ERR(clock);
|
|
|
|
clkevt = kzalloc(sizeof(*clkevt), GFP_KERNEL);
|
|
if (!clkevt)
|
|
return -ENOMEM;
|
|
|
|
rate = clk_get_rate(clock);
|
|
|
|
/* Set Timer prescaler */
|
|
writew(DIV_ROUND_CLOSEST(rate, HZ), base);
|
|
|
|
clkevt->name = "clps711x-clockevent";
|
|
clkevt->rating = 300;
|
|
clkevt->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_C3STOP;
|
|
clkevt->cpumask = cpumask_of(0);
|
|
clockevents_config_and_register(clkevt, HZ, 0, 0);
|
|
|
|
return request_irq(irq, clps711x_timer_interrupt, IRQF_TIMER,
|
|
"clps711x-timer", clkevt);
|
|
}
|
|
|
|
void __init clps711x_clksrc_init(void __iomem *tc1_base, void __iomem *tc2_base,
|
|
unsigned int irq)
|
|
{
|
|
struct clk *tc1 = clk_get_sys("clps711x-timer.0", NULL);
|
|
struct clk *tc2 = clk_get_sys("clps711x-timer.1", NULL);
|
|
|
|
BUG_ON(_clps711x_clksrc_init(tc1, tc1_base));
|
|
BUG_ON(_clps711x_clkevt_init(tc2, tc2_base, irq));
|
|
}
|
|
|
|
#ifdef CONFIG_CLKSRC_OF
|
|
static int __init clps711x_timer_init(struct device_node *np)
|
|
{
|
|
unsigned int irq = irq_of_parse_and_map(np, 0);
|
|
struct clk *clock = of_clk_get(np, 0);
|
|
void __iomem *base = of_iomap(np, 0);
|
|
|
|
switch (of_alias_get_id(np, "timer")) {
|
|
case CLPS711X_CLKSRC_CLOCKSOURCE:
|
|
return _clps711x_clksrc_init(clock, base);
|
|
case CLPS711X_CLKSRC_CLOCKEVENT:
|
|
return _clps711x_clkevt_init(clock, base, irq);
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
CLOCKSOURCE_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init);
|
|
#endif
|