[PATCH 6/9] ARM: zynq: clk: replace define with header

Steffen Trumtrar s.trumtrar at pengutronix.de
Mon Mar 11 14:55:51 EDT 2013


On Mon, Mar 11, 2013 at 01:29:25PM -0500, Josh Cartwright wrote:
> On Mon, Mar 11, 2013 at 10:15:03AM +0100, Steffen Trumtrar wrote:
> > Signed-off-by: Steffen Trumtrar <s.trumtrar at pengutronix.de>
> > ---
> >  arch/arm/mach-zynq/clk-zynq7000.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/mach-zynq/clk-zynq7000.c b/arch/arm/mach-zynq/clk-zynq7000.c
> > index 8dbde2b..5a8a12a 100644
> > --- a/arch/arm/mach-zynq/clk-zynq7000.c
> > +++ b/arch/arm/mach-zynq/clk-zynq7000.c
> > @@ -25,10 +25,9 @@
> >  #include <linux/clk.h>
> >  #include <linux/clkdev.h>
> >  #include <linux/err.h>
> > +#include <mach/zynq7000-regs.h>
> >  #include <malloc.h>
> >  
> > -#define ZYNQ_SLCR_BASE 0xF8000000
> > -
> >  enum zynq_clks {
> >  	dummy, ps_clk, arm_pll, ddr_pll, io_pll, uart_clk, uart0, uart1,
> >  	cpu_clk, cpu_6x4x, cpu_3x2x, cpu_2x, cpu_1x, clks_max
> 
> Again, this is one of those intermediate state things that could be
> cleaned up with a rebase.
> 

I wanted to keep the series bisectable, but Sascha already told me that it
is unnecessary. So, I will squash it all down a little.

str

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



More information about the barebox mailing list