2013-10-10 17:10:33

by Soren Brinkmann

[permalink] [raw]
Subject: [PATCH v2 1/2] clk/zynq/clkc: Add 'fclk-enable' feature

In some use cases Zynq's FPGA clocks are used as static clock
generators for IP in the FPGA part of the SOC for which no Linux driver
exists and would control those clocks. To avoid automatic
gating of these clocks in such cases a new property - fclk-enable - is
added to the clock controller's DT description to accomodate such use
cases. It's value is a bitmask, where a set bit results in enabling
the corresponding FCLK through the clkc.

FPGA clocks are handled following the rules below:

If an FCLK is not enabled by bootloaders, that FCLK will be disabled in
Linux. Drivers can enable and control it through the CCF as usual.

If an FCLK is enabled by bootloaders AND the corresponding bit in the
'fclk-enable' DT property is set, that FCLK will be enabled by the clkc,
resulting in an off by one reference count for that clock. Ensuring it
will always be running.

Signed-off-by: Soren Brinkmann <[email protected]>
---
v2:
- change default value for fclk-enable to '0'
---
Documentation/devicetree/bindings/clock/zynq-7000.txt | 4 ++++
drivers/clk/zynq/clkc.c | 18 +++++++++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/zynq-7000.txt b/Documentation/devicetree/bindings/clock/zynq-7000.txt
index d99af878f5d7..11fdd146ec83 100644
--- a/Documentation/devicetree/bindings/clock/zynq-7000.txt
+++ b/Documentation/devicetree/bindings/clock/zynq-7000.txt
@@ -22,6 +22,10 @@ Required properties:
Optional properties:
- clocks : as described in the clock bindings
- clock-names : as described in the clock bindings
+ - fclk-enable : Bit mask to enable FCLKs in cases no proper CCF compatible
+ driver is available. Bit [0..3] correspond to FCLK0..FCLK3. The
+ corresponding FCLK will only be enabled if it is actually
+ running at boot time. (default = 0xf)

Clock inputs:
The following strings are optional parameters to the 'clock-names' property in
diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index 10772aa72e4e..af3bd0aec538 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -102,9 +102,10 @@ static const char *swdt_ext_clk_input_names[] __initdata = {"swdt_ext_clk"};

static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
const char *clk_name, void __iomem *fclk_ctrl_reg,
- const char **parents)
+ const char **parents, int enable)
{
struct clk *clk;
+ u32 enable_reg;
char *mux_name;
char *div0_name;
char *div1_name;
@@ -147,6 +148,12 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
clks[fclk] = clk_register_gate(NULL, clk_name,
div1_name, CLK_SET_RATE_PARENT, fclk_gate_reg,
0, CLK_GATE_SET_TO_DISABLE, fclk_gate_lock);
+ enable_reg = readl(fclk_gate_reg) & 1;
+ if (enable & !enable_reg) {
+ if (clk_prepare_enable(clks[fclk]))
+ pr_warn("%s: FCLK%u enable failed\n", __func__,
+ fclk - fclk0);
+ }
kfree(mux_name);
kfree(div0_name);
kfree(div1_name);
@@ -213,6 +220,7 @@ static void __init zynq_clk_setup(struct device_node *np)
int ret;
struct clk *clk;
char *clk_name;
+ unsigned int fclk_enable = 0;
const char *clk_output_name[clk_max];
const char *cpu_parents[4];
const char *periph_parents[4];
@@ -238,6 +246,8 @@ static void __init zynq_clk_setup(struct device_node *np)
periph_parents[2] = clk_output_name[armpll];
periph_parents[3] = clk_output_name[ddrpll];

+ of_property_read_u32(np, "fclk-enable", &fclk_enable);
+
/* ps_clk */
ret = of_property_read_u32(np, "ps-clk-frequency", &tmp);
if (ret) {
@@ -340,10 +350,12 @@ static void __init zynq_clk_setup(struct device_node *np)
clk_prepare_enable(clks[dci]);

/* Peripheral clocks */
- for (i = fclk0; i <= fclk3; i++)
+ for (i = fclk0; i <= fclk3; i++) {
+ int enable = !!(fclk_enable & BIT(i - fclk0));
zynq_clk_register_fclk(i, clk_output_name[i],
SLCR_FPGA0_CLK_CTRL + 0x10 * (i - fclk0),
- periph_parents);
+ periph_parents, enable);
+ }

zynq_clk_register_periph_clk(lqspi, 0, clk_output_name[lqspi], NULL,
SLCR_LQSPI_CLK_CTRL, periph_parents, 0);
--
1.8.4


2013-10-10 17:10:35

by Soren Brinkmann

[permalink] [raw]
Subject: [PATCH v2 2/2] arm: dt: zynq: Add fclk-enable property to clkc node

Signed-off-by: Soren Brinkmann <[email protected]>
---
This is kind of optional since it does not have any effect due to the changed
default in 1/2.

v2:
- no change


arch/arm/boot/dts/zynq-7000.dtsi | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index e32b92b949d2..b48d0403537b 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -77,6 +77,7 @@
#clock-cells = <1>;
compatible = "xlnx,ps7-clkc";
ps-clk-frequency = <33333333>;
+ fclk-enable = <0>;
clock-output-names = "armpll", "ddrpll", "iopll", "cpu_6or4x",
"cpu_3or2x", "cpu_2x", "cpu_1x", "ddr2x", "ddr3x",
"dci", "lqspi", "smc", "pcap", "gem0", "gem1",
--
1.8.4

2013-10-14 09:05:08

by Michal Simek

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] clk/zynq/clkc: Add 'fclk-enable' feature

On 10/10/2013 07:10 PM, Soren Brinkmann wrote:
> In some use cases Zynq's FPGA clocks are used as static clock
> generators for IP in the FPGA part of the SOC for which no Linux driver
> exists and would control those clocks. To avoid automatic
> gating of these clocks in such cases a new property - fclk-enable - is
> added to the clock controller's DT description to accomodate such use
> cases. It's value is a bitmask, where a set bit results in enabling
> the corresponding FCLK through the clkc.
>
> FPGA clocks are handled following the rules below:
>
> If an FCLK is not enabled by bootloaders, that FCLK will be disabled in
> Linux. Drivers can enable and control it through the CCF as usual.
>
> If an FCLK is enabled by bootloaders AND the corresponding bit in the
> 'fclk-enable' DT property is set, that FCLK will be enabled by the clkc,
> resulting in an off by one reference count for that clock. Ensuring it
> will always be running.
>
> Signed-off-by: Soren Brinkmann <[email protected]>
> ---
> v2:
> - change default value for fclk-enable to '0'
> ---
> Documentation/devicetree/bindings/clock/zynq-7000.txt | 4 ++++
> drivers/clk/zynq/clkc.c | 18 +++++++++++++++---
> 2 files changed, 19 insertions(+), 3 deletions(-)

For both patches:
Acked-by: Michal Simek <[email protected]>

Mike: Can you please add both these patches to your tree?
There shouldn't be any conflict with DT patch itself.
But if you don't want to add 2/2 through your tree, I am also fine
with taking this through my zynq tree.

Thanks,
Michal

--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



Attachments:
signature.asc (263.00 B)
OpenPGP digital signature

2013-10-28 20:59:23

by Soren Brinkmann

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] clk/zynq/clkc: Add 'fclk-enable' feature

ping?

