Skip to contentSkip to conversation

mtd: rawnand: meson: fix the clock after discarding sd_emmc_c_clkc

PATCH In review Liang Yang 5 participants 13 messages Jan 6, 2022 – Jan 10, 2022

Subsystems (4)
lore
Share & tools
lore

Liang Yang

author maintainer
#0 lore raw

PATCH 1/1 mtd: rawnand: meson: fix the clock after discarding sd_emmc_c_clkc

Because EMMC and NAND have the same control clock register, so we implement a 'sd_emmc_c_clkc'. Previously DTS is defined as below:

	sd_emmc_c_clkc: mmc@7000 {
		compatible = "amlogic,meson-axg-mmc-clkc", "syscon";
		reg = <0x0 0x7000 0x0 0x800>;
	};

	nand-controller@7800 {
		......

		clocks = <&clkc CLKID_SD_EMMC_C>,
			<&sd_emmc_c_clkc CLKID_MMC_DIV>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_RX>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_TX>;
		clock-names = "core", "device", "rx", "tx";
		amlogic,mmc-syscon = <&sd_emmc_c_clkc>;

		......
	}

but in fact, above implementation is rejected. so now registering a nand_divider.

Change-Id Ibeb4c7ff886f5886aac4d6c664d7bbd1b1bcb997
---
 drivers/mtd/nand/raw/meson_nand.c | 88 +++++++++++++++++--------------
 1 file changed, 49 insertions(+), 39 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +49 -39
index ac3be92872d0..4472363059c2 100644
@@ -2,7 +2,7 @@
 /*
  * Amlogic Meson Nand Flash Controller Driver
  *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2018-2021 Amlogic, inc.
  * Author: Liang Yang <[email protected]>
  */
 
@@ -10,6 +10,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>
+#include <linux/clk-provider.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mfd/syscon.h>
@@ -55,6 +56,7 @@
 #define NFC_REG_VER		0x38
 
 #define NFC_RB_IRQ_EN		BIT(21)
