.. | .. |
---|
49 | 49 | }, |
---|
50 | 50 | }; |
---|
51 | 51 | |
---|
52 | | -static CLK_FIXED_FACTOR(r_ahb_clk, "r-ahb", "ar100", 1, 1, 0); |
---|
| 52 | +static CLK_FIXED_FACTOR_HW(r_ahb_clk, "r-ahb", &ar100_clk.common.hw, 1, 1, 0); |
---|
53 | 53 | |
---|
54 | | -static struct ccu_div r_apb1_clk = { |
---|
55 | | - .div = _SUNXI_CCU_DIV(0, 2), |
---|
56 | | - |
---|
57 | | - .common = { |
---|
58 | | - .reg = 0x00c, |
---|
59 | | - .hw.init = CLK_HW_INIT("r-apb1", |
---|
60 | | - "r-ahb", |
---|
61 | | - &ccu_div_ops, |
---|
62 | | - 0), |
---|
63 | | - }, |
---|
64 | | -}; |
---|
| 54 | +static SUNXI_CCU_M(r_apb1_clk, "r-apb1", "r-ahb", 0x00c, 0, 2, 0); |
---|
65 | 55 | |
---|
66 | 56 | static struct ccu_div r_apb2_clk = { |
---|
67 | 57 | .div = _SUNXI_CCU_DIV_FLAGS(8, 2, CLK_DIVIDER_POWER_OF_TWO), |
---|