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

Commit c34002c1 authored by Dan Williams's avatar Dan Williams
Browse files

iop: unconditionally initialize the ATU on platforms known to be 'hosts' 



Platforms like iq80321 and iq80331 which may be host-bus-adapters
require 'iop3xx_init_atu=y' to be specified on the kernel command line.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 97c46048

arch/arm/mach-iop32x/Kconfig

+0 −8
Original line number Original line Diff line number Diff line
@@ -34,14 +34,6 @@ config MACH_N2100 
	  Say Y here if you want to run your kernel on the Thecus n2100

	  Say Y here if you want to run your kernel on the Thecus n2100

	  NAS appliance.

	  NAS appliance.





config IOP3XX_ATU

        bool "Enable the PCI Controller"

        default y

        help

          Say Y here if you want the IOP to initialize its PCI Controller.

          Say N if the IOP is an add in card, the host system owns the PCI

          bus in this case.



config MACH_EM7210

config MACH_EM7210

	bool "Enable support for the Lanner EM7210"

	bool "Enable support for the Lanner EM7210"

	help

	help

arch/arm/mach-iop32x/iq31244.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -178,10 +178,9 @@ static struct hw_pci iq31244_pci __initdata = { 




static int __init iq31244_pci_init(void)

static int __init iq31244_pci_init(void)

{

{

	if (is_ep80219()) {

	if (is_ep80219())

		if (iop3xx_get_init_atu() == IOP3XX_INIT_ATU_ENABLE)

		pci_common_init(&ep80219_pci);

		pci_common_init(&ep80219_pci);

	} else if (machine_is_iq31244()) {

	else if (machine_is_iq31244()) {

		if (is_80219()) {

		if (is_80219()) {

			printk("note: iq31244 board type has been selected\n");

			printk("note: iq31244 board type has been selected\n");

			printk("note: to select ep80219 operation:\n");

			printk("note: to select ep80219 operation:\n");
@@ -190,8 +189,6 @@ static int __init iq31244_pci_init(void) 
			printk("\t2/ update boot loader to pass"

			printk("\t2/ update boot loader to pass"

				" the ep80219 id: %d\n", MACH_TYPE_EP80219);

				" the ep80219 id: %d\n", MACH_TYPE_EP80219);

		}

		}



		if (iop3xx_get_init_atu() == IOP3XX_INIT_ATU_ENABLE)

		pci_common_init(&iq31244_pci);

		pci_common_init(&iq31244_pci);

	}

	}

arch/arm/mach-iop32x/iq80321.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -106,7 +106,7 @@ static struct hw_pci iq80321_pci __initdata = { 
	.swizzle	= pci_std_swizzle,

	.swizzle	= pci_std_swizzle,

	.nr_controllers = 1,

	.nr_controllers = 1,

	.setup		= iop3xx_pci_setup,

	.setup		= iop3xx_pci_setup,

	.preinit	= iop3xx_pci_preinit,

	.preinit	= iop3xx_pci_preinit_cond,

	.scan		= iop3xx_pci_scan_bus,

	.scan		= iop3xx_pci_scan_bus,

	.map_irq	= iq80321_pci_map_irq,

	.map_irq	= iq80321_pci_map_irq,

};

};

arch/arm/mach-iop33x/Kconfig

+0 −8
Original line number Original line Diff line number Diff line
@@ -16,14 +16,6 @@ config MACH_IQ80332 
	  Say Y here if you want to run your kernel on the Intel IQ80332

	  Say Y here if you want to run your kernel on the Intel IQ80332

	  evaluation kit for the IOP332 chipset.

	  evaluation kit for the IOP332 chipset.





config IOP3XX_ATU

	bool "Enable the PCI Controller"

	default y

	help

	  Say Y here if you want the IOP to initialize its PCI Controller.

	  Say N if the IOP is an add in card, the host system owns the PCI

	  bus in this case.



endmenu

endmenu





endif
 
endif

arch/arm/mach-iop33x/iq80331.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ static struct hw_pci iq80331_pci __initdata = { 
	.swizzle	= pci_std_swizzle,

	.swizzle	= pci_std_swizzle,

	.nr_controllers = 1,

	.nr_controllers = 1,

	.setup		= iop3xx_pci_setup,

	.setup		= iop3xx_pci_setup,

	.preinit	= iop3xx_pci_preinit,

	.preinit	= iop3xx_pci_preinit_cond,

	.scan		= iop3xx_pci_scan_bus,

	.scan		= iop3xx_pci_scan_bus,

	.map_irq	= iq80331_pci_map_irq,

	.map_irq	= iq80331_pci_map_irq,

};

};