mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
ARM: SoC driver updates for v4.8
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 ...
This commit is contained in:
commit
43a0a98aa8
140 changed files with 4776 additions and 2641 deletions
|
|
@ -184,5 +184,5 @@ static void __init clps711x_clk_init_dt(struct device_node *np)
|
|||
of_clk_add_provider(np, of_clk_src_onecell_get,
|
||||
&clps711x_clk->clk_data);
|
||||
}
|
||||
CLK_OF_DECLARE(clps711x, "cirrus,clps711x-clk", clps711x_clk_init_dt);
|
||||
CLK_OF_DECLARE(clps711x, "cirrus,ep7209-clk", clps711x_clk_init_dt);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
#include <linux/of_address.h>
|
||||
#include <linux/clk-provider.h>
|
||||
#include <linux/mfd/dbx500-prcmu.h>
|
||||
#include <linux/platform_data/clk-ux500.h>
|
||||
#include "clk.h"
|
||||
|
||||
#define PRCC_NUM_PERIPH_CLUSTERS 6
|
||||
|
|
@ -48,11 +47,6 @@ static struct clk *ux500_twocell_get(struct of_phandle_args *clkspec,
|
|||
return PRCC_SHOW(clk_data, base, bit);
|
||||
}
|
||||
|
||||
static const struct of_device_id u8500_clk_of_match[] = {
|
||||
{ .compatible = "stericsson,u8500-clks", },
|
||||
{ },
|
||||
};
|
||||
|
||||
/* CLKRST4 is missing making it hard to index things */
|
||||
enum clkrst_index {
|
||||
CLKRST1_INDEX = 0,
|
||||
|
|
@ -63,22 +57,15 @@ enum clkrst_index {
|
|||
CLKRST_MAX,
|
||||
};
|
||||
|
||||
void u8500_clk_init(void)
|
||||
static void u8500_clk_init(struct device_node *np)
|
||||
{
|
||||
struct prcmu_fw_version *fw_version;
|
||||
struct device_node *np = NULL;
|
||||
struct device_node *child = NULL;
|
||||
const char *sgaclk_parent = NULL;
|
||||
struct clk *clk, *rtc_clk, *twd_clk;
|
||||
u32 bases[CLKRST_MAX];
|
||||
int i;
|
||||
|
||||
if (of_have_populated_dt())
|
||||
np = of_find_matching_node(NULL, u8500_clk_of_match);
|
||||
if (!np) {
|
||||
pr_err("Either DT or U8500 Clock node not found\n");
|
||||
return;
|
||||
}
|
||||
for (i = 0; i < ARRAY_SIZE(bases); i++) {
|
||||
struct resource r;
|
||||
|
||||
|
|
@ -573,3 +560,4 @@ void u8500_clk_init(void)
|
|||
of_clk_add_provider(child, of_clk_src_simple_get, twd_clk);
|
||||
}
|
||||
}
|
||||
CLK_OF_DECLARE(u8500_clks, "stericsson,u8500-clks", u8500_clk_init);
|
||||
|
|
|
|||
|
|
@ -12,14 +12,8 @@
|
|||
#include <linux/clkdev.h>
|
||||
#include <linux/clk-provider.h>
|
||||
#include <linux/mfd/dbx500-prcmu.h>
|
||||
#include <linux/platform_data/clk-ux500.h>
|
||||
#include "clk.h"
|
||||
|
||||
static const struct of_device_id u8540_clk_of_match[] = {
|
||||
{ .compatible = "stericsson,u8540-clks", },
|
||||
{ }
|
||||
};
|
||||
|
||||
/* CLKRST4 is missing making it hard to index things */
|
||||
enum clkrst_index {
|
||||
CLKRST1_INDEX = 0,
|
||||
|
|
@ -30,19 +24,12 @@ enum clkrst_index {
|
|||
CLKRST_MAX,
|
||||
};
|
||||
|
||||
void u8540_clk_init(void)
|
||||
static void u8540_clk_init(struct device_node *np)
|
||||
{
|
||||
struct clk *clk;
|
||||
struct device_node *np = NULL;
|
||||
u32 bases[CLKRST_MAX];
|
||||
int i;
|
||||
|
||||
if (of_have_populated_dt())
|
||||
np = of_find_matching_node(NULL, u8540_clk_of_match);
|
||||
if (!np) {
|
||||
pr_err("Either DT or U8540 Clock node not found\n");
|
||||
return;
|
||||
}
|
||||
for (i = 0; i < ARRAY_SIZE(bases); i++) {
|
||||
struct resource r;
|
||||
|
||||
|
|
@ -607,3 +594,4 @@ void u8540_clk_init(void)
|
|||
bases[CLKRST6_INDEX], BIT(0), CLK_SET_RATE_GATE);
|
||||
clk_register_clkdev(clk, NULL, "rng");
|
||||
}
|
||||
CLK_OF_DECLARE(u8540_clks, "stericsson,u8540-clks", u8540_clk_init);
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
|
||||
#include <linux/clk-provider.h>
|
||||
#include <linux/mfd/dbx500-prcmu.h>
|
||||
#include <linux/platform_data/clk-ux500.h>
|
||||
#include "clk.h"
|
||||
|
||||
void u9540_clk_init(void)
|
||||
static void u9540_clk_init(struct device_node *np)
|
||||
{
|
||||
/* register clocks here */
|
||||
}
|
||||
CLK_OF_DECLARE(u9540_clks, "stericsson,u9540-clks", u9540_clk_init);
|
||||
|
|
|
|||
Loading…
Reference in a new issue