mbox

[GIT,PULL] ARM: mvebu: soc for v4.9 (#1)

Message ID 87bmzqbilu.fsf@free-electrons.com
State New
Headers show

Pull-request

git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-4.9-1

Message

Gregory CLEMENT Sept. 14, 2016, 3:34 p.m. UTC
Hi,

Here is the first pull request for soc for mvebu for v4.9.

Gregory

The following changes since commit 29b4817d4018df78086157ea3a55c1d9424a7cfc:

  Linux 4.8-rc1 (2016-08-07 18:18:00 -0700)

are available in the git repository at:

  git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-4.9-1

for you to fetch changes up to a7f9f5baf306ff5422e6ab143c0af5dd6b5ed1a9:

  ARM: orion5x: Remove old non-DT-based WNR854T support (2016-09-14 16:57:26 +0200)

----------------------------------------------------------------
mvebu soc for 4.9 (part 1)

- irq cleanup for old mvebu SoC
- Convert orion5x based SoC Netgear WNR854T to devicetree

----------------------------------------------------------------
Arnd Bergmann (4):
      ARM: mv78xx0: simplify ethernet device creation
      ARM: mvebu/orion: remove NO_IRQ check from device init
      ARM: orion: simplify orion_ge00_switch_init
      ARM: orion5x: remove extraneous NO_IRQ

Jamie Lentin (2):
      ARM: orion5x: Add DT-based support for Netgear WNR854T
      ARM: orion5x: Remove old non-DT-based WNR854T support

 arch/arm/configs/multi_v5_defconfig          |   2 +-
 arch/arm/configs/mvebu_v5_defconfig          |   2 +-
 arch/arm/configs/orion5x_defconfig           |   2 +-
 arch/arm/mach-mv78xx0/common.c               |   9 +-
 arch/arm/mach-orion5x/Kconfig                |   4 +-
 arch/arm/mach-orion5x/Makefile               |   2 +-
 arch/arm/mach-orion5x/board-wnr854t.c        |  78 +++++++++++
 arch/arm/mach-orion5x/common.c               |   4 +-
 arch/arm/mach-orion5x/common.h               |   2 +-
 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c |   4 +-
 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c  |   5 +-
 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c |   6 +-
 arch/arm/mach-orion5x/wnr854t-setup.c        | 185 ---------------------------
 arch/arm/mach-orion5x/wrt350n-v2-setup.c     |   4 +-
 arch/arm/plat-orion/common.c                 |  85 +++++-------
 arch/arm/plat-orion/include/plat/common.h    |  10 +-
 16 files changed, 133 insertions(+), 271 deletions(-)
 create mode 100644 arch/arm/mach-orion5x/board-wnr854t.c
 delete mode 100644 arch/arm/mach-orion5x/wnr854t-setup.c

Comments

Arnd Bergmann Sept. 19, 2016, 9:46 p.m. UTC | #1
On Wednesday, September 14, 2016 5:34:37 PM CEST Gregory CLEMENT wrote:
> mvebu soc for 4.9 (part 1)
> 
> - irq cleanup for old mvebu SoC
> - Convert orion5x based SoC Netgear WNR854T to devicetree
> 

Pulled into next/soc, thanks!

	Arnd
Arnd Bergmann Sept. 19, 2016, 9:49 p.m. UTC | #2
On Monday, September 19, 2016 11:46:22 PM CEST Arnd Bergmann wrote:
> On Wednesday, September 14, 2016 5:34:37 PM CEST Gregory CLEMENT wrote:
> > mvebu soc for 4.9 (part 1)
> > 
> > - irq cleanup for old mvebu SoC
> > - Convert orion5x based SoC Netgear WNR854T to devicetree
> > 
> 
> Pulled into next/soc, thanks!

Sorry, backed out again after seeing the PCI stuff on the WNR854T in
there. I thought the plan was to leave out PCI support from the DT
based machine file, and leave the old board in place, or am I
missing something?

	Arnd
Gregory CLEMENT Sept. 20, 2016, 7:25 a.m. UTC | #3
Hi Arnd,
 
 On lun., sept. 19 2016, Arnd Bergmann <arnd@arndb.de> wrote:

> On Monday, September 19, 2016 11:46:22 PM CEST Arnd Bergmann wrote:
>> On Wednesday, September 14, 2016 5:34:37 PM CEST Gregory CLEMENT wrote:
>> > mvebu soc for 4.9 (part 1)
>> > 
>> > - irq cleanup for old mvebu SoC
>> > - Convert orion5x based SoC Netgear WNR854T to devicetree
>> > 
>> 
>> Pulled into next/soc, thanks!
>
> Sorry, backed out again after seeing the PCI stuff on the WNR854T in
> there. I thought the plan was to leave out PCI support from the DT
> based machine file, and leave the old board in place, or am I
> missing something?

I might have overlooked the thread, I thouhgt the state of the patch was
OK as is, and further changes can be done later.

So it seems that it will be 4.10 material.

Gregory
Arnd Bergmann Sept. 20, 2016, 9:45 a.m. UTC | #4
On Tuesday, September 20, 2016 9:25:51 AM CEST Gregory CLEMENT wrote:
> Hi Arnd,
>  
>  On lun., sept. 19 2016, Arnd Bergmann <arnd@arndb.de> wrote:
> 
> > On Monday, September 19, 2016 11:46:22 PM CEST Arnd Bergmann wrote:
> >> On Wednesday, September 14, 2016 5:34:37 PM CEST Gregory CLEMENT wrote:
> >> > mvebu soc for 4.9 (part 1)
> >> > 
> >> > - irq cleanup for old mvebu SoC
> >> > - Convert orion5x based SoC Netgear WNR854T to devicetree
> >> > 
> >> 
> >> Pulled into next/soc, thanks!
> >
> > Sorry, backed out again after seeing the PCI stuff on the WNR854T in
> > there. I thought the plan was to leave out PCI support from the DT
> > based machine file, and leave the old board in place, or am I
> > missing something?
> 
> I might have overlooked the thread, I thouhgt the state of the patch was
> OK as is, and further changes can be done later.
> 
> So it seems that it will be 4.10 material.
> 

We have gained a little more time since Linus delayed the merge window
by another week, so I think there is still a chance to respin this.

I also really want the NO_IRQ changes to get merged ;-)

