Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63a9332b authored by Andrew Lunn's avatar Andrew Lunn Committed by Nicolas Pitre
Browse files

ARM: Orion: Get address map from plat-orion instead of via platform_data 



Use an getter function in plat-orion/addr-map.c to get the address map
structure, rather than pass it to drivers in the platform_data
structures. When the drivers are built for none orion platforms, a
dummy function is provided instead which returns NULL.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarMichael Walle <michael@walle.cc>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarNicolas Pitre <nico@fluxnic.net>
parent 45173d5e

arch/arm/mach-dove/pcie.c

+1 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/mbus.h>

#include <video/vga.h>

#include <asm/mach/pci.h>

#include <asm/mach/arch.h>
@@ -51,7 +50,7 @@ static int __init dove_pcie_setup(int nr, struct pci_sys_data *sys) 
	 */

	orion_pcie_set_local_bus_nr(pp->base, sys->busnr);



	orion_pcie_setup(pp->base, &orion_mbus_dram_info);

	orion_pcie_setup(pp->base);



	/*

	 * IORESOURCE_IO

arch/arm/mach-kirkwood/mpp.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/gpio.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mbus.h>

#include <linux/io.h>

#include <mach/hardware.h>

#include <plat/mpp.h>

arch/arm/mach-kirkwood/pcie.c

+1 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/slab.h>

#include <linux/mbus.h>

#include <video/vga.h>

#include <asm/irq.h>

#include <asm/mach/pci.h>
@@ -209,7 +208,7 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys) 
	 */

	orion_pcie_set_local_bus_nr(pp->base, sys->busnr);



	orion_pcie_setup(pp->base, &orion_mbus_dram_info);

	orion_pcie_setup(pp->base);



	return 1;

}

arch/arm/mach-mv78xx0/mpp.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/gpio.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mbus.h>

#include <linux/io.h>

#include <plat/mpp.h>

#include <mach/hardware.h>

arch/arm/mach-mv78xx0/pcie.c

+1 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/mbus.h>

#include <video/vga.h>

#include <asm/irq.h>

#include <asm/mach/pci.h>
@@ -154,7 +153,7 @@ static int __init mv78xx0_pcie_setup(int nr, struct pci_sys_data *sys) 
	 * Generic PCIe unit setup.

	 */

	orion_pcie_set_local_bus_nr(pp->base, sys->busnr);

	orion_pcie_setup(pp->base, &orion_mbus_dram_info);

	orion_pcie_setup(pp->base);



	sys->resource[0] = &pp->res[0];

	sys->resource[1] = &pp->res[1];