Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-27 21:07:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

clk: renesas: Pull Gen3 specific bits into separate header

Browse source 
Extract the macros specific to Gen3 clock into a separate header.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This commit is contained in:
Marek Vasut 2018-01-08 17:09:45 +01:00 • committed by Marek Vasut
parent 7c88556323
commit 58f1788f47
6 changed files with 64 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/clk/renesas/r8a7795-cpg-mssr.c
View file

@ -18,6 +18,7 @@
#include <dt-bindings/clock/r8a7795-cpg-mssr.h> #include <dt-bindings/clock/r8a7795-cpg-mssr.h>
#include "renesas-cpg-mssr.h" #include "renesas-cpg-mssr.h"
#include "rcar-gen3-cpg.h"
enum clk_ids { enum clk_ids {
/* Core Clock Outputs exported to DT */ /* Core Clock Outputs exported to DT */

1
drivers/clk/renesas/r8a7796-cpg-mssr.c
View file

@ -18,6 +18,7 @@
#include <dt-bindings/clock/r8a7796-cpg-mssr.h> #include <dt-bindings/clock/r8a7796-cpg-mssr.h>
#include "renesas-cpg-mssr.h" #include "renesas-cpg-mssr.h"
#include "rcar-gen3-cpg.h"
enum clk_ids { enum clk_ids {
/* Core Clock Outputs exported to DT */ /* Core Clock Outputs exported to DT */

1
drivers/clk/renesas/r8a77970-cpg-mssr.c
View file

@ -18,6 +18,7 @@
#include <dt-bindings/clock/r8a77970-cpg-mssr.h> #include <dt-bindings/clock/r8a77970-cpg-mssr.h>
#include "renesas-cpg-mssr.h" #include "renesas-cpg-mssr.h"
#include "rcar-gen3-cpg.h"
enum clk_ids { enum clk_ids {
/* Core Clock Outputs exported to DT */ /* Core Clock Outputs exported to DT */

1
drivers/clk/renesas/r8a77995-cpg-mssr.c
View file

@ -18,6 +18,7 @@
#include <dt-bindings/clock/r8a77995-cpg-mssr.h> #include <dt-bindings/clock/r8a77995-cpg-mssr.h>
#include "renesas-cpg-mssr.h" #include "renesas-cpg-mssr.h"
#include "rcar-gen3-cpg.h"
enum clk_ids { enum clk_ids {
/* Core Clock Outputs exported to DT */ /* Core Clock Outputs exported to DT */

60
drivers/clk/renesas/rcar-gen3-cpg.h Normal file
View file

@ -0,0 +1,60 @@
/*
* R-Car Gen3 Clock Pulse Generator
*
* Copyright (C) 2015-2016 Glider bvba
*
* 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; version 2 of the License.
*/
#ifndef __CLK_RENESAS_RCAR_GEN3_CPG_H__
#define __CLK_RENESAS_RCAR_GEN3_CPG_H__
enum rcar_gen3_clk_types {
CLK_TYPE_GEN3_MAIN = CLK_TYPE_CUSTOM,
CLK_TYPE_GEN3_PLL0,
CLK_TYPE_GEN3_PLL1,
CLK_TYPE_GEN3_PLL2,
CLK_TYPE_GEN3_PLL3,
CLK_TYPE_GEN3_PLL4,
CLK_TYPE_GEN3_SD,
CLK_TYPE_GEN3_RPC,
CLK_TYPE_GEN3_R,
CLK_TYPE_GEN3_PE,
CLK_TYPE_GEN3_Z2,
};
#define DEF_GEN3_SD(_name, _id, _parent, _offset) \
DEF_BASE(_name, _id, CLK_TYPE_GEN3_SD, _parent, .offset = _offset)
#define DEF_GEN3_RPC(_name, _id, _parent, _offset) \
DEF_BASE(_name, _id, CLK_TYPE_GEN3_RPC, _parent, .offset = _offset)
#define DEF_GEN3_PE(_name, _id, _parent_sscg, _div_sscg, _parent_clean, \
_div_clean) \
DEF_BASE(_name, _id, CLK_TYPE_FF, \
(_parent_clean), .div = (_div_clean), 1)
struct rcar_gen3_cpg_pll_config {
u8 extal_div;
u8 pll1_mult;
u8 pll1_div;
u8 pll3_mult;
u8 pll3_div;
};
#define CPG_RCKCR 0x240
struct gen3_clk_priv {
void __iomem *base;
struct cpg_mssr_info *info;
struct clk clk_extal;
struct clk clk_extalr;
const struct rcar_gen3_cpg_pll_config *cpg_pll_config;
};
int gen3_clk_probe(struct udevice *dev);
int gen3_clk_remove(struct udevice *dev);
extern const struct clk_ops gen3_clk_ops;
#endif

41
drivers/clk/renesas/renesas-cpg-mssr.h
View file

@ -29,14 +29,6 @@ struct cpg_mssr_info {
const void *(*get_pll_config)(const u32 cpg_mode); const void *(*get_pll_config)(const u32 cpg_mode);
}; };
struct gen3_clk_priv {
void __iomem *base;
struct cpg_mssr_info *info;
struct clk clk_extal;
struct clk clk_extalr;
const struct rcar_gen3_cpg_pll_config *cpg_pll_config;
};
/* /*
* Definitions of CPG Core Clocks * Definitions of CPG Core Clocks
* *
@ -75,14 +67,6 @@ enum clk_types {
DEF_TYPE(_name, _id, CLK_TYPE_IN) DEF_TYPE(_name, _id, CLK_TYPE_IN)
#define DEF_FIXED(_name, _id, _parent, _div, _mult) \ #define DEF_FIXED(_name, _id, _parent, _div, _mult) \
DEF_BASE(_name, _id, CLK_TYPE_FF, _parent, .div = _div, .mult = _mult) DEF_BASE(_name, _id, CLK_TYPE_FF, _parent, .div = _div, .mult = _mult)
#define DEF_GEN3_SD(_name, _id, _parent, _offset) \
DEF_BASE(_name, _id, CLK_TYPE_GEN3_SD, _parent, .offset = _offset)
#define DEF_GEN3_RPC(_name, _id, _parent, _offset) \
DEF_BASE(_name, _id, CLK_TYPE_GEN3_RPC, _parent, .offset = _offset)
#define DEF_GEN3_PE(_name, _id, _parent_sscg, _div_sscg, _parent_clean, \
_div_clean) \
DEF_BASE(_name, _id, CLK_TYPE_FF, \
(_parent_clean), .div = (_div_clean), 1)
/* /*
* Definitions of Module Clocks * Definitions of Module Clocks
@ -101,26 +85,6 @@ struct mssr_mod_clk {
#define DEF_MOD(_name, _mod, _parent...) \ #define DEF_MOD(_name, _mod, _parent...) \
{ .name = _name, .id = MOD_CLK_ID(_mod), .parent = _parent } { .name = _name, .id = MOD_CLK_ID(_mod), .parent = _parent }
enum rcar_gen3_clk_types {
CLK_TYPE_GEN3_MAIN = CLK_TYPE_CUSTOM,
CLK_TYPE_GEN3_PLL0,
CLK_TYPE_GEN3_PLL1,
CLK_TYPE_GEN3_PLL2,
CLK_TYPE_GEN3_PLL3,
CLK_TYPE_GEN3_PLL4,
CLK_TYPE_GEN3_SD,
CLK_TYPE_GEN3_RPC,
CLK_TYPE_GEN3_R,
CLK_TYPE_GEN3_PE,
CLK_TYPE_GEN3_Z2,
};
struct rcar_gen3_cpg_pll_config {
unsigned int extal_div;
unsigned int pll1_mult;
unsigned int pll3_mult;
};
struct mstp_stop_table { struct mstp_stop_table {
u32 dis; u32 dis;
u32 en; u32 en;
@ -129,9 +93,4 @@ struct mstp_stop_table {
#define TSTR0 0x04 #define TSTR0 0x04
#define TSTR0_STR0 BIT(0) #define TSTR0_STR0 BIT(0)
int gen3_clk_probe(struct udevice *dev);
int gen3_clk_remove(struct udevice *dev);
extern const struct clk_ops gen3_clk_ops;
#endif /* __DRIVERS_CLK_RENESAS_CPG_MSSR__ */ #endif /* __DRIVERS_CLK_RENESAS_CPG_MSSR__ */