clk/qcom: use offsets for RCG registers

The RCG registers always have the same offsets, so only store the base
CMD register address and calculate the others relative to that.

Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>

diff --git a/drivers/clk/qcom/clock-apq8016.c b/drivers/clk/qcom/clock-apq8016.c
index e6647f7c41dde84869540ec3f378e8e8f7c9666d..5a5868169c8979d667a2f4cd929078c9de60f7b4 100644 (file)
--- a/drivers/clk/qcom/clock-apq8016.c
+++ b/drivers/clk/qcom/clock-apq8016.c
@@ -23,11 +23,7 @@
 #define APCS_CLOCK_BRANCH_ENA_VOTE (0x45004)
 
 #define SDCC_BCR(n)                    ((n * 0x1000) + 0x41000)
-#define SDCC_CMD_RCGR(n)               ((n * 0x1000) + 0x41004)
-#define SDCC_CFG_RCGR(n)               ((n * 0x1000) + 0x41008)
-#define SDCC_M(n)                      ((n * 0x1000) + 0x4100C)
-#define SDCC_N(n)                      ((n * 0x1000) + 0x41010)
-#define SDCC_D(n)                      ((n * 0x1000) + 0x41014)
+#define SDCC_CMD_RCGR(n)               (((n + 1) * 0x1000) + 0x41004)
 #define SDCC_APPS_CBCR(n)              ((n * 0x1000) + 0x41018)
 #define SDCC_AHB_CBCR(n)               ((n * 0x1000) + 0x4101C)
 
@@ -38,31 +34,10 @@
 #define BLSP1_UART2_BCR                        (0x3028)
 #define BLSP1_UART2_APPS_CBCR          (0x302C)
 #define BLSP1_UART2_APPS_CMD_RCGR      (0x3034)
-#define BLSP1_UART2_APPS_CFG_RCGR      (0x3038)
-#define BLSP1_UART2_APPS_M             (0x303C)
-#define BLSP1_UART2_APPS_N             (0x3040)
-#define BLSP1_UART2_APPS_D             (0x3044)
 
 /* GPLL0 clock control registers */
 #define GPLL0_STATUS_ACTIVE BIT(17)
 
