[MIPS] Use platform_device for Cobalt UART (fb82a3a7) · Commits · e / devices / android_kernel_xiaomi_markw

arch/mips/cobalt/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	# Makefile for the Cobalt micro systems family specific parts of the kernel		# Makefile for the Cobalt micro systems family specific parts of the kernel
	#		#

	obj-y := irq.o reset.o setup.o buttons.o		obj-y := buttons.o irq.o reset.o serial.o setup.o

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

arch/mips/cobalt/serial.c

0 → 100644

+85 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Registration of Cobalt UART platform device.
			*
			* Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
			*
			* 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
			*/
			#include <linux/errno.h>
			#include <linux/init.h>
			#include <linux/ioport.h>
			#include <linux/platform_device.h>
			#include <linux/serial_8250.h>

			#include <cobalt.h>

			static struct resource cobalt_uart_resource[] __initdata = {
			{
			.start = 0x1c800000,
			.end = 0x1c800007,
			.flags = IORESOURCE_MEM,
			},
			{
			.start = COBALT_SERIAL_IRQ,
			.end = COBALT_SERIAL_IRQ,
			.flags = IORESOURCE_IRQ,
			},
			};

			static struct plat_serial8250_port cobalt_serial8250_port[] = {
			{
			.irq = COBALT_SERIAL_IRQ,
			.uartclk = 18432000,
			.iotype = UPIO_MEM,
			.flags = UPF_IOREMAP \| UPF_BOOT_AUTOCONF \| UPF_SKIP_TEST,
			.mapbase = 0x1c800000,
			},
			{},
			};

			static __init int cobalt_uart_add(void)
			{
			struct platform_device *pdev;
			int retval;

			/*
			* Cobalt Qube1 and RAQ1 have no UART.
			*/
			if (cobalt_board_id <= COBALT_BRD_ID_RAQ1)
			return 0;

			pdev = platform_device_alloc("serial8250", -1);
			if (!pdev)
			return -ENOMEM;

			pdev->id = PLAT8250_DEV_PLATFORM;
			pdev->dev.platform_data = cobalt_serial8250_port;

			retval = platform_device_add_resources(pdev, cobalt_uart_resource, ARRAY_SIZE(cobalt_uart_resource));
			if (retval)
			goto err_free_device;

			retval = platform_device_add(pdev);
			if (retval)
			goto err_free_device;

			return 0;

			err_free_device:
			platform_device_put(pdev);

			return retval;
			}
			device_initcall(cobalt_uart_add);

arch/mips/cobalt/setup.c

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -13,8 +13,6 @@
	#include <linux/pci.h>		#include <linux/pci.h>
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/pm.h>		#include <linux/pm.h>
	#include <linux/serial.h>
	#include <linux/serial_core.h>

	#include <asm/bootinfo.h>		#include <asm/bootinfo.h>
	#include <asm/time.h>		#include <asm/time.h>
	@@ -27,7 +25,6 @@
	extern void cobalt_machine_restart(char *command);		extern void cobalt_machine_restart(char *command);
	extern void cobalt_machine_halt(void);		extern void cobalt_machine_halt(void);
	extern void cobalt_machine_power_off(void);		extern void cobalt_machine_power_off(void);
	extern void cobalt_early_console(void);

	int cobalt_board_id;		int cobalt_board_id;

	@@ -95,7 +92,6 @@ static struct resource cobalt_reserved_resources[] = {

	void __init plat_mem_setup(void)		void __init plat_mem_setup(void)
	{		{
	static struct uart_port uart;
	unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0);		unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0);
	int i;		int i;

	@@ -119,21 +115,6 @@ void __init plat_mem_setup(void)
	cobalt_board_id = VIA_COBALT_BRD_REG_to_ID(cobalt_board_id);		cobalt_board_id = VIA_COBALT_BRD_REG_to_ID(cobalt_board_id);

	printk("Cobalt board ID: %d\n", cobalt_board_id);		printk("Cobalt board ID: %d\n", cobalt_board_id);

	if (cobalt_board_id > COBALT_BRD_ID_RAQ1) {
	#ifdef CONFIG_SERIAL_8250
	uart.line = 0;
	uart.type = PORT_UNKNOWN;
	uart.uartclk = 18432000;
	uart.irq = COBALT_SERIAL_IRQ;
	uart.flags = UPF_IOREMAP \| UPF_BOOT_AUTOCONF \|
	UPF_SKIP_TEST;
	uart.iotype = UPIO_MEM;
	uart.mapbase = 0x1c800000;

	early_serial_setup(&uart);
	#endif
	}
	}		}

	/*		/*