On Thu, Oct 10, 2013 at 10:10:17AM -0700, Soren Brinkmann wrote:
> In some use cases Zynq's FPGA clocks are used as static clock
> generators for IP in the FPGA part of the SOC for which no Linux driver
> exists and would control those clocks. To avoid automatic
> gating of these clocks in such cases a new property - fclk-enable - is
> added to the clock controller's DT description to accomodate such use
> cases. It's value is a bitmask, where a set bit results in enabling
> the corresponding FCLK through the clkc.
>
> FPGA clocks are handled following the rules below:
>
> If an FCLK is not enabled by bootloaders, that FCLK will be disabled in
> Linux. Drivers can enable and control it through the CCF as usual.
>
> If an FCLK is enabled by bootloaders AND the corresponding bit in the
> 'fclk-enable' DT property is set, that FCLK will be enabled by the clkc,
> resulting in an off by one reference count for that clock. Ensuring it
> will always be running.
>
> Signed-off-by: Soren Brinkmann <[email protected]>
> ---
> v2:
> - change default value for fclk-enable to '0'
> ---
> Documentation/devicetree/bindings/clock/zynq-7000.txt | 4 ++++
> drivers/clk/zynq/clkc.c | 18 +++++++++++++++---
> 2 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/clock/zynq-7000.txt b/Documentation/devicetree/bindings/clock/zynq-7000.txt
> index d99af878f5d7..11fdd146ec83 100644
> --- a/Documentation/devicetree/bindings/clock/zynq-7000.txt
> +++ b/Documentation/devicetree/bindings/clock/zynq-7000.txt
> @@ -22,6 +22,10 @@ Required properties:
> Optional properties:
> - clocks : as described in the clock bindings
> - clock-names : as described in the clock bindings
> + - fclk-enable : Bit mask to enable FCLKs in cases no proper CCF compatible
> + driver is available. Bit [0..3] correspond to FCLK0..FCLK3. The
> + corresponding FCLK will only be enabled if it is actually
> + running at boot time. (default = 0xf)
>
> Clock inputs:
> The following strings are optional parameters to the 'clock-names' property in
> diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
> index 10772aa72e4e..af3bd0aec538 100644
> --- a/drivers/clk/zynq/clkc.c
> +++ b/drivers/clk/zynq/clkc.c
> @@ -102,9 +102,10 @@ static const char *swdt_ext_clk_input_names[] __initdata = {"swdt_ext_clk"};
>
> static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
> const char *clk_name, void __iomem *fclk_ctrl_reg,
> - const char **parents)
> + const char **parents, int enable)
> {
> struct clk *clk;
> + u32 enable_reg;
> char *mux_name;
> char *div0_name;
> char *div1_name;
> @@ -147,6 +148,12 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
> clks[fclk] = clk_register_gate(NULL, clk_name,
> div1_name, CLK_SET_RATE_PARENT, fclk_gate_reg,
> 0, CLK_GATE_SET_TO_DISABLE, fclk_gate_lock);
> + enable_reg = readl(fclk_gate_reg) & 1;
> + if (enable & !enable_reg) {
> + if (clk_prepare_enable(clks[fclk]))
> + pr_warn("%s: FCLK%u enable failed\n", __func__,
> + fclk - fclk0);
> + }
> kfree(mux_name);
> kfree(div0_name);
> kfree(div1_name);
> @@ -213,6 +220,7 @@ static void __init zynq_clk_setup(struct device_node *np)
> int ret;
> struct clk *clk;
> char *clk_name;
> + unsigned int fclk_enable = 0;
> const char *clk_output_name[clk_max];
> const char *cpu_parents[4];
> const char *periph_parents[4];
> @@ -238,6 +246,8 @@ static void __init zynq_clk_setup(struct device_node *np)
> periph_parents[2] = clk_output_name[armpll];
> periph_parents[3] = clk_output_name[ddrpll];
>
> + of_property_read_u32(np, "fclk-enable", &fclk_enable);
> +
> /* ps_clk */
> ret = of_property_read_u32(np, "ps-clk-frequency", &tmp);
> if (ret) {
> @@ -340,10 +350,12 @@ static void __init zynq_clk_setup(struct device_node *np)
> clk_prepare_enable(clks[dci]);
>
> /* Peripheral clocks */
> - for (i = fclk0; i <= fclk3; i++)
> + for (i = fclk0; i <= fclk3; i++) {
> + int enable = !!(fclk_enable & BIT(i - fclk0));
> zynq_clk_register_fclk(i, clk_output_name[i],
> SLCR_FPGA0_CLK_CTRL + 0x10 * (i - fclk0),
> - periph_parents);
> + periph_parents, enable);
> + }
>
> zynq_clk_register_periph_clk(lqspi, 0, clk_output_name[lqspi], NULL,
> SLCR_LQSPI_CLK_CTRL, periph_parents, 0);
> --
> 1.8.4
>
>

2013-10-28 21:13:33

by Tomasz Figa

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] clk/zynq/clkc: Add 'fclk-enable' feature

Hi Soren,

