Expose clock CLKID_RNG0 which is needed for the HW random number generator.
Signed-off-by: Heiner Kallweit <[email protected]>
---
v2:
- added clk and DT maintainers
- split exposing the clock and using it in DT into two patches
- comment out clock definition in drivers/clk/meson/gxbb.h
- silently move CLKID_SPI to the right place
v3:
- no changes
---
drivers/clk/meson/gxbb.h | 2 +-
include/dt-bindings/clock/gxbb-clkc.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h
index 8ee2022c..cbd62e46 100644
--- a/drivers/clk/meson/gxbb.h
+++ b/drivers/clk/meson/gxbb.h
@@ -193,7 +193,7 @@
/* CLKID_I2C */
/* #define CLKID_SAR_ADC */
#define CLKID_SMART_CARD 24
-#define CLKID_RNG0 25
+/* CLKID_RNG0 */
#define CLKID_UART0 26
#define CLKID_SDHC 27
#define CLKID_STREAM 28
diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h
index 692846c7..63f4c2c4 100644
--- a/include/dt-bindings/clock/gxbb-clkc.h
+++ b/include/dt-bindings/clock/gxbb-clkc.h
@@ -12,9 +12,10 @@
#define CLKID_FCLK_DIV4 6
#define CLKID_CLK81 12
#define CLKID_MPLL2 15
-#define CLKID_SPI 34
#define CLKID_I2C 22
#define CLKID_SAR_ADC 23
+#define CLKID_RNG0 25
+#define CLKID_SPI 34
#define CLKID_ETH 36
#define CLKID_USB0 50
#define CLKID_USB1 51
--
2.11.1
Add clock to DT binding documentation.
Signed-off-by: Heiner Kallweit <[email protected]>
---
v2:
- splitted first version of patch into two
- add DT binding documentation
- mention that clock is optional
- replace spaces with tabs in DT binding example
v3:
- splitted DT extension and binding documentation update into two patches
---
Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt
index 202f2d09..4d403645 100644
--- a/Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt
+++ b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt
@@ -6,9 +6,16 @@ Required properties:
- compatible : should be "amlogic,meson-rng"
- reg : Specifies base physical address and size of the registers.
+Optional properties:
+
+- clocks : phandle to the following named clocks
+- clock-names: Name of core clock, must be "core"
+
Example:
rng {
- compatible = "amlogic,meson-rng";
- reg = <0x0 0xc8834000 0x0 0x4>;
+ compatible = "amlogic,meson-rng";
+ reg = <0x0 0xc8834000 0x0 0x4>;
+ clocks = <&clkc CLKID_RNG0>;
+ clock-names = "core";
};
--
2.11.1
On 02/21/2017 10:55 PM, Heiner Kallweit wrote:
> Expose clock CLKID_RNG0 which is needed for the HW random number generator.
>
> Signed-off-by: Heiner Kallweit <[email protected]>
> ---
> v2:
> - added clk and DT maintainers
> - split exposing the clock and using it in DT into two patches
> - comment out clock definition in drivers/clk/meson/gxbb.h
> - silently move CLKID_SPI to the right place
> v3:
> - no changes
> ---
> drivers/clk/meson/gxbb.h | 2 +-
> include/dt-bindings/clock/gxbb-clkc.h | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
Hi Heiner,
This looks all good to me, but you should always send a cover letter for each revisions
of the patchset.
Using "git send-email" along the "--cover-letter" of "get format-patch" feature would
also help send them in a row with a up-to-date cover letter.
For the third patch, it may be good to also add the same to the GXL dtsi, no ?
Anyway :
Reviewed-by: Neil Armstrong <[email protected]>
Thanks,
Neil
On Wed, Feb 22, 2017 at 07:59:08AM +0100, Heiner Kallweit wrote:
> Add clock to DT binding documentation.
>
> Signed-off-by: Heiner Kallweit <[email protected]>
> ---
> v2:
> - splitted first version of patch into two
> - add DT binding documentation
> - mention that clock is optional
> - replace spaces with tabs in DT binding example
> v3:
> - splitted DT extension and binding documentation update into two patches
> ---
> Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
Now the subject should really be: "dt-bindings: rng: ..."
Acked-by: Rob Herring <[email protected]>
On Wed, Feb 22, 2017 at 07:55:24AM +0100, Heiner Kallweit wrote:
> Expose clock CLKID_RNG0 which is needed for the HW random number generator.
>
> Signed-off-by: Heiner Kallweit <[email protected]>
All patches applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Herbert,
Herbert Xu <[email protected]> writes:
> On Wed, Feb 22, 2017 at 07:55:24AM +0100, Heiner Kallweit wrote:
>> Expose clock CLKID_RNG0 which is needed for the HW random number generator.
>>
>> Signed-off-by: Heiner Kallweit <[email protected]>
>
> All patches applied. Thanks.
Actually, can you just apply [PATCH 4/4] to your tree?
The clock and DT patches need to go through their respective trees or
will otherwise have conflicts with other things going in via those
trees.
Thanks,
Kevin
On Thu, Mar 16, 2017 at 11:24:31AM -0700, Kevin Hilman wrote:
> Hi Herbert,
>
> Herbert Xu <[email protected]> writes:
>
> > On Wed, Feb 22, 2017 at 07:55:24AM +0100, Heiner Kallweit wrote:
> >> Expose clock CLKID_RNG0 which is needed for the HW random number generator.
> >>
> >> Signed-off-by: Heiner Kallweit <[email protected]>
> >
> > All patches applied. Thanks.
>
> Actually, can you just apply [PATCH 4/4] to your tree?
>
> The clock and DT patches need to go through their respective trees or
> will otherwise have conflicts with other things going in via those
> trees.
It's too late now. Please speak up sooner next time. These
patches were posted a month ago.
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Herbert Xu <[email protected]> writes:
> On Thu, Mar 16, 2017 at 11:24:31AM -0700, Kevin Hilman wrote:
>> Hi Herbert,
>>
>> Herbert Xu <[email protected]> writes:
>>
>> > On Wed, Feb 22, 2017 at 07:55:24AM +0100, Heiner Kallweit wrote:
>> >> Expose clock CLKID_RNG0 which is needed for the HW random number generator.
>> >>
>> >> Signed-off-by: Heiner Kallweit <[email protected]>
>> >
>> > All patches applied. Thanks.
>>
>> Actually, can you just apply [PATCH 4/4] to your tree?
>>
>> The clock and DT patches need to go through their respective trees or
>> will otherwise have conflicts with other things going in via those
>> trees.
>
> It's too late now. Please speak up sooner next time. These
> patches were posted a month ago.
Sorry, I didn't realize you would be applying everything. Also, I'm not
the original author, just the platform maintainer that noticed it and
now has to deal with the conflicts. :(
Most other driver maintainers are only applying patches that directly
apply to their subsystem and leave patches to other drivers (e.g. clk) and
platform-specific stuff (e.g. DT) to go in via their proper trees, so
that's what I was expecting to happen here too.
Kevin
Herbert Xu <[email protected]> writes:
> On Thu, Mar 16, 2017 at 11:24:31AM -0700, Kevin Hilman wrote:
>> Hi Herbert,
>>
>> Herbert Xu <[email protected]> writes:
>>
>> > On Wed, Feb 22, 2017 at 07:55:24AM +0100, Heiner Kallweit wrote:
>> >> Expose clock CLKID_RNG0 which is needed for the HW random number generator.
>> >>
>> >> Signed-off-by: Heiner Kallweit <[email protected]>
>> >
>> > All patches applied. Thanks.
>>
>> Actually, can you just apply [PATCH 4/4] to your tree?
>>
>> The clock and DT patches need to go through their respective trees or
>> will otherwise have conflicts with other things going in via those
>> trees.
>
> It's too late now. Please speak up sooner next time. These
> patches were posted a month ago.
Because this will be causing conflicts with both the platform (amlogic)
tree and the clk tree, could provide an immutable branch where these are
applied to help us handle these conflicts?
Thanks,
Kevin
Quoting Kevin Hilman (2017-03-22 08:24:08)
> Herbert Xu <[email protected]> writes:
>
> > On Thu, Mar 16, 2017 at 11:24:31AM -0700, Kevin Hilman wrote:
> >> Hi Herbert,
> >>
> >> Herbert Xu <[email protected]> writes:
> >>
> >> > On Wed, Feb 22, 2017 at 07:55:24AM +0100, Heiner Kallweit wrote:
> >> >> Expose clock CLKID_RNG0 which is needed for the HW random number generator.
> >> >>
> >> >> Signed-off-by: Heiner Kallweit <[email protected]>
> >> >
> >> > All patches applied. Thanks.
> >>
> >> Actually, can you just apply [PATCH 4/4] to your tree?
> >>
> >> The clock and DT patches need to go through their respective trees or
> >> will otherwise have conflicts with other things going in via those
> >> trees.
> >
> > It's too late now. Please speak up sooner next time. These
> > patches were posted a month ago.
>
> Because this will be causing conflicts with both the platform (amlogic)
> tree and the clk tree, could provide an immutable branch where these are
> applied to help us handle these conflicts?
+1
The DT header changes will cause conflicts in the clk tree. Much better
to either arrange for the patches to be applied by the correct
maintainers or to provide a stable, immutable branch.
Best regards,
Mike
>
> Thanks,
>
> Kevin
On Wed, Mar 22, 2017 at 08:24:08AM -0700, Kevin Hilman wrote:
>
> Because this will be causing conflicts with both the platform (amlogic)
> tree and the clk tree, could provide an immutable branch where these are
> applied to help us handle these conflicts?
If you apply the same patches to your tree there should be no
conflicts at all. git is able to resolve this automatically.
Cheers,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Herbert,
On Thu, Mar 23, 2017 at 12:56 AM, Herbert Xu
<[email protected]> wrote:
> On Wed, Mar 22, 2017 at 08:24:08AM -0700, Kevin Hilman wrote:
>>
>> Because this will be causing conflicts with both the platform (amlogic)
>> tree and the clk tree, could provide an immutable branch where these are
>> applied to help us handle these conflicts?
>
> If you apply the same patches to your tree there should be no
> conflicts at all. git is able to resolve this automatically.
The commits will have different SHA1 hashes (commit id's). Having
multiple "copies" of the same patch with separate id's is undesirable
and completely avoidable. Immutable, shared branches resolve this
issue.
Best regards,
Mike
>
> Cheers,
> --
> Email: Herbert Xu <[email protected]>
> Home Page: http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt