From patchwork Tue Jul 20 04:07:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cory Maccarrone X-Patchwork-Id: 112955 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6K48Sv3019324 for ; Tue, 20 Jul 2010 04:08:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751593Ab0GTEIe (ORCPT ); Tue, 20 Jul 2010 00:08:34 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:60023 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751100Ab0GTEId (ORCPT ); Tue, 20 Jul 2010 00:08:33 -0400 Received: by mail-iw0-f174.google.com with SMTP id 7so5354123iwn.19 for ; Mon, 19 Jul 2010 21:08:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=PlwEe8GJGYYTJf39sVA7NIt5Oh7xEx3VAUfZmBXrKoQ=; b=K8coK+cD1KqJMIIM8QWgDYnivdQvO9vDBT66od6jm3mmg3TJ5VLv/Cp+gUSePk1ufB yzQ3755oOWd8wEnekTj82lIacsmkT4Noxvu3e4aCAxUshfswup9UnEzQw1qCFGR7hOiP KNSsCfou34vDBo2FNtL85ZsbN1XbaD3KQJ5xQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=u9JaqxbpYCJrZwYiKOX5out1arPzS05yzVJB5yIPnTlp/hl6b6zSoav1HnsvW1oa69 WVMy/Admc/JeFHRf8vhe1BnbLQHlLWFKVfrYHnjwYUBbvM2C95uCdAfVbmV9dpxK3tlQ +CSPNIepqM5Sr5sHWrDoWgauMRRi9LZlGiOH0= Received: by 10.231.190.132 with SMTP id di4mr6947643ibb.78.1279598911933; Mon, 19 Jul 2010 21:08:31 -0700 (PDT) Received: from localhost ([12.130.106.87]) by mx.google.com with ESMTPS id r3sm27097191ibk.19.2010.07.19.21.08.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 19 Jul 2010 21:08:31 -0700 (PDT) From: Cory Maccarrone To: linux-omap@vger.kernel.org Cc: Cory Maccarrone Subject: [PATCH 7/7] [htcherald] Add board support for UARTs, bluetooth Date: Mon, 19 Jul 2010 21:07:46 -0700 Message-Id: <1279598866-18716-6-git-send-email-darkstar6262@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1279598866-18716-1-git-send-email-darkstar6262@gmail.com> References: <1279598866-18716-1-git-send-email-darkstar6262@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Jul 2010 04:08:34 +0000 (UTC) diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index facfaeb..0b8cb18 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -42,7 +42,7 @@ obj-$(CONFIG_MACH_NOKIA770) += board-nokia770.o obj-$(CONFIG_MACH_AMS_DELTA) += board-ams-delta.o obj-$(CONFIG_AMS_DELTA_FIQ) += ams-delta-fiq.o ams-delta-fiq-handler.o obj-$(CONFIG_MACH_SX1) += board-sx1.o board-sx1-mmc.o -obj-$(CONFIG_MACH_HERALD) += board-htcherald.o +obj-$(CONFIG_MACH_HERALD) += board-htcherald.o htc-bt.o ifeq ($(CONFIG_ARCH_OMAP15XX),y) # Innovator-1510 FPGA diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 1b12b75..cf4b908 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c @@ -47,8 +47,10 @@ #include #include #include +#include #include +#include #include @@ -138,6 +140,7 @@ Happy Times 0 1 0 x x x 0 x #define HTCPLD_GPIO_LED_DPAD HTCPLD_BASE(0, 0) #define HTCPLD_GPIO_LED_KBD HTCPLD_BASE(1, 0) +#define HTCPLD_GPIO_BT_POWER HTCPLD_BASE(1, 4) #define HTCPLD_GPIO_LED_CAPS HTCPLD_BASE(1, 5) #define HTCPLD_GPIO_LED_RED_FLASH HTCPLD_BASE(2, 1) #define HTCPLD_GPIO_LED_RED_SOLID HTCPLD_BASE(2, 2) @@ -423,6 +426,22 @@ static struct omap_mmc_platform_data htc_mmc1_data = { static struct omap_mmc_platform_data *htc_mmc_data[1]; #endif +/* Bluetooth */ +#define HTCHERALD_GPIO_BT_ENABLE 125 + +static struct htc_bt_data htcherald_bt_data = { + .uart_clock = "uart1_ck", + .gpio_pwr = HTCPLD_GPIO_BT_POWER, + .gpio_enable = HTCHERALD_GPIO_BT_ENABLE, +}; + +static struct platform_device bt_device = { + .name = "htc-bt", + .id = -1, + .dev = { + .platform_data = &htcherald_bt_data, + }, +}; /* Platform devices for the Herald */ static struct platform_device *devices[] __initdata = { @@ -431,6 +450,7 @@ static struct platform_device *devices[] __initdata = { &htcpld_device, &gpio_leds_device, &herald_gpiokeys_device, + &bt_device, }; /* @@ -574,6 +594,7 @@ done: printk(KERN_INFO "USB setup complete.\n"); } + static void __init htcherald_init(void) { printk(KERN_INFO "HTC Herald init.\n"); @@ -595,6 +616,8 @@ static void __init htcherald_init(void) omap_register_i2c_bus(1, 100, NULL, 0); + omap_serial_init(); + #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) htc_mmc_data[0] = &htc_mmc1_data; omap1_init_mmc(htc_mmc_data, 1);