Hisilicon HiX5HD2 clock updates for 3.18-v2
- Add I2C clocks - Add watchdog clocks - Add sd clocks - Add complex clock implementation to support sata, usb and ethernet -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJUJ3bFAAoJEGROujcbgXtLdJMP/3OV7vktoDknOi50sJPb4CRj qjGxQ7XcHLCwvzTdnTcorV3x8t8iNReaG2QiESVJA62criTJSxG9/rNK8N6z2233 X8VAZDBIRY2aa8T/jAwHQKTNspQTxIeaBxJ63IqFss3kfsQS9haQZoBAnFciiFLu 5qIrJilVRkpWbXst5XAYLfNy5bLzBJNjUcO8N6JrLI+0yE9vIIxcLtNuUBNAdqi1 hiNxeLIrKmQ4RTobZWCm2BuvW89NTgi1xf+hnLWq6F+e98auGvIoXOHZoF5X58pc eeI8e2r1TcnmcSR96zwesGUelUlfMXKJ7JM2GVKt1kCINyCFFKYGe3evTCRK0+8W 9t8NkJh43x30prcJUM4X8cv2P+tzUTRSgcJqDNqmdNPiaPo7f2QlolyeaO53o+I4 vGydbl0vawk1sHWWE4fRRPXlWK+BWV3Pd0XbLneU2QVlULKyJGGpWWtj4sG+B0oe HF7aelZwVWVy2VoUihZ9f2R3PW1f2MOMzkv25QvOpYlb3/rhjPNVu/+TsBnMbk+3 tf5vZpo7KoZ6AD7EwayhsJc3R0RGwsHx7V422cy6FLbQum0ILG9yWEvLGtzT6gkw Nt/F3LhDSfJbnFwGrW29aSYp3NTEXSS4rY3Y038VV1Apc1UhqK1RaR4uCFQUIHce PJO8lHp8gyTA/++yfM01 =Fqwn -----END PGP SIGNATURE----- Merge tag 'hix5hd2-clock-for-3.18-v2' of git://github.com/hisilicon/linux-hisi into clk-next Hisilicon HiX5HD2 clock updates for 3.18-v2 - Add I2C clocks - Add watchdog clocks - Add sd clocks - Add complex clock implementation to support sata, usb and ethernet
This commit is contained in:
Mike Turquette
commit
6e18ff26c2
|
|
@ -9,6 +9,8 @@
|
|||
|
||||
#include <linux/of_address.h>
|
||||
#include <dt-bindings/clock/hix5hd2-clock.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/delay.h>
|
||||
#include "clk.h"
|
||||
|
||||
static struct hisi_fixed_rate_clock hix5hd2_fixed_rate_clks[] __initdata = {
|
||||
|
|
@ -48,9 +50,9 @@ static const char *sfc_mux_p[] __initconst = {
|
|||
"24m", "150m", "200m", "100m", "75m", };
|
||||
static u32 sfc_mux_table[] = {0, 4, 5, 6, 7};
|
||||
|
||||
static const char *sdio1_mux_p[] __initconst = {
|
||||
static const char *sdio_mux_p[] __initconst = {
|
||||
"75m", "100m", "50m", "15m", };
|
||||
static u32 sdio1_mux_table[] = {0, 1, 2, 3};
|
||||
static u32 sdio_mux_table[] = {0, 1, 2, 3};
|
||||
|
||||
static const char *fephy_mux_p[] __initconst = { "25m", "125m"};
|
||||
static u32 fephy_mux_table[] = {0, 1};
|
||||
|
|
@ -59,28 +61,243 @@ static u32 fephy_mux_table[] = {0, 1};
|
|||
static struct hisi_mux_clock hix5hd2_mux_clks[] __initdata = {
|
||||
{ HIX5HD2_SFC_MUX, "sfc_mux", sfc_mux_p, ARRAY_SIZE(sfc_mux_p),
|
||||
CLK_SET_RATE_PARENT, 0x5c, 8, 3, 0, sfc_mux_table, },
|
||||
{ HIX5HD2_MMC_MUX, "mmc_mux", sdio1_mux_p, ARRAY_SIZE(sdio1_mux_p),
|
||||
CLK_SET_RATE_PARENT, 0xa0, 8, 2, 0, sdio1_mux_table, },
|
||||
{ HIX5HD2_MMC_MUX, "mmc_mux", sdio_mux_p, ARRAY_SIZE(sdio_mux_p),
|
||||
CLK_SET_RATE_PARENT, 0xa0, 8, 2, 0, sdio_mux_table, },
|
||||
{ HIX5HD2_SD_MUX, "sd_mux", sdio_mux_p, ARRAY_SIZE(sdio_mux_p),
|
||||
CLK_SET_RATE_PARENT, 0x9c, 8, 2, 0, sdio_mux_table, },
|
||||
{ HIX5HD2_FEPHY_MUX, "fephy_mux",
|
||||
fephy_mux_p, ARRAY_SIZE(fephy_mux_p),
|
||||
CLK_SET_RATE_PARENT, 0x120, 8, 2, 0, fephy_mux_table, },
|
||||
};
|
||||
|
||||
static struct hisi_gate_clock hix5hd2_gate_clks[] __initdata = {
|
||||
/*sfc*/
|
||||
/* sfc */
|
||||
{ HIX5HD2_SFC_CLK, "clk_sfc", "sfc_mux",
|
||||
CLK_SET_RATE_PARENT, 0x5c, 0, 0, },
|
||||
{ HIX5HD2_SFC_RST, "rst_sfc", "clk_sfc",
|
||||
CLK_SET_RATE_PARENT, 0x5c, 4, CLK_GATE_SET_TO_DISABLE, },
|
||||
/*sdio1*/
|
||||
/* sdio0 */
|
||||
{ HIX5HD2_SD_BIU_CLK, "clk_sd_biu", "200m",
|
||||
CLK_SET_RATE_PARENT, 0x9c, 0, 0, },
|
||||
{ HIX5HD2_SD_CIU_CLK, "clk_sd_ciu", "sd_mux",
|
||||
CLK_SET_RATE_PARENT, 0x9c, 1, 0, },
|
||||
{ HIX5HD2_SD_CIU_RST, "rst_sd_ciu", "clk_sd_ciu",
|
||||
CLK_SET_RATE_PARENT, 0x9c, 4, CLK_GATE_SET_TO_DISABLE, },
|
||||
/* sdio1 */
|
||||
{ HIX5HD2_MMC_BIU_CLK, "clk_mmc_biu", "200m",
|
||||
CLK_SET_RATE_PARENT, 0xa0, 0, 0, },
|
||||
{ HIX5HD2_MMC_CIU_CLK, "clk_mmc_ciu", "mmc_mux",
|
||||
CLK_SET_RATE_PARENT, 0xa0, 1, 0, },
|
||||
{ HIX5HD2_MMC_CIU_RST, "rst_mmc_ciu", "clk_mmc_ciu",
|
||||
CLK_SET_RATE_PARENT, 0xa0, 4, CLK_GATE_SET_TO_DISABLE, },
|
||||
/* gsf */
|
||||
{ HIX5HD2_FWD_BUS_CLK, "clk_fwd_bus", NULL, 0, 0xcc, 0, 0, },
|
||||
{ HIX5HD2_FWD_SYS_CLK, "clk_fwd_sys", "clk_fwd_bus", 0, 0xcc, 5, 0, },
|
||||
{ HIX5HD2_MAC0_PHY_CLK, "clk_fephy", "clk_fwd_sys",
|
||||
CLK_SET_RATE_PARENT, 0x120, 0, 0, },
|
||||
/* wdg0 */
|
||||
{ HIX5HD2_WDG0_CLK, "clk_wdg0", "24m",
|
||||
CLK_SET_RATE_PARENT, 0x178, 0, 0, },
|
||||
{ HIX5HD2_WDG0_RST, "rst_wdg0", "clk_wdg0",
|
||||
CLK_SET_RATE_PARENT, 0x178, 4, CLK_GATE_SET_TO_DISABLE, },
|
||||
/* I2C */
|
||||
{HIX5HD2_I2C0_CLK, "clk_i2c0", "100m",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 4, 0, },
|
||||
{HIX5HD2_I2C0_RST, "rst_i2c0", "clk_i2c0",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 5, CLK_GATE_SET_TO_DISABLE, },
|
||||
{HIX5HD2_I2C1_CLK, "clk_i2c1", "100m",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 8, 0, },
|
||||
{HIX5HD2_I2C1_RST, "rst_i2c1", "clk_i2c1",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 9, CLK_GATE_SET_TO_DISABLE, },
|
||||
{HIX5HD2_I2C2_CLK, "clk_i2c2", "100m",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 12, 0, },
|
||||
{HIX5HD2_I2C2_RST, "rst_i2c2", "clk_i2c2",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 13, CLK_GATE_SET_TO_DISABLE, },
|
||||
{HIX5HD2_I2C3_CLK, "clk_i2c3", "100m",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 16, 0, },
|
||||
{HIX5HD2_I2C3_RST, "rst_i2c3", "clk_i2c3",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 17, CLK_GATE_SET_TO_DISABLE, },
|
||||
{HIX5HD2_I2C4_CLK, "clk_i2c4", "100m",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 20, 0, },
|
||||
{HIX5HD2_I2C4_RST, "rst_i2c4", "clk_i2c4",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 21, CLK_GATE_SET_TO_DISABLE, },
|
||||
{HIX5HD2_I2C5_CLK, "clk_i2c5", "100m",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 0, 0, },
|
||||
{HIX5HD2_I2C5_RST, "rst_i2c5", "clk_i2c5",
|
||||
CLK_SET_RATE_PARENT, 0x06c, 1, CLK_GATE_SET_TO_DISABLE, },
|
||||
};
|
||||
|
||||
enum hix5hd2_clk_type {
|
||||
TYPE_COMPLEX,
|
||||
TYPE_ETHER,
|
||||
};
|
||||
|
||||
struct hix5hd2_complex_clock {
|
||||
const char *name;
|
||||
const char *parent_name;
|
||||
u32 id;
|
||||
u32 ctrl_reg;
|
||||
u32 ctrl_clk_mask;
|
||||
u32 ctrl_rst_mask;
|
||||
u32 phy_reg;
|
||||
u32 phy_clk_mask;
|
||||
u32 phy_rst_mask;
|
||||
enum hix5hd2_clk_type type;
|
||||
};
|
||||
|
||||
struct hix5hd2_clk_complex {
|
||||
struct clk_hw hw;
|
||||
u32 id;
|
||||
void __iomem *ctrl_reg;
|
||||
u32 ctrl_clk_mask;
|
||||
u32 ctrl_rst_mask;
|
||||
void __iomem *phy_reg;
|
||||
u32 phy_clk_mask;
|
||||
u32 phy_rst_mask;
|
||||
};
|
||||
|
||||
static struct hix5hd2_complex_clock hix5hd2_complex_clks[] __initdata = {
|
||||
{"clk_mac0", "clk_fephy", HIX5HD2_MAC0_CLK,
|
||||
0xcc, 0xa, 0x500, 0x120, 0, 0x10, TYPE_ETHER},
|
||||
{"clk_mac1", "clk_fwd_sys", HIX5HD2_MAC1_CLK,
|
||||
0xcc, 0x14, 0xa00, 0x168, 0x2, 0, TYPE_ETHER},
|
||||
{"clk_sata", NULL, HIX5HD2_SATA_CLK,
|
||||
0xa8, 0x1f, 0x300, 0xac, 0x1, 0x0, TYPE_COMPLEX},
|
||||
{"clk_usb", NULL, HIX5HD2_USB_CLK,
|
||||
0xb8, 0xff, 0x3f000, 0xbc, 0x7, 0x3f00, TYPE_COMPLEX},
|
||||
};
|
||||
|
||||
#define to_complex_clk(_hw) container_of(_hw, struct hix5hd2_clk_complex, hw)
|
||||
|
||||
static int clk_ether_prepare(struct clk_hw *hw)
|
||||
{
|
||||
struct hix5hd2_clk_complex *clk = to_complex_clk(hw);
|
||||
u32 val;
|
||||
|
||||
val = readl_relaxed(clk->ctrl_reg);
|
||||
val |= clk->ctrl_clk_mask | clk->ctrl_rst_mask;
|
||||
writel_relaxed(val, clk->ctrl_reg);
|
||||
val &= ~(clk->ctrl_rst_mask);
|
||||
writel_relaxed(val, clk->ctrl_reg);
|
||||
|
||||
val = readl_relaxed(clk->phy_reg);
|
||||
val |= clk->phy_clk_mask;
|
||||
val &= ~(clk->phy_rst_mask);
|
||||
writel_relaxed(val, clk->phy_reg);
|
||||
mdelay(10);
|
||||
|
||||
val &= ~(clk->phy_clk_mask);
|
||||
val |= clk->phy_rst_mask;
|
||||
writel_relaxed(val, clk->phy_reg);
|
||||
mdelay(10);
|
||||
|
||||
val |= clk->phy_clk_mask;
|
||||
val &= ~(clk->phy_rst_mask);
|
||||
writel_relaxed(val, clk->phy_reg);
|
||||
mdelay(30);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void clk_ether_unprepare(struct clk_hw *hw)
|
||||
{
|
||||
struct hix5hd2_clk_complex *clk = to_complex_clk(hw);
|
||||
u32 val;
|
||||
|
||||
val = readl_relaxed(clk->ctrl_reg);
|
||||
val &= ~(clk->ctrl_clk_mask);
|
||||
writel_relaxed(val, clk->ctrl_reg);
|
||||
}
|
||||
|
||||
static struct clk_ops clk_ether_ops = {
|
||||
.prepare = clk_ether_prepare,
|
||||
.unprepare = clk_ether_unprepare,
|
||||
};
|
||||
|
||||
static int clk_complex_enable(struct clk_hw *hw)
|
||||
{
|
||||
struct hix5hd2_clk_complex *clk = to_complex_clk(hw);
|
||||
u32 val;
|
||||
|
||||
val = readl_relaxed(clk->ctrl_reg);
|
||||
val |= clk->ctrl_clk_mask;
|
||||
val &= ~(clk->ctrl_rst_mask);
|
||||
writel_relaxed(val, clk->ctrl_reg);
|
||||
|
||||
val = readl_relaxed(clk->phy_reg);
|
||||
val |= clk->phy_clk_mask;
|
||||
val &= ~(clk->phy_rst_mask);
|
||||
writel_relaxed(val, clk->phy_reg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void clk_complex_disable(struct clk_hw *hw)
|
||||
{
|
||||
struct hix5hd2_clk_complex *clk = to_complex_clk(hw);
|
||||
u32 val;
|
||||
|
||||
val = readl_relaxed(clk->ctrl_reg);
|
||||
val |= clk->ctrl_rst_mask;
|
||||
val &= ~(clk->ctrl_clk_mask);
|
||||
writel_relaxed(val, clk->ctrl_reg);
|
||||
|
||||
val = readl_relaxed(clk->phy_reg);
|
||||
val |= clk->phy_rst_mask;
|
||||
val &= ~(clk->phy_clk_mask);
|
||||
writel_relaxed(val, clk->phy_reg);
|
||||
}
|
||||
|
||||
static struct clk_ops clk_complex_ops = {
|
||||
.enable = clk_complex_enable,
|
||||
.disable = clk_complex_disable,
|
||||
};
|
||||
|
||||
void __init hix5hd2_clk_register_complex(struct hix5hd2_complex_clock *clks,
|
||||
int nums, struct hisi_clock_data *data)
|
||||
{
|
||||
void __iomem *base = data->base;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < nums; i++) {
|
||||
struct hix5hd2_clk_complex *p_clk;
|
||||
struct clk *clk;
|
||||
struct clk_init_data init;
|
||||
|
||||
p_clk = kzalloc(sizeof(*p_clk), GFP_KERNEL);
|
||||
if (!p_clk)
|
||||
return;
|
||||
|
||||
init.name = clks[i].name;
|
||||
if (clks[i].type == TYPE_ETHER)
|
||||
init.ops = &clk_ether_ops;
|
||||
else
|
||||
init.ops = &clk_complex_ops;
|
||||
|
||||
init.flags = CLK_IS_BASIC;
|
||||
init.parent_names =
|
||||
(clks[i].parent_name ? &clks[i].parent_name : NULL);
|
||||
init.num_parents = (clks[i].parent_name ? 1 : 0);
|
||||
|
||||
p_clk->ctrl_reg = base + clks[i].ctrl_reg;
|
||||
p_clk->ctrl_clk_mask = clks[i].ctrl_clk_mask;
|
||||
p_clk->ctrl_rst_mask = clks[i].ctrl_rst_mask;
|
||||
p_clk->phy_reg = base + clks[i].phy_reg;
|
||||
p_clk->phy_clk_mask = clks[i].phy_clk_mask;
|
||||
p_clk->phy_rst_mask = clks[i].phy_rst_mask;
|
||||
p_clk->hw.init = &init;
|
||||
|
||||
clk = clk_register(NULL, &p_clk->hw);
|
||||
if (IS_ERR(clk)) {
|
||||
kfree(p_clk);
|
||||
pr_err("%s: failed to register clock %s\n",
|
||||
__func__, clks[i].name);
|
||||
continue;
|
||||
}
|
||||
|
||||
data->clk_data.clks[clks[i].id] = clk;
|
||||
}
|
||||
}
|
||||
|
||||
static void __init hix5hd2_clk_init(struct device_node *np)
|
||||
{
|
||||
struct hisi_clock_data *clk_data;
|
||||
|
|
@ -96,6 +313,9 @@ static void __init hix5hd2_clk_init(struct device_node *np)
|
|||
clk_data);
|
||||
hisi_clk_register_gate(hix5hd2_gate_clks,
|
||||
ARRAY_SIZE(hix5hd2_gate_clks), clk_data);
|
||||
hix5hd2_clk_register_complex(hix5hd2_complex_clks,
|
||||
ARRAY_SIZE(hix5hd2_complex_clks),
|
||||
clk_data);
|
||||
}
|
||||
|
||||
CLK_OF_DECLARE(hix5hd2_clk, "hisilicon,hix5hd2-clock", hix5hd2_clk_init);
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
#define HIX5HD2_SFC_MUX 64
|
||||
#define HIX5HD2_MMC_MUX 65
|
||||
#define HIX5HD2_FEPHY_MUX 66
|
||||
#define HIX5HD2_SD_MUX 67
|
||||
|
||||
/* gate clocks */
|
||||
#define HIX5HD2_SFC_RST 128
|
||||
|
|
@ -53,6 +54,32 @@
|
|||
#define HIX5HD2_MMC_CIU_CLK 130
|
||||
#define HIX5HD2_MMC_BIU_CLK 131
|
||||
#define HIX5HD2_MMC_CIU_RST 132
|
||||
#define HIX5HD2_FWD_BUS_CLK 133
|
||||
#define HIX5HD2_FWD_SYS_CLK 134
|
||||
#define HIX5HD2_MAC0_PHY_CLK 135
|
||||
#define HIX5HD2_SD_CIU_CLK 136
|
||||
#define HIX5HD2_SD_BIU_CLK 137
|
||||
#define HIX5HD2_SD_CIU_RST 138
|
||||
#define HIX5HD2_WDG0_CLK 139
|
||||
#define HIX5HD2_WDG0_RST 140
|
||||
#define HIX5HD2_I2C0_CLK 141
|
||||
#define HIX5HD2_I2C0_RST 142
|
||||
#define HIX5HD2_I2C1_CLK 143
|
||||
#define HIX5HD2_I2C1_RST 144
|
||||
#define HIX5HD2_I2C2_CLK 145
|
||||
#define HIX5HD2_I2C2_RST 146
|
||||
#define HIX5HD2_I2C3_CLK 147
|
||||
#define HIX5HD2_I2C3_RST 148
|
||||
#define HIX5HD2_I2C4_CLK 149
|
||||
#define HIX5HD2_I2C4_RST 150
|
||||
#define HIX5HD2_I2C5_CLK 151
|
||||
#define HIX5HD2_I2C5_RST 152
|
||||
|
||||
/* complex */
|
||||
#define HIX5HD2_MAC0_CLK 192
|
||||
#define HIX5HD2_MAC1_CLK 193
|
||||
#define HIX5HD2_SATA_CLK 194
|
||||
#define HIX5HD2_USB_CLK 195
|
||||
|
||||
#define HIX5HD2_NR_CLKS 256
|
||||
#endif /* __DTS_HIX5HD2_CLOCK_H */
|
||||
|
|
|
|||
Loading…
Reference in New Issue