+#define NFC_CMD_FIFO_RESET	BIT(31)
 
 #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages)	\
 	(								\
@@ -104,6 +106,9 @@
 
 #define PER_INFO_BYTE		8
 
+#define CLK_DIV_SHIFT		0
+#define CLK_DIV_WIDTH		6
+
 struct meson_nfc_nand_chip {
 	struct list_head node;
 	struct nand_chip nand;
@@ -151,15 +156,15 @@ struct meson_nfc {
 	struct nand_controller controller;
 	struct clk *core_clk;
 	struct clk *device_clk;
-	struct clk *phase_tx;
-	struct clk *phase_rx;
+	struct clk *nand_clk;
+	struct clk_divider nand_divider;
 
 	unsigned long clk_rate;
 	u32 bus_timing;
 
 	struct device *dev;
 	void __iomem *reg_base;
-	struct regmap *reg_clk;
+	void __iomem *reg_clk;
 	struct completion completion;
 	struct list_head chips;
 	const struct meson_nfc_data *data;
@@ -406,12 +411,14 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms)
 	cmd = NFC_CMD_RB | NFC_CMD_RB_INT
 		| nfc->param.chip_select | nfc->timing.tbers_max;
 	writel(cmd, nfc->reg_base + NFC_REG_CMD);
-
+	meson_nfc_drain_cmd(nfc);
 	ret = wait_for_completion_timeout(&nfc->completion,
 					  msecs_to_jiffies(timeout_ms));
 	if (ret == 0)
 		ret = -1;
 
+	/* reset command fifo to avoid lock */
+	writel(NFC_CMD_FIFO_RESET, nfc->reg_base + NFC_REG_CMD);
 	return ret;
 }
 
@@ -988,8 +995,9 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = {
 static int meson_nfc_clk_init(struct meson_nfc *nfc)
 {
 	int ret;
+	struct clk_init_data init = {0};
+	const char *fix_div2_pll_name[1];
 
-	/* request core clock */
 	nfc->core_clk = devm_clk_get(nfc->dev, "core");
 	if (IS_ERR(nfc->core_clk)) {
 		dev_err(nfc->dev, "failed to get core clock\n");
@@ -1002,21 +1010,25 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 		return PTR_ERR(nfc->device_clk);
 	}
 
-	nfc->phase_tx = devm_clk_get(nfc->dev, "tx");
-	if (IS_ERR(nfc->phase_tx)) {
-		dev_err(nfc->dev, "failed to get TX clk\n");
-		return PTR_ERR(nfc->phase_tx);
-	}
-
-	nfc->phase_rx = devm_clk_get(nfc->dev, "rx");
-	if (IS_ERR(nfc->phase_rx)) {
-		dev_err(nfc->dev, "failed to get RX clk\n");
-		return PTR_ERR(nfc->phase_rx);
-	}
+	init.name = devm_kstrdup(nfc->dev, "nfc#div", GFP_KERNEL);
+	init.ops = &clk_divider_ops;
+	fix_div2_pll_name[0] = __clk_get_name(nfc->device_clk);
+	init.parent_names = fix_div2_pll_name;
+	init.num_parents = 1;
+	nfc->nand_divider.reg = nfc->reg_clk;
+	nfc->nand_divider.shift = CLK_DIV_SHIFT;
+	nfc->nand_divider.width = CLK_DIV_WIDTH;
+	nfc->nand_divider.hw.init = &init;
+	nfc->nand_divider.flags = CLK_DIVIDER_ONE_BASED |
+				  CLK_DIVIDER_ROUND_CLOSEST |
+          			  CLK_DIVIDER_ALLOW_ZERO;
+
+	nfc->nand_clk = devm_clk_register(nfc->dev, &nfc->nand_divider.hw);
+	if (IS_ERR(nfc->nand_clk))
+		return PTR_ERR(nfc->nand_clk);
 
 	/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
-	regmap_update_bits(nfc->reg_clk,
-			   0, CLK_SELECT_NAND, CLK_SELECT_NAND);
+	writel(CLK_SELECT_NAND | readl(nfc->reg_clk), nfc->reg_clk);
 
 	ret = clk_prepare_enable(nfc->core_clk);
 	if (ret) {
@@ -1030,29 +1042,21 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 		goto err_device_clk;
 	}
 
-	ret = clk_prepare_enable(nfc->phase_tx);
+	ret = clk_prepare_enable(nfc->nand_clk);
 	if (ret) {
-		dev_err(nfc->dev, "failed to enable TX clock\n");
-		goto err_phase_tx;
-	}
-
-	ret = clk_prepare_enable(nfc->phase_rx);
-	if (ret) {
-		dev_err(nfc->dev, "failed to enable RX clock\n");
-		goto err_phase_rx;
+		dev_err(nfc->dev, "pre enable NFC divider fail\n");
+		goto err_nand_clk;
 	}
 
 	ret = clk_set_rate(nfc->device_clk, 24000000);
 	if (ret)
-		goto err_disable_rx;
+		goto err_disable_clk;
 
 	return 0;
 
-err_disable_rx:
-	clk_disable_unprepare(nfc->phase_rx);
-err_phase_rx:
-	clk_disable_unprepare(nfc->phase_tx);
-err_phase_tx:
+err_disable_clk:
+	clk_disable_unprepare(nfc->nand_clk);
+err_nand_clk:
 	clk_disable_unprepare(nfc->device_clk);
 err_device_clk:
 	clk_disable_unprepare(nfc->core_clk);
@@ -1061,8 +1065,7 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 
 static void meson_nfc_disable_clk(struct meson_nfc *nfc)
 {
-	clk_disable_unprepare(nfc->phase_rx);
-	clk_disable_unprepare(nfc->phase_tx);
+	clk_disable_unprepare(nfc->nand_clk);
 	clk_disable_unprepare(nfc->device_clk);
 	clk_disable_unprepare(nfc->core_clk);
 }
@@ -1375,6 +1378,7 @@ static int meson_nfc_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct meson_nfc *nfc;
 	struct resource *res;
+	u32 ext_clk_reg;
 	int ret, irq;
 
 	nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);
@@ -1396,9 +1400,15 @@ static int meson_nfc_probe(struct platform_device *pdev)
 	if (IS_ERR(nfc->reg_base))
 		return PTR_ERR(nfc->reg_base);
 
-	nfc->reg_clk =
-		syscon_regmap_lookup_by_phandle(dev->of_node,
-						"amlogic,mmc-syscon");
+	ret = of_property_read_u32(pdev->dev.of_node,
+				   "sd_emmc_c_clkc",
+				   &ext_clk_reg);
+	if (ret) {
+		dev_err(dev, "failed to get NAND external clock register\n");
+		return ret;
+	}
+
+	nfc->reg_clk = devm_ioremap(&pdev->dev, ext_clk_reg, sizeof(int));
 	if (IS_ERR(nfc->reg_clk)) {
 		dev_err(dev, "Failed to lookup clock base\n");
 		return PTR_ERR(nfc->reg_clk);
Signature · 7 lines
2.34.1


_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
maintainer
#1 lore raw

Hi Liang,

[email protected] wrote on Thu, 6 Jan 2022 11:25:04 +0800:

Quoted 21 lines

Because EMMC and NAND have the same control clock register, so we implement a 'sd_emmc_c_clkc'. Previously DTS is defined as below:

	sd_emmc_c_clkc: mmc@7000 {
		compatible = "amlogic,meson-axg-mmc-clkc", "syscon";
		reg = <0x0 0x7000 0x0 0x800>;
	};

	nand-controller@7800 {
		......

		clocks = <&clkc CLKID_SD_EMMC_C>,
			<&sd_emmc_c_clkc CLKID_MMC_DIV>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_RX>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_TX>;
		clock-names = "core", "device", "rx", "tx";
		amlogic,mmc-syscon = <&sd_emmc_c_clkc>;

		......
	}
Quoted 2 lines

but in fact, above implementation is rejected. so now registering a nand_divider.

What is rejected?
Why is it rejected?
What is nand_divider?

Quoted 2 lines

Change-Id: Ibeb4c7ff886f5886aac4d6c664d7bbd1b1bcb997

Change Ids are not expected in the upstream kernel.

But if you fix something you should have a Fixes:.

Quoted 193 lines
---
 drivers/mtd/nand/raw/meson_nand.c | 88 +++++++++++++++++--------------
 1 file changed, 49 insertions(+), 39 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +42 -39
index ac3be92872d0..4472363059c2 100644
@@ -2,7 +2,7 @@
 /*
  * Amlogic Meson Nand Flash Controller Driver
  *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2018-2021 Amlogic, inc.
  * Author: Liang Yang <[email protected]>
  */
 
@@ -10,6 +10,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>
+#include <linux/clk-provider.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mfd/syscon.h>
@@ -55,6 +56,7 @@
 #define NFC_REG_VER		0x38
 
 #define NFC_RB_IRQ_EN		BIT(21)
+#define NFC_CMD_FIFO_RESET	BIT(31)
 
 #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages)	\
 	(								\
@@ -104,6 +106,9 @@
 
 #define PER_INFO_BYTE		8
 
+#define CLK_DIV_SHIFT		0
+#define CLK_DIV_WIDTH		6
+
 struct meson_nfc_nand_chip {
 	struct list_head node;
 	struct nand_chip nand;
@@ -151,15 +156,15 @@ struct meson_nfc {
 	struct nand_controller controller;
 	struct clk *core_clk;
 	struct clk *device_clk;
-	struct clk *phase_tx;
-	struct clk *phase_rx;
+	struct clk *nand_clk;
+	struct clk_divider nand_divider;
 
 	unsigned long clk_rate;
 	u32 bus_timing;
 
 	struct device *dev;
 	void __iomem *reg_base;
-	struct regmap *reg_clk;
+	void __iomem *reg_clk;
 	struct completion completion;
 	struct list_head chips;
 	const struct meson_nfc_data *data;
@@ -406,12 +411,14 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms)
 	cmd = NFC_CMD_RB | NFC_CMD_RB_INT
 		| nfc->param.chip_select | nfc->timing.tbers_max;
 	writel(cmd, nfc->reg_base + NFC_REG_CMD);
-
+	meson_nfc_drain_cmd(nfc);
 	ret = wait_for_completion_timeout(&nfc->completion,
 					  msecs_to_jiffies(timeout_ms));
 	if (ret == 0)
 		ret = -1;
 
+	/* reset command fifo to avoid lock */
+	writel(NFC_CMD_FIFO_RESET, nfc->reg_base + NFC_REG_CMD);
 	return ret;
 }
 
@@ -988,8 +995,9 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = {
 static int meson_nfc_clk_init(struct meson_nfc *nfc)
 {
 	int ret;
+	struct clk_init_data init = {0};
+	const char *fix_div2_pll_name[1];
 
-	/* request core clock */
 	nfc->core_clk = devm_clk_get(nfc->dev, "core");
 	if (IS_ERR(nfc->core_clk)) {
 		dev_err(nfc->dev, "failed to get core clock\n");
@@ -1002,21 +1010,25 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 		return PTR_ERR(nfc->device_clk);
 	}
 
-	nfc->phase_tx = devm_clk_get(nfc->dev, "tx");
-	if (IS_ERR(nfc->phase_tx)) {
-		dev_err(nfc->dev, "failed to get TX clk\n");
-		return PTR_ERR(nfc->phase_tx);
-	}
-
-	nfc->phase_rx = devm_clk_get(nfc->dev, "rx");
-	if (IS_ERR(nfc->phase_rx)) {
-		dev_err(nfc->dev, "failed to get RX clk\n");
-		return PTR_ERR(nfc->phase_rx);
-	}
+	init.name = devm_kstrdup(nfc->dev, "nfc#div", GFP_KERNEL);
+	init.ops = &clk_divider_ops;
+	fix_div2_pll_name[0] = __clk_get_name(nfc->device_clk);
+	init.parent_names = fix_div2_pll_name;
+	init.num_parents = 1;
+	nfc->nand_divider.reg = nfc->reg_clk;
+	nfc->nand_divider.shift = CLK_DIV_SHIFT;
+	nfc->nand_divider.width = CLK_DIV_WIDTH;
+	nfc->nand_divider.hw.init = &init;
+	nfc->nand_divider.flags = CLK_DIVIDER_ONE_BASED |
+				  CLK_DIVIDER_ROUND_CLOSEST |
+          			  CLK_DIVIDER_ALLOW_ZERO;
+
+	nfc->nand_clk = devm_clk_register(nfc->dev, &nfc->nand_divider.hw);
+	if (IS_ERR(nfc->nand_clk))
+		return PTR_ERR(nfc->nand_clk);
 
 	/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
-	regmap_update_bits(nfc->reg_clk,
-			   0, CLK_SELECT_NAND, CLK_SELECT_NAND);
+	writel(CLK_SELECT_NAND | readl(nfc->reg_clk), nfc->reg_clk);
 
 	ret = clk_prepare_enable(nfc->core_clk);
 	if (ret) {
@@ -1030,29 +1042,21 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 		goto err_device_clk;
 	}
 
-	ret = clk_prepare_enable(nfc->phase_tx);
+	ret = clk_prepare_enable(nfc->nand_clk);
 	if (ret) {
-		dev_err(nfc->dev, "failed to enable TX clock\n");
-		goto err_phase_tx;
-	}
-
-	ret = clk_prepare_enable(nfc->phase_rx);
-	if (ret) {
-		dev_err(nfc->dev, "failed to enable RX clock\n");
-		goto err_phase_rx;
+		dev_err(nfc->dev, "pre enable NFC divider fail\n");
+		goto err_nand_clk;
 	}
 
 	ret = clk_set_rate(nfc->device_clk, 24000000);
 	if (ret)
-		goto err_disable_rx;
+		goto err_disable_clk;
 
 	return 0;
 
-err_disable_rx:
-	clk_disable_unprepare(nfc->phase_rx);
-err_phase_rx:
-	clk_disable_unprepare(nfc->phase_tx);
-err_phase_tx:
+err_disable_clk:
+	clk_disable_unprepare(nfc->nand_clk);
+err_nand_clk:
 	clk_disable_unprepare(nfc->device_clk);
 err_device_clk:
 	clk_disable_unprepare(nfc->core_clk);
@@ -1061,8 +1065,7 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 
 static void meson_nfc_disable_clk(struct meson_nfc *nfc)
 {
-	clk_disable_unprepare(nfc->phase_rx);
-	clk_disable_unprepare(nfc->phase_tx);
+	clk_disable_unprepare(nfc->nand_clk);
 	clk_disable_unprepare(nfc->device_clk);
 	clk_disable_unprepare(nfc->core_clk);
 }
@@ -1375,6 +1378,7 @@ static int meson_nfc_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct meson_nfc *nfc;
 	struct resource *res;
+	u32 ext_clk_reg;
 	int ret, irq;
 
 	nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);
@@ -1396,9 +1400,15 @@ static int meson_nfc_probe(struct platform_device *pdev)
 	if (IS_ERR(nfc->reg_base))
 		return PTR_ERR(nfc->reg_base);
 
-	nfc->reg_clk =
-		syscon_regmap_lookup_by_phandle(dev->of_node,
-						"amlogic,mmc-syscon");
+	ret = of_property_read_u32(pdev->dev.of_node,
+				   "sd_emmc_c_clkc",

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1414

Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +7 -0
+				   &ext_clk_reg);
+	if (ret) {
+		dev_err(dev, "failed to get NAND external clock register\n");
+		return ret;
+	}
+
+	nfc->reg_clk = devm_ioremap(&pdev->dev, ext_clk_reg, sizeof(int));
 	if (IS_ERR(nfc->reg_clk)) {
 		dev_err(dev, "Failed to lookup clock base\n");
 		return PTR_ERR(nfc->reg_clk);

Thanks,
Miquèl

author maintainer
#2 lore raw

Hi Miquel,

Meson NFC clock depends on the implementation of sd_emmc_c_clkc, but i don't find the commit in linux mainline. then the information i got from [[email protected]] is the rejection of serial patches. I just look into the corresponding emails in link:

https://lore.kernel.org/all/[email protected]/
it seems the patch never go on since V6, so [[email protected]], could you help to clear it? let us address the discussion in another email from [[email protected]].

Quoted 27 lines · Miquel Raynal

[ EXTERNAL EMAIL ]

Hi Liang,

[email protected] wrote on Thu, 6 Jan 2022 11:25:04 +0800:

Quoted 21 lines

Because EMMC and NAND have the same control clock register, so we implement a 'sd_emmc_c_clkc'. Previously DTS is defined as below:

	sd_emmc_c_clkc: mmc@7000 {
		compatible = "amlogic,meson-axg-mmc-clkc", "syscon";
		reg = <0x0 0x7000 0x0 0x800>;
	};

	nand-controller@7800 {
		......

		clocks = <&clkc CLKID_SD_EMMC_C>,
			<&sd_emmc_c_clkc CLKID_MMC_DIV>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_RX>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_TX>;
		clock-names = "core", "device", "rx", "tx";
		amlogic,mmc-syscon = <&sd_emmc_c_clkc>;

		......
	}
Quoted 6 lines
Quoted 2 lines

but in fact, above implementation is rejected. so now registering a nand_divider.

What is rejected?
Why is it rejected?
What is nand_divider?

i simplify our clock framework below, so nand divider is SD_EMMC_CLOCK[5:0] here.

			   -----          -----		    -----
	   the other------|	\        |     |	   |	 |
         		  | mux	| -----  |  N  | ----------| NFC/|
	   FCLK_DIV2------|     |        |     |	   | EMMC|
			   -----/         ----- 	    -----
		    SD_EMMC_CLOCK[7:6] SD_EMMC_CLOCK[5:0]
Quoted 218 lines
Quoted 4 lines

Change-Id: Ibeb4c7ff886f5886aac4d6c664d7bbd1b1bcb997

Change Ids are not expected in the upstream kernel.

But if you fix something you should have a Fixes:.

Quoted 193 lines
---
  drivers/mtd/nand/raw/meson_nand.c | 88 +++++++++++++++++--------------
  1 file changed, 49 insertions(+), 39 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +42 -39
index ac3be92872d0..4472363059c2 100644
@@ -2,7 +2,7 @@
  /*
   * Amlogic Meson Nand Flash Controller Driver
   *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2018-2021 Amlogic, inc.
   * Author: Liang Yang <[email protected]>
   */
 
@@ -10,6 +10,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/interrupt.h>
  #include <linux/clk.h>
+#include <linux/clk-provider.h>
  #include <linux/mtd/rawnand.h>
  #include <linux/mtd/mtd.h>
  #include <linux/mfd/syscon.h>
@@ -55,6 +56,7 @@
  #define NFC_REG_VER		0x38
 
  #define NFC_RB_IRQ_EN		BIT(21)
+#define NFC_CMD_FIFO_RESET	BIT(31)
 
  #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages)	\
  	(								\
@@ -104,6 +106,9 @@
 
  #define PER_INFO_BYTE		8
 
+#define CLK_DIV_SHIFT		0
+#define CLK_DIV_WIDTH		6
+
  struct meson_nfc_nand_chip {
  	struct list_head node;
  	struct nand_chip nand;
@@ -151,15 +156,15 @@ struct meson_nfc {
  	struct nand_controller controller;
  	struct clk *core_clk;
  	struct clk *device_clk;
-	struct clk *phase_tx;
-	struct clk *phase_rx;
+	struct clk *nand_clk;
+	struct clk_divider nand_divider;
 
  	unsigned long clk_rate;
  	u32 bus_timing;
 
  	struct device *dev;
  	void __iomem *reg_base;
-	struct regmap *reg_clk;
+	void __iomem *reg_clk;
  	struct completion completion;
  	struct list_head chips;
  	const struct meson_nfc_data *data;
@@ -406,12 +411,14 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms)
  	cmd = NFC_CMD_RB | NFC_CMD_RB_INT
  		| nfc->param.chip_select | nfc->timing.tbers_max;
  	writel(cmd, nfc->reg_base + NFC_REG_CMD);
-
+	meson_nfc_drain_cmd(nfc);
  	ret = wait_for_completion_timeout(&nfc->completion,
  					  msecs_to_jiffies(timeout_ms));
  	if (ret == 0)
  		ret = -1;
 
+	/* reset command fifo to avoid lock */
+	writel(NFC_CMD_FIFO_RESET, nfc->reg_base + NFC_REG_CMD);
  	return ret;
  }
 
@@ -988,8 +995,9 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = {
  static int meson_nfc_clk_init(struct meson_nfc *nfc)
  {
  	int ret;
+	struct clk_init_data init = {0};
+	const char *fix_div2_pll_name[1];
 
-	/* request core clock */
  	nfc->core_clk = devm_clk_get(nfc->dev, "core");
  	if (IS_ERR(nfc->core_clk)) {
  		dev_err(nfc->dev, "failed to get core clock\n");
@@ -1002,21 +1010,25 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
  		return PTR_ERR(nfc->device_clk);
  	}
 
-	nfc->phase_tx = devm_clk_get(nfc->dev, "tx");
-	if (IS_ERR(nfc->phase_tx)) {
-		dev_err(nfc->dev, "failed to get TX clk\n");
-		return PTR_ERR(nfc->phase_tx);
-	}
-
-	nfc->phase_rx = devm_clk_get(nfc->dev, "rx");
-	if (IS_ERR(nfc->phase_rx)) {
-		dev_err(nfc->dev, "failed to get RX clk\n");
-		return PTR_ERR(nfc->phase_rx);
-	}
+	init.name = devm_kstrdup(nfc->dev, "nfc#div", GFP_KERNEL);
+	init.ops = &clk_divider_ops;
+	fix_div2_pll_name[0] = __clk_get_name(nfc->device_clk);
+	init.parent_names = fix_div2_pll_name;
+	init.num_parents = 1;
+	nfc->nand_divider.reg = nfc->reg_clk;
+	nfc->nand_divider.shift = CLK_DIV_SHIFT;
+	nfc->nand_divider.width = CLK_DIV_WIDTH;
+	nfc->nand_divider.hw.init = &init;
+	nfc->nand_divider.flags = CLK_DIVIDER_ONE_BASED |
+				  CLK_DIVIDER_ROUND_CLOSEST |
+          			  CLK_DIVIDER_ALLOW_ZERO;
+
+	nfc->nand_clk = devm_clk_register(nfc->dev, &nfc->nand_divider.hw);
+	if (IS_ERR(nfc->nand_clk))
+		return PTR_ERR(nfc->nand_clk);
 
  	/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
-	regmap_update_bits(nfc->reg_clk,
-			   0, CLK_SELECT_NAND, CLK_SELECT_NAND);
+	writel(CLK_SELECT_NAND | readl(nfc->reg_clk), nfc->reg_clk);
 
  	ret = clk_prepare_enable(nfc->core_clk);
  	if (ret) {
@@ -1030,29 +1042,21 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
  		goto err_device_clk;
  	}
 
-	ret = clk_prepare_enable(nfc->phase_tx);
+	ret = clk_prepare_enable(nfc->nand_clk);
  	if (ret) {
-		dev_err(nfc->dev, "failed to enable TX clock\n");
-		goto err_phase_tx;
-	}
-
-	ret = clk_prepare_enable(nfc->phase_rx);
-	if (ret) {
-		dev_err(nfc->dev, "failed to enable RX clock\n");
-		goto err_phase_rx;
+		dev_err(nfc->dev, "pre enable NFC divider fail\n");
+		goto err_nand_clk;
  	}
 
  	ret = clk_set_rate(nfc->device_clk, 24000000);
  	if (ret)
-		goto err_disable_rx;
+		goto err_disable_clk;
 
  	return 0;
 
-err_disable_rx:
-	clk_disable_unprepare(nfc->phase_rx);
-err_phase_rx:
-	clk_disable_unprepare(nfc->phase_tx);
-err_phase_tx:
+err_disable_clk:
+	clk_disable_unprepare(nfc->nand_clk);
+err_nand_clk:
  	clk_disable_unprepare(nfc->device_clk);
  err_device_clk:
  	clk_disable_unprepare(nfc->core_clk);
@@ -1061,8 +1065,7 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 
  static void meson_nfc_disable_clk(struct meson_nfc *nfc)
  {
-	clk_disable_unprepare(nfc->phase_rx);
-	clk_disable_unprepare(nfc->phase_tx);
+	clk_disable_unprepare(nfc->nand_clk);
  	clk_disable_unprepare(nfc->device_clk);
  	clk_disable_unprepare(nfc->core_clk);
  }
@@ -1375,6 +1378,7 @@ static int meson_nfc_probe(struct platform_device *pdev)
  	struct device *dev = &pdev->dev;
  	struct meson_nfc *nfc;
  	struct resource *res;
+	u32 ext_clk_reg;
  	int ret, irq;
 
  	nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);
@@ -1396,9 +1400,15 @@ static int meson_nfc_probe(struct platform_device *pdev)
  	if (IS_ERR(nfc->reg_base))
  		return PTR_ERR(nfc->reg_base);
 
-	nfc->reg_clk =
-		syscon_regmap_lookup_by_phandle(dev->of_node,
-						"amlogic,mmc-syscon");
+	ret = of_property_read_u32(pdev->dev.of_node,
+				   "sd_emmc_c_clkc",

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1414

Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +7 -0
+				   &ext_clk_reg);
+	if (ret) {
+		dev_err(dev, "failed to get NAND external clock register\n");
+		return ret;
+	}
+
+	nfc->reg_clk = devm_ioremap(&pdev->dev, ext_clk_reg, sizeof(int));
  	if (IS_ERR(nfc->reg_clk)) {
  		dev_err(dev, "Failed to lookup clock base\n");
  		return PTR_ERR(nfc->reg_clk);

Thanks,
Miquèl

.

author maintainer
#3 lore raw

Hi Miquel,

refine the clock framework diagram.

Quoted 8 lines · Liang Yang
Quoted 1 line

What is nand_divider?

i simplify our clock framework below, so nand divider is SD_EMMC_CLOCK[5:0] here.
               -----          -----            -----
       the other------|    \        |     |       |     |

                    | mux    | -----  |  N  | ----------| NFC/|
        FCLK_DIV2------|     |        |     |       | EMMC|

               -----/         -----         ----- SD_EMMC_CLOCK[7:6] SD_EMMC_CLOCK[5:0]

                         -----           -------         --------
              the other-|      \        |       |       |        |
                        | mux  |--------|  N    |-------|   NFC/ |
                        |      |        |       |       |   EMMC |
              fclk_div2-|      /        |       |       |        |
                         -----           -------         --------
                  SD_EMMC_CLOCK[7:6]   SD_EMMC_CLOCK[5:0]
reviewer
#4 lore raw
In reply to Liang Yang
Quoted 8 lines · Liang Yang

Hi Miquel,

Meson NFC clock depends on the implementation of sd_emmc_c_clkc, but i don't find the commit in
linux mainline. then the information i got from [[email protected]] is the rejection of
serial patches. I just look into the corresponding emails in link:

Quoted 5 lines

https://lore.kernel.org/all/[email protected]/
it seems the patch never go on since V6, so [[email protected]], could you help to clear it?
let us address the discussion in another email from [[email protected]].

That V6 was "rejected" because some comments from thre V5 were still not addressed.

Quoted 235 lines · Miquel Raynal
Quoted 22 lines

[ EXTERNAL EMAIL ]
Hi Liang,
[email protected] wrote on Thu, 6 Jan 2022 11:25:04 +0800:

Quoted 18 lines

Because EMMC and NAND have the same control clock register, so we implement a 'sd_emmc_c_clkc'. Previously DTS is defined as below:

	sd_emmc_c_clkc: mmc@7000 {
		compatible = "amlogic,meson-axg-mmc-clkc", "syscon";
		reg = <0x0 0x7000 0x0 0x800>;
	};

	nand-controller@7800 {
		......

		clocks = <&clkc CLKID_SD_EMMC_C>,
			<&sd_emmc_c_clkc CLKID_MMC_DIV>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_RX>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_TX>;
		clock-names = "core", "device", "rx", "tx";
		amlogic,mmc-syscon = <&sd_emmc_c_clkc>;
Quoted 8 lines
Quoted 5 lines
		......
	}

but in fact, above implementation is rejected. so now registering a nand_divider.

What is rejected?
Why is it rejected?
What is nand_divider?

i simplify our clock framework below, so nand divider is SD_EMMC_CLOCK[5:0] here.

			   -----          -----		    -----
	   the other------|	\        |     |	   |	 |
         		  | mux	| -----  |  N  | ----------| NFC/|
	   FCLK_DIV2------|     |        |     |	   | EMMC|
			   -----/         ----- 	    -----
		    SD_EMMC_CLOCK[7:6] SD_EMMC_CLOCK[5:0]
Quoted 195 lines
Quoted 3 lines

Change-Id: Ibeb4c7ff886f5886aac4d6c664d7bbd1b1bcb997

Change Ids are not expected in the upstream kernel. But if you fix something you should have a Fixes:.

Quoted 175 lines
---
  drivers/mtd/nand/raw/meson_nand.c | 88 +++++++++++++++++--------------
  1 file changed, 49 insertions(+), 39 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +1 -1
index ac3be92872d0..4472363059c2 100644
@@ -2,7 +2,7 @@
  /*
   * Amlogic Meson Nand Flash Controller Driver
   *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2018-2021 Amlogic, inc.
   * Author: Liang Yang <[email protected]>
   */
  @@ -10,6 +10,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/interrupt.h>
  #include <linux/clk.h>
drivers/mtd/nand/raw/meson_nand.c +9 -4
+#include <linux/clk-provider.h>
  #include <linux/mtd/rawnand.h>
  #include <linux/mtd/mtd.h>
  #include <linux/mfd/syscon.h>
@@ -55,6 +56,7 @@
  #define NFC_REG_VER		0x38
    #define NFC_RB_IRQ_EN		BIT(21)
+#define NFC_CMD_FIFO_RESET	BIT(31)
    #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages)
 \
  	(								\
@@ -104,6 +106,9 @@
    #define PER_INFO_BYTE		8
  +#define CLK_DIV_SHIFT		0
+#define CLK_DIV_WIDTH		6
+
  struct meson_nfc_nand_chip {
  	struct list_head node;
  	struct nand_chip nand;
@@ -151,15 +156,15 @@ struct meson_nfc {
  	struct nand_controller controller;
  	struct clk *core_clk;
  	struct clk *device_clk;
-	struct clk *phase_tx;
-	struct clk *phase_rx;
+	struct clk *nand_clk;
+	struct clk_divider nand_divider;
    	unsigned long clk_rate;
  	u32 bus_timing;
    	struct device *dev;
  	void __iomem *reg_base;
-	struct regmap *reg_clk;
+	void __iomem *reg_clk;
  	struct completion completion;
  	struct list_head chips;
  	const struct meson_nfc_data *data;
@@ -406,12 +411,14 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms)
  	cmd = NFC_CMD_RB | NFC_CMD_RB_INT
  		| nfc->param.chip_select | nfc->timing.tbers_max;
  	writel(cmd, nfc->reg_base + NFC_REG_CMD);
-
+	meson_nfc_drain_cmd(nfc);
  	ret = wait_for_completion_timeout(&nfc->completion,
  					  msecs_to_jiffies(timeout_ms));
  	if (ret == 0)
  		ret = -1;
  +	/* reset command fifo to avoid lock */
+	writel(NFC_CMD_FIFO_RESET, nfc->reg_base + NFC_REG_CMD);
  	return ret;
  }
  @@ -988,8 +995,9 @@ static const struct mtd_ooblayout_ops

meson_ooblayout_ops = {
static int meson_nfc_clk_init(struct meson_nfc *nfc) {
int ret;

drivers/mtd/nand/raw/meson_nand.c +30 -29
+	struct clk_init_data init = {0};
+	const char *fix_div2_pll_name[1];
  -	/* request core clock */
  	nfc->core_clk = devm_clk_get(nfc->dev, "core");
  	if (IS_ERR(nfc->core_clk)) {
  		dev_err(nfc->dev, "failed to get core clock\n");
@@ -1002,21 +1010,25 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
  		return PTR_ERR(nfc->device_clk);
  	}
  -	nfc->phase_tx = devm_clk_get(nfc->dev, "tx");
-	if (IS_ERR(nfc->phase_tx)) {
-		dev_err(nfc->dev, "failed to get TX clk\n");
-		return PTR_ERR(nfc->phase_tx);
-	}
-
-	nfc->phase_rx = devm_clk_get(nfc->dev, "rx");
-	if (IS_ERR(nfc->phase_rx)) {
-		dev_err(nfc->dev, "failed to get RX clk\n");
-		return PTR_ERR(nfc->phase_rx);
-	}
+	init.name = devm_kstrdup(nfc->dev, "nfc#div", GFP_KERNEL);
+	init.ops = &clk_divider_ops;
+	fix_div2_pll_name[0] = __clk_get_name(nfc->device_clk);
+	init.parent_names = fix_div2_pll_name;
+	init.num_parents = 1;
+	nfc->nand_divider.reg = nfc->reg_clk;
+	nfc->nand_divider.shift = CLK_DIV_SHIFT;
+	nfc->nand_divider.width = CLK_DIV_WIDTH;
+	nfc->nand_divider.hw.init = &init;
+	nfc->nand_divider.flags = CLK_DIVIDER_ONE_BASED |
+				  CLK_DIVIDER_ROUND_CLOSEST |
+          			  CLK_DIVIDER_ALLOW_ZERO;
+
+	nfc->nand_clk = devm_clk_register(nfc->dev, &nfc->nand_divider.hw);
+	if (IS_ERR(nfc->nand_clk))
+		return PTR_ERR(nfc->nand_clk);
    	/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
-	regmap_update_bits(nfc->reg_clk,
-			   0, CLK_SELECT_NAND, CLK_SELECT_NAND);
+	writel(CLK_SELECT_NAND | readl(nfc->reg_clk), nfc->reg_clk);
    	ret = clk_prepare_enable(nfc->core_clk);
  	if (ret) {
@@ -1030,29 +1042,21 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
  		goto err_device_clk;
  	}
  -	ret = clk_prepare_enable(nfc->phase_tx);
+	ret = clk_prepare_enable(nfc->nand_clk);
  	if (ret) {
-		dev_err(nfc->dev, "failed to enable TX clock\n");
-		goto err_phase_tx;
-	}
-
-	ret = clk_prepare_enable(nfc->phase_rx);
-	if (ret) {
-		dev_err(nfc->dev, "failed to enable RX clock\n");
-		goto err_phase_rx;
+		dev_err(nfc->dev, "pre enable NFC divider fail\n");
+		goto err_nand_clk;
  	}
    	ret = clk_set_rate(nfc->device_clk, 24000000);
  	if (ret)
-		goto err_disable_rx;
+		goto err_disable_clk;
    	return 0;
  -err_disable_rx:
-	clk_disable_unprepare(nfc->phase_rx);
-err_phase_rx:
-	clk_disable_unprepare(nfc->phase_tx);
-err_phase_tx:
+err_disable_clk:
+	clk_disable_unprepare(nfc->nand_clk);
+err_nand_clk:
  	clk_disable_unprepare(nfc->device_clk);
  err_device_clk:
  	clk_disable_unprepare(nfc->core_clk);
@@ -1061,8 +1065,7 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
    static void meson_nfc_disable_clk(struct meson_nfc *nfc)
  {
-	clk_disable_unprepare(nfc->phase_rx);
-	clk_disable_unprepare(nfc->phase_tx);
+	clk_disable_unprepare(nfc->nand_clk);
  	clk_disable_unprepare(nfc->device_clk);
  	clk_disable_unprepare(nfc->core_clk);
  }
@@ -1375,6 +1378,7 @@ static int meson_nfc_probe(struct platform_device *pdev)
  	struct device *dev = &pdev->dev;
  	struct meson_nfc *nfc;
  	struct resource *res;
+	u32 ext_clk_reg;
  	int ret, irq;
    	nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);
@@ -1396,9 +1400,15 @@ static int meson_nfc_probe(struct platform_device *pdev)
  	if (IS_ERR(nfc->reg_base))
  		return PTR_ERR(nfc->reg_base);
  -	nfc->reg_clk =
-		syscon_regmap_lookup_by_phandle(dev->of_node,
-						"amlogic,mmc-syscon");
+	ret = of_property_read_u32(pdev->dev.of_node,
+				   "sd_emmc_c_clkc",

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1414

Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +7 -0
+				   &ext_clk_reg);
+	if (ret) {
+		dev_err(dev, "failed to get NAND external clock register\n");
+		return ret;
+	}
+
+	nfc->reg_clk = devm_ioremap(&pdev->dev, ext_clk_reg, sizeof(int));
  	if (IS_ERR(nfc->reg_clk)) {
  		dev_err(dev, "Failed to lookup clock base\n");
  		return PTR_ERR(nfc->reg_clk);

Thanks,
Miquèl
.

author maintainer
#5 lore raw

Hello Jerome,

Quoted 13 lines · Jerome Brunet

[ EXTERNAL EMAIL ]

Quoted 8 lines · Liang Yang

Hi Miquel,

Meson NFC clock depends on the implementation of sd_emmc_c_clkc, but i don't find the commit in
linux mainline. then the information i got from [[email protected]] is the rejection of
serial patches. I just look into the corresponding emails in link:

Quoted 9 lines
Quoted 5 lines

https://lore.kernel.org/all/[email protected]/
it seems the patch never go on since V6, so [[email protected]], could you help to clear it?
let us address the discussion in another email from [[email protected]].

That V6 was "rejected" because some comments from thre V5 were still not addressed.

em, we decide to continue to work on sd_emmc_c_clkc and it already has a longer trip, see this link <https://lkml.org/lkml/2019/1/8/441>. thanks.

Quoted 237 lines
Quoted 32 lines · Miquel Raynal
Quoted 22 lines

[ EXTERNAL EMAIL ]
Hi Liang,
[email protected] wrote on Thu, 6 Jan 2022 11:25:04 +0800:

Quoted 18 lines

Because EMMC and NAND have the same control clock register, so we implement a 'sd_emmc_c_clkc'. Previously DTS is defined as below:

	sd_emmc_c_clkc: mmc@7000 {
		compatible = "amlogic,meson-axg-mmc-clkc", "syscon";
		reg = <0x0 0x7000 0x0 0x800>;
	};

	nand-controller@7800 {
		......

		clocks = <&clkc CLKID_SD_EMMC_C>,
			<&sd_emmc_c_clkc CLKID_MMC_DIV>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_RX>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_TX>;
		clock-names = "core", "device", "rx", "tx";
		amlogic,mmc-syscon = <&sd_emmc_c_clkc>;
Quoted 8 lines
Quoted 5 lines
		......
	}

but in fact, above implementation is rejected. so now registering a nand_divider.

What is rejected?
Why is it rejected?
What is nand_divider?

Quoted 203 lines

i simplify our clock framework below, so nand divider is SD_EMMC_CLOCK[5:0] here.

			   -----          -----		    -----
	   the other------|	\        |     |	   |	 |
          		  | mux	| -----  |  N  | ----------| NFC/|
	   FCLK_DIV2------|     |        |     |	   | EMMC|
			   -----/         ----- 	    -----
		    SD_EMMC_CLOCK[7:6] SD_EMMC_CLOCK[5:0]
Quoted 195 lines
Quoted 3 lines

Change-Id: Ibeb4c7ff886f5886aac4d6c664d7bbd1b1bcb997

Change Ids are not expected in the upstream kernel. But if you fix something you should have a Fixes:.

Quoted 175 lines
---
   drivers/mtd/nand/raw/meson_nand.c | 88 +++++++++++++++++--------------
   1 file changed, 49 insertions(+), 39 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +1 -1
index ac3be92872d0..4472363059c2 100644
@@ -2,7 +2,7 @@
   /*
    * Amlogic Meson Nand Flash Controller Driver
    *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2018-2021 Amlogic, inc.
    * Author: Liang Yang <[email protected]>
    */
   @@ -10,6 +10,7 @@
   #include <linux/dma-mapping.h>
   #include <linux/interrupt.h>
   #include <linux/clk.h>
drivers/mtd/nand/raw/meson_nand.c +9 -4
+#include <linux/clk-provider.h>
   #include <linux/mtd/rawnand.h>
   #include <linux/mtd/mtd.h>
   #include <linux/mfd/syscon.h>
@@ -55,6 +56,7 @@
   #define NFC_REG_VER		0x38
     #define NFC_RB_IRQ_EN		BIT(21)
+#define NFC_CMD_FIFO_RESET	BIT(31)
     #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages)
 \
   	(								\
@@ -104,6 +106,9 @@
     #define PER_INFO_BYTE		8
   +#define CLK_DIV_SHIFT		0
+#define CLK_DIV_WIDTH		6
+
   struct meson_nfc_nand_chip {
   	struct list_head node;
   	struct nand_chip nand;
@@ -151,15 +156,15 @@ struct meson_nfc {
   	struct nand_controller controller;
   	struct clk *core_clk;
   	struct clk *device_clk;
-	struct clk *phase_tx;
-	struct clk *phase_rx;
+	struct clk *nand_clk;
+	struct clk_divider nand_divider;
     	unsigned long clk_rate;
   	u32 bus_timing;
     	struct device *dev;
   	void __iomem *reg_base;
-	struct regmap *reg_clk;
+	void __iomem *reg_clk;
   	struct completion completion;
   	struct list_head chips;
   	const struct meson_nfc_data *data;
@@ -406,12 +411,14 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms)
   	cmd = NFC_CMD_RB | NFC_CMD_RB_INT
   		| nfc->param.chip_select | nfc->timing.tbers_max;
   	writel(cmd, nfc->reg_base + NFC_REG_CMD);
-
+	meson_nfc_drain_cmd(nfc);
   	ret = wait_for_completion_timeout(&nfc->completion,
   					  msecs_to_jiffies(timeout_ms));
   	if (ret == 0)
   		ret = -1;
   +	/* reset command fifo to avoid lock */
+	writel(NFC_CMD_FIFO_RESET, nfc->reg_base + NFC_REG_CMD);
   	return ret;
   }
   @@ -988,8 +995,9 @@ static const struct mtd_ooblayout_ops
meson_ooblayout_ops = {
   static int meson_nfc_clk_init(struct meson_nfc *nfc)
   {
   	int ret;
drivers/mtd/nand/raw/meson_nand.c +30 -29
+	struct clk_init_data init = {0};
+	const char *fix_div2_pll_name[1];
   -	/* request core clock */
   	nfc->core_clk = devm_clk_get(nfc->dev, "core");
   	if (IS_ERR(nfc->core_clk)) {
   		dev_err(nfc->dev, "failed to get core clock\n");
@@ -1002,21 +1010,25 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
   		return PTR_ERR(nfc->device_clk);
   	}
   -	nfc->phase_tx = devm_clk_get(nfc->dev, "tx");
-	if (IS_ERR(nfc->phase_tx)) {
-		dev_err(nfc->dev, "failed to get TX clk\n");
-		return PTR_ERR(nfc->phase_tx);
-	}
-
-	nfc->phase_rx = devm_clk_get(nfc->dev, "rx");
-	if (IS_ERR(nfc->phase_rx)) {
-		dev_err(nfc->dev, "failed to get RX clk\n");
-		return PTR_ERR(nfc->phase_rx);
-	}
+	init.name = devm_kstrdup(nfc->dev, "nfc#div", GFP_KERNEL);
+	init.ops = &clk_divider_ops;
+	fix_div2_pll_name[0] = __clk_get_name(nfc->device_clk);
+	init.parent_names = fix_div2_pll_name;
+	init.num_parents = 1;
+	nfc->nand_divider.reg = nfc->reg_clk;
+	nfc->nand_divider.shift = CLK_DIV_SHIFT;
+	nfc->nand_divider.width = CLK_DIV_WIDTH;
+	nfc->nand_divider.hw.init = &init;
+	nfc->nand_divider.flags = CLK_DIVIDER_ONE_BASED |
+				  CLK_DIVIDER_ROUND_CLOSEST |
+          			  CLK_DIVIDER_ALLOW_ZERO;
+
+	nfc->nand_clk = devm_clk_register(nfc->dev, &nfc->nand_divider.hw);
+	if (IS_ERR(nfc->nand_clk))
+		return PTR_ERR(nfc->nand_clk);
     	/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
-	regmap_update_bits(nfc->reg_clk,
-			   0, CLK_SELECT_NAND, CLK_SELECT_NAND);
+	writel(CLK_SELECT_NAND | readl(nfc->reg_clk), nfc->reg_clk);
     	ret = clk_prepare_enable(nfc->core_clk);
   	if (ret) {
@@ -1030,29 +1042,21 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
   		goto err_device_clk;
   	}
   -	ret = clk_prepare_enable(nfc->phase_tx);
+	ret = clk_prepare_enable(nfc->nand_clk);
   	if (ret) {
-		dev_err(nfc->dev, "failed to enable TX clock\n");
-		goto err_phase_tx;
-	}
-
-	ret = clk_prepare_enable(nfc->phase_rx);
-	if (ret) {
-		dev_err(nfc->dev, "failed to enable RX clock\n");
-		goto err_phase_rx;
+		dev_err(nfc->dev, "pre enable NFC divider fail\n");
+		goto err_nand_clk;
   	}
     	ret = clk_set_rate(nfc->device_clk, 24000000);
   	if (ret)
-		goto err_disable_rx;
+		goto err_disable_clk;
     	return 0;
   -err_disable_rx:
-	clk_disable_unprepare(nfc->phase_rx);
-err_phase_rx:
-	clk_disable_unprepare(nfc->phase_tx);
-err_phase_tx:
+err_disable_clk:
+	clk_disable_unprepare(nfc->nand_clk);
+err_nand_clk:
   	clk_disable_unprepare(nfc->device_clk);
   err_device_clk:
   	clk_disable_unprepare(nfc->core_clk);
@@ -1061,8 +1065,7 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
     static void meson_nfc_disable_clk(struct meson_nfc *nfc)
   {
-	clk_disable_unprepare(nfc->phase_rx);
-	clk_disable_unprepare(nfc->phase_tx);
+	clk_disable_unprepare(nfc->nand_clk);
   	clk_disable_unprepare(nfc->device_clk);
   	clk_disable_unprepare(nfc->core_clk);
   }
@@ -1375,6 +1378,7 @@ static int meson_nfc_probe(struct platform_device *pdev)
   	struct device *dev = &pdev->dev;
   	struct meson_nfc *nfc;
   	struct resource *res;
+	u32 ext_clk_reg;
   	int ret, irq;
     	nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);
@@ -1396,9 +1400,15 @@ static int meson_nfc_probe(struct platform_device *pdev)
   	if (IS_ERR(nfc->reg_base))
   		return PTR_ERR(nfc->reg_base);
   -	nfc->reg_clk =
-		syscon_regmap_lookup_by_phandle(dev->of_node,
-						"amlogic,mmc-syscon");
+	ret = of_property_read_u32(pdev->dev.of_node,
+				   "sd_emmc_c_clkc",

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1414

Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +7 -0
+				   &ext_clk_reg);
+	if (ret) {
+		dev_err(dev, "failed to get NAND external clock register\n");
+		return ret;
+	}
+
+	nfc->reg_clk = devm_ioremap(&pdev->dev, ext_clk_reg, sizeof(int));
   	if (IS_ERR(nfc->reg_clk)) {
   		dev_err(dev, "Failed to lookup clock base\n");
   		return PTR_ERR(nfc->reg_clk);

Thanks,
Miquèl
.

.

reviewer
#6 lore raw
In reply to Liang Yang
Quoted 21 lines · Liang Yang

Because EMMC and NAND have the same control clock register, so we implement a 'sd_emmc_c_clkc'. Previously DTS is defined as below:

	sd_emmc_c_clkc: mmc@7000 {
		compatible = "amlogic,meson-axg-mmc-clkc", "syscon";
		reg = <0x0 0x7000 0x0 0x800>;
	};

	nand-controller@7800 {
		......

		clocks = <&clkc CLKID_SD_EMMC_C>,
			<&sd_emmc_c_clkc CLKID_MMC_DIV>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_RX>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_TX>;
		clock-names = "core", "device", "rx", "tx";
		amlogic,mmc-syscon = <&sd_emmc_c_clkc>;

		......
	}
Quoted 2 lines

but in fact, above implementation is rejected. so now registering a nand_divider.

Can you give a bit of context ? a link to the discussion rejecting this

As far as remember, things were getting done for A1 and stopped before clock part was finished. I'm saying the change is wrong, just that a discussion is needed before a decision is made.

Quoted 47 lines
Change-Id Ibeb4c7ff886f5886aac4d6c664d7bbd1b1bcb997
---
 drivers/mtd/nand/raw/meson_nand.c | 88 +++++++++++++++++--------------
 1 file changed, 49 insertions(+), 39 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +6 -1
index ac3be92872d0..4472363059c2 100644
@@ -2,7 +2,7 @@
 /*
  * Amlogic Meson Nand Flash Controller Driver
  *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2018-2021 Amlogic, inc.
  * Author: Liang Yang <[email protected]>
  */
 
@@ -10,6 +10,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>
+#include <linux/clk-provider.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mfd/syscon.h>
@@ -55,6 +56,7 @@
 #define NFC_REG_VER		0x38
 
 #define NFC_RB_IRQ_EN		BIT(21)
+#define NFC_CMD_FIFO_RESET	BIT(31)
 
 #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages)	\
 	(								\
@@ -104,6 +106,9 @@
 
 #define PER_INFO_BYTE		8
 
+#define CLK_DIV_SHIFT		0
+#define CLK_DIV_WIDTH		6
+
 struct meson_nfc_nand_chip {
 	struct list_head node;
 	struct nand_chip nand;

drivers/mtd/nand/raw/meson_nand.c struct meson_nfc { · line 155

Quoted 5 lines
drivers/mtd/nand/raw/meson_nand.c +0 -2
@@ -151,15 +156,15 @@ struct meson_nfc {
 	struct nand_controller controller;
 	struct clk *core_clk;
 	struct clk *device_clk;
-	struct clk *phase_tx;
-	struct clk *phase_rx;

I would have been nice to explain why these clock are no longer required, in the change description maybe ?

Quoted 14 lines
drivers/mtd/nand/raw/meson_nand.c +3 -1
+	struct clk *nand_clk;
+	struct clk_divider nand_divider;
 
 	unsigned long clk_rate;
 	u32 bus_timing;
 
 	struct device *dev;
 	void __iomem *reg_base;
-	struct regmap *reg_clk;
+	void __iomem *reg_clk;
 	struct completion completion;
 	struct list_head chips;
 	const struct meson_nfc_data *data;

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) · line 414

Quoted 5 lines
drivers/mtd/nand/raw/meson_nand.c +1 -1
@@ -406,12 +411,14 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms)
 	cmd = NFC_CMD_RB | NFC_CMD_RB_INT
 		| nfc->param.chip_select | nfc->timing.tbers_max;
 	writel(cmd, nfc->reg_base + NFC_REG_CMD);
-
+	meson_nfc_drain_cmd(nfc);

is this clock related ?

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) · line 421

Quoted 7 lines
drivers/mtd/nand/raw/meson_nand.c +2 -0
 	ret = wait_for_completion_timeout(&nfc->completion,
 					  msecs_to_jiffies(timeout_ms));
 	if (ret == 0)
 		ret = -1;
 
+	/* reset command fifo to avoid lock */
+	writel(NFC_CMD_FIFO_RESET, nfc->reg_base + NFC_REG_CMD);

Again, not seem to be clock related - does not belong in this patch

drivers/mtd/nand/raw/meson_nand.c static const struct mtd_ooblayout_ops meson_ooblayout_ops = { · line 992

Quoted 11 lines
drivers/mtd/nand/raw/meson_nand.c +2 -1
 	return ret;
 }
 
@@ -988,8 +995,9 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = {
 static int meson_nfc_clk_init(struct meson_nfc *nfc)
 {
 	int ret;
+	struct clk_init_data init = {0};
+	const char *fix_div2_pll_name[1];
 
-	/* request core clock */

Why is the comment bothering you ?

Quoted 11 lines
drivers/mtd/nand/raw/meson_nand.c +0 -4
 	nfc->core_clk = devm_clk_get(nfc->dev, "core");
 	if (IS_ERR(nfc->core_clk)) {
 		dev_err(nfc->dev, "failed to get core clock\n");
@@ -1002,21 +1010,25 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 		return PTR_ERR(nfc->device_clk);
 	}
 
-	nfc->phase_tx = devm_clk_get(nfc->dev, "tx");
-	if (IS_ERR(nfc->phase_tx)) {
-		dev_err(nfc->dev, "failed to get TX clk\n");
-		return PTR_ERR(nfc->phase_tx);

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_clk_init(struct meson_nfc *nfc) · line 1015

Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +3 -7
-	}
-
-	nfc->phase_rx = devm_clk_get(nfc->dev, "rx");
-	if (IS_ERR(nfc->phase_rx)) {
-		dev_err(nfc->dev, "failed to get RX clk\n");
-		return PTR_ERR(nfc->phase_rx);
-	}
+	init.name = devm_kstrdup(nfc->dev, "nfc#div", GFP_KERNEL);
+	init.ops = &clk_divider_ops;
+	fix_div2_pll_name[0] = __clk_get_name(nfc->device_clk);

You should be using "fw_name" so CCF looks a DT directly, instead of this

Quoted 82 lines
drivers/mtd/nand/raw/meson_nand.c +23 -21
+	init.parent_names = fix_div2_pll_name;
+	init.num_parents = 1;
+	nfc->nand_divider.reg = nfc->reg_clk;
+	nfc->nand_divider.shift = CLK_DIV_SHIFT;
+	nfc->nand_divider.width = CLK_DIV_WIDTH;
+	nfc->nand_divider.hw.init = &init;
+	nfc->nand_divider.flags = CLK_DIVIDER_ONE_BASED |
+				  CLK_DIVIDER_ROUND_CLOSEST |
+          			  CLK_DIVIDER_ALLOW_ZERO;
+
+	nfc->nand_clk = devm_clk_register(nfc->dev, &nfc->nand_divider.hw);
+	if (IS_ERR(nfc->nand_clk))
+		return PTR_ERR(nfc->nand_clk);
 
 	/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
-	regmap_update_bits(nfc->reg_clk,
-			   0, CLK_SELECT_NAND, CLK_SELECT_NAND);
+	writel(CLK_SELECT_NAND | readl(nfc->reg_clk), nfc->reg_clk);
 
 	ret = clk_prepare_enable(nfc->core_clk);
 	if (ret) {
@@ -1030,29 +1042,21 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 		goto err_device_clk;
 	}
 
-	ret = clk_prepare_enable(nfc->phase_tx);
+	ret = clk_prepare_enable(nfc->nand_clk);
 	if (ret) {
-		dev_err(nfc->dev, "failed to enable TX clock\n");
-		goto err_phase_tx;
-	}
-
-	ret = clk_prepare_enable(nfc->phase_rx);
-	if (ret) {
-		dev_err(nfc->dev, "failed to enable RX clock\n");
-		goto err_phase_rx;
+		dev_err(nfc->dev, "pre enable NFC divider fail\n");
+		goto err_nand_clk;
 	}
 
 	ret = clk_set_rate(nfc->device_clk, 24000000);
 	if (ret)
-		goto err_disable_rx;
+		goto err_disable_clk;
 
 	return 0;
 
-err_disable_rx:
-	clk_disable_unprepare(nfc->phase_rx);
-err_phase_rx:
-	clk_disable_unprepare(nfc->phase_tx);
-err_phase_tx:
+err_disable_clk:
+	clk_disable_unprepare(nfc->nand_clk);
+err_nand_clk:
 	clk_disable_unprepare(nfc->device_clk);
 err_device_clk:
 	clk_disable_unprepare(nfc->core_clk);
@@ -1061,8 +1065,7 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 
 static void meson_nfc_disable_clk(struct meson_nfc *nfc)
 {
-	clk_disable_unprepare(nfc->phase_rx);
-	clk_disable_unprepare(nfc->phase_tx);
+	clk_disable_unprepare(nfc->nand_clk);
 	clk_disable_unprepare(nfc->device_clk);
 	clk_disable_unprepare(nfc->core_clk);
 }
@@ -1375,6 +1378,7 @@ static int meson_nfc_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct meson_nfc *nfc;
 	struct resource *res;
+	u32 ext_clk_reg;
 	int ret, irq;
 
 	nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);
@@ -1396,9 +1400,15 @@ static int meson_nfc_probe(struct platform_device *pdev)
 	if (IS_ERR(nfc->reg_base))
 		return PTR_ERR(nfc->reg_base);
 
-	nfc->reg_clk =
-		syscon_regmap_lookup_by_phandle(dev->of_node,

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1411

Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +9 -1
-						"amlogic,mmc-syscon");
+	ret = of_property_read_u32(pdev->dev.of_node,
+				   "sd_emmc_c_clkc",
+				   &ext_clk_reg);
+	if (ret) {
+		dev_err(dev, "failed to get NAND external clock register\n");
+		return ret;
+	}
+
+	nfc->reg_clk = devm_ioremap(&pdev->dev, ext_clk_reg, sizeof(int));

That's how you should get a register region.
If you want an example of a device claiming several region on amlogic, have a look at the pinctrl driver.

Quoted 3 lines
drivers/mtd/nand/raw/meson_nand.c +0 -0
 	if (IS_ERR(nfc->reg_clk)) {
 		dev_err(dev, "Failed to lookup clock base\n");
 		return PTR_ERR(nfc->reg_clk);
author maintainer
#7 lore raw

Hi Jerome,

Quoted 23 lines · Jerome Brunet

[ EXTERNAL EMAIL ]

Quoted 18 lines · Liang Yang

Because EMMC and NAND have the same control clock register, so we implement a 'sd_emmc_c_clkc'. Previously DTS is defined as below:

	sd_emmc_c_clkc: mmc@7000 {
		compatible = "amlogic,meson-axg-mmc-clkc", "syscon";
		reg = <0x0 0x7000 0x0 0x800>;
	};

	nand-controller@7800 {
		......

		clocks = <&clkc CLKID_SD_EMMC_C>,
			<&sd_emmc_c_clkc CLKID_MMC_DIV>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_RX>,
			<&sd_emmc_c_clkc CLKID_MMC_PHASE_TX>;
		clock-names = "core", "device", "rx", "tx";
		amlogic,mmc-syscon = <&sd_emmc_c_clkc>;
Quoted 8 lines
Quoted 5 lines
		......
	}

but in fact, above implementation is rejected. so now registering a nand_divider.

Can you give a bit of context ? a link to the discussion rejecting this

Maybe I mistake the meaning of [[email protected]], so i need him to clarify it.

Quoted 4 lines

As far as remember, things were getting done for A1 and stopped before clock part was finished. I'm saying the change is wrong, just that a discussion is needed before a decision is made.

ok.
previous discussion in this link:
https://lore.kernel.org/all/[email protected]/
it never go on since v6.

Quoted 40 lines
Quoted 40 lines
Change-Id Ibeb4c7ff886f5886aac4d6c664d7bbd1b1bcb997
---
  drivers/mtd/nand/raw/meson_nand.c | 88 +++++++++++++++++--------------
  1 file changed, 49 insertions(+), 39 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +3 -1
index ac3be92872d0..4472363059c2 100644
@@ -2,7 +2,7 @@
  /*
   * Amlogic Meson Nand Flash Controller Driver
   *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2018-2021 Amlogic, inc.
   * Author: Liang Yang <[email protected]>
   */
 
@@ -10,6 +10,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/interrupt.h>
  #include <linux/clk.h>
+#include <linux/clk-provider.h>
  #include <linux/mtd/rawnand.h>
  #include <linux/mtd/mtd.h>
  #include <linux/mfd/syscon.h>
@@ -55,6 +56,7 @@
  #define NFC_REG_VER		0x38
 
  #define NFC_RB_IRQ_EN		BIT(21)
+#define NFC_CMD_FIFO_RESET	BIT(31)
 
  #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages)	\
  	(								\
@@ -104,6 +106,9 @@
 
  #define PER_INFO_BYTE		8
 
Quoted 15 lines

drivers/mtd/nand/raw/meson_nand.c struct meson_nfc { · line 155

Quoted 12 lines
drivers/mtd/nand/raw/meson_nand.c +3 -2
+#define CLK_DIV_SHIFT		0
+#define CLK_DIV_WIDTH		6
+
  struct meson_nfc_nand_chip {
  	struct list_head node;
  	struct nand_chip nand;
@@ -151,15 +156,15 @@ struct meson_nfc {
  	struct nand_controller controller;
  	struct clk *core_clk;
  	struct clk *device_clk;
-	struct clk *phase_tx;
-	struct clk *phase_rx;

I would have been nice to explain why these clock are no longer required, in the change description maybe ?

i got the reply from our vlsi members that rx and tx doesn't make sense to meson NFC timing. so previous commit about this should be wrong.

Quoted 7 lines
Quoted 7 lines
drivers/mtd/nand/raw/meson_nand.c +2 -0
+	struct clk *nand_clk;
+	struct clk_divider nand_divider;
 
  	unsigned long clk_rate;
  	u32 bus_timing;
 
Quoted 15 lines

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) · line 414

Quoted 13 lines
drivers/mtd/nand/raw/meson_nand.c +2 -2
  	struct device *dev;
  	void __iomem *reg_base;
-	struct regmap *reg_clk;
+	void __iomem *reg_clk;
  	struct completion completion;
  	struct list_head chips;
  	const struct meson_nfc_data *data;
@@ -406,12 +411,14 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms)
  	cmd = NFC_CMD_RB | NFC_CMD_RB_INT
  		| nfc->param.chip_select | nfc->timing.tbers_max;
  	writel(cmd, nfc->reg_base + NFC_REG_CMD);
-
+	meson_nfc_drain_cmd(nfc);

is this clock related ?

ok, i will split it in another patch.

Quoted 10 lines

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) · line 421

Quoted 8 lines
drivers/mtd/nand/raw/meson_nand.c +2 -0
  	ret = wait_for_completion_timeout(&nfc->completion,
  					  msecs_to_jiffies(timeout_ms));
  	if (ret == 0)
  		ret = -1;
 
+	/* reset command fifo to avoid lock */
+	writel(NFC_CMD_FIFO_RESET, nfc->reg_base + NFC_REG_CMD);

Again, not seem to be clock related - does not belong in this patch

ok, i will split it in another patch.

Quoted 22 lines

drivers/mtd/nand/raw/meson_nand.c static const struct mtd_ooblayout_ops meson_ooblayout_ops = { · line 992

Quoted 12 lines
drivers/mtd/nand/raw/meson_nand.c +2 -1
  	return ret;
  }
 
@@ -988,8 +995,9 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = {
  static int meson_nfc_clk_init(struct meson_nfc *nfc)
  {
  	int ret;
+	struct clk_init_data init = {0};
+	const char *fix_div2_pll_name[1];
 
-	/* request core clock */

Why is the comment bothering you ?

Quoted 7 lines
drivers/mtd/nand/raw/meson_nand.c +0 -0
  	nfc->core_clk = devm_clk_get(nfc->dev, "core");
  	if (IS_ERR(nfc->core_clk)) {
  		dev_err(nfc->dev, "failed to get core clock\n");
@@ -1002,21 +1010,25 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
  		return PTR_ERR(nfc->device_clk);
  	}
 
Quoted 16 lines
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +0 -4
-	nfc->phase_tx = devm_clk_get(nfc->dev, "tx");
-	if (IS_ERR(nfc->phase_tx)) {
-		dev_err(nfc->dev, "failed to get TX clk\n");
-		return PTR_ERR(nfc->phase_tx);

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_clk_init(struct meson_nfc *nfc) · line 1015

Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +3 -7
-	}
-
-	nfc->phase_rx = devm_clk_get(nfc->dev, "rx");
-	if (IS_ERR(nfc->phase_rx)) {
-		dev_err(nfc->dev, "failed to get RX clk\n");
-		return PTR_ERR(nfc->phase_rx);
-	}
+	init.name = devm_kstrdup(nfc->dev, "nfc#div", GFP_KERNEL);
+	init.ops = &clk_divider_ops;
+	fix_div2_pll_name[0] = __clk_get_name(nfc->device_clk);

You should be using "fw_name" so CCF looks a DT directly, instead of this

ok

Quoted 81 lines
Quoted 81 lines
drivers/mtd/nand/raw/meson_nand.c +23 -19
+	init.parent_names = fix_div2_pll_name;
+	init.num_parents = 1;
+	nfc->nand_divider.reg = nfc->reg_clk;
+	nfc->nand_divider.shift = CLK_DIV_SHIFT;
+	nfc->nand_divider.width = CLK_DIV_WIDTH;
+	nfc->nand_divider.hw.init = &init;
+	nfc->nand_divider.flags = CLK_DIVIDER_ONE_BASED |
+				  CLK_DIVIDER_ROUND_CLOSEST |
+          			  CLK_DIVIDER_ALLOW_ZERO;
+
+	nfc->nand_clk = devm_clk_register(nfc->dev, &nfc->nand_divider.hw);
+	if (IS_ERR(nfc->nand_clk))
+		return PTR_ERR(nfc->nand_clk);
 
  	/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
-	regmap_update_bits(nfc->reg_clk,
-			   0, CLK_SELECT_NAND, CLK_SELECT_NAND);
+	writel(CLK_SELECT_NAND | readl(nfc->reg_clk), nfc->reg_clk);
 
  	ret = clk_prepare_enable(nfc->core_clk);
  	if (ret) {
@@ -1030,29 +1042,21 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
  		goto err_device_clk;
  	}
 
-	ret = clk_prepare_enable(nfc->phase_tx);
+	ret = clk_prepare_enable(nfc->nand_clk);
  	if (ret) {
-		dev_err(nfc->dev, "failed to enable TX clock\n");
-		goto err_phase_tx;
-	}
-
-	ret = clk_prepare_enable(nfc->phase_rx);
-	if (ret) {
-		dev_err(nfc->dev, "failed to enable RX clock\n");
-		goto err_phase_rx;
+		dev_err(nfc->dev, "pre enable NFC divider fail\n");
+		goto err_nand_clk;
  	}
 
  	ret = clk_set_rate(nfc->device_clk, 24000000);
  	if (ret)
-		goto err_disable_rx;
+		goto err_disable_clk;
 
  	return 0;
 
-err_disable_rx:
-	clk_disable_unprepare(nfc->phase_rx);
-err_phase_rx:
-	clk_disable_unprepare(nfc->phase_tx);
-err_phase_tx:
+err_disable_clk:
+	clk_disable_unprepare(nfc->nand_clk);
+err_nand_clk:
  	clk_disable_unprepare(nfc->device_clk);
  err_device_clk:
  	clk_disable_unprepare(nfc->core_clk);
@@ -1061,8 +1065,7 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
 
  static void meson_nfc_disable_clk(struct meson_nfc *nfc)
  {
-	clk_disable_unprepare(nfc->phase_rx);
-	clk_disable_unprepare(nfc->phase_tx);
+	clk_disable_unprepare(nfc->nand_clk);
  	clk_disable_unprepare(nfc->device_clk);
  	clk_disable_unprepare(nfc->core_clk);
  }
@@ -1375,6 +1378,7 @@ static int meson_nfc_probe(struct platform_device *pdev)
  	struct device *dev = &pdev->dev;
  	struct meson_nfc *nfc;
  	struct resource *res;
+	u32 ext_clk_reg;
  	int ret, irq;
 
  	nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);
@@ -1396,9 +1400,15 @@ static int meson_nfc_probe(struct platform_device *pdev)
  	if (IS_ERR(nfc->reg_base))
  		return PTR_ERR(nfc->reg_base);
 
Quoted 16 lines

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1411

Quoted 12 lines
drivers/mtd/nand/raw/meson_nand.c +9 -3
-	nfc->reg_clk =
-		syscon_regmap_lookup_by_phandle(dev->of_node,
-						"amlogic,mmc-syscon");
+	ret = of_property_read_u32(pdev->dev.of_node,
+				   "sd_emmc_c_clkc",
+				   &ext_clk_reg);
+	if (ret) {
+		dev_err(dev, "failed to get NAND external clock register\n");
+		return ret;
+	}
+
+	nfc->reg_clk = devm_ioremap(&pdev->dev, ext_clk_reg, sizeof(int));

That's how you should get a register region.
If you want an example of a device claiming several region on amlogic, have a look at the pinctrl driver.

ok

Quoted 6 lines

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1414

Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +0 -0
  	if (IS_ERR(nfc->reg_clk)) {
  		dev_err(dev, "Failed to lookup clock base\n");
  		return PTR_ERR(nfc->reg_clk);

.

#8 lore raw

Hi,

Quoted 35 lines · Liang Yang

Hi Jerome,

Quoted 23 lines · Jerome Brunet

[ EXTERNAL EMAIL ]

Quoted 18 lines · Liang Yang

Because EMMC and NAND have the same control clock register, so we implement a 'sd_emmc_c_clkc'. Previously DTS is defined as below:

    sd_emmc_c_clkc: mmc@7000 {
        compatible = "amlogic,meson-axg-mmc-clkc", "syscon"; reg = <0x0 0x7000 0x0 0x800>;
    };

    nand-controller@7800 {
        ......

        clocks = <&clkc CLKID_SD_EMMC_C>, <&sd_emmc_c_clkc CLKID_MMC_DIV>, <&sd_emmc_c_clkc CLKID_MMC_PHASE_RX>, <&sd_emmc_c_clkc CLKID_MMC_PHASE_TX>; clock-names = "core", "device", "rx", "tx"; amlogic,mmc-syscon = <&sd_emmc_c_clkc>;

Quoted 8 lines
Quoted 5 lines

        ......
    }

but in fact, above implementation is rejected. so now registering a nand_divider.

Can you give a bit of context ? a link to the discussion rejecting this

Maybe I mistake the meaning of [[email protected]], so i need him to clarify it.

Quoted 8 lines
Quoted 4 lines

As far as remember, things were getting done for A1 and stopped before clock part was finished. I'm saying the change is wrong, just that a discussion is needed before a decision is made.

ok.
previous discussion in this link:
https://lore.kernel.org/all/[email protected]/
it never go on since v6.

Looking at the serie I don't see any major blockers, if you're willing to take ownership of this patchset and send a v6 with all issues/comments addressed, it would be easier than restarting the whole design discussion

Neil

Quoted 215 lines
Quoted 43 lines
Quoted 43 lines
Change-Id Ibeb4c7ff886f5886aac4d6c664d7bbd1b1bcb997

---
  drivers/mtd/nand/raw/meson_nand.c | 88 +++++++++++++++++--------------

  1 file changed, 49 insertions(+), 39 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +1 -1
index ac3be92872d0..4472363059c2 100644
@@ -2,7 +2,7 @@
   /*
    * Amlogic Meson Nand Flash Controller Driver
    *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2018-2021 Amlogic, inc.
    * Author: Liang Yang <[email protected]>
    */

  @@ -10,6 +10,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/interrupt.h>
  #include <linux/clk.h>
+#include <linux/clk-provider.h>
  #include <linux/mtd/rawnand.h>
  #include <linux/mtd/mtd.h>
  #include <linux/mfd/syscon.h>

drivers/mtd/nand/raw/meson_nand.c +1 -0
@@ -55,6 +56,7 @@
   #define NFC_REG_VER        0x38
     #define NFC_RB_IRQ_EN        BIT(21)
+#define NFC_CMD_FIFO_RESET    BIT(31)
     #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages)    \
       (                                \
@@ -104,6 +106,9 @@
     #define PER_INFO_BYTE        8

  +#define CLK_DIV_SHIFT        0

drivers/mtd/nand/raw/meson_nand.c +2 -0
+#define CLK_DIV_WIDTH        6
+

  struct meson_nfc_nand_chip {
      struct list_head node;
      struct nand_chip nand;

drivers/mtd/nand/raw/meson_nand.c +0 -0
@@ -151,15 +156,15 @@ struct meson_nfc {
Quoted 8 lines

drivers/mtd/nand/raw/meson_nand.c struct meson_nfc { · line 155

Quoted 5 lines
drivers/mtd/nand/raw/meson_nand.c +0 -2
       struct nand_controller controller;
       struct clk *core_clk;
       struct clk *device_clk;
-    struct clk *phase_tx;
-    struct clk *phase_rx;

I would have been nice to explain why these clock are no longer required, in the change description maybe ?

i got the reply from our vlsi members that rx and tx doesn't make sense to meson NFC timing. so previous commit about this should be wrong.

Quoted 12 lines
Quoted 12 lines
drivers/mtd/nand/raw/meson_nand.c +3 -1
+    struct clk *nand_clk;
+    struct clk_divider nand_divider;
         unsigned long clk_rate;
       u32 bus_timing;
         struct device *dev;
       void __iomem *reg_base;
-    struct regmap *reg_clk;
+    void __iomem *reg_clk;
       struct completion completion;
       struct list_head chips;
       const struct meson_nfc_data *data;
Quoted 8 lines
Quoted 6 lines
drivers/mtd/nand/raw/meson_nand.c +0 -0
@@ -406,12 +411,14 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms)

      cmd = NFC_CMD_RB | NFC_CMD_RB_INT
          | nfc->param.chip_select | nfc->timing.tbers_max; writel(cmd, nfc->reg_base + NFC_REG_CMD);
-
+    meson_nfc_drain_cmd(nfc);

is this clock related ?

ok, i will split it in another patch.

Quoted 9 lines
Quoted 7 lines

      ret = wait_for_completion_timeout(&nfc->completion, msecs_to_jiffies(timeout_ms)); if (ret == 0)
          ret = -1;
  +    /* reset command fifo to avoid lock */
+    writel(NFC_CMD_FIFO_RESET, nfc->reg_base + NFC_REG_CMD);

Again, not seem to be clock related - does not belong in this patch

ok, i will split it in another patch.

Quoted 27 lines
Quoted 10 lines

      return ret;
  }
  @@ -988,8 +995,9 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = { static int meson_nfc_clk_init(struct meson_nfc *nfc)
  {
      int ret;
+    struct clk_init_data init = {0};
+    const char *fix_div2_pll_name[1];
  -    /* request core clock */

Why is the comment bothering you ?

Quoted 14 lines

      nfc->core_clk = devm_clk_get(nfc->dev, "core"); if (IS_ERR(nfc->core_clk)) { dev_err(nfc->dev, "failed to get core clock\n");

drivers/mtd/nand/raw/meson_nand.c +0 -7
@@ -1002,21 +1010,25 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
           return PTR_ERR(nfc->device_clk);
       }
   -    nfc->phase_tx = devm_clk_get(nfc->dev, "tx");
-    if (IS_ERR(nfc->phase_tx)) {
-        dev_err(nfc->dev, "failed to get TX clk\n");
-        return PTR_ERR(nfc->phase_tx);
-    }
-
-    nfc->phase_rx = devm_clk_get(nfc->dev, "rx");
-    if (IS_ERR(nfc->phase_rx)) {
Quoted 8 lines

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_clk_init(struct meson_nfc *nfc) · line 1015

Quoted 6 lines
drivers/mtd/nand/raw/meson_nand.c +3 -3
-        dev_err(nfc->dev, "failed to get RX clk\n");
-        return PTR_ERR(nfc->phase_rx);
-    }
+    init.name = devm_kstrdup(nfc->dev, "nfc#div", GFP_KERNEL);
+    init.ops = &clk_divider_ops;
+    fix_div2_pll_name[0] = __clk_get_name(nfc->device_clk);

You should be using "fw_name" so CCF looks a DT directly, instead of this

ok

Quoted 80 lines
Quoted 80 lines
drivers/mtd/nand/raw/meson_nand.c +18 -11
+    init.parent_names = fix_div2_pll_name;
+    init.num_parents = 1;
+    nfc->nand_divider.reg = nfc->reg_clk;
+    nfc->nand_divider.shift = CLK_DIV_SHIFT;
+    nfc->nand_divider.width = CLK_DIV_WIDTH;
+    nfc->nand_divider.hw.init = &init;
+    nfc->nand_divider.flags = CLK_DIVIDER_ONE_BASED |
+                  CLK_DIVIDER_ROUND_CLOSEST |
+                        CLK_DIVIDER_ALLOW_ZERO;
+
+    nfc->nand_clk = devm_clk_register(nfc->dev, &nfc->nand_divider.hw);
+    if (IS_ERR(nfc->nand_clk))
+        return PTR_ERR(nfc->nand_clk);
         /* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
-    regmap_update_bits(nfc->reg_clk,
-               0, CLK_SELECT_NAND, CLK_SELECT_NAND);
+    writel(CLK_SELECT_NAND | readl(nfc->reg_clk), nfc->reg_clk);
         ret = clk_prepare_enable(nfc->core_clk);
       if (ret) {
@@ -1030,29 +1042,21 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
           goto err_device_clk;
       }
   -    ret = clk_prepare_enable(nfc->phase_tx);
+    ret = clk_prepare_enable(nfc->nand_clk);
       if (ret) {
-        dev_err(nfc->dev, "failed to enable TX clock\n");
-        goto err_phase_tx;
-    }
-
-    ret = clk_prepare_enable(nfc->phase_rx);
-    if (ret) {
-        dev_err(nfc->dev, "failed to enable RX clock\n");
-        goto err_phase_rx;
+        dev_err(nfc->dev, "pre enable NFC divider fail\n");
+        goto err_nand_clk;
       }
         ret = clk_set_rate(nfc->device_clk, 24000000);
       if (ret)
-        goto err_disable_rx;
+        goto err_disable_clk;
         return 0;

  -err_disable_rx:
-    clk_disable_unprepare(nfc->phase_rx);

drivers/mtd/nand/raw/meson_nand.c +3 -3
-err_phase_rx:
-    clk_disable_unprepare(nfc->phase_tx);
-err_phase_tx:
+err_disable_clk:
+    clk_disable_unprepare(nfc->nand_clk);
+err_nand_clk:

      clk_disable_unprepare(nfc->device_clk);
  err_device_clk:
      clk_disable_unprepare(nfc->core_clk);

drivers/mtd/nand/raw/meson_nand.c +2 -2
@@ -1061,8 +1065,7 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
     static void meson_nfc_disable_clk(struct meson_nfc *nfc)
   {
-    clk_disable_unprepare(nfc->phase_rx);
-    clk_disable_unprepare(nfc->phase_tx);
+    clk_disable_unprepare(nfc->nand_clk);
       clk_disable_unprepare(nfc->device_clk);
       clk_disable_unprepare(nfc->core_clk);
   }
@@ -1375,6 +1378,7 @@ static int meson_nfc_probe(struct platform_device *pdev)
       struct device *dev = &pdev->dev;
       struct meson_nfc *nfc;
       struct resource *res;
+    u32 ext_clk_reg;
       int ret, irq;
         nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);
@@ -1396,9 +1400,15 @@ static int meson_nfc_probe(struct platform_device *pdev)
       if (IS_ERR(nfc->reg_base))
           return PTR_ERR(nfc->reg_base);

  -    nfc->reg_clk =
-        syscon_regmap_lookup_by_phandle(dev->of_node,
-                        "amlogic,mmc-syscon");
+    ret = of_property_read_u32(pdev->dev.of_node,
+                   "sd_emmc_c_clkc",
+                   &ext_clk_reg);
+    if (ret) {
+        dev_err(dev, "failed to get NAND external clock register\n");

Quoted 8 lines
Quoted 4 lines

+        return ret;
+    }
+
+    nfc->reg_clk = devm_ioremap(&pdev->dev, ext_clk_reg, sizeof(int));

That's how you should get a register region.
If you want an example of a device claiming several region on amlogic, have a look at the pinctrl driver.

ok

Quoted 6 lines
Quoted 4 lines

      if (IS_ERR(nfc->reg_clk)) {
          dev_err(dev, "Failed to lookup clock base\n"); return PTR_ERR(nfc->reg_clk);

.

author maintainer
#9 lore raw

Hi,

Quoted 49 lines · Neil Armstrong

[ EXTERNAL EMAIL ]

Hi,

Quoted 35 lines · Liang Yang

Hi Jerome,

Quoted 23 lines · Jerome Brunet

[ EXTERNAL EMAIL ]

Quoted 18 lines · Liang Yang

Because EMMC and NAND have the same control clock register, so we implement a 'sd_emmc_c_clkc'. Previously DTS is defined as below:

    sd_emmc_c_clkc: mmc@7000 {
        compatible = "amlogic,meson-axg-mmc-clkc", "syscon"; reg = <0x0 0x7000 0x0 0x800>;
    };

    nand-controller@7800 {
        ......

        clocks = <&clkc CLKID_SD_EMMC_C>, <&sd_emmc_c_clkc CLKID_MMC_DIV>, <&sd_emmc_c_clkc CLKID_MMC_PHASE_RX>, <&sd_emmc_c_clkc CLKID_MMC_PHASE_TX>; clock-names = "core", "device", "rx", "tx"; amlogic,mmc-syscon = <&sd_emmc_c_clkc>;

Quoted 8 lines
Quoted 5 lines

        ......
    }

but in fact, above implementation is rejected. so now registering a nand_divider.

Can you give a bit of context ? a link to the discussion rejecting this

Maybe I mistake the meaning of [[email protected]], so i need him to clarify it.

Quoted 8 lines
Quoted 4 lines

As far as remember, things were getting done for A1 and stopped before clock part was finished. I'm saying the change is wrong, just that a discussion is needed before a decision is made.

ok.
previous discussion in this link:
https://lore.kernel.org/all/[email protected]/
it never go on since v6.

Quoted 5 lines

Looking at the serie I don't see any major blockers, if you're willing to take ownership of this patchset and send a v6 with all issues/comments addressed, it would be easier than restarting the whole design discussion

Neil

Hi Neil, thanks for your advice.
After talking with [jianxin.pan], form this link <https://lkml.org/lkml/2019/1/8/441>, it already moves futher and on v9, so we decide to continue to work hard on it.

Quoted 218 lines
Quoted 209 lines
Quoted 44 lines
Quoted 44 lines
Change-Id Ibeb4c7ff886f5886aac4d6c664d7bbd1b1bcb997
---
   drivers/mtd/nand/raw/meson_nand.c | 88 +++++++++++++++++--------------
   1 file changed, 49 insertions(+), 39 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +1 -1
index ac3be92872d0..4472363059c2 100644
@@ -2,7 +2,7 @@
   /*
    * Amlogic Meson Nand Flash Controller Driver
    *
- * Copyright (c) 2018 Amlogic, inc.
+ * Copyright (c) 2018-2021 Amlogic, inc.
    * Author: Liang Yang <[email protected]>
    */
   @@ -10,6 +10,7 @@

  #include <linux/dma-mapping.h>
  #include <linux/interrupt.h>
  #include <linux/clk.h>

drivers/mtd/nand/raw/meson_nand.c +4 -0
+#include <linux/clk-provider.h>
   #include <linux/mtd/rawnand.h>
   #include <linux/mtd/mtd.h>
   #include <linux/mfd/syscon.h>
@@ -55,6 +56,7 @@
   #define NFC_REG_VER        0x38
     #define NFC_RB_IRQ_EN        BIT(21)
+#define NFC_CMD_FIFO_RESET    BIT(31)
     #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages)    \
       (                                \
@@ -104,6 +106,9 @@
     #define PER_INFO_BYTE        8
   +#define CLK_DIV_SHIFT        0
+#define CLK_DIV_WIDTH        6
+
   struct meson_nfc_nand_chip {
       struct list_head node;
       struct nand_chip nand;
@@ -151,15 +156,15 @@ struct meson_nfc {
Quoted 8 lines

drivers/mtd/nand/raw/meson_nand.c struct meson_nfc { · line 155

Quoted 5 lines
drivers/mtd/nand/raw/meson_nand.c +0 -2
       struct nand_controller controller;
       struct clk *core_clk;
       struct clk *device_clk;
-    struct clk *phase_tx;
-    struct clk *phase_rx;

I would have been nice to explain why these clock are no longer required, in the change description maybe ?

i got the reply from our vlsi members that rx and tx doesn't make sense to meson NFC timing. so previous commit about this should be wrong.

Quoted 12 lines
Quoted 12 lines
drivers/mtd/nand/raw/meson_nand.c +3 -1
+    struct clk *nand_clk;
+    struct clk_divider nand_divider;
         unsigned long clk_rate;
       u32 bus_timing;
         struct device *dev;
       void __iomem *reg_base;
-    struct regmap *reg_clk;
+    void __iomem *reg_clk;
       struct completion completion;
       struct list_head chips;
       const struct meson_nfc_data *data;
Quoted 8 lines

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) · line 414

Quoted 6 lines
drivers/mtd/nand/raw/meson_nand.c +1 -1
@@ -406,12 +411,14 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms)
       cmd = NFC_CMD_RB | NFC_CMD_RB_INT
           | nfc->param.chip_select | nfc->timing.tbers_max;
       writel(cmd, nfc->reg_base + NFC_REG_CMD);
-
+    meson_nfc_drain_cmd(nfc);

is this clock related ?

ok, i will split it in another patch.

Quoted 9 lines

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) · line 421

Quoted 7 lines
drivers/mtd/nand/raw/meson_nand.c +1 -0
       ret = wait_for_completion_timeout(&nfc->completion,
                         msecs_to_jiffies(timeout_ms));
       if (ret == 0)
           ret = -1;
   +    /* reset command fifo to avoid lock */
+    writel(NFC_CMD_FIFO_RESET, nfc->reg_base + NFC_REG_CMD);

Again, not seem to be clock related - does not belong in this patch

ok, i will split it in another patch.

Quoted 27 lines

drivers/mtd/nand/raw/meson_nand.c static const struct mtd_ooblayout_ops meson_ooblayout_ops = {

Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +2 -0
       return ret;
   }
   @@ -988,8 +995,9 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = {
   static int meson_nfc_clk_init(struct meson_nfc *nfc)
   {
       int ret;
+    struct clk_init_data init = {0};
+    const char *fix_div2_pll_name[1];
   -    /* request core clock */

Why is the comment bothering you ?

Quoted 14 lines

      nfc->core_clk = devm_clk_get(nfc->dev, "core"); if (IS_ERR(nfc->core_clk)) { dev_err(nfc->dev, "failed to get core clock\n");

drivers/mtd/nand/raw/meson_nand.c +0 -7
@@ -1002,21 +1010,25 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
           return PTR_ERR(nfc->device_clk);
       }
   -    nfc->phase_tx = devm_clk_get(nfc->dev, "tx");
-    if (IS_ERR(nfc->phase_tx)) {
-        dev_err(nfc->dev, "failed to get TX clk\n");
-        return PTR_ERR(nfc->phase_tx);
-    }
-
-    nfc->phase_rx = devm_clk_get(nfc->dev, "rx");
-    if (IS_ERR(nfc->phase_rx)) {
Quoted 8 lines

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_clk_init(struct meson_nfc *nfc) · line 1015

Quoted 6 lines
drivers/mtd/nand/raw/meson_nand.c +3 -3
-        dev_err(nfc->dev, "failed to get RX clk\n");
-        return PTR_ERR(nfc->phase_rx);
-    }
+    init.name = devm_kstrdup(nfc->dev, "nfc#div", GFP_KERNEL);
+    init.ops = &clk_divider_ops;
+    fix_div2_pll_name[0] = __clk_get_name(nfc->device_clk);

You should be using "fw_name" so CCF looks a DT directly, instead of this

ok

Quoted 80 lines
Quoted 80 lines
drivers/mtd/nand/raw/meson_nand.c +28 -19
+    init.parent_names = fix_div2_pll_name;
+    init.num_parents = 1;
+    nfc->nand_divider.reg = nfc->reg_clk;
+    nfc->nand_divider.shift = CLK_DIV_SHIFT;
+    nfc->nand_divider.width = CLK_DIV_WIDTH;
+    nfc->nand_divider.hw.init = &init;
+    nfc->nand_divider.flags = CLK_DIVIDER_ONE_BASED |
+                  CLK_DIVIDER_ROUND_CLOSEST |
+                        CLK_DIVIDER_ALLOW_ZERO;
+
+    nfc->nand_clk = devm_clk_register(nfc->dev, &nfc->nand_divider.hw);
+    if (IS_ERR(nfc->nand_clk))
+        return PTR_ERR(nfc->nand_clk);
         /* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
-    regmap_update_bits(nfc->reg_clk,
-               0, CLK_SELECT_NAND, CLK_SELECT_NAND);
+    writel(CLK_SELECT_NAND | readl(nfc->reg_clk), nfc->reg_clk);
         ret = clk_prepare_enable(nfc->core_clk);
       if (ret) {
@@ -1030,29 +1042,21 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
           goto err_device_clk;
       }
   -    ret = clk_prepare_enable(nfc->phase_tx);
+    ret = clk_prepare_enable(nfc->nand_clk);
       if (ret) {
-        dev_err(nfc->dev, "failed to enable TX clock\n");
-        goto err_phase_tx;
-    }
-
-    ret = clk_prepare_enable(nfc->phase_rx);
-    if (ret) {
-        dev_err(nfc->dev, "failed to enable RX clock\n");
-        goto err_phase_rx;
+        dev_err(nfc->dev, "pre enable NFC divider fail\n");
+        goto err_nand_clk;
       }
         ret = clk_set_rate(nfc->device_clk, 24000000);
       if (ret)
-        goto err_disable_rx;
+        goto err_disable_clk;
         return 0;
   -err_disable_rx:
-    clk_disable_unprepare(nfc->phase_rx);
-err_phase_rx:
-    clk_disable_unprepare(nfc->phase_tx);
-err_phase_tx:
+err_disable_clk:
+    clk_disable_unprepare(nfc->nand_clk);
+err_nand_clk:
       clk_disable_unprepare(nfc->device_clk);
   err_device_clk:
       clk_disable_unprepare(nfc->core_clk);
@@ -1061,8 +1065,7 @@ static int meson_nfc_clk_init(struct meson_nfc *nfc)
     static void meson_nfc_disable_clk(struct meson_nfc *nfc)
   {
-    clk_disable_unprepare(nfc->phase_rx);
-    clk_disable_unprepare(nfc->phase_tx);
+    clk_disable_unprepare(nfc->nand_clk);
       clk_disable_unprepare(nfc->device_clk);
       clk_disable_unprepare(nfc->core_clk);
   }
@@ -1375,6 +1378,7 @@ static int meson_nfc_probe(struct platform_device *pdev)
       struct device *dev = &pdev->dev;
       struct meson_nfc *nfc;
       struct resource *res;
+    u32 ext_clk_reg;
       int ret, irq;
         nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);
@@ -1396,9 +1400,15 @@ static int meson_nfc_probe(struct platform_device *pdev)
       if (IS_ERR(nfc->reg_base))
           return PTR_ERR(nfc->reg_base);
   -    nfc->reg_clk =
-        syscon_regmap_lookup_by_phandle(dev->of_node,
-                        "amlogic,mmc-syscon");
+    ret = of_property_read_u32(pdev->dev.of_node,
+                   "sd_emmc_c_clkc",
+                   &ext_clk_reg);
+    if (ret) {
+        dev_err(dev, "failed to get NAND external clock register\n");
Quoted 8 lines

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1411

Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +4 -0
+        return ret;
+    }
+
+    nfc->reg_clk = devm_ioremap(&pdev->dev, ext_clk_reg, sizeof(int));

That's how you should get a register region.
If you want an example of a device claiming several region on amlogic, have a look at the pinctrl driver.

Quoted 7 lines

ok

Quoted 6 lines

drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1414

Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +0 -0
       if (IS_ERR(nfc->reg_clk)) {
           dev_err(dev, "Failed to lookup clock base\n");
           return PTR_ERR(nfc->reg_clk);

.

.

#10 lore raw
In reply to Liang Yang
I love your patch! Yet something to improve:

Hi Liang,

I love your patch! Yet something to improve:

[auto build test ERROR on mtd/nand/next]
[also build test ERROR on v5.16-rc8 next-20220105]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Liang-Yang/mtd-rawnand-meson-fix-the-clock-after-discarding-sd_emmc_c_clkc/20220106-114103
base:   https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
config: openrisc-randconfig-r012-20220105 (https://download.01.org/0day-ci/archive/20220106/202201062140.24LB23iM-lkp(a)intel.com/config)
compiler: or1k-linux-gcc (GCC) 11.2.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/a7e02cbd62a38e6fcbdcafe806b129bb287e7cf6
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Liang-Yang/mtd-rawnand-meson-fix-the-clock-after-discarding-sd_emmc_c_clkc/20220106-114103 git checkout a7e02cbd62a38e6fcbdcafe806b129bb287e7cf6
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=openrisc SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

or1k-linux-ld: drivers/mtd/nand/raw/meson_nand.o: in function `meson_nfc_probe':

>> meson_nand.c:(.text+0x21a0): undefined reference to `clk_divider_ops'
>> or1k-linux-ld: meson_nand.c:(.text+0x21a4): undefined reference to `clk_divider_ops'
>> or1k-linux-ld: meson_nand.c:(.text+0x21b0): undefined reference to `__clk_get_name'
   meson_nand.c:(.text+0x21b0): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__clk_get_name'
>> or1k-linux-ld: meson_nand.c:(.text+0x21ec): undefined reference to `devm_clk_register'

meson_nand.c:(.text+0x21ec): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `devm_clk_register'

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#11 lore raw
In reply to Liang Yang
I love your patch! Yet something to improve:

Hi Liang,

I love your patch! Yet something to improve:

[auto build test ERROR on mtd/nand/next]
[also build test ERROR on v5.16-rc8 next-20220106]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Liang-Yang/mtd-rawnand-meson-fix-the-clock-after-discarding-sd_emmc_c_clkc/20220106-114103
base:   https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
config: hexagon-randconfig-r045-20220106 (https://download.01.org/0day-ci/archive/20220107/202201070440.ncSR3Xpb-lkp(a)intel.com/config)
compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project ca7ffe09dc6e525109e3cd570cc5182ce568be13)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/a7e02cbd62a38e6fcbdcafe806b129bb287e7cf6
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Liang-Yang/mtd-rawnand-meson-fix-the-clock-after-discarding-sd_emmc_c_clkc/20220106-114103 git checkout a7e02cbd62a38e6fcbdcafe806b129bb287e7cf6
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> ld.lld: error: undefined symbol: __clk_get_name
   >>> referenced by meson_nand.c
   >>> mtd/nand/raw/meson_nand.o:(meson_nfc_probe) in archive drivers/built-in.a
   >>> referenced by meson_nand.c
   >>> mtd/nand/raw/meson_nand.o:(meson_nfc_probe) in archive drivers/built-in.a
--
>> ld.lld: error: undefined symbol: clk_divider_ops
   >>> referenced by meson_nand.c
   >>> mtd/nand/raw/meson_nand.o:(meson_nfc_probe) in archive drivers/built-in.a
   >>> referenced by meson_nand.c
   >>> mtd/nand/raw/meson_nand.o:(meson_nfc_probe) in archive drivers/built-in.a
--
>> ld.lld: error: undefined symbol: devm_clk_register
   >>> referenced by meson_nand.c
   >>> mtd/nand/raw/meson_nand.o:(meson_nfc_probe) in archive drivers/built-in.a
   >>> referenced by meson_nand.c
   >>> mtd/nand/raw/meson_nand.o:(meson_nfc_probe) in archive drivers/built-in.a

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#12 lore raw
In reply to Liang Yang
I love your patch! Yet something to improve:

Hi Liang,

I love your patch! Yet something to improve:

[auto build test ERROR on mtd/nand/next]
[also build test ERROR on v5.16-rc8 next-20220106]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Liang-Yang/mtd-rawnand-meson-fix-the-clock-after-discarding-sd_emmc_c_clkc/20220106-114103
base:   https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
config: ia64-randconfig-r035-20220106 (https://download.01.org/0day-ci/archive/20220107/202201070543.goUXCEdh-lkp(a)intel.com/config)
compiler: ia64-linux-gcc (GCC) 11.2.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/a7e02cbd62a38e6fcbdcafe806b129bb287e7cf6
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Liang-Yang/mtd-rawnand-meson-fix-the-clock-after-discarding-sd_emmc_c_clkc/20220106-114103 git checkout a7e02cbd62a38e6fcbdcafe806b129bb287e7cf6
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=ia64 SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

ia64-linux-ld: drivers/mtd/nand/raw/meson_nand.o: in function `meson_nfc_probe':
meson_nand.c:(.text+0x3410): undefined reference to `clk_divider_ops'

>> ia64-linux-ld: meson_nand.c:(.text+0x3430): undefined reference to `clk_divider_ops'
>> ia64-linux-ld: meson_nand.c:(.text+0x3442): undefined reference to `__clk_get_name'
>> ia64-linux-ld: meson_nand.c:(.text+0x34d2): undefined reference to `devm_clk_register'

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org