On Thursday 10 of October 2013 10:10:17 Soren Brinkmann wrote:
> In some use cases Zynq's FPGA clocks are used as static clock
> generators for IP in the FPGA part of the SOC for which no Linux driver
> exists and would control those clocks. To avoid automatic
> gating of these clocks in such cases a new property - fclk-enable - is
> added to the clock controller's DT description to accomodate such use
> cases. It's value is a bitmask, where a set bit results in enabling
> the corresponding FCLK through the clkc.
>
> FPGA clocks are handled following the rules below:
>
> If an FCLK is not enabled by bootloaders, that FCLK will be disabled in
> Linux. Drivers can enable and control it through the CCF as usual.
>
> If an FCLK is enabled by bootloaders AND the corresponding bit in the
> 'fclk-enable' DT property is set, that FCLK will be enabled by the clkc,
> resulting in an off by one reference count for that clock. Ensuring it
> will always be running.
>
> Signed-off-by: Soren Brinkmann <[email protected]>
> ---
> v2:
> - change default value for fclk-enable to '0'
> ---
> Documentation/devicetree/bindings/clock/zynq-7000.txt | 4 ++++
> drivers/clk/zynq/clkc.c | 18
> +++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/clock/zynq-7000.txt
> b/Documentation/devicetree/bindings/clock/zynq-7000.txt index
> d99af878f5d7..11fdd146ec83 100644
> --- a/Documentation/devicetree/bindings/clock/zynq-7000.txt
> +++ b/Documentation/devicetree/bindings/clock/zynq-7000.txt
> @@ -22,6 +22,10 @@ Required properties:
> Optional properties:
> - clocks : as described in the clock bindings
> - clock-names : as described in the clock bindings
> + - fclk-enable : Bit mask to enable FCLKs in cases no proper CCF

Since it's a vendor specific property, it should include vendor prefix.

Also CCF is a Linux-specific implementation detail, which DT bindings
should not be involved into. If you really need to implement this using
this way, then at least property description should say something like
this:

xlnx,fclk-enable : Bit mask of bits of fclk enable register that must
be statically enabled at boot-up time.

However, I wonder why you can't simply define an FPGA block using a single
node, which would be a consumer to all the fclk clocks you need to enable
and then make a driver for it that would simply enable all clocks
specified in clocks property.

Best regards,
Tomasz

2013-10-28 21:43:46

by Soren Brinkmann

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] clk/zynq/clkc: Add 'fclk-enable' feature

On Mon, Oct 28, 2013 at 10:13:28PM +0100, Tomasz Figa wrote:
> Hi Soren,
>
> On Thursday 10 of October 2013 10:10:17 Soren Brinkmann wrote:
> > In some use cases Zynq's FPGA clocks are used as static clock
> > generators for IP in the FPGA part of the SOC for which no Linux driver
> > exists and would control those clocks. To avoid automatic
> > gating of these clocks in such cases a new property - fclk-enable - is
> > added to the clock controller's DT description to accomodate such use
> > cases. It's value is a bitmask, where a set bit results in enabling
> > the corresponding FCLK through the clkc.
> >
> > FPGA clocks are handled following the rules below:
> >
> > If an FCLK is not enabled by bootloaders, that FCLK will be disabled in
> > Linux. Drivers can enable and control it through the CCF as usual.
> >
> > If an FCLK is enabled by bootloaders AND the corresponding bit in the
> > 'fclk-enable' DT property is set, that FCLK will be enabled by the clkc,
> > resulting in an off by one reference count for that clock. Ensuring it
> > will always be running.
> >
> > Signed-off-by: Soren Brinkmann <[email protected]>
> > ---
> > v2:
> > - change default value for fclk-enable to '0'
> > ---
> > Documentation/devicetree/bindings/clock/zynq-7000.txt | 4 ++++
> > drivers/clk/zynq/clkc.c | 18
> > +++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/clock/zynq-7000.txt
> > b/Documentation/devicetree/bindings/clock/zynq-7000.txt index
> > d99af878f5d7..11fdd146ec83 100644
> > --- a/Documentation/devicetree/bindings/clock/zynq-7000.txt
> > +++ b/Documentation/devicetree/bindings/clock/zynq-7000.txt
> > @@ -22,6 +22,10 @@ Required properties:
> > Optional properties:
> > - clocks : as described in the clock bindings
> > - clock-names : as described in the clock bindings
> > + - fclk-enable : Bit mask to enable FCLKs in cases no proper CCF
>
> Since it's a vendor specific property, it should include vendor prefix.
The whole driver is vendor specific. Should there really be another
prefix for that property?

>
> Also CCF is a Linux-specific implementation detail, which DT bindings
> should not be involved into. If you really need to implement this using
> this way, then at least property description should say something like
> this:
>
> xlnx,fclk-enable : Bit mask of bits of fclk enable register that must
> be statically enabled at boot-up time.
Fair enough. I'll change the description

>
> However, I wonder why you can't simply define an FPGA block using a single
> node, which would be a consumer to all the fclk clocks you need to enable
> and then make a driver for it that would simply enable all clocks
> specified in clocks property.
Well, then we'd have a dummy driver that wouldn't fit into any subsystem
and wouldn't do anything but enabling clocks. Seems much easier to
handle it in this driver. Especially, since I hope that this is just a
workaround and that the majority of use cases involves drivers for their
soft-IP that simply uses the CCF.