Just drop the patch removing wnr854t-setup.c, and add another patch
on top to remove the PCI initialization from wrt350n-v2-setup.c,
and I'll take it.

	Arnd
Gregory CLEMENT Sept. 20, 2016, 4:43 p.m. UTC | #5
Hi Arnd,
 
 On mar., sept. 20 2016, Arnd Bergmann <arnd@arndb.de> wrote:

> On Tuesday, September 20, 2016 9:25:51 AM CEST Gregory CLEMENT wrote:
>> Hi Arnd,
>>  
>>  On lun., sept. 19 2016, Arnd Bergmann <arnd@arndb.de> wrote:
>> 
>> > On Monday, September 19, 2016 11:46:22 PM CEST Arnd Bergmann wrote:
>> >> On Wednesday, September 14, 2016 5:34:37 PM CEST Gregory CLEMENT wrote:
>> >> > mvebu soc for 4.9 (part 1)
>> >> > 
>> >> > - irq cleanup for old mvebu SoC
>> >> > - Convert orion5x based SoC Netgear WNR854T to devicetree
>> >> > 
>> >> 
>> >> Pulled into next/soc, thanks!
>> >
>> > Sorry, backed out again after seeing the PCI stuff on the WNR854T in
>> > there. I thought the plan was to leave out PCI support from the DT
>> > based machine file, and leave the old board in place, or am I
>> > missing something?
>> 
>> I might have overlooked the thread, I thouhgt the state of the patch was
>> OK as is, and further changes can be done later.
>> 
>> So it seems that it will be 4.10 material.
>> 
>
> We have gained a little more time since Linus delayed the merge window
> by another week, so I think there is still a chance to respin this.
>
> I also really want the NO_IRQ changes to get merged ;-)
>
> Just drop the patch removing wnr854t-setup.c, and add another patch
> on top to remove the PCI initialization from wrt350n-v2-setup.c,
> and I'll take it.

Do you mean board-wnr854t.c?

If it is the case then I can just drop the patch adding this file because
the only things done in this file are about the PCI.

Gregory

>
> 	Arnd
Arnd Bergmann Sept. 21, 2016, 8:10 a.m. UTC | #6
On Tuesday, September 20, 2016 6:43:34 PM CEST Gregory CLEMENT wrote:
> 
> Do you mean board-wnr854t.c?

Yes.
 
> If it is the case then I can just drop the patch adding this file because
> the only things done in this file are about the PCI.

Ah, that's perfect. Just for more background, I think it shouldn't be too
hard to convert the existing orion5x PCI support into a proper host driver,
and I can assist anyone willing to work on this and test it.

I think the steps here would roughly be:

- change PCI (not PCIe) host initialization to call
  pci_scan_root_bus() directly, bypassing the pci_common_init
  logic
- move PCI code into a separate file
- change PCI code into a driver by adding platform_device based
  probing
- add DT support for that driver.

For the PCIe code, the obvious strategy is to replace it with
the existing pcie-mvebu driver, adding any missing parts
in the process.

	Arnd