Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751772AbWB1AGi (ORCPT ); Mon, 27 Feb 2006 19:06:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751785AbWB1AGi (ORCPT ); Mon, 27 Feb 2006 19:06:38 -0500 Received: from ozlabs.org ([203.10.76.45]:59565 "EHLO ozlabs.org") by vger.kernel.org with ESMTP id S1751772AbWB1AGh (ORCPT ); Mon, 27 Feb 2006 19:06:37 -0500 Date: Tue, 28 Feb 2006 11:06:38 +1100 From: Michael Neuling To: Linux Kernel Mailing List Cc: dtor_core@ameritech.net, dmitry.torokhov@gmail.com, rth@redhat.com, Ralf Baechle , Andrew Morton , "paulus@samba.org" Subject: [PATCH] input: pcspkr device and driver separation Message-Id: <20060228110638.08f97800.mikey@neuling.org> In-Reply-To: References: <20060208110815.5e70e36b.mikey@neuling.org> <20060213150308.337c2e58.mikey@neuling.org> <200602150118.53220.dtor_core@ameritech.net> <20060216161258.03919e2e.mikey@neuling.org> <20060216162807.f3bb15a3.mikey@neuling.org> X-Mailer: Sylpheed version 2.1.1 (GTK+ 2.8.6; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6628 Lines: 227 Retransmission with updates from Ralf on MIPS. The current pcspkr code combines the device and driver registration. This patch splits these, putting the device registration in the arch specific code. It seems opinion is divided as how much error checking needs to be done when registering the device at boot. This patch does a BUG_ON on any device allocation failures for all architectures touched. The PowerPC guys are happy with this. PowerPC and MIPS only have the pcspkr present sometimes. Signed-off-by: Michael Neuling Signed-off-by: Ralf Baechle --- arch/alpha/kernel/setup.c | 12 ++++++++++++ arch/i386/kernel/setup.c | 12 ++++++++++++ arch/mips/Kconfig | 6 ++++++ arch/mips/kernel/Makefile | 2 ++ arch/mips/kernel/i8253.c | 23 +++++++++++++++++++++++ arch/powerpc/kernel/setup-common.c | 18 ++++++++++++++++++ drivers/input/misc/pcspkr.c | 27 +-------------------------- 7 files changed, 74 insertions(+), 26 deletions(-) Index: linux-2.6-linus/arch/alpha/kernel/setup.c =================================================================== --- linux-2.6-linus.orig/arch/alpha/kernel/setup.c +++ linux-2.6-linus/arch/alpha/kernel/setup.c @@ -1484,3 +1484,15 @@ alpha_panic_event(struct notifier_block #endif return NOTIFY_DONE; } + +static __init int add_pcspkr(void) +{ + struct platform_device *pd; + + pd = platform_device_alloc("pcspkr", -1); + BUGON(!pd); + BUGON(platform_device_add(pd)); + + return 0; +} +device_initcall(add_pcspkr); Index: linux-2.6-linus/arch/i386/kernel/setup.c =================================================================== --- linux-2.6-linus.orig/arch/i386/kernel/setup.c +++ linux-2.6-linus/arch/i386/kernel/setup.c @@ -1630,6 +1630,18 @@ void __init setup_arch(char **cmdline_p) #endif } +static __init int add_pcspkr(void) +{ + struct platform_device *pd; + + pd = platform_device_alloc("pcspkr", -1); + BUG_ON(!pd); + BUG_ON(platform_device_add(pd)); + + return 0; +} +device_initcall(add_pcspkr); + #include "setup_arch_post.h" /* * Local Variables: Index: linux-2.6-linus/arch/mips/Kconfig =================================================================== --- linux-2.6-linus.orig/arch/mips/Kconfig +++ linux-2.6-linus/arch/mips/Kconfig @@ -233,6 +233,7 @@ config MACH_JAZZ select ARC32 select ARCH_MAY_HAVE_PC_FDC select GENERIC_ISA_DMA + select I8253 select I8259 select ISA select SYS_HAS_CPU_R4X00 @@ -530,6 +531,7 @@ config QEMU select DMA_COHERENT select GENERIC_ISA_DMA select HAVE_STD_PC_SERIAL_PORT + select I8253 select I8259 select ISA select SWAP_IO_SPACE @@ -714,6 +716,7 @@ config SNI_RM200_PCI select HAVE_STD_PC_SERIAL_PORT select HW_HAS_EISA select HW_HAS_PCI + select I8253 select I8259 select ISA select SYS_HAS_CPU_R4X00 @@ -1707,6 +1710,9 @@ config MMU bool default y +config I8253 + bool + source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" Index: linux-2.6-linus/arch/mips/kernel/Makefile =================================================================== --- linux-2.6-linus.orig/arch/mips/kernel/Makefile +++ linux-2.6-linus/arch/mips/kernel/Makefile @@ -59,6 +59,8 @@ obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_64BIT) += cpu-bugs64.o +obj-$(CONFIG_I8253) += i8253.o + CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi) EXTRA_AFLAGS := $(CFLAGS) Index: linux-2.6-linus/arch/mips/kernel/i8253.c =================================================================== --- /dev/null +++ linux-2.6-linus/arch/mips/kernel/i8253.c @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2006 IBM Corporation + * + * Implements device information for i8253 timer chip + * + * 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 + */ + +#include + +static __init int add_pcspkr(void) +{ + struct platform_device *pd; + + pd = platform_device_alloc("pcspkr", -1); + BUG_ON(!pd); + BUG_ON(platform_device_add(pd)); + + return 0; +} +device_initcall(add_pcspkr); Index: linux-2.6-linus/arch/powerpc/kernel/setup-common.c =================================================================== --- linux-2.6-linus.orig/arch/powerpc/kernel/setup-common.c +++ linux-2.6-linus/arch/powerpc/kernel/setup-common.c @@ -469,3 +469,21 @@ static int __init early_xmon(char *p) } early_param("xmon", early_xmon); #endif + +static __init int add_pcspkr(void) +{ + struct device_node *np; + struct platform_device *pd; + + np = of_find_compatible_node(NULL, NULL, "pnpPNP,100"); + of_node_put(np); + if (!np) + return -ENODEV; + + pd = platform_device_alloc("pcspkr", -1); + BUG_ON(!pd); + BUG_ON(platform_device_add(pd)); + + return 0; +} +device_initcall(add_pcspkr); Index: linux-2.6-linus/drivers/input/misc/pcspkr.c =================================================================== --- linux-2.6-linus.orig/drivers/input/misc/pcspkr.c +++ linux-2.6-linus/drivers/input/misc/pcspkr.c @@ -24,7 +24,6 @@ MODULE_AUTHOR("Vojtech Pavlik