Commit fb180322 authored by John Rigby's avatar John Rigby Committed by Grant Likely
Browse files

powerpc/mpc5121: Add generic board support for MPC5121 platforms 



Move shared code from mpc5121_ads.c to new file mpc512x_shared.c
- mpc512x_find_ips_freq -> unchanged
- contents of mpc5121_ads_init_IRQ -> mpc512x_init_IRQ
  - looking for fsl,mpc5121-ipic instead of fsl,ipic
- mpc5121_ads_declare_of_platform_devices -> mpc5121_declare_of_platform_devices
  - and use compatible for lookup instead of node name

Add new generic board setup mpc5121_generic.c

Signed-off-by: default avatarJohn Rigby <jrigby@freescale.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 137e9590

arch/powerpc/platforms/512x/Kconfig

+12 −3
Original line number Diff line number Diff line
@@ -3,12 +3,10 @@ config PPC_MPC512x 
	select FSL_SOC

	select IPIC

	select PPC_CLOCK

	default n



config PPC_MPC5121

	bool

	select PPC_MPC512x

	default n



config MPC5121_ADS

	bool "Freescale MPC5121E ADS"
@@ -17,4 +15,15 @@ config MPC5121_ADS 
	select PPC_MPC5121

	help

	  This option enables support for the MPC5121E ADS board.

	default n
 


config MPC5121_GENERIC

	bool "Generic support for simple MPC5121 based boards"

	depends on PPC_MULTIPLATFORM && PPC32

	select DEFAULT_UIMAGE

	select PPC_MPC5121

	help

	  This option enables support for simple MPC5121 based boards

	  which do not need custom platform specific setup.



	  Compatible boards include:  Protonic LVT base boards (ZANMCU

	  and VICVT2).

arch/powerpc/platforms/512x/Makefile

+2 −1
Original line number Diff line number Diff line 
#

# Makefile for the Freescale PowerPC 512x linux kernel.

#

obj-y				+= clock.o

obj-y				+= clock.o mpc512x_shared.o

obj-$(CONFIG_MPC5121_ADS)	+= mpc5121_ads.o

obj-$(CONFIG_MPC5121_GENERIC)	+= mpc5121_generic.o

arch/powerpc/platforms/512x/mpc5121_ads.c

+5 −59
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.

 * Copyright (C) 2007, 2008 Freescale Semiconductor, Inc. All rights reserved.

 *

 * Author: John Rigby, <jrigby@freescale.com>, Thur Mar 29 2007

 *
@@ -15,7 +15,6 @@ 


#include <linux/kernel.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/of_platform.h>



#include <asm/machdep.h>
@@ -23,65 +22,11 @@ 
#include <asm/prom.h>

#include <asm/time.h>



/**

 * 	mpc512x_find_ips_freq - Find the IPS bus frequency for a device

 * 	@node:	device node

 *

 * 	Returns IPS bus frequency, or 0 if the bus frequency cannot be found.

 */

unsigned long

mpc512x_find_ips_freq(struct device_node *node)

{

	struct device_node *np;

	const unsigned int *p_ips_freq = NULL;



	of_node_get(node);

	while (node) {

		p_ips_freq = of_get_property(node, "bus-frequency", NULL);

		if (p_ips_freq)

			break;



		np = of_get_parent(node);

		of_node_put(node);

		node = np;

	}

	if (node)

		of_node_put(node);



	return p_ips_freq ? *p_ips_freq : 0;

}

EXPORT_SYMBOL(mpc512x_find_ips_freq);



static struct of_device_id __initdata of_bus_ids[] = {

	{ .name = "soc", },

	{ .name = "localbus", },

	{},

};



static void __init mpc5121_ads_declare_of_platform_devices(void)

{

	/* Find every child of the SOC node and add it to of_platform */

	if (of_platform_bus_probe(NULL, of_bus_ids, NULL))

		printk(KERN_ERR __FILE__ ": "

			"Error while probing of_platform bus\n");

}

#include "mpc512x.h"



static void __init mpc5121_ads_init_IRQ(void)

{

	struct device_node *np;



	np = of_find_compatible_node(NULL, NULL, "fsl,ipic");

	if (!np)

		return;



	ipic_init(np, 0);

	of_node_put(np);



	/*

	 * Initialize the default interrupt mapping priorities,

	 * in case the boot rom changed something on us.

	 */

	ipic_set_default_priority();

	mpc512x_init_IRQ();

}



/*
@@ -97,7 +42,8 @@ static int __init mpc5121_ads_probe(void) 
define_machine(mpc5121_ads) {

	.name			= "MPC5121 ADS",

	.probe			= mpc5121_ads_probe,

	.init			= mpc5121_ads_declare_of_platform_devices,

	.setup_arch		= mpc5121_ads_setup_arch,

	.init			= mpc512x_declare_of_platform_devices,

	.init_IRQ		= mpc5121_ads_init_IRQ,

	.get_irq		= ipic_get_irq,

	.calibrate_decr		= generic_calibrate_decr,

arch/powerpc/platforms/512x/mpc5121_generic.c

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007,2008 Freescale Semiconductor, Inc. All rights reserved.

 *

 * Author: John Rigby, <jrigby@freescale.com>

 *

 * Description:

 * MPC5121 SoC setup

 *

 * This is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 */



#include <linux/kernel.h>

#include <linux/of_platform.h>



#include <asm/machdep.h>

#include <asm/ipic.h>

#include <asm/prom.h>

#include <asm/time.h>



#include "mpc512x.h"



/*

 * list of supported boards

 */

static char *board[] __initdata = {

	"prt,prtlvt",

	NULL

};



/*

 * Called very early, MMU is off, device-tree isn't unflattened

 */

static int __init mpc5121_generic_probe(void)

{

	unsigned long node = of_get_flat_dt_root();

	int i = 0;



	while (board[i]) {

		if (of_flat_dt_is_compatible(node, board[i]))

			break;

		i++;

	}



	return board[i] != NULL;

}



define_machine(mpc5121_generic) {

	.name			= "MPC5121 generic",

	.probe			= mpc5121_generic_probe,

	.init			= mpc512x_declare_of_platform_devices,

	.init_IRQ		= mpc512x_init_IRQ,

	.get_irq		= ipic_get_irq,

	.calibrate_decr		= generic_calibrate_decr,

};

arch/powerpc/platforms/512x/mpc512x.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 *

 * Prototypes for MPC512x shared code

 */



#ifndef __MPC512X_H__

#define __MPC512X_H__

extern unsigned long mpc512x_find_ips_freq(struct device_node *node);

extern void __init mpc512x_init_IRQ(void);

void __init mpc512x_declare_of_platform_devices(void);

#endif				/* __MPC512X_H__ */