ARM: MX3: modularize 'mx31lite' code (b7d91a62) · Commits · 戴 / test

arch/arm/mach-mx3/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ obj-$(CONFIG_ARCH_MX31) += clock.o iomux.o
		obj-$(CONFIG_ARCH_MX35) += clock-imx35.o
		obj-$(CONFIG_MACH_MX31ADS) += mx31ads.o
		obj-$(CONFIG_MACH_MX31LILLY) += mx31lilly.o mx31lilly-db.o
		obj-$(CONFIG_MACH_MX31LITE) += mx31lite.o
		obj-$(CONFIG_MACH_MX31LITE) += mx31lite.o mx31lite-db.o
		obj-$(CONFIG_MACH_PCM037) += pcm037.o
		obj-$(CONFIG_MACH_PCM037_EET) += pcm037_eet.o
		obj-$(CONFIG_MACH_MX31_3DS) += mx31pdk.o

arch/arm/mach-mx3/mx31lite-db.c

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* LogicPD i.MX31 SOM-LV development board support
		*
		* Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
		*
		* based on code for other MX31 boards,
		*
		* Copyright 2005-2007 Freescale Semiconductor
		* Copyright (c) 2009 Alberto Panizzo <maramaopercheseimorto@gmail.com>
		* Copyright (C) 2009 Valentin Longchamp, EPFL Mobots group
		*
		* 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.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*/

		#include <linux/kernel.h>
		#include <linux/types.h>
		#include <linux/init.h>
		#include <linux/gpio.h>

		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>
		#include <asm/mach/map.h>

		#include <mach/hardware.h>
		#include <mach/common.h>
		#include <mach/imx-uart.h>
		#include <mach/iomux-mx3.h>
		#include <mach/board-mx31lite.h>

		#include "devices.h"

		/*
		* This file contains board-specific initialization routines for the
		* LogicPD i.MX31 SOM-LV development board, aka 'LiteKit'.
		* If you design an own baseboard for the module, use this file as base
		* for support code.
		*/

		static unsigned int litekit_db_board_pins[] __initdata = {
		/* UART1 */
		MX31_PIN_CTS1__CTS1,
		MX31_PIN_RTS1__RTS1,
		MX31_PIN_TXD1__TXD1,
		MX31_PIN_RXD1__RXD1,
		};

		/* UART */
		static struct imxuart_platform_data uart_pdata __initdata = {
		.flags = IMXUART_HAVE_RTSCTS,
		};

		void __init mx31lite_db_init(void)
		{
		mxc_iomux_setup_multiple_pins(litekit_db_board_pins,
		ARRAY_SIZE(litekit_db_board_pins),
		"development board pins");
		mxc_register_device(&mxc_uart_device0, &uart_pdata);
		}

arch/arm/mach-mx3/mx31lite.c

+16 −20

Original line number	Diff line number	Diff line
		@@ -42,23 +42,14 @@
		#include "devices.h"

		/*
		* This file contains the board-specific initialization routines.
		* This file contains the module-specific initialization routines.
		*/

		static unsigned int mx31lite_pins[] = {
		/* UART1 */
		MX31_PIN_CTS1__CTS1,
		MX31_PIN_RTS1__RTS1,
		MX31_PIN_TXD1__TXD1,
		MX31_PIN_RXD1__RXD1,
		/* LAN9117 IRQ pin */
		IOMUX_MODE(MX31_PIN_SFS6, IOMUX_CONFIG_GPIO),
		};

		static struct imxuart_platform_data uart_pdata = {
		.flags = IMXUART_HAVE_RTSCTS,
		};

		static struct mxc_nand_platform_data mx31lite_nand_board_info = {
		.width = 1,
		.hw_ecc = 1,
		@@ -118,17 +109,27 @@ void __init mx31lite_map_io(void)
		iotable_init(mx31lite_io_desc, ARRAY_SIZE(mx31lite_io_desc));
		}

		/*
		* Board specific initialization.
		*/
		static int mx31lite_baseboard;
		core_param(mx31lite_baseboard, mx31lite_baseboard, int, 0444);

		static void __init mxc_board_init(void)
		{
		int ret;

		switch (mx31lite_baseboard) {
		case MX31LITE_NOBOARD:
		break;
		case MX31LITE_DB:
		mx31lite_db_init();
		break;
		default:
		printk(KERN_ERR "Illegal mx31lite_baseboard type %d\n",
		mx31lite_baseboard);
		}

		mxc_iomux_setup_multiple_pins(mx31lite_pins, ARRAY_SIZE(mx31lite_pins),
		"mx31lite");

		mxc_register_device(&mxc_uart_device0, &uart_pdata);
		mxc_register_device(&mxc_nand_device, &mx31lite_nand_board_info);

		/* SMSC9117 IRQ pin */
		@@ -150,12 +151,7 @@ struct sys_timer mx31lite_timer = {
		.init = mx31lite_timer_init,
		};

		/*
		* The following uses standard kernel macros defined in arch.h in order to
		* initialize __mach_desc_MX31LITE data structure.
		*/

		MACHINE_START(MX31LITE, "LogicPD MX31 LITEKIT")
		MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM")
		/* Maintainer: Freescale Semiconductor, Inc. */
		.phys_io = AIPS1_BASE_ADDR,
		.io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,

arch/arm/plat-mxc/include/mach/board-mx31lite.h

+33 −6

Original line number	Diff line number	Diff line
		/*
		* Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.
		* Copyright (C) 2009 Daniel Mack <daniel@caiaq.de>
		*
		* Based on code for mobots boards,
		* Copyright (C) 2009 Valentin Longchamp, EPFL Mobots group
		*
		* 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.
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
		* MA 02110-1301, USA.
		*/

		#ifndef __ASM_ARCH_MXC_BOARD_MX31LITE_H__
		#define __ASM_ARCH_MXC_BOARD_MX31LITE_H__

		#ifndef __ASSEMBLY__

		enum mx31lilly_boards {
		MX31LITE_NOBOARD = 0,
		MX31LITE_DB = 1,
		};

		/*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		* This CPU module needs a baseboard to work. After basic initializing
		* its own devices, it calls baseboard's init function.
		*/

		#ifndef __ASM_ARCH_MXC_BOARD_MX31LITE_H__
		#define __ASM_ARCH_MXC_BOARD_MX31LITE_H__
		extern void mx31lite_db_init(void);

		#endif /* __ASM_ARCH_MXC_BOARD_MX31LITE_H__ */
		#endif

		#endif /* __ASM_ARCH_MXC_BOARD_MX31LITE_H__ */

Admin message