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

Commit 9724b86f authored by Sylvain Munaut's avatar Sylvain Munaut Committed by Paul Mackerras
Browse files

[POWERPC] Small cleanup of EFIKA platform 



The efika platform used three files efika-pci.c efika-setup.c and
a 2 line efika.h to link the two. The total of code in those is
really not much and therefore, I think they're better merged
in a single file.

There is absolutely _no_code_change_ at all, just merged the files.

Signed-off-by: default avatarSylvain Munaut <tnt@246tNt.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 46e4cf6c

arch/powerpc/platforms/52xx/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,5 +6,5 @@ obj-y += mpc52xx_pic.o mpc52xx_common.o 
obj-$(CONFIG_PCI)		+= mpc52xx_pci.o

obj-$(CONFIG_PCI)		+= mpc52xx_pci.o

endif

endif





obj-$(CONFIG_PPC_EFIKA)		+= efika-setup.o efika-pci.o

obj-$(CONFIG_PPC_EFIKA)		+= efika.o

obj-$(CONFIG_PPC_LITE5200)	+= lite5200.o
 
obj-$(CONFIG_PPC_LITE5200)	+= lite5200.o

arch/powerpc/platforms/52xx/efika-setup.c

deleted100644 → 0
+0 −121
Original line number Original line Diff line number Diff line 
/*

 *

 * Efika 5K2 platform setup

 * Some code really inspired from the lite5200b platform.

 *

 * Copyright (C) 2006 bplan GmbH

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2. This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 *

 */



#include <linux/errno.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/reboot.h>

#include <linux/init.h>

#include <linux/utsrelease.h>

#include <linux/seq_file.h>

#include <linux/root_dev.h>

#include <linux/initrd.h>

#include <linux/timer.h>

#include <linux/pci.h>



#include <asm/pgtable.h>

#include <asm/prom.h>

#include <asm/time.h>

#include <asm/machdep.h>

#include <asm/rtas.h>

#include <asm/of_device.h>

#include <asm/of_platform.h>

#include <asm/mpc52xx.h>



#include "efika.h"



static void efika_show_cpuinfo(struct seq_file *m)

{

	struct device_node *root;

	const char *revision = NULL;

	const char *codegendescription = NULL;

	const char *codegenvendor = NULL;



	root = of_find_node_by_path("/");

	if (!root)

		return;



	revision = get_property(root, "revision", NULL);

	codegendescription =

		    get_property(root, "CODEGEN,description", NULL);

	codegenvendor = get_property(root, "CODEGEN,vendor", NULL);



	if (codegendescription)

		seq_printf(m, "machine\t\t: %s\n", codegendescription);

	else

		seq_printf(m, "machine\t\t: Efika\n");



	if (revision)

		seq_printf(m, "revision\t: %s\n", revision);



	if (codegenvendor)

		seq_printf(m, "vendor\t\t: %s\n", codegenvendor);



	of_node_put(root);

}



static void __init efika_setup_arch(void)

{

	rtas_initialize();



#ifdef CONFIG_BLK_DEV_INITRD

	initrd_below_start_ok = 1;



	if (initrd_start)

		ROOT_DEV = Root_RAM0;

	else

#endif

		ROOT_DEV = Root_SDA2;	/* sda2 (sda1 is for the kernel) */



	efika_pcisetup();



	if (ppc_md.progress)

		ppc_md.progress("Linux/PPC " UTS_RELEASE " running on Efika ;-)\n", 0x0);

}



static int __init efika_probe(void)

{

	char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),

					  "model", NULL);



	if (model == NULL)

		return 0;

	if (strcmp(model, "EFIKA5K2"))

		return 0;



	ISA_DMA_THRESHOLD = ~0L;

	DMA_MODE_READ = 0x44;

	DMA_MODE_WRITE = 0x48;



	return 1;

}



define_machine(efika)

{

	.name			= EFIKA_PLATFORM_NAME,

	.probe			= efika_probe,

	.setup_arch		= efika_setup_arch,

	.init			= mpc52xx_declare_of_platform_devices,

	.show_cpuinfo		= efika_show_cpuinfo,

	.init_IRQ		= mpc52xx_init_irq,

	.get_irq		= mpc52xx_get_irq,

	.restart		= rtas_restart,

	.power_off		= rtas_power_off,

	.halt			= rtas_halt,

	.set_rtc_time		= rtas_set_rtc_time,

	.get_rtc_time		= rtas_get_rtc_time,

	.progress		= rtas_progress,

	.get_boot_time		= rtas_get_boot_time,

	.calibrate_decr		= generic_calibrate_decr,

	.phys_mem_access_prot	= pci_phys_mem_access_prot,

};

arch/powerpc/platforms/52xx/efika-pci.c→arch/powerpc/platforms/52xx/efika.c

+243 −0
Original line number Original line Diff line number Diff line 
/*

 * Efika 5K2 platform code

 * Some code really inspired from the lite5200b platform.

 *

 * Copyright (C) 2006 bplan GmbH

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2. This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */





#include <linux/errno.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/reboot.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/utsrelease.h>

#include <linux/seq_file.h>

#include <linux/string.h>

#include <linux/root_dev.h>

#include <linux/initrd.h>

#include <linux/timer.h>

#include <linux/pci.h>





#include <asm/io.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/prom.h>

#include <asm/machdep.h>

#include <asm/sections.h>

#include <asm/sections.h>

#include <asm/pci-bridge.h>

#include <asm/pci-bridge.h>

#include <asm/pgtable.h>

#include <asm/prom.h>

#include <asm/time.h>

#include <asm/machdep.h>

#include <asm/rtas.h>

#include <asm/rtas.h>

#include <asm/of_device.h>

#include <asm/of_platform.h>

#include <asm/mpc52xx.h>





#define EFIKA_PLATFORM_NAME "Efika"







#include "efika.h"

/* ------------------------------------------------------------------------ */

/* PCI accesses thru RTAS                                                   */

/* ------------------------------------------------------------------------ */





#ifdef CONFIG_PCI

#ifdef CONFIG_PCI



/*

/*

 * Access functions for PCI config space using RTAS calls.

 * Access functions for PCI config space using RTAS calls.

 */

 */
@@ -52,6 +82,7 @@ static struct pci_ops rtas_pci_ops = { 
	rtas_write_config

	rtas_write_config

};

};







void __init efika_pcisetup(void)

void __init efika_pcisetup(void)

{

{

	const int *bus_range;

	const int *bus_range;
@@ -117,3 +148,96 @@ void __init efika_pcisetup(void) 
void __init efika_pcisetup(void)

void __init efika_pcisetup(void)

{}

{}

#endif

#endif







/* ------------------------------------------------------------------------ */

/* Platform setup                                                           */

/* ------------------------------------------------------------------------ */



static void efika_show_cpuinfo(struct seq_file *m)

{

	struct device_node *root;

	const char *revision = NULL;

	const char *codegendescription = NULL;

	const char *codegenvendor = NULL;



	root = of_find_node_by_path("/");

	if (!root)

		return;



	revision = get_property(root, "revision", NULL);

	codegendescription =

		    get_property(root, "CODEGEN,description", NULL);

	codegenvendor = get_property(root, "CODEGEN,vendor", NULL);



	if (codegendescription)

		seq_printf(m, "machine\t\t: %s\n", codegendescription);

	else

		seq_printf(m, "machine\t\t: Efika\n");



	if (revision)

		seq_printf(m, "revision\t: %s\n", revision);



	if (codegenvendor)

		seq_printf(m, "vendor\t\t: %s\n", codegenvendor);



	of_node_put(root);

}



static void __init efika_setup_arch(void)

{

	rtas_initialize();



#ifdef CONFIG_BLK_DEV_INITRD

	initrd_below_start_ok = 1;



	if (initrd_start)

		ROOT_DEV = Root_RAM0;

	else

#endif

		ROOT_DEV = Root_SDA2;	/* sda2 (sda1 is for the kernel) */



	efika_pcisetup();



	if (ppc_md.progress)

		ppc_md.progress("Linux/PPC " UTS_RELEASE " running on Efika ;-)\n", 0x0);

}



static int __init efika_probe(void)

{

	char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),

					  "model", NULL);



	if (model == NULL)

		return 0;

	if (strcmp(model, "EFIKA5K2"))

		return 0;



	ISA_DMA_THRESHOLD = ~0L;

	DMA_MODE_READ = 0x44;

	DMA_MODE_WRITE = 0x48;



	return 1;

}



define_machine(efika)

{

	.name			= EFIKA_PLATFORM_NAME,

	.probe			= efika_probe,

	.setup_arch		= efika_setup_arch,

	.init			= mpc52xx_declare_of_platform_devices,

	.show_cpuinfo		= efika_show_cpuinfo,

	.init_IRQ		= mpc52xx_init_irq,

	.get_irq		= mpc52xx_get_irq,

	.restart		= rtas_restart,

	.power_off		= rtas_power_off,

	.halt			= rtas_halt,

	.set_rtc_time		= rtas_set_rtc_time,

	.get_rtc_time		= rtas_get_rtc_time,

	.progress		= rtas_progress,

	.get_boot_time		= rtas_get_boot_time,

	.calibrate_decr		= generic_calibrate_decr,

	.phys_mem_access_prot	= pci_phys_mem_access_prot,

};

arch/powerpc/platforms/52xx/efika.h

deleted100644 → 0
+0 −19
Original line number Original line Diff line number Diff line 
/*

 * Efika 5K2 platform setup - Header file

 *

 * Copyright (C) 2006 bplan GmbH

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2. This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 *

 */



#ifndef __ARCH_POWERPC_EFIKA__

#define __ARCH_POWERPC_EFIKA__



#define EFIKA_PLATFORM_NAME "Efika"



extern void __init efika_pcisetup(void);



#endif