refine the NFC clock framework
Subsystems (5)
Liang Yang
maintainerv4 cover refine the NFC clock framework
Background firstly,
Both EMMC and NAND have the same clock control register named 'SD_EMMC_CLOCK' which is defined in EMMC port internally. bit0~5 of 'SD_EMMC_CLOCK' is the divider and bit6~7 is the mux for fix pll and xtal.
Previously a common MMC sub clock framework is implemented and shared by EMMC and NAND, but that is coupling the EMMC and NAND, although EMMC and NAND is mutually exclusive. see the link:
[https://lore.kernel.org/all/[email protected]/]
Now we plan to abandon common mmc sub clock framework and recovery the series.
Changes since v3 [4]
- use devm_platform_ioremap_resource_byname
- dt_binding_check for mtd/amlogic,meson-nand.yaml
Changes since v2 [3]
- use fw_name from dts, instead the wrong way using __clk_get_name
- reg resource size change to 0x800
- use reg-names
Changes since v1 [2]
- use clk_parent_data instead of parent_names
- define a reg resource instead of sd_emmc_c_clkc
[1] https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
[2] https://lore.kernel.org/all/[email protected]
[3] https://lore.kernel.org/all/[email protected]
Liang Yang (2):
mtd: rawnand: meson: discard the common MMC sub clock framework
dt-bindings: nand: meson: refine Amlogic NAND controller driver
.../bindings/mtd/amlogic,meson-nand.txt | 60 ------------- .../bindings/mtd/amlogic,meson-nand.yaml | 80 +++++++++++++++++ drivers/mtd/nand/raw/meson_nand.c | 89 +++++++++---------- 3 files changed, 122 insertions(+), 107 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt create mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml
Signature · 1 line
2.34.1
Liang Yang
maintainerPATCH v4 1/2 mtd: rawnand: meson: discard the common MMC sub clock framework
EMMC and NAND have the same clock control register named 'SD_EMMC_CLOCK' which is defined in EMMC port internally. bit0~5 of 'SD_EMMC_CLOCK' is the divider and bit6~7 is the mux for fix pll and xtal.A common MMC and NAND sub-clock has been implemented and can be used by the eMMC and NAND controller (which are mutually exclusive anyway). Let's use this new clock.
--- drivers/mtd/nand/raw/meson_nand.c | 89 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 47 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +42 -47
@@ -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>
@@ -19,6 +20,7 @@#include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_address.h> #include <linux/sched/task_stack.h> #define NFC_REG_CMD 0x00
@@ -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 *sd_emmc_clock;struct completion completion;struct list_head chips;const struct meson_nfc_data *data;
@@ -235,7 +240,7 @@ static void meson_nfc_select_chip(struct nand_chip *nand, int chip) nfc->timing.tbers_max = meson_chip->tbers_max;if (nfc->clk_rate != meson_chip->clk_rate) { - ret =clk_set_rate (nfc->device_clk, meson_chip->clk_rate); + ret =clk_set_rate (nfc->nand_clk, meson_chip->clk_rate);if (ret) {dev_err (nfc->dev,"failed to set clock rate\n" );return ;
@@ -406,7 +411,6 @@ 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 ); - ret =wait_for_completion_timeout (&nfc->completion,msecs_to_jiffies (timeout_ms));if (ret ==0 )
@@ -985,9 +989,11 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = { .free = meson_ooblayout_free, }; +struct clk_parent_data nfc_divider_parent_data[1 ];static int meson_nfc_clk_init (struct meson_nfc *nfc) {int ret; +struct clk_init_data init = {0 };/* request core clock */ nfc->core_clk =devm_clk_get (nfc->dev,"core" );
@@ -1002,21 +1008,26 @@ 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; + nfc_divider_parent_data[0 ].fw_name ="device" ; + init.parent_data = nfc_divider_parent_data; + init.num_parents =1 ; + nfc->nand_divider.reg = nfc->sd_emmc_clock; + 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->sd_emmc_clock), + nfc->sd_emmc_clock); ret =clk_prepare_enable (nfc->core_clk);if (ret) {
@@ -1030,29 +1041,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; +dev_err (nfc->dev,"pre enable NFC divider fail\n" ); + goto err_nand_clk; } - ret =clk_prepare_enable (nfc->phase_rx); -if (ret) { -dev_err (nfc->dev,"failed to enable RX clock\n" ); - goto err_phase_rx; - } - - ret =clk_set_rate (nfc->device_clk,24000000 ); + ret =clk_set_rate (nfc->nand_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 +1064,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); }
@@ -1374,7 +1376,6 @@ static int meson_nfc_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct meson_nfc *nfc; -struct resource *res;int ret, irq; nfc =devm_kzalloc (dev,sizeof (*nfc),GFP_KERNEL );
@@ -1388,21 +1389,15 @@ static int meson_nfc_probe(struct platform_device *pdev)nand_controller_init (&nfc->controller);INIT_LIST_HEAD (&nfc->chips);init_completion (&nfc->completion); - nfc->dev = dev; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - nfc->reg_base =devm_ioremap_resource (dev, res); + nfc->reg_base =devm_platform_ioremap_resource_byname (pdev,"nfc" );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" ); -if (IS_ERR (nfc->reg_clk)) { -dev_err (dev,"Failed to lookup clock base\n" ); -return PTR_ERR (nfc->reg_clk); - } + nfc->sd_emmc_clock =devm_platform_ioremap_resource_byname (pdev,"emmc" ); +if (IS_ERR (nfc->sd_emmc_clock)) +return PTR_ERR (nfc->sd_emmc_clock); irq =platform_get_irq (pdev,0 );if (irq <0 )
Signature · 1 line
2.34.1
Miquel Raynal
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hi Liang,
[email protected] wrote on Sat, 2 Apr 2022 15:49:19 +0800:
Quoted 70 lines
EMMC and NAND have the same clock control register named '
SD_EMMC_CLOCK' which is defined in EMMC port internally. bit0~5 of 'SD_EMMC_CLOCK' is the divider and bit6~7 is the mux for fix pll and xtal.A common MMC and NAND sub-clock has been implemented and can be used by the eMMC and NAND controller (which are mutually exclusive anyway). Let's use this new clock.Signed-off-by Liang Yang <[email protected]>--- drivers/mtd/nand/raw/meson_nand.c | 89 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 47 deletions(-)drivers/mtd/nand/raw/meson_nand.c +9
-4@@ -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> @@ -19,6 +20,7 @@#include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_address.h> #include <linux/sched/task_stack.h> #define NFC_REG_CMD 0x00@@ -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 *sd_emmc_clock;struct completion completion;struct list_head chips;const struct meson_nfc_data *data;@@ -235,7 +240,7 @@ static void meson_nfc_select_chip(struct nand_chip *nand, int chip) nfc->timing.tbers_max = meson_chip->tbers_max;if (nfc->clk_rate != meson_chip->clk_rate) { - ret =clk_set_rate (nfc->device_clk, meson_chip->clk_rate); + ret =clk_set_rate (nfc->nand_clk, meson_chip->clk_rate);if (ret) {dev_err (nfc->dev,"failed to set clock rate\n" );return ;
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) · line 409
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +0
-1@@ -406,7 +411,6 @@ 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 ); -
Please avoid these spacing changes in the middle of a commit.
Quoted 66 lines
drivers/mtd/nand/raw/meson_nand.c +23
-16ret =wait_for_completion_timeout (&nfc->completion,msecs_to_jiffies (timeout_ms));if (ret ==0 )@@ -985,9 +989,11 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = { .free = meson_ooblayout_free, }; +struct clk_parent_data nfc_divider_parent_data[1 ];static int meson_nfc_clk_init (struct meson_nfc *nfc) {int ret; +struct clk_init_data init = {0 };/* request core clock */ nfc->core_clk =devm_clk_get (nfc->dev,"core" );@@ -1002,21 +1008,26 @@ 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; + nfc_divider_parent_data[0 ].fw_name ="device" ; + init.parent_data = nfc_divider_parent_data; + init.num_parents =1 ; + nfc->nand_divider.reg = nfc->sd_emmc_clock; + 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->sd_emmc_clock), + nfc->sd_emmc_clock); ret =clk_prepare_enable (nfc->core_clk);if (ret) {@@ -1030,29 +1041,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; +dev_err (nfc->dev,"pre enable NFC divider fail\n" ); + goto err_nand_clk;
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_clk_init(struct meson_nfc *nfc) · line 1050
Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +1
-7} - ret =clk_prepare_enable (nfc->phase_rx); -if (ret) { -dev_err (nfc->dev,"failed to enable RX clock\n" ); - goto err_phase_rx; - } - - ret =clk_set_rate (nfc->device_clk,24000000 ); + ret =clk_set_rate (nfc->nand_clk,24000000 );
Is this rename really useful?
Quoted 36 lines
drivers/mtd/nand/raw/meson_nand.c +5
-9if (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 +1064,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); }@@ -1374,7 +1376,6 @@ static int meson_nfc_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct meson_nfc *nfc; -struct resource *res;int ret, irq; nfc =devm_kzalloc (dev,sizeof (*nfc),GFP_KERNEL );
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1391
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +0
-1@@ -1388,21 +1389,15 @@ static int meson_nfc_probe(struct platform_device *pdev)nand_controller_init (&nfc->controller);INIT_LIST_HEAD (&nfc->chips);init_completion (&nfc->completion); -
Please don't modify spacing in this commit.
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1394
Quoted 5 lines
drivers/mtd/nand/raw/meson_nand.c +1
-2nfc->dev = dev; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - nfc->reg_base =devm_ioremap_resource (dev, res); + nfc->reg_base =devm_platform_ioremap_resource_byname (pdev,"nfc" );
This change seems unrelated.
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1400
Quoted 13 lines
drivers/mtd/nand/raw/meson_nand.c +3
-7if (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" ); -if (IS_ERR (nfc->reg_clk)) { -dev_err (dev,"Failed to lookup clock base\n" ); -return PTR_ERR (nfc->reg_clk); - } + nfc->sd_emmc_clock =devm_platform_ioremap_resource_byname (pdev,"emmc" ); +if (IS_ERR (nfc->sd_emmc_clock)) +return PTR_ERR (nfc->sd_emmc_clock);
While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1403
Quoted 3 lines
drivers/mtd/nand/raw/meson_nand.c +0
-0irq =platform_get_irq (pdev,0 );if (irq <0 )
Thanks,
Miquèl
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Liang Yang
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hi Miquel,
Quoted 69 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hi Liang,
[email protected] wrote on Sat, 2 Apr 2022 15:49:19 +0800:
Quoted 63 lines
EMMC and NAND have the same clock control register named '
SD_EMMC_CLOCK' which is defined in EMMC port internally. bit0~5 of 'SD_EMMC_CLOCK' is the divider and bit6~7 is the mux for fix pll and xtal.A common MMC and NAND sub-clock has been implemented and can be used by the eMMC and NAND controller (which are mutually exclusive anyway). Let's use this new clock.Signed-off-by Liang Yang <[email protected]>--- drivers/mtd/nand/raw/meson_nand.c | 89 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 47 deletions(-)drivers/mtd/nand/raw/meson_nand.c +8
-3@@ -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> @@ -19,6 +20,7 @@#include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_address.h> #include <linux/sched/task_stack.h> #define NFC_REG_CMD 0x00@@ -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 *sd_emmc_clock;struct completion completion;struct list_head chips;const struct meson_nfc_data *data;@@ -235,7 +240,7 @@ static void meson_nfc_select_chip(struct nand_chip *nand, int chip) nfc->timing.tbers_max = meson_chip->tbers_max;
Quoted 13 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) · line 409
Quoted 11 lines
drivers/mtd/nand/raw/meson_nand.c +1
-2if (nfc->clk_rate != meson_chip->clk_rate) { - ret =clk_set_rate (nfc->device_clk, meson_chip->clk_rate); + ret =clk_set_rate (nfc->nand_clk, meson_chip->clk_rate);if (ret) {dev_err (nfc->dev,"failed to set clock rate\n" );return ;@@ -406,7 +411,6 @@ 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 ); -Please avoid these spacing changes in the middle of a commit.
ok, i will fix it.
Quoted 69 lines
Quoted 69 lines
drivers/mtd/nand/raw/meson_nand.c +23
-16ret =wait_for_completion_timeout (&nfc->completion,msecs_to_jiffies (timeout_ms));if (ret ==0 )@@ -985,9 +989,11 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = { .free = meson_ooblayout_free, }; +struct clk_parent_data nfc_divider_parent_data[1 ];static int meson_nfc_clk_init (struct meson_nfc *nfc) {int ret; +struct clk_init_data init = {0 };/* request core clock */ nfc->core_clk =devm_clk_get (nfc->dev,"core" );@@ -1002,21 +1008,26 @@ 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; + nfc_divider_parent_data[0 ].fw_name ="device" ; + init.parent_data = nfc_divider_parent_data; + init.num_parents =1 ; + nfc->nand_divider.reg = nfc->sd_emmc_clock; + 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->sd_emmc_clock), + nfc->sd_emmc_clock); ret =clk_prepare_enable (nfc->core_clk);if (ret) {@@ -1030,29 +1041,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; +dev_err (nfc->dev,"pre enable NFC divider fail\n" ); + goto err_nand_clk; }
Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_clk_init(struct meson_nfc *nfc) · line 1050
Quoted 8 lines
drivers/mtd/nand/raw/meson_nand.c +1
-7- ret =clk_prepare_enable (nfc->phase_rx); -if (ret) { -dev_err (nfc->dev,"failed to enable RX clock\n" ); - goto err_phase_rx; - } - - ret =clk_set_rate (nfc->device_clk,24000000 ); + ret =clk_set_rate (nfc->nand_clk,24000000 );Is this rename really useful?
yes, it works.
Quoted 45 lines
Quoted 37 lines
drivers/mtd/nand/raw/meson_nand.c +5
-9if (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 +1064,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); }@@ -1374,7 +1376,6 @@ static int meson_nfc_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct meson_nfc *nfc; -struct resource *res;int ret, irq; nfc =devm_kzalloc (dev,sizeof (*nfc),GFP_KERNEL );drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1391
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +0
-1@@ -1388,21 +1389,15 @@ static int meson_nfc_probe(struct platform_device *pdev)nand_controller_init (&nfc->controller);INIT_LIST_HEAD (&nfc->chips);init_completion (&nfc->completion); -Please don't modify spacing in this commit.
ok
Quoted 7 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1394
Quoted 5 lines
drivers/mtd/nand/raw/meson_nand.c +1
-2nfc->dev = dev; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - nfc->reg_base =devm_ioremap_resource (dev, res); + nfc->reg_base =devm_platform_ioremap_resource_byname (pdev,"nfc" );This change seems unrelated.
To be consistent with the following devm_platform_ioremap_resource_byname(pdev, "emmc"). do you mean that we don't need it?>
Quoted 17 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1400
Quoted 13 lines
drivers/mtd/nand/raw/meson_nand.c +3
-7if (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" ); -if (IS_ERR (nfc->reg_clk)) { -dev_err (dev,"Failed to lookup clock base\n" ); -return PTR_ERR (nfc->reg_clk); - } + nfc->sd_emmc_clock =devm_platform_ioremap_resource_byname (pdev,"emmc" ); +if (IS_ERR (nfc->sd_emmc_clock)) +return PTR_ERR (nfc->sd_emmc_clock);While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
ok, i will fix it next version. thanks.
Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1403
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +0
-0irq =platform_get_irq (pdev,0 );if (irq <0 )Thanks,
Miquèl.
Miquel Raynal
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hi Liang,
[email protected] wrote on Mon, 11 Apr 2022 10:40:15 +0800:
Quoted 154 lines
Hi Miquel,
Quoted 68 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hi Liang,
[email protected] wrote on Sat, 2 Apr 2022 15:49:19 +0800:
Quoted 62 lines
EMMC and NAND have the same clock control register named '
SD_EMMC_CLOCK' which is defined in EMMC port internally. bit0~5 of 'SD_EMMC_CLOCK' is the divider and bit6~7 is the mux for fix pll and xtal.A common MMC and NAND sub-clock has been implemented and can be used by the eMMC and NAND controller (which are mutually exclusive anyway). Let's use this new clock.Signed-off-by Liang Yang <[email protected]>--- drivers/mtd/nand/raw/meson_nand.c | 89 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 47 deletions(-)drivers/mtd/nand/raw/meson_nand.c +8
-4@@ -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> @@ -19,6 +20,7 @@#include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_address.h> #include <linux/sched/task_stack.h> >> #define NFC_REG_CMD 0x00@@ -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 *sd_emmc_clock;struct completion completion;struct list_head chips;const struct meson_nfc_data *data;@@ -235,7 +240,7 @@ static void meson_nfc_select_chip(struct nand_chip *nand, int chip) nfc->timing.tbers_max = meson_chip->tbers_max; >> if (nfc->clk_rate != meson_chip->clk_rate) { - ret =clk_set_rate (nfc->device_clk, meson_chip->clk_rate); + ret =clk_set_rate (nfc->nand_clk, meson_chip->clk_rate);if (ret) {dev_err (nfc->dev,"failed to set clock rate\n" );Quoted 8 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) · line 409
Quoted 6 lines
drivers/mtd/nand/raw/meson_nand.c +0
-1return ;@@ -406,7 +411,6 @@ 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 ); -Please avoid these spacing changes in the middle of a commit.
ok, i will fix it.
Quoted 64 lines
Quoted 64 lines
drivers/mtd/nand/raw/meson_nand.c +22
-15ret =wait_for_completion_timeout (&nfc->completion,msecs_to_jiffies (timeout_ms));if (ret ==0 )@@ -985,9 +989,11 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = { .free = meson_ooblayout_free, }; >> +struct clk_parent_data nfc_divider_parent_data[1];static int meson_nfc_clk_init (struct meson_nfc *nfc) {int ret; +struct clk_init_data init = {0 }; >> /* request core clock */ nfc->core_clk =devm_clk_get (nfc->dev,"core" );@@ -1002,21 +1008,26 @@ 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; + nfc_divider_parent_data[0 ].fw_name ="device" ; + init.parent_data = nfc_divider_parent_data; + init.num_parents =1 ; + nfc->nand_divider.reg = nfc->sd_emmc_clock; + 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->sd_emmc_clock), + nfc->sd_emmc_clock); >> ret = clk_prepare_enable(nfc->core_clk);if (ret) {@@ -1030,29 +1041,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; +dev_err (nfc->dev,"pre enable NFC divider fail\n" ); + goto err_nand_clk; } >> - ret = clk_prepare_enable(nfc->phase_rx); -if (ret) {Quoted 8 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_clk_init(struct meson_nfc *nfc) · line 1050
Quoted 6 lines
drivers/mtd/nand/raw/meson_nand.c +1
-5-dev_err (nfc->dev,"failed to enable RX clock\n" ); - goto err_phase_rx; - } - - ret =clk_set_rate (nfc->device_clk,24000000 ); + ret =clk_set_rate (nfc->nand_clk,24000000 );Is this rename really useful?
Quoted 1 line
yes, it works.
I understand it works, but if this is just a name change of a variable in your driver that has implications everywhere in this driver, then it's probably best to do it in a separate commit to ease the review.
Quoted 42 lines
Quoted 41 lines
Quoted 34 lines
drivers/mtd/nand/raw/meson_nand.c +5
-8if (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 +1064,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); }@@ -1374,7 +1376,6 @@ static int meson_nfc_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct meson_nfc *nfc; -struct resource *res;int ret, irq; >> nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1391
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +0
-1@@ -1388,21 +1389,15 @@ static int meson_nfc_probe(struct platform_device *pdev)nand_controller_init (&nfc->controller);INIT_LIST_HEAD (&nfc->chips);init_completion (&nfc->completion); -Please don't modify spacing in this commit.
ok
Quoted 8 lines
Quoted 6 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1394
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +1
-1nfc->dev = dev; >> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - nfc->reg_base =devm_ioremap_resource (dev, res); + nfc->reg_base =devm_platform_ioremap_resource_byname (pdev,"nfc" );This change seems unrelated.
To be consistent with the following
devm_platform_ioremap_resource_byname(pdev, "emmc"). do you mean that we don't need it?>
So indeed it should not be in this commit. You can do that as a preparation patch if you wish.
Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
drivers/mtd/nand/raw/meson_nand.c +0
-5if (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" ); -if (IS_ERR (nfc->reg_clk)) { -dev_err (dev,"Failed to lookup clock base\n" ); -return PTR_ERR (nfc->reg_clk);Quoted 8 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1400
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +3
-1- } + nfc->sd_emmc_clock =devm_platform_ioremap_resource_byname (pdev,"emmc" ); +if (IS_ERR (nfc->sd_emmc_clock)) +return PTR_ERR (nfc->sd_emmc_clock);While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
Quoted 11 lines
ok, i will fix it next version. thanks.
Quoted 9 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1402
Quoted 3 lines
drivers/mtd/nand/raw/meson_nand.c +0
-0>> irq = platform_get_irq(pdev, 0);if (irq <0 )Thanks,
Miquèl.
Thanks,
Miquèl
Liang Yang
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hi Miquel,
Quoted 160 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hi Liang,
[email protected] wrote on Mon, 11 Apr 2022 10:40:15 +0800:
Quoted 154 lines
Hi Miquel,
Quoted 68 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hi Liang,
[email protected] wrote on Sat, 2 Apr 2022 15:49:19 +0800:
Quoted 62 lines
EMMC and NAND have the same clock control register named '
SD_EMMC_CLOCK' which is defined in EMMC port internally. bit0~5 of 'SD_EMMC_CLOCK' is the divider and bit6~7 is the mux for fix pll and xtal.A common MMC and NAND sub-clock has been implemented and can be used by the eMMC and NAND controller (which are mutually exclusive anyway). Let's use this new clock.Signed-off-by Liang Yang <[email protected]>--- drivers/mtd/nand/raw/meson_nand.c | 89 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 47 deletions(-)drivers/mtd/nand/raw/meson_nand.c +8
-4@@ -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> @@ -19,6 +20,7 @@#include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_address.h> #include <linux/sched/task_stack.h> >> #define NFC_REG_CMD 0x00@@ -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 *sd_emmc_clock;struct completion completion;struct list_head chips;const struct meson_nfc_data *data;@@ -235,7 +240,7 @@ static void meson_nfc_select_chip(struct nand_chip *nand, int chip) nfc->timing.tbers_max = meson_chip->tbers_max; >> if (nfc->clk_rate != meson_chip->clk_rate) { - ret =clk_set_rate (nfc->device_clk, meson_chip->clk_rate); + ret =clk_set_rate (nfc->nand_clk, meson_chip->clk_rate);if (ret) {dev_err (nfc->dev,"failed to set clock rate\n" );Quoted 8 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) · line 409
Quoted 6 lines
drivers/mtd/nand/raw/meson_nand.c +0
-1return ;@@ -406,7 +411,6 @@ 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 ); -Please avoid these spacing changes in the middle of a commit.
ok, i will fix it.
Quoted 72 lines
Quoted 60 lines
drivers/mtd/nand/raw/meson_nand.c +21
-14ret =wait_for_completion_timeout (&nfc->completion,msecs_to_jiffies (timeout_ms));if (ret ==0 )@@ -985,9 +989,11 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = { .free = meson_ooblayout_free, }; >> +struct clk_parent_data nfc_divider_parent_data[1];static int meson_nfc_clk_init (struct meson_nfc *nfc) {int ret; +struct clk_init_data init = {0 }; >> /* request core clock */ nfc->core_clk =devm_clk_get (nfc->dev,"core" );@@ -1002,21 +1008,26 @@ 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; + nfc_divider_parent_data[0 ].fw_name ="device" ; + init.parent_data = nfc_divider_parent_data; + init.num_parents =1 ; + nfc->nand_divider.reg = nfc->sd_emmc_clock; + 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->sd_emmc_clock), + nfc->sd_emmc_clock); >> ret = clk_prepare_enable(nfc->core_clk);if (ret) {@@ -1030,29 +1041,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; +dev_err (nfc->dev,"pre enable NFC divider fail\n" );drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_clk_init(struct meson_nfc *nfc) · line 1050
Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +2
-6+ goto err_nand_clk; } >> - ret = clk_prepare_enable(nfc->phase_rx); -if (ret) { -dev_err (nfc->dev,"failed to enable RX clock\n" ); - goto err_phase_rx; - } - - ret =clk_set_rate (nfc->device_clk,24000000 ); + ret =clk_set_rate (nfc->nand_clk,24000000 );Is this rename really useful?
Quoted 6 lines
Quoted 1 line
yes, it works.
I understand it works, but if this is just a name change of a variable in your driver that has implications everywhere in this driver, then it's probably best to do it in a separate commit to ease the review. After apply these patches, i think we have to change the clk from
device_clk to nand_clk. previously the device_clk comes from <&sd_emmc_c_clkc CLKID_MMC_DIV> in dts and we set device_clk to give NFC controller the clock; now device_clk comes from <&clkc CLKID_FCLK_DIV2> which is the parent node of nand_clk, so we set nand_clk to give NFC controller the clock.
Quoted 49 lines
Quoted 49 lines
Quoted 48 lines
Quoted 34 lines
drivers/mtd/nand/raw/meson_nand.c +5
-8if (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 +1064,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); }@@ -1374,7 +1376,6 @@ static int meson_nfc_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct meson_nfc *nfc; -struct resource *res;int ret, irq; >> nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1391
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +0
-1@@ -1388,21 +1389,15 @@ static int meson_nfc_probe(struct platform_device *pdev)nand_controller_init (&nfc->controller);INIT_LIST_HEAD (&nfc->chips);init_completion (&nfc->completion); -Please don't modify spacing in this commit.
okdrivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1394
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +1
-1nfc->dev = dev; >> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - nfc->reg_base =devm_ioremap_resource (dev, res); + nfc->reg_base =devm_platform_ioremap_resource_byname (pdev,"nfc" );This change seems unrelated.
Quoted 4 lines
Quoted 1 line
To be consistent with the following
devm_platform_ioremap_resource_byname(pdev, "emmc"). do you mean that we don't need it?>So indeed it should not be in this commit. You can do that as a preparation patch if you wish.
ok. May i split this change as one of patches in this series?
Quoted 35 lines
Quoted 18 lines
Quoted 17 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1400
Quoted 13 lines
drivers/mtd/nand/raw/meson_nand.c +3
-6if (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" ); -if (IS_ERR (nfc->reg_clk)) { -dev_err (dev,"Failed to lookup clock base\n" ); -return PTR_ERR (nfc->reg_clk); - } + nfc->sd_emmc_clock =devm_platform_ioremap_resource_byname (pdev,"emmc" ); +if (IS_ERR (nfc->sd_emmc_clock)) +return PTR_ERR (nfc->sd_emmc_clock);While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
Quoted 11 lines
ok, i will fix it next version. thanks.
Quoted 9 lines
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1402
Quoted 3 lines
drivers/mtd/nand/raw/meson_nand.c +0
-0>> irq = platform_get_irq(pdev, 0);if (irq <0 )Thanks,
Miquèl.
Thanks,
Miquèl.
Liang Yang
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
In reply to Liang YangHi Miquel,
i have some confusion when i prepare the patches. for DT compatibility, it falls back to the old DT when failed to get resource by the new DT, but there is some points:
a. old DT depends on MMC sub clock driver, but it never be merged, so it can't work.
b. if it falls back to the old DT, beside the regmap lookup below, it seems that we have to preserve the code of the old clock setting in nfc_clk_init(). do we still need to avoid break DT compatibility?
Thanks.
Quoted 30 lines · Liang Yang
Quoted 6 lines
Quoted 4 lines
nfc->dev= dev;
- res =platform_get_resource(pdev, IORESOURCE_MEM, 0);
-nfc->reg_base=devm_ioremap_resource(dev, res);
+nfc->reg_base=devm_platform_ioremap_resource_byname(pdev, "nfc");This change seems unrelated.
To be consistent with the following
devm_platform_ioremap_resource_byname(pdev, "emmc"). do you mean that we don't need it?>Quoted 14 lines
Quoted 5 lines
if (
IS_ERR(nfc->reg_base))
returnPTR_ERR(nfc->reg_base);
-nfc->reg_clk=
-syscon_regmap_lookup_by_phandle(dev->of_node, - "amlogic,mmc-syscon");Quoted 8 lines
- if (
IS_ERR(nfc->reg_clk)) {
-dev_err(dev, "Failed to lookup clock base\n");
- returnPTR_ERR(nfc->reg_clk);
- }
+nfc->sd_emmc_clock=devm_platform_ioremap_resource_byname(pdev, "emmc");
+ if (IS_ERR(nfc->sd_emmc_clock))
+ returnPTR_ERR(nfc->sd_emmc_clock);Quoted 3 lines
While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
ok, i will fix it next version. thanks.
Quoted 2 lines
Quoted 2 lines
irq =
platform_get_irq(pdev, 0);
Miquel Raynal
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hello,
[email protected] wrote on Mon, 18 Apr 2022 11:40:10 +0800:
Quoted 4 lines
Hi Miquel,
i have some confusion when i prepare the patches. for DT compatibility, it falls back to the old DT when failed to get resource by the new DT, but there is some points:
a. old DT depends on MMC sub clock driver, but it never be merged, so it can't work.
I don't get what you mean here, sorry. I believe there is a new way to describe this clock but grabbing the one from the MMC still works, does not it?
Quoted 1 line
b. if it falls back to the old DT, beside the regmap lookup below, it seems that we have to preserve the code of the old clock setting in
nfc_clk_init().
Yes, probably.
Quoted 1 line
do we still need to avoid break DT compatibility?
We should try our best to avoid breaking the DT, yes.
Quoted 33 lines
Thanks.
Quoted 29 lines · Liang Yang
Quoted 6 lines
Quoted 4 lines
nfc->dev= dev;
- res =platform_get_resource(pdev, IORESOURCE_MEM, 0);
-nfc->reg_base=devm_ioremap_resource(dev, res);
+nfc->reg_base=devm_platform_ioremap_resource_byname(pdev, "nfc");This change seems unrelated.
To be consistent with the following >
devm_platform_ioremap_resource_byname(pdev, "emmc"). do you mean that we > don't need it?>Quoted 13 lines
Quoted 4 lines
if (
IS_ERR(nfc->reg_base))
returnPTR_ERR(nfc->reg_base);
-nfc->reg_clk=
- syscon_regmap_lookup_by_phandle(dev->of_node,Quoted 8 lines
- "amlogic,mmc-syscon");
- if (IS_ERR(nfc->reg_clk)) {
-dev_err(dev, "Failed to lookup clock base\n");
- returnPTR_ERR(nfc->reg_clk);
- }
+nfc->sd_emmc_clock=devm_platform_ioremap_resource_byname(pdev, >>> "emmc"); + if (IS_ERR(nfc->sd_emmc_clock))
+ returnPTR_ERR(nfc->sd_emmc_clock);Quoted 3 lines
While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
ok, i will fix it next version. thanks.
Quoted 2 lines
Quoted 2 lines
irq =
platform_get_irq(pdev, 0);
Thanks,
Miquèl
Liang Yang
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hello Miquel,
Quoted 6 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hello,
[email protected] wrote on Mon, 18 Apr 2022 11:40:10 +0800:
Quoted 9 lines
Quoted 4 lines
Hi Miquel,
i have some confusion when i prepare the patches. for DT compatibility, it falls back to the old DT when failed to get resource by the new DT, but there is some points:
a. old DT depends on MMC sub clock driver, but it never be merged, so it can't work.I don't get what you mean here, sorry. I believe there is a new way to describe this clock but grabbing the one from the MMC still works, does not it?
No, it doesn't. after the NFC driver using the MMC sub clock framework was merged into the mainline of kernel, we didn't continue to submit the series of patches about MMC sub clock after v9. when i found that, we made a discussion to decide whether to recover the series of patches about MMC sub clock framework, finally, see the description from cover letter, we plan to abandon it and adopt the new clock scheme in this series of patches.
Thanks.
Quoted 47 lines
Quoted 1 line
b. if it falls back to the old DT, beside the regmap lookup below, it seems that we have to preserve the code of the old clock setting in
nfc_clk_init().Yes, probably.
Quoted 1 line
do we still need to avoid break DT compatibility?
We should try our best to avoid breaking the DT, yes.
Quoted 33 lines
Thanks.
Quoted 29 lines · Liang Yang
Quoted 6 lines
Quoted 4 lines
nfc->dev= dev;
- res =platform_get_resource(pdev, IORESOURCE_MEM, 0);
-nfc->reg_base=devm_ioremap_resource(dev, res);
+nfc->reg_base=devm_platform_ioremap_resource_byname(pdev, "nfc");This change seems unrelated.
To be consistent with the following >
devm_platform_ioremap_resource_byname(pdev, "emmc"). do you mean that we > don't need it?>Quoted 13 lines
Quoted 4 lines
if (
IS_ERR(nfc->reg_base))
returnPTR_ERR(nfc->reg_base);
-nfc->reg_clk=
- syscon_regmap_lookup_by_phandle(dev->of_node,Quoted 8 lines
- "amlogic,mmc-syscon");
- if (IS_ERR(nfc->reg_clk)) {
-dev_err(dev, "Failed to lookup clock base\n");
- returnPTR_ERR(nfc->reg_clk);
- }
+nfc->sd_emmc_clock=devm_platform_ioremap_resource_byname(pdev, >>> "emmc"); + if (IS_ERR(nfc->sd_emmc_clock))
+ returnPTR_ERR(nfc->sd_emmc_clock);Quoted 3 lines
While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
ok, i will fix it next version. thanks.
Quoted 2 lines
Quoted 2 lines
irq =
platform_get_irq(pdev, 0);Thanks,
Miquèl.
Miquel Raynal
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hello,
[email protected] wrote on Tue, 19 Apr 2022 17:17:48 +0800:
Quoted 14 lines
Hello Miquel,
Quoted 11 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hello,
[email protected] wrote on Mon, 18 Apr 2022 11:40:10 +0800:
Quoted 4 lines
Hi Miquel,
i have some confusion when i prepare the patches. for DT compatibility, it falls back to the old DT when failed to get resource by the new DT, but there is some points:
a. old DT depends on MMC sub clock driver, but it never be merged, so it can't work.
Quoted 6 lines
Quoted 4 lines
I don't get what you mean here, sorry. I believe there is a new way to describe this clock but grabbing the one from the MMC still works, does not it?
No, it doesn't. after the NFC driver using the MMC sub clock framework was merged into the mainline of kernel, we didn't continue to submit the series of patches about MMC sub clock after v9. when i found that, we made a discussion to decide whether to recover the series of patches about MMC sub clock framework, finally, see the description from cover letter, we plan to abandon it and adopt the new clock scheme in this series of patches.
I am not sure to follow. Is the current code completely broken? I believe it is not, so I don't understand your issue.
Can you please summarize the situation?
Quoted 48 lines
Thanks.
Quoted 45 lines
Quoted 1 line
b. if it falls back to the old DT, beside the regmap lookup below, it seems that we have to preserve the code of the old clock setting in
nfc_clk_init().Yes, probably.
Quoted 1 line
do we still need to avoid break DT compatibility?
We should try our best to avoid breaking the DT, yes.
Quoted 31 lines
Thanks.
Quoted 27 lines · Liang Yang
Quoted 6 lines
Quoted 4 lines
nfc->dev= dev;
- res =platform_get_resource(pdev, IORESOURCE_MEM, 0);
-nfc->reg_base=devm_ioremap_resource(dev, res);
+nfc->reg_base=devm_platform_ioremap_resource_byname(pdev, "nfc");This change seems unrelated.
To be consistent with the following >
devm_platform_ioremap_resource_byname(pdev, "emmc"). do you mean that we > don't need it?>Quoted 13 lines
Quoted 4 lines
if (
IS_ERR(nfc->reg_base))
returnPTR_ERR(nfc->reg_base);
-nfc->reg_clk=
- syscon_regmap_lookup_by_phandle(dev->of_node,Quoted 8 lines
- "amlogic,mmc-syscon");
- if (IS_ERR(nfc->reg_clk)) {
-dev_err(dev, "Failed to lookup clock base\n");
- returnPTR_ERR(nfc->reg_clk);
- }
+nfc->sd_emmc_clock=devm_platform_ioremap_resource_byname(pdev, >>> "emmc"); + if (IS_ERR(nfc->sd_emmc_clock))
+ returnPTR_ERR(nfc->sd_emmc_clock);Quoted 3 lines
While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
ok, i will fix it next version. thanks.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
irq = platform_get_irq(pdev, 0);
Thanks,
Miquèl.
Thanks,
Miquèl
Liang Yang
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hi Miquel,
Quoted 25 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hello,
[email protected] wrote on Tue, 19 Apr 2022 17:17:48 +0800:
Quoted 19 lines
Hello Miquel,
Quoted 15 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hello,
[email protected] wrote on Mon, 18 Apr 2022 11:40:10 +0800:
Quoted 4 lines
Hi Miquel,
i have some confusion when i prepare the patches. for DT compatibility, it falls back to the old DT when failed to get resource by the new DT, but there is some points:
a. old DT depends on MMC sub clock driver, but it never be merged, so it can't work.I don't get what you mean here, sorry. I believe there is a new way to describe this clock but grabbing the one from the MMC still works, does not it?
Quoted 4 lines
Quoted 1 line
No, it doesn't. after the NFC driver using the MMC sub clock framework was merged into the mainline of kernel, we didn't continue to submit the series of patches about MMC sub clock after v9. when i found that, we made a discussion to decide whether to recover the series of patches about MMC sub clock framework, finally, see the description from cover letter, we plan to abandon it and adopt the new clock scheme in this series of patches.
I am not sure to follow. Is the current code completely broken? I believe it is not, so I don't understand your issue.
i think only the code about the clock is completely broken.
Quoted 2 lines
Can you please summarize the situation?
Yes. the current NFC clock implementation depends on the following series of patches [https://lore.kernel.org/all/[email protected]], which we call "Meson MMC Sub Clock Controller Driver".
when i was preparing the NFC patchset at that time, we discussed how the clock should be implemented base on the special clock framework for NFC and EMMC port. then we decided to implement a driver "Meson MMC Sub Clock Controller Driver". so another people begin to prepare "Meson MMC Sub Clock Controller Driver", but submitted it by different patchset. finally, now the meson NFC patchset is accepted and merged, but "Meson MMC Sub Clock Controller Driver" patchset is not. also we decide to abandon the patset "Meson MMC Sub Clock Controller Driver" and implement the new clock design in this series.
Quoted 55 lines
Quoted 49 lines
Thanks.
Quoted 45 lines
Quoted 1 line
b. if it falls back to the old DT, beside the regmap lookup below, it seems that we have to preserve the code of the old clock setting in
nfc_clk_init().Yes, probably.
Quoted 1 line
do we still need to avoid break DT compatibility?
We should try our best to avoid breaking the DT, yes.
Quoted 31 lines
Thanks.
Quoted 27 lines · Liang Yang
Quoted 6 lines
Quoted 4 lines
nfc->dev= dev;
- res =platform_get_resource(pdev, IORESOURCE_MEM, 0);
-nfc->reg_base=devm_ioremap_resource(dev, res);
+nfc->reg_base=devm_platform_ioremap_resource_byname(pdev, "nfc");This change seems unrelated.
To be consistent with the following >
devm_platform_ioremap_resource_byname(pdev, "emmc"). do you mean that we > don't need it?>Quoted 13 lines
Quoted 4 lines
if (
IS_ERR(nfc->reg_base))
returnPTR_ERR(nfc->reg_base);
-nfc->reg_clk=
- syscon_regmap_lookup_by_phandle(dev->of_node,Quoted 8 lines
- "amlogic,mmc-syscon");
- if (IS_ERR(nfc->reg_clk)) {
-dev_err(dev, "Failed to lookup clock base\n");
- returnPTR_ERR(nfc->reg_clk);
- }
+nfc->sd_emmc_clock=devm_platform_ioremap_resource_byname(pdev, >>> "emmc"); + if (IS_ERR(nfc->sd_emmc_clock))
+ returnPTR_ERR(nfc->sd_emmc_clock);Quoted 3 lines
While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
ok, i will fix it next version. thanks.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
irq = platform_get_irq(pdev, 0);
Thanks,
Miquèl.
Thanks,
Miquèl.
Miquel Raynal
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hi Liang,
[email protected] wrote on Wed, 20 Apr 2022 13:44:32 +0800:
Quoted 31 lines
Hi Miquel,
Quoted 19 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hello,
[email protected] wrote on Tue, 19 Apr 2022 17:17:48 +0800:
Quoted 13 lines
Hello Miquel,
Quoted 10 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hello,
[email protected] wrote on Mon, 18 Apr 2022 11:40:10 +0800:
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Hi Miquel,
i have some confusion when i prepare the patches. for DT compatibility, it falls back to the old DT when failed to get resource by the new DT, but there is some points:
a. old DT depends on MMC sub clock driver, but it never be merged, so it can't work.Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
I don't get what you mean here, sorry. I believe there is a new way to describe this clock but grabbing the one from the MMC still works, does not it?
Quoted 1 line
Quoted 1 line
No, it doesn't. after the NFC driver using the MMC sub clock framework was merged into the mainline of kernel, we didn't continue to submit the series of patches about MMC sub clock after v9. when i found that, we made a discussion to decide whether to recover the series of patches about MMC sub clock framework, finally, see the description from cover letter, we plan to abandon it and adopt the new clock scheme in this series of patches.
I am not sure to follow. Is the current code completely broken? I believe it is not, so I don't understand your issue.
Quoted 8 lines
i think only the code about the clock is completely broken.
Quoted 2 lines
Can you please summarize the situation?
Yes. the current NFC clock implementation depends on the following series of patches [https://lore.kernel.org/all/[email protected]], which we call "Meson MMC Sub Clock Controller Driver".
when i was preparing the NFC patchset at that time, we discussed how the clock should be implemented base on the special clock framework for NFC and EMMC port. then we decided to implement a driver "Meson MMC Sub Clock Controller Driver". so another people begin to prepare "Meson MMC Sub Clock Controller Driver", but submitted it by different patchset. finally, now the meson NFC patchset is accepted and merged, but "Meson MMC Sub Clock Controller Driver" patchset is not. also we decide to abandon the patset "Meson MMC Sub Clock Controller Driver" and implement the new clock design in this series.
Ok thanks for the summary and the link with the discussion with Jerome and Neil, it's informative.
So in the end, we are not really breaking anything here as this NAND controller driver never worked in the first place? Or is it only one of the two compatibles which is not working?
If this never worked then please do the binding changes (in the first patch of your series) and then do the necessary changes in the code. If this worked with at least one of the two compatibles, then you have to create dedicated helpers, one for each, in order to grab the clocks differently and not break anybody.
Quoted 47 lines
Quoted 47 lines
Quoted 47 lines
Thanks.
Quoted 42 lines
Quoted 1 line
b. if it falls back to the old DT, beside the regmap lookup below, it seems that we have to preserve the code of the old clock setting in
nfc_clk_init().Yes, probably.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
do we still need to avoid break DT compatibility?
We should try our best to avoid breaking the DT, yes.
Quoted 31 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Thanks.
Quoted 27 lines · Liang Yang
Quoted 6 lines
Quoted 4 lines
nfc->dev= dev;
- res =platform_get_resource(pdev, IORESOURCE_MEM, 0);
-nfc->reg_base=devm_ioremap_resource(dev, res);
+nfc->reg_base=devm_platform_ioremap_resource_byname(pdev, "nfc");This change seems unrelated.
To be consistent with the following >
devm_platform_ioremap_resource_byname(pdev, "emmc"). do you mean that we > don't need it?>Quoted 13 lines
Quoted 4 lines
if (
IS_ERR(nfc->reg_base))
returnPTR_ERR(nfc->reg_base);
-nfc->reg_clk=
- syscon_regmap_lookup_by_phandle(dev->of_node,Quoted 8 lines
- "amlogic,mmc-syscon");
- if (IS_ERR(nfc->reg_clk)) {
-dev_err(dev, "Failed to lookup clock base\n");
- returnPTR_ERR(nfc->reg_clk);
- }
+nfc->sd_emmc_clock=devm_platform_ioremap_resource_byname(pdev, >>> "emmc"); + if (IS_ERR(nfc->sd_emmc_clock))
+ returnPTR_ERR(nfc->sd_emmc_clock);Quoted 3 lines
While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
ok, i will fix it next version. thanks.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
irq = platform_get_irq(pdev, 0);
Thanks,
Miquèl
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
Quoted 1 line
.
Thanks,
Miquèl.
Thanks,
Miquèl
Liang Yang
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hi Miquel,
Quoted 46 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hi Liang,
[email protected] wrote on Wed, 20 Apr 2022 13:44:32 +0800:
Quoted 31 lines
Hi Miquel,
Quoted 19 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hello,
[email protected] wrote on Tue, 19 Apr 2022 17:17:48 +0800:
Quoted 13 lines
Hello Miquel,
Quoted 10 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hello,
[email protected] wrote on Mon, 18 Apr 2022 11:40:10 +0800:
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Hi Miquel,
i have some confusion when i prepare the patches. for DT compatibility, it falls back to the old DT when failed to get resource by the new DT, but there is some points:
a. old DT depends on MMC sub clock driver, but it never be merged, so it can't work.Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
I don't get what you mean here, sorry. I believe there is a new way to describe this clock but grabbing the one from the MMC still works, does not it?
Quoted 1 line
Quoted 1 line
No, it doesn't. after the NFC driver using the MMC sub clock framework was merged into the mainline of kernel, we didn't continue to submit the series of patches about MMC sub clock after v9. when i found that, we made a discussion to decide whether to recover the series of patches about MMC sub clock framework, finally, see the description from cover letter, we plan to abandon it and adopt the new clock scheme in this series of patches.
I am not sure to follow. Is the current code completely broken? I believe it is not, so I don't understand your issue.
Quoted 8 lines
i think only the code about the clock is completely broken.
Quoted 2 lines
Can you please summarize the situation?
Yes. the current NFC clock implementation depends on the following series of patches [https://lore.kernel.org/all/[email protected]], which we call "Meson MMC Sub Clock Controller Driver".
when i was preparing the NFC patchset at that time, we discussed how the clock should be implemented base on the special clock framework for NFC and EMMC port. then we decided to implement a driver "Meson MMC Sub Clock Controller Driver". so another people begin to prepare "Meson MMC Sub Clock Controller Driver", but submitted it by different patchset. finally, now the meson NFC patchset is accepted and merged, but "Meson MMC Sub Clock Controller Driver" patchset is not. also we decide to abandon the patset "Meson MMC Sub Clock Controller Driver" and implement the new clock design in this series.
Quoted 6 lines
Ok thanks for the summary and the link with the discussion with Jerome and Neil, it's informative.
So in the end, we are not really breaking anything here as this NAND controller driver never worked in the first place? Or is it only one of the two compatibles which is not working?
i think no one can work now. i am preparing the newer clock framework in this series.
Quoted 6 lines
If this never worked then please do the binding changes (in the first patch of your series) and then do the necessary changes in the code. If this worked with at least one of the two compatibles, then you have to create dedicated helpers, one for each, in order to grab the clocks differently and not break anybody.
ok, i am changing the bindings and code in this series. thanks for your explanation.
Quoted 61 lines
Quoted 48 lines
Quoted 48 lines
Quoted 48 lines
Thanks.
Quoted 42 lines
Quoted 1 line
b. if it falls back to the old DT, beside the regmap lookup below, it seems that we have to preserve the code of the old clock setting in
nfc_clk_init().Yes, probably.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
do we still need to avoid break DT compatibility?
We should try our best to avoid breaking the DT, yes.
Quoted 31 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Thanks.
Quoted 27 lines · Liang Yang
Quoted 6 lines
Quoted 4 lines
nfc->dev = dev;- res =
platform_get_resource(pdev, IORESOURCE_MEM, 0);
-nfc->reg_base=devm_ioremap_resource(dev, res);
+nfc->reg_base=devm_platform_ioremap_resource_byname(pdev, "nfc");This change seems unrelated.
To be consistent with the following >
devm_platform_ioremap_resource_byname(pdev, "emmc"). do you mean that we > don't need it?>Quoted 13 lines
Quoted 12 lines
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");
- if (IS_ERR(nfc->reg_clk)) {
-dev_err(dev, "Failed to lookup clock base\n");
- returnPTR_ERR(nfc->reg_clk);
- }
+nfc->sd_emmc_clock=devm_platform_ioremap_resource_byname(pdev, >>> "emmc"); + if (IS_ERR(nfc->sd_emmc_clock))
+ returnPTR_ERR(nfc->sd_emmc_clock);Quoted 3 lines
While I agree this is much better than the previous solution, we cannot break DT compatibility, so you need to try getting the emmc clock, but if it fails you should fallback to the regmap lookup.
ok, i will fix it next version. thanks.
>>>> >>>>> irq = platform_get_irq(pdev, 0);Thanks,
MiquèlQuoted 7 lines
Quoted 7 lines
Quoted 1 line
Quoted 1 line
.
Thanks,
Miquèl.
Thanks,
Miquèl.
Re: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
In reply to Liang YangHi,
Quoted 47 lines · Liang Yang
EMMC and NAND have the same clock control register named '
SD_EMMC_CLOCK' which is defined in EMMC port internally. bit0~5 of 'SD_EMMC_CLOCK' is the divider and bit6~7 is the mux for fix pll and xtal.A common MMC and NAND sub-clock has been implemented and can be used by the eMMC and NAND controller (which are mutually exclusive anyway). Let's use this new clock.Signed-off-by Liang Yang <[email protected]>--- drivers/mtd/nand/raw/meson_nand.c | 89 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 47 deletions(-)drivers/mtd/nand/raw/meson_nand.c +5
-2@@ -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> @@ -19,6 +20,7 @@#include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_address.h> #include <linux/sched/task_stack.h> #define NFC_REG_CMD 0x00@@ -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;
drivers/mtd/nand/raw/meson_nand.c struct meson_nfc { · line 167
Quoted 10 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 *sd_emmc_clock;
The name could still be reg_clk, even if not a regmap anymore.
Quoted 21 lines
drivers/mtd/nand/raw/meson_nand.c +1
-2struct completion completion;struct list_head chips;const struct meson_nfc_data *data;@@ -235,7 +240,7 @@ static void meson_nfc_select_chip(struct nand_chip *nand, int chip) nfc->timing.tbers_max = meson_chip->tbers_max;if (nfc->clk_rate != meson_chip->clk_rate) { - ret =clk_set_rate (nfc->device_clk, meson_chip->clk_rate); + ret =clk_set_rate (nfc->nand_clk, meson_chip->clk_rate);if (ret) {dev_err (nfc->dev,"failed to set clock rate\n" );return ;@@ -406,7 +411,6 @@ 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 ); - ret =wait_for_completion_timeout (&nfc->completion,msecs_to_jiffies (timeout_ms));if (ret ==0 )
drivers/mtd/nand/raw/meson_nand.c static const struct mtd_ooblayout_ops meson_ooblayout_ops = { · line 992
Quoted 4 lines
drivers/mtd/nand/raw/meson_nand.c +1
-0@@ -985,9 +989,11 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = { .free = meson_ooblayout_free, }; +struct clk_parent_data nfc_divider_parent_data[1 ];
This should be in the meson_nfc_clk_init() function, not global
Quoted 13 lines
drivers/mtd/nand/raw/meson_nand.c +1
-2static int meson_nfc_clk_init (struct meson_nfc *nfc) {int ret; +struct clk_init_data init = {0 };/* request core clock */ nfc->core_clk =devm_clk_get (nfc->dev,"core" );@@ -1002,21 +1008,26 @@ 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)) {
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_clk_init(struct meson_nfc *nfc) · line 1011
Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +1
-9-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 );
name = devm_kasprintf(nfc->dev, GFP_KERNEL, "%s#div", dev_name(dev));
would be better.
Quoted 96 lines
drivers/mtd/nand/raw/meson_nand.c +27
-27+ init.ops = &clk_divider_ops; + nfc_divider_parent_data[0 ].fw_name ="device" ; + init.parent_data = nfc_divider_parent_data; + init.num_parents =1 ; + nfc->nand_divider.reg = nfc->sd_emmc_clock; + 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->sd_emmc_clock), + nfc->sd_emmc_clock); ret =clk_prepare_enable (nfc->core_clk);if (ret) {@@ -1030,29 +1041,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; +dev_err (nfc->dev,"pre enable NFC divider fail\n" ); + goto err_nand_clk; } - ret =clk_prepare_enable (nfc->phase_rx); -if (ret) { -dev_err (nfc->dev,"failed to enable RX clock\n" ); - goto err_phase_rx; - } - - ret =clk_set_rate (nfc->device_clk,24000000 ); + ret =clk_set_rate (nfc->nand_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 +1064,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); }@@ -1374,7 +1376,6 @@ static int meson_nfc_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct meson_nfc *nfc; -struct resource *res;int ret, irq; nfc =devm_kzalloc (dev,sizeof (*nfc),GFP_KERNEL );@@ -1388,21 +1389,15 @@ static int meson_nfc_probe(struct platform_device *pdev)nand_controller_init (&nfc->controller);INIT_LIST_HEAD (&nfc->chips);init_completion (&nfc->completion); - nfc->dev = dev; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - nfc->reg_base =devm_ioremap_resource (dev, res); + nfc->reg_base =devm_platform_ioremap_resource_byname (pdev,"nfc" );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" );
drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct platform_device *pdev) · line 1403
Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +3
-4-if (IS_ERR (nfc->reg_clk)) { -dev_err (dev,"Failed to lookup clock base\n" ); -return PTR_ERR (nfc->reg_clk); - } + nfc->sd_emmc_clock =devm_platform_ioremap_resource_byname (pdev,"emmc" ); +if (IS_ERR (nfc->sd_emmc_clock)) +return PTR_ERR (nfc->sd_emmc_clock); irq =platform_get_irq (pdev,0 );if (irq <0 )
Thanks,
Neil
Liang Yang
maintainerRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
Hi Neil,
Quoted 51 lines · Neil Armstrong
[ EXTERNAL EMAIL ]
Hi,
Quoted 46 lines · Liang Yang
EMMC and NAND have the same clock control register named '
SD_EMMC_CLOCK' which is defined in EMMC port internally. bit0~5 of 'SD_EMMC_CLOCK' is the divider and bit6~7 is the mux for fix pll and xtal.A common MMC and NAND sub-clock has been implemented and can be used by the eMMC and NAND controller (which are mutually exclusive anyway). Let's use this new clock.Signed-off-by Liang Yang <[email protected]>---
drivers/mtd/nand/raw/meson_nand.c| 89 +++++++++++++++----------------1 file changed, 42 insertions(+), 47 deletions(-)drivers/mtd/nand/raw/meson_nand.c +7
-2@@ -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>@@ -19,6 +20,7 @@ #include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_address.h> #include <linux/sched/task_stack.h> #define NFC_REG_CMD 0x00@@ -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;
Quoted 8 lines
drivers/mtd/nand/raw/meson_nand.c struct meson_nfc { · line 167
Quoted 6 lines
drivers/mtd/nand/raw/meson_nand.c +1
-1unsigned long clk_rate; u32 bus_timing; struct device *dev; void __iomem *reg_base; - struct regmap *reg_clk; + void __iomem *sd_emmc_clock;The name could still be
reg_clk, even if not a regmap anymore.
ok, i will do it.
Quoted 21 lines
Quoted 21 lines
drivers/mtd/nand/raw/meson_nand.c +1
-1struct completion completion; struct list_head chips; const struct meson_nfc_data *data;@@ -235,7 +240,7 @@ static void meson_nfc_select_chip(struct nand_chip *nand, int chip) nfc->timing.tbers_max = meson_chip->tbers_max; if (nfc->clk_rate != meson_chip->clk_rate) { - ret = clk_set_rate(nfc->device_clk, meson_chip->clk_rate); + ret = clk_set_rate(nfc->nand_clk, meson_chip->clk_rate); if (ret) { dev_err(nfc->dev, "failed to set clock rate\n"); return;@@ -406,7 +411,6 @@ 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);
-
ret =wait_for_completion_timeout(&nfc->completion, msecs_to_jiffies(timeout_ms));
Quoted 8 lines
drivers/mtd/nand/raw/meson_nand.c static const struct mtd_ooblayout_ops · line 992
Quoted 6 lines
if (ret == 0)
drivers/mtd/nand/raw/meson_nand.c +1
-0@@ -985,9 +989,11 @@ static const struct mtd_ooblayout_ops meson_ooblayout_ops = { .free = meson_ooblayout_free, }; +struct clk_parent_data nfc_divider_parent_data[1 ];This should be in the
meson_nfc_clk_init()function, not global
ok.
Quoted 26 lines
Quoted 13 lines
drivers/mtd/nand/raw/meson_nand.c +1
-2static int meson_nfc_clk_init(struct meson_nfc *nfc) { int ret; + struct clk_init_data init = {0}; /* request core clock */ nfc->core_clk = devm_clk_get(nfc->dev, "core");@@ -1002,21 +1008,26 @@ 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)) {drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_clk_init(struct meson_nfc · line 1011
Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +1
-9- 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);name =
devm_kasprintf(nfc->dev, GFP_KERNEL, "%s#div", dev_name(dev));
Quoted 1 line
would be better.
ok, thanks.
Quoted 106 lines
Quoted 91 lines
drivers/mtd/nand/raw/meson_nand.c +25
-18+ init.ops = &clk_divider_ops; + nfc_divider_parent_data[0].fw_name = "device"; + init.parent_data = nfc_divider_parent_data; + init.num_parents = 1; + nfc->nand_divider.reg = nfc->sd_emmc_clock; + 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->sd_emmc_clock), + nfc->sd_emmc_clock); ret = clk_prepare_enable(nfc->core_clk); if (ret) {@@ -1030,29 +1041,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; + dev_err(nfc->dev, "pre enable NFC divider fail\n"); + goto err_nand_clk; } - ret = clk_prepare_enable(nfc->phase_rx); - if (ret) { - dev_err(nfc->dev, "failed to enable RX clock\n"); - goto err_phase_rx; - } - - ret = clk_set_rate(nfc->device_clk, 24000000); + ret = clk_set_rate(nfc->nand_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);drivers/mtd/nand/raw/meson_nand.c +2
-9@@ -1061,8 +1064,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); }@@ -1374,7 +1376,6 @@ static int meson_nfc_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct meson_nfc *nfc; - struct resource *res; int ret, irq; nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);@@ -1388,21 +1389,15 @@ static int meson_nfc_probe(struct platform_device *pdev) nand_controller_init(&nfc->controller); INIT_LIST_HEAD(&nfc->chips); init_completion(&nfc->completion); - nfc->dev = dev; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - nfc->reg_base = devm_ioremap_resource(dev, res); + nfc->reg_base = devm_platform_ioremap_resource_byname(pdev, "nfc"); 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");drivers/mtd/nand/raw/meson_nand.c static int meson_nfc_probe(struct · line 1402
Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +3
-4- if (IS_ERR(nfc->reg_clk)) { - dev_err(dev, "Failed to lookup clock base\n"); - return PTR_ERR(nfc->reg_clk); - } + nfc->sd_emmc_clock = devm_platform_ioremap_resource_byname(pdev,"emmc" ); + if (IS_ERR(nfc->sd_emmc_clock)) + return PTR_ERR(nfc->sd_emmc_clock); irq = platform_get_irq(pdev, 0); if (irq < 0)Thanks,
Neil.
kernel test robot
build botRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
In reply to Liang YangI 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 mtd/mtd/next mtd/mtd/fixes robh/for-next v5.18-rc1 next-20220404] [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/intel-lab-lkp/linux/commits/Liang-Yang/refine-the-NFC-clock-framework/20220402-155036 base: https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next config: s390-randconfig-r002-20220403 (https://download.01.org/0day-ci/archive/20220404/[email protected]/config) compiler: s390-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/intel-lab-lkp/linux/commit/c34b64ab8005a978739f157a07ed342d247fecac
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Liang-Yang/refine-the-NFC-clock-framework/20220402-155036 git checkout c34b64ab8005a978739f157a07ed342d247fecac
# 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=s390 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
s390-linux-ld: drivers/mtd/nand/raw/meson_nand.o: in function `meson_nfc_probe':
meson_nand.c:(.text+0xd9e): undefined reference to `clk_divider_ops'
>> s390-linux-ld: meson_nand.c:(.text+0xe34): undefined reference to `devm_clk_register'
s390-linux-ld: net/core/sock.o: in function `sk_destruct':
sock.c:(.text+0x373e): undefined reference to `__sk_defer_free_flush'
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
kernel test robot
build botRe: [PATCH v4 1/2] mtd: rawnand: meson: discard the common MMC sub clock framework
In reply to Liang YangI 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 mtd/mtd/next mtd/mtd/fixes robh/for-next v5.18-rc1 next-20220405] [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/intel-lab-lkp/linux/commits/Liang-Yang/refine-the-NFC-clock-framework/20220402-155036 base: https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next config: parisc-randconfig-r001-20220405 (https://download.01.org/0day-ci/archive/20220405/[email protected]/config) compiler: hppa-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/intel-lab-lkp/linux/commit/c34b64ab8005a978739f157a07ed342d247fecac
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Liang-Yang/refine-the-NFC-clock-framework/20220402-155036 git checkout c34b64ab8005a978739f157a07ed342d247fecac
# 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=parisc SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> ERROR: modpost: "devm_clk_register" [drivers/mtd/nand/raw/meson_nand.ko] undefined! >> ERROR: modpost: "clk_divider_ops" [drivers/mtd/nand/raw/meson_nand.ko] undefined!
Signature · 7 lines
0-DAY CI Kernel Test Service https://01.org/lkp _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Liang Yang
maintainerPATCH v4 2/2 dt-bindings: nand: meson: refine Amlogic NAND controller driver
In reply to Liang Yangconvert txt to yaml and refine the meson NFC clock document.
--- .../bindings/mtd/amlogic,meson-nand.txt | 60 -------------- .../bindings/mtd/amlogic,meson-nand.yaml | 80 +++++++++++++++++++ 2 files changed, 80 insertions(+), 60 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt create mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt deleted +0 -60
@@ -1,60 +0,0 @@ -Amlogic NAND Flash Controller (NFC) for GXBB/GXL/AXG family SoCs - -This file documents the properties in addition to those available in -the MTD NAND bindings. - -Required properties: -- compatible : contains one of: - - "amlogic,meson-gxl-nfc" - - "amlogic,meson-axg-nfc" -- clocks : - A list of phandle + clock-specifier pairs for the clocks listed - in clock-names. - -- clock-names: Should contain the following: - "core" - NFC module gate clock - "device" - device clock from eMMC sub clock controller - "rx" - rx clock phase - "tx" - tx clock phase - -- amlogic,mmc-syscon : Required for NAND clocks, it's shared with SD/eMMC - controller port C - -Optional children nodes: -Children nodes represent the available nand chips. - -Other properties: -see Documentation/devicetree/bindings/mtd/nand-controller.yaml for generic bindings. - -Example demonstrate on AXG SoC: - - sd_emmc_c_clkc: mmc@7000 { - compatible = "amlogic,meson-axg-mmc-clkc", "syscon"; - reg = <0x0 0x7000 0x0 0x800>; - }; - - nand-controller@7800 { - compatible = "amlogic,meson-axg-nfc"; - reg = <0x0 0x7800 0x0 0x100>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; - - 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>; - - pinctrl-names = "default"; - pinctrl-0 = <&nand_pins>; - - nand@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <1>; - - nand-on-flash-bbt; - }; - };
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +80 -0
80 lines not on this page · raw message
Signature · 1 line
2.34.1
Miquel Raynal
maintainerRe: [PATCH v4 2/2] dt-bindings: nand: meson: refine Amlogic NAND controller driver
Hi Liang,
[email protected] wrote on Sat, 2 Apr 2022 15:49:20 +0800:
Quoted 1 line
convert txt to yaml and refine the meson NFC clock document.
We generally prefer to split this into two changes (yaml conversion then modifications). You need to be very explicit on the changes you bring to this file afterward. Also you may s/refine/fix/ in your title if this really is a correction of something that does not work at all as you suggest.
Please mention that due to the other series about the clock changes never being accepted the current binding was never valid/working (again, I'm not sure it's the case on all Amlogic SoCs, so please be very careful about that).
And please use a Link: tag to point to the discussion with Neil and Jerome on your MMC/NAND subclock final discussion.
Quoted 80 lines
Signed-off-by Liang Yang <[email protected]>--- .../bindings/mtd/amlogic,meson-nand.txt | 60 -------------- .../bindings/mtd/amlogic,meson-nand.yaml | 80 +++++++++++++++++++ 2 files changed, 80 insertions(+), 60 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt create mode 100644 Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yamlDocumentation/devicetree/bindings/mtd/amlogic,meson-nand.txt deleted +0
-60@@ -1,60 +0,0 @@ -Amlogic NAND Flash Controller (NFC) for GXBB/GXL/AXG family SoCs - -This file documents the properties in addition to those available in -the MTD NAND bindings. - -Required properties: -- compatible : contains one of: - - "amlogic,meson-gxl-nfc" - - "amlogic,meson-axg-nfc" -- clocks : - A list of phandle + clock-specifier pairs for the clocks listed - in clock-names. - -- clock-names: Should contain the following: - "core" - NFC module gate clock - "device" - device clock from eMMC sub clock controller - "rx" - rx clock phase - "tx" - tx clock phase - -- amlogic,mmc-syscon : Required for NAND clocks, it's shared with SD/eMMC - controller port C - -Optional children nodes: -Children nodes represent the available nand chips. - -Other properties: -see Documentation/devicetree/bindings/mtd/nand-controller.yaml for generic bindings. - -Example demonstrate on AXG SoC: - - sd_emmc_c_clkc: mmc@7000 { - compatible = "amlogic,meson-axg-mmc-clkc", "syscon"; - reg = <0x0 0x7000 0x0 0x800>; - }; - - nand-controller@7800 { - compatible = "amlogic,meson-axg-nfc"; - reg = <0x0 0x7800 0x0 0x100>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; - - 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>; - - pinctrl-names = "default"; - pinctrl-0 = <&nand_pins>; - - nand@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <1>; - - nand-on-flash-bbt; - }; - };Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +0
-0
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 7
Quoted 7 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +7
-0@@ -0,0 +1,80 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/amlogic,meson-nand.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic NAND Flash Controller (NFC) for GXBB/GXL/AXG family SoCs
Maybe you need to inherit from nand-controller.yaml.
Quoted 5 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +5
-0+ +maintainers: + - [email protected] + +properties:
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 22
Quoted 10 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +10
-0+ compatible: + enum: + - "amlogic,meson-gxl-nfc" + - "amlogic,meson-axg-nfc" + + reg: + maxItems: 2 + + '#address-cells': + const: 1
Not sure this property is needed.
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 25
Quoted 3 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +3
-0+ + '#size-cells': + const: 0
Ditto. Plus, this one looks wrong anyway.
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 30
Quoted 5 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +5
-0+ + reg-names: + items: + - const: nfc + - const: emmc
Why do you need the emmc register map? Do you really need to perform a register access there?
Quoted 4 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +4
-0+ + interrupts: + maxItems: 1 +
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 44
Quoted 10 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +10
-0+ clocks: + maxItems: 2 + + clock-names: + items: + - const: core + - const: device + + "#clock-cells": + const: 1
?
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 56
Quoted 12 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +12
-0+ +required: + - compatible + - reg + - '#address-cells' + - '#size-cells' + - reg-names + - interrupts + - clocks + - clock-names + +additionalProperties: false
I will let Rob check that but I think what you need is
unevaluatedProperties: false
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 64
Quoted 8 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +8
-0+ +examples: + - | + #include <dt-bindings/clock/axg-clkc.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + apb { + #address-cells = <2>; + #size-cells = <2>;
Not sure you need this upper node in the example.
Quoted 6 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +6
-0+ nand-controller@7800 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "amlogic,meson-axg-nfc"; + reg = <0x0 0x7800 0x0 0x100>, + <0x0 0x7000 0x0 0x800>;
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 80
Quoted 10 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +10
-0+ reg-names = "nfc", "emmc"; + + interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_SD_EMMC_C>, + <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "device"; + + }; + }; +...
Thanks,
Miquèl
Liang Yang
maintainerRe: [PATCH v4 2/2] dt-bindings: nand: meson: refine Amlogic NAND controller driver
Hi Miquel,
Quoted 6 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hi Liang,
[email protected] wrote on Sat, 2 Apr 2022 15:49:20 +0800:
Quoted 7 lines
Quoted 1 line
convert txt to yaml and refine the meson NFC clock document.
We generally prefer to split this into two changes (yaml conversion then modifications). You need to be very explicit on the changes you bring to this file afterward. Also you may s/refine/fix/ in your title if this really is a correction of something that does not work at all as you suggest.
ok
Quoted 3 lines
Please mention that due to the other series about the clock changes never being accepted the current binding was never valid/working
ok
Quoted 2 lines
(again, I'm not sure it's the case on all Amlogic SoCs, so please be very careful about that).
of course.
Quoted 3 lines
And please use a Link: tag to point to the discussion with Neil and Jerome on your MMC/NAND subclock final discussion.
ok
Quoted 82 lines
Quoted 82 lines
Signed-off-by Liang Yang <[email protected]>--- .../bindings/mtd/amlogic,meson-nand.txt | 60 -------------- .../bindings/mtd/amlogic,meson-nand.yaml | 80 +++++++++++++++++++ 2 files changed, 80 insertions(+), 60 deletions(-)delete mode 100644
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txtcreate mode 100644Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yamlDocumentation/devicetree/bindings/mtd/amlogic,meson-nand.txt deleted +0
-60@@ -1,60 +0,0 @@ -Amlogic NAND Flash Controller (NFC) for GXBB/GXL/AXG family SoCs - -This file documents the properties in addition to those available in -the MTD NAND bindings. - -Required properties: -- compatible : contains one of: - - "amlogic,meson-gxl-nfc" - - "amlogic,meson-axg-nfc" -- clocks : - A list of phandle + clock-specifier pairs for the clocks listed - in clock-names. - -- clock-names: Should contain the following: - "core" - NFC module gate clock - "device" - device clock from eMMC sub clock controller - "rx" - rx clock phase - "tx" - tx clock phase - -- amlogic,mmc-syscon : Required for NAND clocks, it's shared with SD/eMMC - controller port C - -Optional children nodes: -Children nodes represent the available nand chips. - -Other properties: -see Documentation/devicetree/bindings/mtd/nand-controller.yaml for generic bindings. - -Example demonstrate on AXG SoC: - - sd_emmc_c_clkc: mmc@7000 { - compatible = "amlogic,meson-axg-mmc-clkc", "syscon"; - reg = <0x0 0x7000 0x0 0x800>; - }; - - nand-controller@7800 { - compatible = "amlogic,meson-axg-nfc"; - reg = <0x0 0x7800 0x0 0x100>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; - - 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>; - - pinctrl-names = "default"; - pinctrl-0 = <&nand_pins>; - - nand@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <1>; - - nand-on-flash-bbt; - }; - };Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +1
-0@@ -0,0 +1,80 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
Quoted 8 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 7
Quoted 6 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +6
-0+%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/amlogic,meson-nand.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic NAND Flash Controller (NFC) for GXBB/GXL/AXG family SoCsMaybe you need to inherit from
nand-controller.yaml.
ok
Quoted 10 lines
Quoted 10 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +9
-0+ +maintainers: + - [email protected] + +properties: + compatible: + enum: + - "amlogic,meson-gxl-nfc" + - "amlogic,meson-axg-nfc"
Quoted 8 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 22
Quoted 6 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +6
-0+ + reg: + maxItems: 2 + + '#address-cells': + const: 1Not sure this property is needed.
this is for the subnode, such as nand@0.
Quoted 6 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 25
Quoted 4 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +3
-0+ + '#size-cells': + const: 0Ditto. Plus, this one looks wrong anyway.
this is for the subnode, such as nand@0. do you mean s/''/""/?
Quoted 9 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 30
Quoted 6 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +5
-0+ + reg-names: + items: + - const: nfc + - const: emmcWhy do you need the emmc register map? Do you really need to perform a register access there?
yes, we have to access the emmc register map. because the NFC clock comes from SDEMMC_CLOCK register.
Quoted 17 lines
Quoted 5 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +4
-0+ + interrupts: + maxItems: 1 +Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 44
Quoted 10 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +10
-0+ clocks: + maxItems: 2 + + clock-names: + items: + - const: core + - const: device + + "#clock-cells": + const: 1?
en, it should be deleted here.
Quoted 16 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 56
Quoted 13 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +12
-0+ +required: + - compatible + - reg + - '#address-cells' + - '#size-cells' + - reg-names + - interrupts + - clocks + - clock-names + +additionalProperties: falseI will let Rob check that but I think what you need is
Quoted 1 line
unevaluatedProperties: false
ok
Quoted 11 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 64
Quoted 9 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +8
-0+ +examples: + - | + #include <dt-bindings/clock/axg-clkc.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + apb { + #address-cells = <2>; + #size-cells = <2>;Not sure you need this upper node in the example.
use the upper node to indicate the "#address-cells" and "#size-cells". if i do not do that, dt_binding_check will report:
".....reg:0: [0, 30720, 0, 256] is too long" and
".....reg:1: [0, 28672, 0, 2048] is too long".
Quoted 22 lines
Quoted 7 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +6
-0+ nand-controller@7800 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "amlogic,meson-axg-nfc"; + reg = <0x0 0x7800 0x0 0x100>, + <0x0 0x7000 0x0 0x800>;Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 80
Quoted 10 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +10
-0+ reg-names = "nfc", "emmc"; + + interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_SD_EMMC_C>, + <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "device"; + + }; + }; +...Thanks,
Miquèl
Quoted 1 line
.
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Miquel Raynal
maintainerRe: [PATCH v4 2/2] dt-bindings: nand: meson: refine Amlogic NAND controller driver
Hi Liang,
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +8
-0+maintainers: + - [email protected] + +properties: + compatible: + enum: + - "amlogic,meson-gxl-nfc" + - "amlogic,meson-axg-nfc"Quoted 8 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 22
Quoted 6 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +6
-0+ + reg: + maxItems: 2 + + '#address-cells': + const: 1Not sure this property is needed.
Quoted 1 line
this is for the subnode, such as nand@0.
Yes but if you refer to nand-controller.yaml you no longer need these.
Quoted 7 lines
Quoted 6 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 25
Quoted 4 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +3
-0+ + '#size-cells': + const: 0Ditto. Plus, this one looks wrong anyway.
this is for the subnode, such as nand@0. do you mean s/''/""/?
Sorry, this is not "wrong anyway", my fault. But still, you don't need this property for the same reason as above.
Quoted 10 lines
Quoted 9 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 30
Quoted 6 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +5
-0+ + reg-names: + items: + - const: nfc + - const: emmcWhy do you need the emmc register map? Do you really need to perform a register access there?
yes, we have to access the emmc register map. because the NFC clock comes from
SDEMMC_CLOCKregister.
But if it's a clock you should get the clock and call clk_prepare_enable(), you don't need to poke directly in the registers. Do you?
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +7
-0+examples: + - | + #include <dt-bindings/clock/axg-clkc.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + apb { + #address-cells = <2>; + #size-cells = <2>;
Quoted 4 lines
Quoted 1 line
Not sure you need this upper node in the example.
use the upper node to indicate the "#address-cells" and "#size-cells". if i do not do that,
dt_binding_checkwill report:
".....reg:0: [0, 30720, 0, 256] is too long" and
".....reg:1: [0, 28672, 0, 2048] is too long".
ok, maybe, I'll let bindings maintainer review that.
Quoted 17 lines
Quoted 17 lines
Quoted 7 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +6
-0+ nand-controller@7800 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "amlogic,meson-axg-nfc"; + reg = <0x0 0x7800 0x0 0x100>, + <0x0 0x7000 0x0 0x800>;Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 80
Quoted 10 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +10
-0+ reg-names = "nfc", "emmc"; + + interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_SD_EMMC_C>, + <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "device"; + + }; + }; +...
Thanks,
Miquèl
Liang Yang
maintainerRe: [PATCH v4 2/2] dt-bindings: nand: meson: refine Amlogic NAND controller driver
Hi Miquel,
Quoted 20 lines · Miquel Raynal
[ EXTERNAL EMAIL ]
Hi Liang,
Quoted 16 lines
Quoted 16 lines
Quoted 4 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +4
-0+maintainers: + - [email protected] + +properties:Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 22
Quoted 10 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +10
-0+ compatible: + enum: + - "amlogic,meson-gxl-nfc" + - "amlogic,meson-axg-nfc" + + reg: + maxItems: 2 + + '#address-cells': + const: 1Not sure this property is needed.
Quoted 3 lines
Quoted 1 line
this is for the subnode, such as nand@0.
Yes but if you refer to
nand-controller.yamlyou no longer need these.
ok, i will try it.
Quoted 11 lines
Quoted 8 lines
Quoted 7 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 25
Quoted 5 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +3
-0+ + '#size-cells': + const: 0Ditto. Plus, this one looks wrong anyway.
this is for the subnode, such as nand@0. do you mean s/''/""/?
Sorry, this is not "wrong anyway", my fault. But still, you don't need this property for the same reason as above.
ok.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +5
-0+ + reg-names: + items: + - const: nfc + - const: emmc
Quoted 7 lines
Quoted 3 lines
Quoted 2 lines
Why do you need the emmc register map? Do you really need to perform a register access there?
yes, we have to access the emmc register map. because the NFC clock comes from
SDEMMC_CLOCKregister.But if it's a clock you should get the clock and call
clk_prepare_enable(), you don't need to poke directly in the registers. Do you?
no, it doesn't. it is special and the reason why need to implement a MMC sub clock driver previously. also we don't implement it as a clock provider in drivers/clk/meson/, because the SDEMMC_CLOCK register is internal in MCI controller.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +7
-0+examples: + - | + #include <dt-bindings/clock/axg-clkc.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + apb { + #address-cells = <2>; + #size-cells = <2>;
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Not sure you need this upper node in the example.
use the upper node to indicate the "#address-cells" and "#size-cells". if i do not do that,
dt_binding_checkwill report:".....reg:0: [0, 30720, 0, 256] is too long" and ".....reg:1: [0, 28672, 0, 2048] is too long".ok, maybe, I'll let bindings maintainer review that.
ok. thanks.
Quoted 24 lines
Quoted 18 lines
Quoted 18 lines
Quoted 8 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +6
-0+ nand-controller@7800 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "amlogic,meson-axg-nfc"; + reg = <0x0 0x7800 0x0 0x100>, + <0x0 0x7000 0x0 0x800>;Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml line 80
Quoted 10 lines
Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml new file +10
-0+ reg-names = "nfc", "emmc"; + + interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_SD_EMMC_C>, + <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "device"; + + }; + }; +...Thanks,
Miquèl.