[PATCH 05/15] MIPS: add initial R4000-style cache support

[Sascha Hauer]

On Wed, Mar 09, 2016 at 07:12:01PM +0300, Antony Pavlov wrote:
> On Wed, 9 Mar 2016 17:23:24 +0300
> Antony Pavlov <antonynpavlov at gmail.com> wrote:
> 
> > On Wed, 9 Mar 2016 14:28:14 +0100
> > Sascha Hauer <s.hauer at pengutronix.de> wrote:
> > 
> > > Hi Antony,
> > > 
> > > On Mon, Mar 07, 2016 at 04:30:16PM +0300, Antony Pavlov wrote:
> > > > Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
> > > > Signed-off-by: Peter Mamonov <pmamonov at gmail.com>
> > > > ---
> > > >  arch/mips/include/asm/cacheops.h |  7 ++++++
> > > >  arch/mips/include/asm/io.h       |  3 +++
> > > >  arch/mips/lib/c-r4k.c            | 48 ++++++++++++++++++++++++++++++++++++++++
> > > >  3 files changed, 58 insertions(+)
> > > > 
> > > > index ff68677..4fe046a 100644
> > > > --- a/arch/mips/lib/c-r4k.c
> > > > +++ b/arch/mips/lib/c-r4k.c
> > > > @@ -10,10 +10,58 @@
> > > >  #include <common.h>
> > > >  #include <asm/io.h>
> > > >  #include <asm/mipsregs.h>
> > > > +#include <asm/cache.h>
> > > 
> > > This breaks bisectibility. asm/cache.h is introduced with the next.
> > > patch. I tried swapping the patches but got merge conflicts. Shall I
> > > squash both patches or do you have another preferred solution?
> > 
> > I'm so sorry!
> > I'll fix it by myself and resend the series.
> 
> Hmmm. It look like the patchseries is in the next branch.
> 
> So I just send fixups.

Thanks, just applied.

Sascha


-- 
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 |