The patch does the following
Update the versions of the clocking wizard ip.
Move from staging to clk directory.
Update the bindings.
v12:
No change.
Rebased
v13:
Update the clocking compatible
Add the change removing the driver from staging
v14:
Moved to the xilinx folder
Shubhrajyoti Datta (5):
dt-bindings: add documentation of xilinx clocking wizard
clk: clocking-wizard: Add the clockwizard to clk directory
clk: clocking-wizard: Rename nr-outputs to xlnx,nr-outputs
clk: clocking-wizard: Fix the reconfig for 5.2
clk: clocking-wizard: Update the compatible
.../bindings/clock/xlnx,clocking-wizard.yaml | 77 +++++++++++++++++++
drivers/clk/xilinx/Kconfig | 11 +++
drivers/clk/xilinx/Makefile | 1 +
.../xilinx}/clk-xlnx-clock-wizard.c | 19 +++--
drivers/staging/Kconfig | 2 -
drivers/staging/Makefile | 1 -
drivers/staging/clocking-wizard/Kconfig | 10 ---
drivers/staging/clocking-wizard/Makefile | 2 -
drivers/staging/clocking-wizard/TODO | 13 ----
.../staging/clocking-wizard/dt-binding.txt | 30 --------
10 files changed, 103 insertions(+), 63 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.yaml
rename drivers/{staging/clocking-wizard => clk/xilinx}/clk-xlnx-clock-wizard.c (96%)
delete mode 100644 drivers/staging/clocking-wizard/Kconfig
delete mode 100644 drivers/staging/clocking-wizard/Makefile
delete mode 100644 drivers/staging/clocking-wizard/TODO
delete mode 100644 drivers/staging/clocking-wizard/dt-binding.txt
--
2.17.1
Update the compatible to indicate support for both 5.2 and 6.0
Signed-off-by: Shubhrajyoti Datta <[email protected]>
---
drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clk/xilinx/clk-xlnx-clock-wizard.c b/drivers/clk/xilinx/clk-xlnx-clock-wizard.c
index 61c40e06e381..5b8433468cc5 100644
--- a/drivers/clk/xilinx/clk-xlnx-clock-wizard.c
+++ b/drivers/clk/xilinx/clk-xlnx-clock-wizard.c
@@ -621,6 +621,8 @@ static int clk_wzrd_remove(struct platform_device *pdev)
static const struct of_device_id clk_wzrd_ids[] = {
{ .compatible = "xlnx,clocking-wizard" },
+ { .compatible = "xlnx,clocking-wizard-v5.2" },
+ { .compatible = "xlnx,clocking-wizard-v6.0" },
{ },
};
MODULE_DEVICE_TABLE(of, clk_wzrd_ids);
--
2.17.1
Rename nr-outputs to xlnx,output.
Signed-off-by: Shubhrajyoti Datta <[email protected]>
---
drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/xilinx/clk-xlnx-clock-wizard.c b/drivers/clk/xilinx/clk-xlnx-clock-wizard.c
index ec377f0d569b..1e0818eb0435 100644
--- a/drivers/clk/xilinx/clk-xlnx-clock-wizard.c
+++ b/drivers/clk/xilinx/clk-xlnx-clock-wizard.c
@@ -480,7 +480,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)
goto err_disable_clk;
}
- ret = of_property_read_u32(np, "nr-outputs", &nr_outputs);
+ ret = of_property_read_u32(np, "xlnx,nr-outputs", &nr_outputs);
if (ret || nr_outputs > WZRD_NUM_OUTPUTS) {
ret = -EINVAL;
goto err_disable_clk;
--
2.17.1
[AMD Official Use Only - General]
Gentle ping.
-----Original Message-----
From: Shubhrajyoti Datta <[email protected]>
Sent: Monday, April 11, 2022 3:35 PM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Shubhrajyoti Datta <[email protected]>
Subject: [PATCH v14 0/5] clk: clocking-wizard: Driver updates
The patch does the following
Update the versions of the clocking wizard ip.
Move from staging to clk directory.
Update the bindings.
v12:
No change.
Rebased
v13:
Update the clocking compatible
Add the change removing the driver from staging
v14:
Moved to the xilinx folder
Shubhrajyoti Datta (5):
dt-bindings: add documentation of xilinx clocking wizard
clk: clocking-wizard: Add the clockwizard to clk directory
clk: clocking-wizard: Rename nr-outputs to xlnx,nr-outputs
clk: clocking-wizard: Fix the reconfig for 5.2
clk: clocking-wizard: Update the compatible
.../bindings/clock/xlnx,clocking-wizard.yaml | 77 +++++++++++++++++++
drivers/clk/xilinx/Kconfig | 11 +++
drivers/clk/xilinx/Makefile | 1 +
.../xilinx}/clk-xlnx-clock-wizard.c | 19 +++--
drivers/staging/Kconfig | 2 -
drivers/staging/Makefile | 1 -
drivers/staging/clocking-wizard/Kconfig | 10 ---
drivers/staging/clocking-wizard/Makefile | 2 -
drivers/staging/clocking-wizard/TODO | 13 ----
.../staging/clocking-wizard/dt-binding.txt | 30 --------
10 files changed, 103 insertions(+), 63 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.yaml
rename drivers/{staging/clocking-wizard => clk/xilinx}/clk-xlnx-clock-wizard.c (96%) delete mode 100644 drivers/staging/clocking-wizard/Kconfig
delete mode 100644 drivers/staging/clocking-wizard/Makefile
delete mode 100644 drivers/staging/clocking-wizard/TODO
delete mode 100644 drivers/staging/clocking-wizard/dt-binding.txt
--
2.17.1
Hi Stephen and Michael,
On 4/11/22 12:04, Shubhrajyoti Datta wrote:
> The patch does the following
> Update the versions of the clocking wizard ip.
> Move from staging to clk directory.
> Update the bindings.
>
> v12:
> No change.
> Rebased
> v13:
> Update the clocking compatible
> Add the change removing the driver from staging
> v14:
> Moved to the xilinx folder
>
> Shubhrajyoti Datta (5):
> dt-bindings: add documentation of xilinx clocking wizard
> clk: clocking-wizard: Add the clockwizard to clk directory
> clk: clocking-wizard: Rename nr-outputs to xlnx,nr-outputs
> clk: clocking-wizard: Fix the reconfig for 5.2
> clk: clocking-wizard: Update the compatible
>
> .../bindings/clock/xlnx,clocking-wizard.yaml | 77 +++++++++++++++++++
> drivers/clk/xilinx/Kconfig | 11 +++
> drivers/clk/xilinx/Makefile | 1 +
> .../xilinx}/clk-xlnx-clock-wizard.c | 19 +++--
> drivers/staging/Kconfig | 2 -
> drivers/staging/Makefile | 1 -
> drivers/staging/clocking-wizard/Kconfig | 10 ---
> drivers/staging/clocking-wizard/Makefile | 2 -
> drivers/staging/clocking-wizard/TODO | 13 ----
> .../staging/clocking-wizard/dt-binding.txt | 30 --------
> 10 files changed, 103 insertions(+), 63 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.yaml
> rename drivers/{staging/clocking-wizard => clk/xilinx}/clk-xlnx-clock-wizard.c (96%)
> delete mode 100644 drivers/staging/clocking-wizard/Kconfig
> delete mode 100644 drivers/staging/clocking-wizard/Makefile
> delete mode 100644 drivers/staging/clocking-wizard/TODO
> delete mode 100644 drivers/staging/clocking-wizard/dt-binding.txt
>
I was looking at comment in v13 and moving to xilinx folder was done in v14.
v13: https://lore.kernel.org/r/[email protected]
dt binding is also reviewed by Rob already.
You asked there to get confirmation from Greg that it can be moved out of
staging. I didn't see any reply from Greg about it but not sure if this is
really required to get.
Greg: Can you please ACK it or comment?
And in your v13 reply you said that you will pick it up
https://lore.kernel.org/all/[email protected]/#t
but I can't see this patch in your linux clk tree yet.
I have also see that some people are sending you pull requests to merge it to
clock tree. If this is something what you prefer I have really not a problem to
do it.
Thanks,
Michal
On Thu, Jul 14, 2022 at 01:26:58PM +0200, Michal Simek wrote:
> Hi Stephen and Michael,
>
> On 4/11/22 12:04, Shubhrajyoti Datta wrote:
> > The patch does the following
> > Update the versions of the clocking wizard ip.
> > Move from staging to clk directory.
> > Update the bindings.
> >
> > v12:
> > No change.
> > Rebased
> > v13:
> > Update the clocking compatible
> > Add the change removing the driver from staging
> > v14:
> > Moved to the xilinx folder
> >
> > Shubhrajyoti Datta (5):
> > dt-bindings: add documentation of xilinx clocking wizard
> > clk: clocking-wizard: Add the clockwizard to clk directory
> > clk: clocking-wizard: Rename nr-outputs to xlnx,nr-outputs
> > clk: clocking-wizard: Fix the reconfig for 5.2
> > clk: clocking-wizard: Update the compatible
> >
> > .../bindings/clock/xlnx,clocking-wizard.yaml | 77 +++++++++++++++++++
> > drivers/clk/xilinx/Kconfig | 11 +++
> > drivers/clk/xilinx/Makefile | 1 +
> > .../xilinx}/clk-xlnx-clock-wizard.c | 19 +++--
> > drivers/staging/Kconfig | 2 -
> > drivers/staging/Makefile | 1 -
> > drivers/staging/clocking-wizard/Kconfig | 10 ---
> > drivers/staging/clocking-wizard/Makefile | 2 -
> > drivers/staging/clocking-wizard/TODO | 13 ----
> > .../staging/clocking-wizard/dt-binding.txt | 30 --------
> > 10 files changed, 103 insertions(+), 63 deletions(-)
> > create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.yaml
> > rename drivers/{staging/clocking-wizard => clk/xilinx}/clk-xlnx-clock-wizard.c (96%)
> > delete mode 100644 drivers/staging/clocking-wizard/Kconfig
> > delete mode 100644 drivers/staging/clocking-wizard/Makefile
> > delete mode 100644 drivers/staging/clocking-wizard/TODO
> > delete mode 100644 drivers/staging/clocking-wizard/dt-binding.txt
> >
>
> I was looking at comment in v13 and moving to xilinx folder was done in v14.
> v13: https://lore.kernel.org/r/[email protected]
>
> dt binding is also reviewed by Rob already.
>
> You asked there to get confirmation from Greg that it can be moved out of
> staging. I didn't see any reply from Greg about it but not sure if this is
> really required to get.
> Greg: Can you please ACK it or comment?
No objection from me if others want to maintainer it in their portion of
the kernel tree:
Acked-by: Greg Kroah-Hartman <[email protected]>
Quoting Shubhrajyoti Datta (2022-04-11 03:04:41)
> Rename nr-outputs to xlnx,output.
>
> Signed-off-by: Shubhrajyoti Datta <[email protected]>
> ---
Applied to clk-next
Quoting Shubhrajyoti Datta (2022-04-11 03:04:43)
> Update the compatible to indicate support for both 5.2 and 6.0
>
> Signed-off-by: Shubhrajyoti Datta <[email protected]>
> ---
Applied to clk-next