Sören

2013-10-28 22:17:46

by Tomasz Figa

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] clk/zynq/clkc: Add 'fclk-enable' feature

On Monday 28 of October 2013 14:43:35 S?ren Brinkmann wrote:
> On Mon, Oct 28, 2013 at 10:13:28PM +0100, Tomasz Figa wrote:
> > Hi Soren,
> >
> > On Thursday 10 of October 2013 10:10:17 Soren Brinkmann wrote:
> > > In some use cases Zynq's FPGA clocks are used as static clock
> > > generators for IP in the FPGA part of the SOC for which no Linux
> > > driver
> > > exists and would control those clocks. To avoid automatic
> > > gating of these clocks in such cases a new property - fclk-enable -
> > > is
> > > added to the clock controller's DT description to accomodate such
> > > use
> > > cases. It's value is a bitmask, where a set bit results in enabling
> > > the corresponding FCLK through the clkc.
> > >
> > > FPGA clocks are handled following the rules below:
> > >
> > > If an FCLK is not enabled by bootloaders, that FCLK will be disabled
> > > in
> > > Linux. Drivers can enable and control it through the CCF as usual.
> > >
> > > If an FCLK is enabled by bootloaders AND the corresponding bit in
> > > the
> > > 'fclk-enable' DT property is set, that FCLK will be enabled by the
> > > clkc, resulting in an off by one reference count for that clock.
> > > Ensuring it will always be running.
> > >
> > > Signed-off-by: Soren Brinkmann <[email protected]>
> > > ---
> > >
> > > v2:
> > > - change default value for fclk-enable to '0'
> > >
> > > ---
> > >
> > > Documentation/devicetree/bindings/clock/zynq-7000.txt | 4 ++++
> > > drivers/clk/zynq/clkc.c | 18
> > >
> > > +++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/Documentation/devicetree/bindings/clock/zynq-7000.txt
> > > b/Documentation/devicetree/bindings/clock/zynq-7000.txt index
> > > d99af878f5d7..11fdd146ec83 100644
> > > --- a/Documentation/devicetree/bindings/clock/zynq-7000.txt
> > > +++ b/Documentation/devicetree/bindings/clock/zynq-7000.txt
> > >
> > > @@ -22,6 +22,10 @@ Required properties:
> > > Optional properties:
> > > - clocks : as described in the clock bindings
> > > - clock-names : as described in the clock bindings
> > >
> > > + - fclk-enable : Bit mask to enable FCLKs in cases no proper CCF
> >
> > Since it's a vendor specific property, it should include vendor
> > prefix.
>
> The whole driver is vendor specific. Should there really be another
> prefix for that property?

Yes. If a property is introduced just for use by this particular driver
then it must be prepended by a vendor prefix. That's a general rule.

> > Also CCF is a Linux-specific implementation detail, which DT bindings
> > should not be involved into. If you really need to implement this
> > using
> > this way, then at least property description should say something like
> > this:
> >
> > xlnx,fclk-enable : Bit mask of bits of fclk enable register that must
> > be statically enabled at boot-up time.
>
> Fair enough. I'll change the description
>
> > However, I wonder why you can't simply define an FPGA block using a
> > single node, which would be a consumer to all the fclk clocks you
> > need to enable and then make a driver for it that would simply enable
> > all clocks specified in clocks property.
>
> Well, then we'd have a dummy driver that wouldn't fit into any subsystem
> and wouldn't do anything but enabling clocks. Seems much easier to
> handle it in this driver. Especially, since I hope that this is just a
> workaround and that the majority of use cases involves drivers for
> their soft-IP that simply uses the CCF.

Hmm, I'm not really convinced, but well, let's say that I'm fine with your
proposed solution, unless someone else complains.

Best regards,
Tomasz

2013-10-29 08:26:26

by Kumar Gala

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] clk/zynq/clkc: Add 'fclk-enable' feature


On Oct 28, 2013, at 5:17 PM, Tomasz Figa wrote:

>>>> diff --git a/Documentation/devicetree/bindings/clock/zynq-7000.txt
>>>> b/Documentation/devicetree/bindings/clock/zynq-7000.txt index
>>>> d99af878f5d7..11fdd146ec83 100644
>>>> --- a/Documentation/devicetree/bindings/clock/zynq-7000.txt
>>>> +++ b/Documentation/devicetree/bindings/clock/zynq-7000.txt
>>>>
>>>> @@ -22,6 +22,10 @@ Required properties:
>>>> Optional properties:
>>>> - clocks : as described in the clock bindings
>>>> - clock-names : as described in the clock bindings
>>>>
>>>> + - fclk-enable : Bit mask to enable FCLKs in cases no proper CCF
>>>
>>> Since it's a vendor specific property, it should include vendor
>>> prefix.
>>
>> The whole driver is vendor specific. Should there really be another
>> prefix for that property?
>
> Yes. If a property is introduced just for use by this particular driver
> then it must be prepended by a vendor prefix. That's a general rule.

Most all nodes are vendor specific by definition ;).

- k

--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

2013-10-29 13:04:24

by Michal Simek

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] clk/zynq/clkc: Add 'fclk-enable' feature

On 10/29/2013 09:26 AM, Kumar Gala wrote:
>
> On Oct 28, 2013, at 5:17 PM, Tomasz Figa wrote:
>
>>>>> diff --git a/Documentation/devicetree/bindings/clock/zynq-7000.txt
>>>>> b/Documentation/devicetree/bindings/clock/zynq-7000.txt index
>>>>> d99af878f5d7..11fdd146ec83 100644
>>>>> --- a/Documentation/devicetree/bindings/clock/zynq-7000.txt
>>>>> +++ b/Documentation/devicetree/bindings/clock/zynq-7000.txt
>>>>>
>>>>> @@ -22,6 +22,10 @@ Required properties:
>>>>> Optional properties:
>>>>> - clocks : as described in the clock bindings
>>>>> - clock-names : as described in the clock bindings
>>>>>
>>>>> + - fclk-enable : Bit mask to enable FCLKs in cases no proper CCF
>>>>
>>>> Since it's a vendor specific property, it should include vendor
>>>> prefix.
>>>
>>> The whole driver is vendor specific. Should there really be another
>>> prefix for that property?
>>
>> Yes. If a property is introduced just for use by this particular driver
>> then it must be prepended by a vendor prefix. That's a general rule.
>
> Most all nodes are vendor specific by definition ;).

Is this really generic rule? I haven't seen/heard any point regarding this on KS.

I don't think we should use prefix here. It is xilinx specific option
but there shouldn't be any problem to use fclk-enable without any prefix.
Because it means we have to also rename ps-clk-frequency.

We are using xlnx prefix for properties which are autogenerated from design tools
which is not even this case.

Thanks,
Michal

2013-10-30 18:44:16

by Soren Brinkmann

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] clk/zynq/clkc: Add 'fclk-enable' feature

On Tue, Oct 29, 2013 at 02:04:06PM +0100, Michal Simek wrote:
> On 10/29/2013 09:26 AM, Kumar Gala wrote:
> >
> > On Oct 28, 2013, at 5:17 PM, Tomasz Figa wrote:
> >
> >>>>> diff --git a/Documentation/devicetree/bindings/clock/zynq-7000.txt
> >>>>> b/Documentation/devicetree/bindings/clock/zynq-7000.txt index
> >>>>> d99af878f5d7..11fdd146ec83 100644
> >>>>> --- a/Documentation/devicetree/bindings/clock/zynq-7000.txt
> >>>>> +++ b/Documentation/devicetree/bindings/clock/zynq-7000.txt
> >>>>>
> >>>>> @@ -22,6 +22,10 @@ Required properties:
> >>>>> Optional properties:
> >>>>> - clocks : as described in the clock bindings
> >>>>> - clock-names : as described in the clock bindings
> >>>>>
> >>>>> + - fclk-enable : Bit mask to enable FCLKs in cases no proper CCF
> >>>>
> >>>> Since it's a vendor specific property, it should include vendor
> >>>> prefix.
> >>>
> >>> The whole driver is vendor specific. Should there really be another
> >>> prefix for that property?
> >>
> >> Yes. If a property is introduced just for use by this particular driver
> >> then it must be prepended by a vendor prefix. That's a general rule.
> >
> > Most all nodes are vendor specific by definition ;).
>
> Is this really generic rule? I haven't seen/heard any point regarding this on KS.
>
> I don't think we should use prefix here. It is xilinx specific option
> but there shouldn't be any problem to use fclk-enable without any prefix.
> Because it means we have to also rename ps-clk-frequency.
>
> We are using xlnx prefix for properties which are autogenerated from design tools
> which is not even this case.

So, what is the final call on this? Respin this and changing the prop name,
or leaving it as is?

Thanks,
Sören