Merge tag 'mac80211-for-net-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / clk / clk-bd718x7.c

diff --git a/drivers/clk/clk-bd718x7.c b/drivers/clk/clk-bd718x7.c
index 00926c5873909f657ad5f371ce817e211856d8f4..b52e8d6f660c4a9e71c4904331b285aa0077af7a 100644 (file)
--- a/drivers/clk/clk-bd718x7.c
+++ b/drivers/clk/clk-bd718x7.c
@@ -7,12 +7,25 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/mfd/rohm-bd718x7.h>
-#include <linux/mfd/rohm-bd70528.h>
+#include <linux/mfd/rohm-generic.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/regmap.h>
 
+/* clk control registers */
+/* BD70528 */
+#define BD70528_REG_OUT32K     0x2c
+/* BD71828 */
+#define BD71828_REG_OUT32K     0x4B
+/* BD71837 and BD71847 */
+#define BD718XX_REG_OUT32K     0x2E
+
+/*
+ * BD71837, BD71847, BD70528 and BD71828 all use bit [0] to clk output control
+ */
+#define CLK_OUT_EN_MASK                BIT(0)
+
+
 struct bd718xx_clk {
        struct clk_hw hw;
        u8 reg;
@@ -21,10 +34,8 @@ struct bd718xx_clk {
        struct rohm_regmap_dev *mfd;
 };
 
-static int bd71837_clk_set(struct clk_hw *hw, int status)
+static int bd71837_clk_set(struct bd718xx_clk *c, unsigned int status)
 {
-       struct bd718xx_clk *c = container_of(hw, struct bd718xx_clk, hw);
-
        return regmap_update_bits(c->mfd->regmap, c->reg, c->mask, status);
 }
 
@@ -33,14 +44,16 @@ static void bd71837_clk_disable(struct clk_hw *hw)
        int rv;
        struct bd718xx_clk *c = container_of(hw, struct bd718xx_clk, hw);
 
-       rv = bd71837_clk_set(hw, 0);
+       rv = bd71837_clk_set(c, 0);
        if (rv)
                dev_dbg(&c->pdev->dev, "Failed to disable 32K clk (%d)\n", rv);
 }
 
 static int bd71837_clk_enable(struct clk_hw *hw)
 {
-       return bd71837_clk_set(hw, 1);
+       struct bd718xx_clk *c = container_of(hw, struct bd718xx_clk, hw);
+
+       return bd71837_clk_set(c, 0xffffffff);
 }
 
 static int bd71837_clk_is_enabled(struct clk_hw *hw)
@@ -74,6 +87,7 @@ static int bd71837_clk_probe(struct platform_device *pdev)
                .name = "bd718xx-32k-out",
                .ops = &bd71837_clk_ops,
        };
+       enum rohm_chip_type chip = platform_get_device_id(pdev)->driver_data;
 
        c = devm_kzalloc(&pdev->dev, sizeof(*c), GFP_KERNEL);
        if (!c)
@@ -87,15 +101,19 @@ static int bd71837_clk_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "No parent clk found\n");
                return -EINVAL;
        }
-       switch (mfd->chip_type) {
+       switch (chip) {
        case ROHM_CHIP_TYPE_BD71837:
        case ROHM_CHIP_TYPE_BD71847:
                c->reg = BD718XX_REG_OUT32K;
-               c->mask = BD718XX_OUT32K_EN;
+               c->mask = CLK_OUT_EN_MASK;
+               break;
+       case ROHM_CHIP_TYPE_BD71828:
+               c->reg = BD71828_REG_OUT32K;
+               c->mask = CLK_OUT_EN_MASK;
                break;
        case ROHM_CHIP_TYPE_BD70528:
-               c->reg = BD70528_REG_CLK_OUT;
-               c->mask = BD70528_CLK_OUT_EN_MASK;
+               c->reg = BD70528_REG_OUT32K;
+               c->mask = CLK_OUT_EN_MASK;
                break;
        default:
                dev_err(&pdev->dev, "Unknown clk chip\n");
@@ -121,11 +139,21 @@ static int bd71837_clk_probe(struct platform_device *pdev)
        return rval;
 }
 
+static const struct platform_device_id bd718x7_clk_id[] = {
+       { "bd71837-clk", ROHM_CHIP_TYPE_BD71837 },
+       { "bd71847-clk", ROHM_CHIP_TYPE_BD71847 },
+       { "bd70528-clk", ROHM_CHIP_TYPE_BD70528 },
+       { "bd71828-clk", ROHM_CHIP_TYPE_BD71828 },
+       { },
+};
+MODULE_DEVICE_TABLE(platform, bd718x7_clk_id);
+
 static struct platform_driver bd71837_clk = {
        .driver = {
                .name = "bd718xx-clk",
        },
        .probe = bd71837_clk_probe,
+       .id_table = bd718x7_clk_id,
 };
 
 module_platform_driver(bd71837_clk);