| Message ID | 20170404215329.14823-1-raltherr@google.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
Hi Rick, I tried to apply this and got the following: Applying patch #746973 using 'git am -s' Description: [linux,dev-4.7,v1] dts: aspeed: Add hardware RNG to aspeed-g4 and aspeed-g5 Applying: dts: aspeed: Add hardware RNG to aspeed-g4 and aspeed-g5 error: corrupt patch at line 42 Patch failed at 0001 dts: aspeed: Add hardware RNG to aspeed-g4 and aspeed-g5 Can you try sending again? Cheers, Joel On Wed, Apr 5, 2017 at 7:23 AM, Rick Altherr <raltherr@google.com> wrote: > Signed-off-by: Rick Altherr <raltherr@google.com> > --- > > arch/arm/boot/dts/aspeed-g4.dtsi | 6 ++++++ > arch/arm/boot/dts/aspeed-g5.dtsi | 12 ++++++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi > index e5be87076a6b..ee735e92c3d9 100644 > --- a/arch/arm/boot/dts/aspeed-g4.dtsi > +++ b/arch/arm/boot/dts/aspeed-g4.dtsi > @@ -840,6 +840,12 @@ > reg = <0x1e6e202c 0x4>; > }; > > + hwrng@1e6e2078 { > + compatible = "timeriomem_rng"; > + reg = <0x1e6e2078 0x4>; > + period = <1>; > + }; > + > adc: adc@1e6e9000 { > compatible = "aspeed,ast2400-adc"; > reg = <0x1e6e9000 0xB0>; > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi > index 48fd068251d6..4f29dcfcc134 100644 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi > @@ -1009,6 +1009,18 @@ > reg = <0x1e6e202c 0x4>; > }; > > + hwrng@1e6e2078 { > + compatible = "timeriomem_rng"; > + reg = <0x1e6e2078 0x4>; > + period = <1>; > + }; > + > gfx: display@1e6e6000 { > compatible = "aspeed,ast2500-gfx", "syscon"; > reg = <0x1e6e6000 0x1000>; > -- > 2.12.2.715.g7642488e1d-goog >
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index e5be87076a6b..ee735e92c3d9 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -840,6 +840,12 @@ reg = <0x1e6e202c 0x4>; }; + hwrng@1e6e2078 { + compatible = "timeriomem_rng"; + reg = <0x1e6e2078 0x4>; + period = <1>; + }; + adc: adc@1e6e9000 { compatible = "aspeed,ast2400-adc"; reg = <0x1e6e9000 0xB0>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 48fd068251d6..4f29dcfcc134 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -1009,6 +1009,18 @@ reg = <0x1e6e202c 0x4>; }; + hwrng@1e6e2078 { + compatible = "timeriomem_rng"; + reg = <0x1e6e2078 0x4>; + period = <1>; + }; + gfx: display@1e6e6000 { compatible = "aspeed,ast2500-gfx", "syscon"; reg = <0x1e6e6000 0x1000>; -- 2.12.2.715.g7642488e1d-goog
Signed-off-by: Rick Altherr <raltherr@google.com> --- arch/arm/boot/dts/aspeed-g4.dtsi | 6 ++++++ arch/arm/boot/dts/aspeed-g5.dtsi | 12 ++++++++++++ 2 files changed, 18 insertions(+)