-static const struct bcr_regs sdc_regs[] = {
-       {
-       .cfg_rcgr = SDCC_CFG_RCGR(1),
-       .cmd_rcgr = SDCC_CMD_RCGR(1),
-       .M = SDCC_M(1),
-       .N = SDCC_N(1),
-       .D = SDCC_D(1),
-       },
-       {
-       .cfg_rcgr = SDCC_CFG_RCGR(2),
-       .cmd_rcgr = SDCC_CMD_RCGR(2),
-       .M = SDCC_M(2),
-       .N = SDCC_N(2),
-       .D = SDCC_D(2),
-       }
-};
-
 static struct pll_vote_clk gpll0_vote_clk = {
        .status = GPLL0_STATUS,
        .status_bit = GPLL0_STATUS_ACTIVE,
@@ -86,7 +61,7 @@ static int clk_init_sdc(struct msm_clk_priv *priv, int slot, uint rate)
 
        clk_enable_cbc(priv->base + SDCC_AHB_CBCR(slot));
        /* 800Mhz/div, gpll0 */
-       clk_rcg_set_rate_mnd(priv->base, &sdc_regs[slot], div, 0, 0,
+       clk_rcg_set_rate_mnd(priv->base, SDCC_CMD_RCGR(slot), div, 0, 0,
                             CFG_CLK_SRC_GPLL0, 8);
        clk_enable_gpll0(priv->base, &gpll0_vote_clk);
        clk_enable_cbc(priv->base + SDCC_APPS_CBCR(slot));
@@ -94,14 +69,6 @@ static int clk_init_sdc(struct msm_clk_priv *priv, int slot, uint rate)
        return rate;
 }
 
-static const struct bcr_regs uart2_regs = {
-       .cfg_rcgr = BLSP1_UART2_APPS_CFG_RCGR,
-       .cmd_rcgr = BLSP1_UART2_APPS_CMD_RCGR,
-       .M = BLSP1_UART2_APPS_M,
-       .N = BLSP1_UART2_APPS_N,
-       .D = BLSP1_UART2_APPS_D,
-};
-
 /* UART: 115200 */
 int apq8016_clk_init_uart(phys_addr_t base)
 {
@@ -109,7 +76,7 @@ int apq8016_clk_init_uart(phys_addr_t base)
        clk_enable_vote_clk(base, &gcc_blsp1_ahb_clk);
 
        /* 7372800 uart block clock @ GPLL0 */
-       clk_rcg_set_rate_mnd(base, &uart2_regs, 1, 144, 15625,
+       clk_rcg_set_rate_mnd(base, BLSP1_UART2_APPS_CMD_RCGR, 1, 144, 15625,
                             CFG_CLK_SRC_GPLL0, 16);
 
        /* Vote for gpll0 clock */

diff --git a/drivers/clk/qcom/clock-apq8096.c b/drivers/clk/qcom/clock-apq8096.c
index a4731613c5e0cdde672d5ba438fa367740e4230c..479f9771a46445e92aee194325193d403eb4f1a3 100644 (file)
--- a/drivers/clk/qcom/clock-apq8096.c
+++ b/drivers/clk/qcom/clock-apq8096.c
@@ -26,31 +26,15 @@
 #define SDCC2_APPS_CBCR                        (0x14004) /* branch control */
 #define SDCC2_AHB_CBCR                 (0x14008)
 #define SDCC2_CMD_RCGR                 (0x14010)
-#define SDCC2_CFG_RCGR                 (0x14014)
-#define SDCC2_M                                (0x14018)
-#define SDCC2_N                                (0x1401C)
-#define SDCC2_D                                (0x14020)
 
 #define BLSP2_AHB_CBCR                 (0x25004)
 #define BLSP2_UART2_APPS_CBCR          (0x29004)
 #define BLSP2_UART2_APPS_CMD_RCGR      (0x2900C)
-#define BLSP2_UART2_APPS_CFG_RCGR      (0x29010)
-#define BLSP2_UART2_APPS_M             (0x29014)
-#define BLSP2_UART2_APPS_N             (0x29018)
-#define BLSP2_UART2_APPS_D             (0x2901C)
 
 /* GPLL0 clock control registers */
 #define GPLL0_STATUS_ACTIVE            BIT(30)
 #define APCS_GPLL_ENA_VOTE_GPLL0       BIT(0)
 
-static const struct bcr_regs sdc_regs = {
-       .cfg_rcgr = SDCC2_CFG_RCGR,
-       .cmd_rcgr = SDCC2_CMD_RCGR,
-       .M = SDCC2_M,
-       .N = SDCC2_N,
-       .D = SDCC2_D,
-};
-
 static const struct pll_vote_clk gpll0_vote_clk = {
        .status = GPLL0_STATUS,
        .status_bit = GPLL0_STATUS_ACTIVE,
@@ -69,7 +53,7 @@ static int clk_init_sdc(struct msm_clk_priv *priv, uint rate)
        int div = 5;
 
        clk_enable_cbc(priv->base + SDCC2_AHB_CBCR);
-       clk_rcg_set_rate_mnd(priv->base, &sdc_regs, div, 0, 0,
+       clk_rcg_set_rate_mnd(priv->base, SDCC2_CMD_RCGR, div, 0, 0,
                             CFG_CLK_SRC_GPLL0, 8);
        clk_enable_gpll0(priv->base, &gpll0_vote_clk);
        clk_enable_cbc(priv->base + SDCC2_APPS_CBCR);
@@ -77,21 +61,13 @@ static int clk_init_sdc(struct msm_clk_priv *priv, uint rate)
        return rate;
 }
 
-static const struct bcr_regs uart2_regs = {
-       .cfg_rcgr = BLSP2_UART2_APPS_CFG_RCGR,
-       .cmd_rcgr = BLSP2_UART2_APPS_CMD_RCGR,
-       .M = BLSP2_UART2_APPS_M,
-       .N = BLSP2_UART2_APPS_N,
-       .D = BLSP2_UART2_APPS_D,
-};
-
 static int clk_init_uart(struct msm_clk_priv *priv)
 {
        /* Enable AHB clock */
        clk_enable_vote_clk(priv->base, &gcc_blsp2_ahb_clk);
 
        /* 7372800 uart block clock @ GPLL0 */
-       clk_rcg_set_rate_mnd(priv->base, &uart2_regs, 1, 192, 15625,
+       clk_rcg_set_rate_mnd(priv->base, BLSP2_UART2_APPS_CMD_RCGR, 1, 192, 15625,
                             CFG_CLK_SRC_GPLL0, 16);
 
        /* Vote for gpll0 clock */

diff --git a/drivers/clk/qcom/clock-qcom.c b/drivers/clk/qcom/clock-qcom.c
index 6303dcbf846127370d1cf540b6edffbfd3d7a0ab..05e5ab7d094b8534c9c7c73171101301f8c242cb 100644 (file)
--- a/drivers/clk/qcom/clock-qcom.c
+++ b/drivers/clk/qcom/clock-qcom.c
@@ -104,7 +104,7 @@ void clk_bcr_update(phys_addr_t apps_cmd_rcgr)
  * root set rate for clocks with half integer and MND divider
  * div should be pre-calculated ((div * 2) - 1)
  */
-void clk_rcg_set_rate_mnd(phys_addr_t base, const struct bcr_regs *regs,
+void clk_rcg_set_rate_mnd(phys_addr_t base, uint32_t cmd_rcgr,
                          int div, int m, int n, int source, u8 mnd_width)
 {
        u32 cfg;
@@ -120,12 +120,12 @@ void clk_rcg_set_rate_mnd(phys_addr_t base, const struct bcr_regs *regs,
        debug("m %#x n %#x d %#x div %#x mask %#x\n", m_val, n_val, d_val, div, mask);
 
        /* Program MND values */
-       writel(m_val & mask, base + regs->M);
-       writel(n_val & mask, base + regs->N);
-       writel(d_val & mask, base + regs->D);
+       writel(m_val & mask, base + cmd_rcgr + RCG_M_REG);
+       writel(n_val & mask, base + cmd_rcgr + RCG_N_REG);
+       writel(d_val & mask, base + cmd_rcgr + RCG_D_REG);
 
        /* setup src select and divider */
-       cfg  = readl(base + regs->cfg_rcgr);
+       cfg  = readl(base + cmd_rcgr + RCG_CFG_REG);
        cfg &= ~(CFG_SRC_SEL_MASK | CFG_MODE_MASK | CFG_HW_CLK_CTRL_MASK |
                 CFG_SRC_DIV_MASK);
        cfg |= source & CFG_SRC_SEL_MASK; /* Select clock source */
@@ -136,20 +136,20 @@ void clk_rcg_set_rate_mnd(phys_addr_t base, const struct bcr_regs *regs,
        if (n && n != m)
                cfg |= CFG_MODE_DUAL_EDGE;
 
-       writel(cfg, base + regs->cfg_rcgr); /* Write new clock configuration */
+       writel(cfg, base + cmd_rcgr + RCG_CFG_REG); /* Write new clock configuration */
 
        /* Inform h/w to start using the new config. */
-       clk_bcr_update(base + regs->cmd_rcgr);
+       clk_bcr_update(base + cmd_rcgr);
 }
 
 /* root set rate for clocks with half integer and mnd_width=0 */
-void clk_rcg_set_rate(phys_addr_t base, const struct bcr_regs *regs, int div,
+void clk_rcg_set_rate(phys_addr_t base, uint32_t cmd_rcgr, int div,
                      int source)
 {
        u32 cfg;
 
        /* setup src select and divider */
-       cfg  = readl(base + regs->cfg_rcgr);
+       cfg  = readl(base + cmd_rcgr + RCG_CFG_REG);
        cfg &= ~(CFG_SRC_SEL_MASK | CFG_MODE_MASK | CFG_HW_CLK_CTRL_MASK);
        cfg |= source & CFG_CLK_SRC_MASK; /* Select clock source */
 
@@ -160,10 +160,10 @@ void clk_rcg_set_rate(phys_addr_t base, const struct bcr_regs *regs, int div,
        if (div)
                cfg |= (2 * div - 1) & CFG_SRC_DIV_MASK;
 
-       writel(cfg, base + regs->cfg_rcgr); /* Write new clock configuration */
+       writel(cfg, base + cmd_rcgr + RCG_CFG_REG); /* Write new clock configuration */
 
        /* Inform h/w to start using the new config. */
-       clk_bcr_update(base + regs->cmd_rcgr);
+       clk_bcr_update(base + cmd_rcgr);
 }
 
 const struct freq_tbl *qcom_find_freq(const struct freq_tbl *f, uint rate)

diff --git a/drivers/clk/qcom/clock-qcom.h b/drivers/clk/qcom/clock-qcom.h
index 12a1eaec2b2e0d43f4dd654a322e0417774c15a0..a7f833a4b6dd06bfbb4750ebe8101896fd7f34d9 100644 (file)
--- a/drivers/clk/qcom/clock-qcom.h
+++ b/drivers/clk/qcom/clock-qcom.h
@@ -12,6 +12,11 @@
 #define CFG_CLK_SRC_GPLL0_EVEN (6 << 8)
 #define CFG_CLK_SRC_MASK  (7 << 8)
 
+#define RCG_CFG_REG            0x4
+#define RCG_M_REG              0x8
+#define RCG_N_REG              0xc
+#define RCG_D_REG              0x10
+
 struct pll_vote_clk {
        uintptr_t status;
        int status_bit;
@@ -24,13 +29,6 @@ struct vote_clk {
        uintptr_t ena_vote;
        int vote_bit;
 };
-struct bcr_regs {
-       uintptr_t cfg_rcgr;
-       uintptr_t cmd_rcgr;
-       uintptr_t M;
-       uintptr_t N;
-       uintptr_t D;
-};
 
 struct freq_tbl {
        uint freq;
@@ -88,9 +86,9 @@ void clk_bcr_update(phys_addr_t apps_cmd_rgcr);
 void clk_enable_cbc(phys_addr_t cbcr);
 void clk_enable_vote_clk(phys_addr_t base, const struct vote_clk *vclk);
 const struct freq_tbl *qcom_find_freq(const struct freq_tbl *f, uint rate);
-void clk_rcg_set_rate_mnd(phys_addr_t base, const struct bcr_regs *regs,
+void clk_rcg_set_rate_mnd(phys_addr_t base, uint32_t cmd_rcgr,
                          int div, int m, int n, int source, u8 mnd_width);
-void clk_rcg_set_rate(phys_addr_t base, const struct bcr_regs *regs, int div,
+void clk_rcg_set_rate(phys_addr_t base, uint32_t cmd_rcgr, int div,
                      int source);
 
 static inline void qcom_gate_clk_en(const struct msm_clk_priv *priv, unsigned long id)

diff --git a/drivers/clk/qcom/clock-qcs404.c b/drivers/clk/qcom/clock-qcs404.c
index 958312b8884249e15dd50cf97689d375dd4ddca3..8a897a52bc00bf283b20c4d6dddcd2836e6a8da1 100644 (file)
--- a/drivers/clk/qcom/clock-qcs404.c
+++ b/drivers/clk/qcom/clock-qcs404.c
@@ -28,35 +28,22 @@
 #define BLSP1_UART2_BCR                        (0x3028)
 #define BLSP1_UART2_APPS_CBCR          (0x302C)
 #define BLSP1_UART2_APPS_CMD_RCGR      (0x3034)
-#define BLSP1_UART2_APPS_CFG_RCGR      (0x3038)
-#define BLSP1_UART2_APPS_M             (0x303C)
-#define BLSP1_UART2_APPS_N             (0x3040)
-#define BLSP1_UART2_APPS_D             (0x3044)
 
 /* I2C controller clock control registerss */
 #define BLSP1_QUP0_I2C_APPS_CBCR       (0x6028)
 #define BLSP1_QUP0_I2C_APPS_CMD_RCGR   (0x602C)
-#define BLSP1_QUP0_I2C_APPS_CFG_RCGR   (0x6030)
 #define BLSP1_QUP1_I2C_APPS_CBCR       (0x2008)
 #define BLSP1_QUP1_I2C_APPS_CMD_RCGR   (0x200C)
-#define BLSP1_QUP1_I2C_APPS_CFG_RCGR   (0x2010)
 #define BLSP1_QUP2_I2C_APPS_CBCR       (0x3010)
 #define BLSP1_QUP2_I2C_APPS_CMD_RCGR   (0x3000)
-#define BLSP1_QUP2_I2C_APPS_CFG_RCGR   (0x3004)
 #define BLSP1_QUP3_I2C_APPS_CBCR       (0x4020)
 #define BLSP1_QUP3_I2C_APPS_CMD_RCGR   (0x4000)
-#define BLSP1_QUP3_I2C_APPS_CFG_RCGR   (0x4004)
 #define BLSP1_QUP4_I2C_APPS_CBCR       (0x5020)
 #define BLSP1_QUP4_I2C_APPS_CMD_RCGR   (0x5000)
-#define BLSP1_QUP4_I2C_APPS_CFG_RCGR   (0x5004)
 
 /* SD controller clock control registers */
 #define SDCC_BCR(n)                    (((n) * 0x1000) + 0x41000)
-#define SDCC_CMD_RCGR(n)               (((n) * 0x1000) + 0x41004)
-#define SDCC_CFG_RCGR(n)               (((n) * 0x1000) + 0x41008)
-#define SDCC_M(n)                      (((n) * 0x1000) + 0x4100C)
-#define SDCC_N(n)                      (((n) * 0x1000) + 0x41010)
-#define SDCC_D(n)                      (((n) * 0x1000) + 0x41014)
+#define SDCC_CMD_RCGR(n)               (((n + 1) * 0x1000) + 0x41004)
 #define SDCC_APPS_CBCR(n)              (((n) * 0x1000) + 0x41018)
 #define SDCC_AHB_CBCR(n)               (((n) * 0x1000) + 0x4101C)
 
@@ -70,10 +57,6 @@
 #define USB30_MOCK_UTMI_CMD_RCGR       (0x3901C)
 #define USB30_MOCK_UTMI_CFG_RCGR       (0x39020)
 #define USB30_MASTER_CMD_RCGR          (0x39028)
-#define USB30_MASTER_CFG_RCGR          (0x3902C)
-#define USB30_MASTER_M                 (0x39030)
-#define USB30_MASTER_N                 (0x39034)
-#define USB30_MASTER_D                 (0x39038)
 #define USB2A_PHY_SLEEP_CBCR           (0x4102C)
 #define USB_HS_PHY_CFG_AHB_CBCR                (0x41030)
 
@@ -83,12 +66,7 @@
 #define ETH_SLAVE_AHB_CBCR             (0x4e00c)
 #define ETH_AXI_CBCR                   (0x4e010)
 #define EMAC_PTP_CMD_RCGR              (0x4e014)
-#define EMAC_PTP_CFG_RCGR              (0x4e018)
 #define EMAC_CMD_RCGR                  (0x4e01c)
-#define EMAC_CFG_RCGR                  (0x4e020)
-#define EMAC_M                         (0x4e024)
-#define EMAC_N                         (0x4e028)
-#define EMAC_D                         (0x4e02c)
 
 
 /* GPLL0 clock control registers */
@@ -103,22 +81,6 @@ static struct vote_clk gcc_blsp1_ahb_clk = {
        .vote_bit = BIT(10) | BIT(5) | BIT(4),
 };
 
-static const struct bcr_regs uart2_regs = {
-       .cfg_rcgr = BLSP1_UART2_APPS_CFG_RCGR,
-       .cmd_rcgr = BLSP1_UART2_APPS_CMD_RCGR,
-       .M = BLSP1_UART2_APPS_M,
-       .N = BLSP1_UART2_APPS_N,
-       .D = BLSP1_UART2_APPS_D,
-};
-
-static const struct bcr_regs sdc_regs = {
-       .cfg_rcgr = SDCC_CFG_RCGR(1),
-       .cmd_rcgr = SDCC_CMD_RCGR(1),
-       .M = SDCC_M(1),
-       .N = SDCC_N(1),
-       .D = SDCC_D(1),
-};
-
 static struct pll_vote_clk gpll0_vote_clk = {
        .status = GPLL0_STATUS,
        .status_bit = GPLL0_STATUS_ACTIVE,
@@ -133,60 +95,6 @@ static struct pll_vote_clk gpll1_vote_clk = {
        .vote_bit = BIT(1),
 };
 
-static const struct bcr_regs usb30_master_regs = {
-       .cfg_rcgr = USB30_MASTER_CFG_RCGR,
-       .cmd_rcgr = USB30_MASTER_CMD_RCGR,
-       .M = USB30_MASTER_M,
-       .N = USB30_MASTER_N,
-       .D = USB30_MASTER_D,
-};
-
-static const struct bcr_regs emac_regs = {
-       .cfg_rcgr = EMAC_CFG_RCGR,
-       .cmd_rcgr = EMAC_CMD_RCGR,
-       .M = EMAC_M,
-       .N = EMAC_N,
-       .D = EMAC_D,
-};
-
-static const struct bcr_regs emac_ptp_regs = {
-       .cfg_rcgr = EMAC_PTP_CFG_RCGR,
-       .cmd_rcgr = EMAC_PTP_CMD_RCGR,
-       .M = EMAC_M,
-       .N = EMAC_N,
-       .D = EMAC_D,
-};
-
-static const struct bcr_regs blsp1_qup0_i2c_apps_regs = {
-       .cmd_rcgr = BLSP1_QUP0_I2C_APPS_CMD_RCGR,
-       .cfg_rcgr = BLSP1_QUP0_I2C_APPS_CFG_RCGR,
-       /* mnd_width = 0 */
-};
-
-static const struct bcr_regs blsp1_qup1_i2c_apps_regs = {
-       .cmd_rcgr = BLSP1_QUP1_I2C_APPS_CMD_RCGR,
-       .cfg_rcgr = BLSP1_QUP1_I2C_APPS_CFG_RCGR,
-       /* mnd_width = 0 */
-};
-
-static const struct bcr_regs blsp1_qup2_i2c_apps_regs = {
-       .cmd_rcgr = BLSP1_QUP2_I2C_APPS_CMD_RCGR,
-       .cfg_rcgr = BLSP1_QUP2_I2C_APPS_CFG_RCGR,
-       /* mnd_width = 0 */
-};
-
-static const struct bcr_regs blsp1_qup3_i2c_apps_regs = {
-       .cmd_rcgr = BLSP1_QUP3_I2C_APPS_CMD_RCGR,
-       .cfg_rcgr = BLSP1_QUP3_I2C_APPS_CFG_RCGR,
-       /* mnd_width = 0 */
-};
-
-static const struct bcr_regs blsp1_qup4_i2c_apps_regs = {
-       .cmd_rcgr = BLSP1_QUP4_I2C_APPS_CMD_RCGR,
-       .cfg_rcgr = BLSP1_QUP4_I2C_APPS_CFG_RCGR,
-       /* mnd_width = 0 */
-};
-
 static ulong qcs404_clk_set_rate(struct clk *clk, ulong rate)
 {
        struct msm_clk_priv *priv = dev_get_priv(clk->dev);
@@ -194,29 +102,29 @@ static ulong qcs404_clk_set_rate(struct clk *clk, ulong rate)
        switch (clk->id) {
        case GCC_BLSP1_UART2_APPS_CLK:
                /* UART: 1843200Hz for a fixed 115200 baudrate (19200000 * (12/125)) */
-               clk_rcg_set_rate_mnd(priv->base, &uart2_regs, 0, 12, 125,
+               clk_rcg_set_rate_mnd(priv->base, BLSP1_UART2_APPS_CMD_RCGR, 0, 12, 125,
                                     CFG_CLK_SRC_CXO, 16);
                clk_enable_cbc(priv->base + BLSP1_UART2_APPS_CBCR);
                return 1843200;
        case GCC_SDCC1_APPS_CLK:
                /* SDCC1: 200MHz */
-               clk_rcg_set_rate_mnd(priv->base, &sdc_regs, 7, 0, 0,
+               clk_rcg_set_rate_mnd(priv->base, SDCC_CMD_RCGR(0), 7, 0, 0,
                                     CFG_CLK_SRC_GPLL0, 8);
                clk_enable_gpll0(priv->base, &gpll0_vote_clk);
                clk_enable_cbc(priv->base + SDCC_APPS_CBCR(1));
                return rate;
        case GCC_ETH_RGMII_CLK:
                if (rate == 250000000)
-                       clk_rcg_set_rate_mnd(priv->base, &emac_regs, 3, 0, 0,
+                       clk_rcg_set_rate_mnd(priv->base, EMAC_CMD_RCGR, 3, 0, 0,
                                             CFG_CLK_SRC_GPLL1, 8);
                else if (rate == 125000000)
-                       clk_rcg_set_rate_mnd(priv->base, &emac_regs, 7, 0, 0,
+                       clk_rcg_set_rate_mnd(priv->base, EMAC_CMD_RCGR, 7, 0, 0,
                                             CFG_CLK_SRC_GPLL1, 8);
                else if (rate == 50000000)
-                       clk_rcg_set_rate_mnd(priv->base, &emac_regs, 19, 0, 0,
+                       clk_rcg_set_rate_mnd(priv->base, EMAC_CMD_RCGR, 19, 0, 0,
                                             CFG_CLK_SRC_GPLL1, 8);
                else if (rate == 5000000)
-                       clk_rcg_set_rate_mnd(priv->base, &emac_regs, 3, 1, 50,
+                       clk_rcg_set_rate_mnd(priv->base, EMAC_CMD_RCGR, 3, 1, 50,
                                             CFG_CLK_SRC_GPLL1, 8);
                return rate;
        }
@@ -237,7 +145,7 @@ static int qcs404_clk_enable(struct clk *clk)
        switch (clk->id) {
        case GCC_USB30_MASTER_CLK:
                clk_enable_cbc(priv->base + USB30_MASTER_CBCR);
-               clk_rcg_set_rate_mnd(priv->base, &usb30_master_regs, 7, 0, 0,
+               clk_rcg_set_rate_mnd(priv->base, USB30_MASTER_CMD_RCGR, 7, 0, 0,
                                     CFG_CLK_SRC_GPLL0, 8);
                break;
        case GCC_SYS_NOC_USB3_CLK:
@@ -259,14 +167,14 @@ static int qcs404_clk_enable(struct clk *clk)
                /* SPEED_1000: freq -> 250MHz */
                clk_enable_cbc(priv->base + ETH_PTP_CBCR);
                clk_enable_gpll0(priv->base, &gpll1_vote_clk);
-               clk_rcg_set_rate_mnd(priv->base, &emac_ptp_regs, 3, 0, 0,
+               clk_rcg_set_rate_mnd(priv->base, EMAC_PTP_CMD_RCGR, 3, 0, 0,
                                     CFG_CLK_SRC_GPLL1, 8);
                break;
        case GCC_ETH_RGMII_CLK:
                /* SPEED_1000: freq -> 250MHz */
                clk_enable_cbc(priv->base + ETH_RGMII_CBCR);
                clk_enable_gpll0(priv->base, &gpll1_vote_clk);
-               clk_rcg_set_rate_mnd(priv->base, &emac_regs, 3, 0, 0,
+               clk_rcg_set_rate_mnd(priv->base, EMAC_CMD_RCGR, 3, 0, 0,
                                     CFG_CLK_SRC_GPLL1, 8);
                break;
        case GCC_ETH_SLAVE_AHB_CLK:
@@ -280,27 +188,27 @@ static int qcs404_clk_enable(struct clk *clk)
                break;
        case GCC_BLSP1_QUP0_I2C_APPS_CLK:
                clk_enable_cbc(priv->base + BLSP1_QUP0_I2C_APPS_CBCR);
-               clk_rcg_set_rate(priv->base, &blsp1_qup0_i2c_apps_regs, 0,
+               clk_rcg_set_rate(priv->base, BLSP1_QUP0_I2C_APPS_CMD_RCGR, 0,
                                 CFG_CLK_SRC_CXO);
                break;
        case GCC_BLSP1_QUP1_I2C_APPS_CLK:
                clk_enable_cbc(priv->base + BLSP1_QUP1_I2C_APPS_CBCR);
-               clk_rcg_set_rate(priv->base, &blsp1_qup1_i2c_apps_regs, 0,
+               clk_rcg_set_rate(priv->base, BLSP1_QUP1_I2C_APPS_CMD_RCGR, 0,
                                 CFG_CLK_SRC_CXO);
                break;
        case GCC_BLSP1_QUP2_I2C_APPS_CLK:
                clk_enable_cbc(priv->base + BLSP1_QUP2_I2C_APPS_CBCR);
-               clk_rcg_set_rate(priv->base, &blsp1_qup2_i2c_apps_regs, 0,
+               clk_rcg_set_rate(priv->base, BLSP1_QUP2_I2C_APPS_CMD_RCGR, 0,
                                 CFG_CLK_SRC_CXO);
                break;
        case GCC_BLSP1_QUP3_I2C_APPS_CLK:
                clk_enable_cbc(priv->base + BLSP1_QUP3_I2C_APPS_CBCR);
-               clk_rcg_set_rate(priv->base, &blsp1_qup3_i2c_apps_regs, 0,
+               clk_rcg_set_rate(priv->base, BLSP1_QUP3_I2C_APPS_CMD_RCGR, 0,
                                 CFG_CLK_SRC_CXO);
                break;
        case GCC_BLSP1_QUP4_I2C_APPS_CLK:
                clk_enable_cbc(priv->base + BLSP1_QUP4_I2C_APPS_CBCR);
-               clk_rcg_set_rate(priv->base, &blsp1_qup4_i2c_apps_regs, 0,
+               clk_rcg_set_rate(priv->base, BLSP1_QUP4_I2C_APPS_CMD_RCGR, 0,
                                 CFG_CLK_SRC_CXO);
                break;
        case GCC_SDCC1_AHB_CLK:

diff --git a/drivers/clk/qcom/clock-sdm845.c b/drivers/clk/qcom/clock-sdm845.c
index babd83119e2c0718ad02b3f838dc0f4d6b8fb4ec..ccb0cf245d33c75dd01c2822695b8b0c7858d633 100644 (file)
--- a/drivers/clk/qcom/clock-sdm845.c
+++ b/drivers/clk/qcom/clock-sdm845.c
@@ -19,13 +19,7 @@
 
 #include "clock-qcom.h"
 
-#define SE9_AHB_CBCR           0x25004
-#define SE9_UART_APPS_CBCR     0x29004
 #define SE9_UART_APPS_CMD_RCGR 0x18148
-#define SE9_UART_APPS_CFG_RCGR 0x1814C
-#define SE9_UART_APPS_M                0x18150
-#define SE9_UART_APPS_N                0x18154
-#define SE9_UART_APPS_D                0x18158
 
 static const struct freq_tbl ftbl_gcc_qupv3_wrap0_s0_clk_src[] = {
        F(7372800, CFG_CLK_SRC_GPLL0_EVEN, 1, 384, 15625),
@@ -46,14 +40,6 @@ static const struct freq_tbl ftbl_gcc_qupv3_wrap0_s0_clk_src[] = {
        { }
 };
 
-static const struct bcr_regs uart2_regs = {
-       .cfg_rcgr = SE9_UART_APPS_CFG_RCGR,
-       .cmd_rcgr = SE9_UART_APPS_CMD_RCGR,
-       .M = SE9_UART_APPS_M,
-       .N = SE9_UART_APPS_N,
-       .D = SE9_UART_APPS_D,
-};
-
 static ulong sdm845_clk_set_rate(struct clk *clk, ulong rate)
 {
        struct msm_clk_priv *priv = dev_get_priv(clk->dev);
@@ -62,7 +48,7 @@ static ulong sdm845_clk_set_rate(struct clk *clk, ulong rate)
        switch (clk->id) {
        case GCC_QUPV3_WRAP1_S1_CLK: /* UART9 */
                freq = qcom_find_freq(ftbl_gcc_qupv3_wrap0_s0_clk_src, rate);
-               clk_rcg_set_rate_mnd(priv->base, &uart2_regs,
+               clk_rcg_set_rate_mnd(priv->base, SE9_UART_APPS_CMD_RCGR,
                                     freq->pre_div, freq->m, freq->n, freq->src, 16);
                return freq->freq;
        default: