MIPS: Malta: Consolidate platform device code. (566a3b95) · Commits · 戴 / test

arch/mips/mti-malta/Makefile

+2 −3

Original line number	Diff line number	Diff line
		@@ -7,9 +7,8 @@
		#
		obj-y := malta-amon.o malta-cmdline.o \
		malta-display.o malta-init.o malta-int.o \
		malta-memory.o malta-mtd.o \
		malta-platform.o malta-reset.o \
		malta-setup.o malta-time.o
		malta-memory.o malta-platform.o \
		malta-reset.o malta-setup.o malta-time.o

		obj-$(CONFIG_EARLY_PRINTK) += malta-console.o
		obj-$(CONFIG_PCI) += malta-pci.o

arch/mips/mti-malta/malta-mtd.c

deleted100644 → 0

+0 −63

Original line number	Diff line number	Diff line
		/*
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file "COPYING" in the main directory of this archive
		* for more details.
		*
		* Copyright (C) 2006 MIPS Technologies, Inc.
		* written by Ralf Baechle <ralf@linux-mips.org>
		*/

		#include <linux/init.h>
		#include <linux/platform_device.h>
		#include <linux/mtd/partitions.h>
		#include <linux/mtd/physmap.h>
		#include <mtd/mtd-abi.h>

		static struct mtd_partition malta_mtd_partitions[] = {
		{
		.name = "YAMON",
		.offset = 0x0,
		.size = 0x100000,
		.mask_flags = MTD_WRITEABLE
		}, {
		.name = "User FS",
		.offset = 0x100000,
		.size = 0x2e0000
		}, {
		.name = "Board Config",
		.offset = 0x3e0000,
		.size = 0x020000,
		.mask_flags = MTD_WRITEABLE
		}
		};

		static struct physmap_flash_data malta_flash_data = {
		.width = 4,
		.nr_parts = ARRAY_SIZE(malta_mtd_partitions),
		.parts = malta_mtd_partitions
		};

		static struct resource malta_flash_resource = {
		.start = 0x1e000000,
		.end = 0x1e3fffff,
		.flags = IORESOURCE_MEM
		};

		static struct platform_device malta_flash = {
		.name = "physmap-flash",
		.id = 0,
		.dev = {
		.platform_data = &malta_flash_data,
		},
		.num_resources = 1,
		.resource = &malta_flash_resource,
		};

		static int __init malta_mtd_init(void)
		{
		platform_device_register(&malta_flash);

		return 0;
		}

		module_init(malta_mtd_init)

arch/mips/mti-malta/malta-platform.c

+48 −3

Original line number	Diff line number	Diff line
		@@ -3,8 +3,9 @@
		* License. See the file "COPYING" in the main directory of this archive
		* for more details.
		*
		* Copyright (C) 2007 MIPS Technologies, Inc.
		* Copyright (C) 2006, 07 MIPS Technologies, Inc.
		* written by Ralf Baechle (ralf@linux-mips.org)
		* written by Ralf Baechle <ralf@linux-mips.org>
		*
		* Copyright (C) 2008 Wind River Systems, Inc.
		* updated by Tiejun Chen <tiejun.chen@windriver.com>
		@@ -20,11 +21,14 @@
		*
		* 2. Register RTC-CMOS platform device on Malta.
		*/
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/serial_8250.h>
		#include <linux/mc146818rtc.h>
		#include <linux/module.h>
		#include <linux/mtd/partitions.h>
		#include <linux/mtd/physmap.h>
		#include <linux/platform_device.h>
		#include <mtd/mtd-abi.h>

		#define SMC_PORT(base, int) \
		{ \
		@@ -54,7 +58,7 @@ static struct plat_serial8250_port uart8250_data[] = {

		static struct platform_device malta_uart8250_device = {
		.name = "serial8250",
		.id = PLAT8250_DEV_PLATFORM2,
		.id = PLAT8250_DEV_PLATFORM,
		.dev = {
		.platform_data = uart8250_data,
		},
		@@ -79,9 +83,50 @@ static struct platform_device malta_rtc_device = {
		.num_resources = ARRAY_SIZE(malta_rtc_resources),
		};

		static struct mtd_partition malta_mtd_partitions[] = {
		{
		.name = "YAMON",
		.offset = 0x0,
		.size = 0x100000,
		.mask_flags = MTD_WRITEABLE
		}, {
		.name = "User FS",
		.offset = 0x100000,
		.size = 0x2e0000
		}, {
		.name = "Board Config",
		.offset = 0x3e0000,
		.size = 0x020000,
		.mask_flags = MTD_WRITEABLE
		}
		};

		static struct physmap_flash_data malta_flash_data = {
		.width = 4,
		.nr_parts = ARRAY_SIZE(malta_mtd_partitions),
		.parts = malta_mtd_partitions
		};

		static struct resource malta_flash_resource = {
		.start = 0x1e000000,
		.end = 0x1e3fffff,
		.flags = IORESOURCE_MEM
		};

		static struct platform_device malta_flash_device = {
		.name = "physmap-flash",
		.id = 0,
		.dev = {
		.platform_data = &malta_flash_data,
		},
		.num_resources = 1,
		.resource = &malta_flash_resource,
		};

		static struct platform_device *malta_devices[] __initdata = {
		&malta_uart8250_device,
		&malta_rtc_device,
		&malta_flash_device,
		};

		static int __init malta_add_devices(void)

Admin message