From mboxrd@z Thu Jan 1 00:00:00 1970 From: jason@lakedaemon.net (Jason Cooper) Date: Wed, 3 Apr 2013 06:57:57 -0400 Subject: [RFC PATCHv1 2/5] bus: mvebu: fix mistake in PCIe window target attribute for Kirkwood In-Reply-To: <20130403125247.5914a862@skate> References: <1364407504-13524-1-git-send-email-thomas.petazzoni@free-electrons.com> <1364407504-13524-3-git-send-email-thomas.petazzoni@free-electrons.com> <20130403125247.5914a862@skate> Message-ID: <20130403105757.GV13280@titan.lakedaemon.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Thomas, On Wed, Apr 03, 2013 at 12:52:47PM +0200, Thomas Petazzoni wrote: > Jason (Cooper), > > Do you mind taking this patch in your mvebu/drivers branch, next to the > patch adding the mvebu-mbus driver? Or do you want a new mvebu-mbus > driver patch that contains this fix and would replace the one you have > already merged in mvebu/drivers? Thanks for pointing this out. I'll put it in mvebu/drivers as you suggested. I'll need to rebase mvebu/soc on it. But I haven't done the PR yet, so not a big deal. thx, Jason. > On Wed, 27 Mar 2013 19:05:01 +0100, Thomas Petazzoni wrote: > > The target and attributes for the PCIe address decoding windows were > > not correct on Kirkwood for the second PCIe interface. > > > > Signed-off-by: Thomas Petazzoni > > --- > > Note: this patch should be merged with the existing mvebu-mbus driver. > > --- > > drivers/bus/mvebu-mbus.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c > > index 586d03e..4de2c6b 100644 > > --- a/drivers/bus/mvebu-mbus.c > > +++ b/drivers/bus/mvebu-mbus.c > > @@ -626,7 +626,7 @@ static const struct mvebu_mbus_soc_data armada_xp_mbus_data = { > > > > static const struct mvebu_mbus_mapping kirkwood_map[] = { > > MAPDEF("pcie0.0", 4, 0xe0, MAPDEF_PCIMASK), > > - MAPDEF("pcie1.0", 8, 0xe0, MAPDEF_PCIMASK), > > + MAPDEF("pcie1.0", 4, 0xd0, MAPDEF_PCIMASK), > > MAPDEF("sram", 3, 0x01, MAPDEF_NOMASK), > > MAPDEF("nand", 1, 0x2f, MAPDEF_NOMASK), > > {},