From patchwork Wed Dec 16 21:34:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 7866051 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5D3DB9F350 for ; Wed, 16 Dec 2015 21:34:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7B13203C2 for ; Wed, 16 Dec 2015 21:34:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCC0C200C1 for ; Wed, 16 Dec 2015 21:34:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965929AbbLPVeh (ORCPT ); Wed, 16 Dec 2015 16:34:37 -0500 Received: from mail-ig0-f178.google.com ([209.85.213.178]:35256 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965870AbbLPVeg (ORCPT ); Wed, 16 Dec 2015 16:34:36 -0500 Received: by mail-ig0-f178.google.com with SMTP id to4so85133372igc.0 for ; Wed, 16 Dec 2015 13:34:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=vT+euIzFOAjjOZwd0o3EkwEwG6vA76PFx4X3aReUlzQ=; b=Isud04mXQTTwZBUSYYqmEtx33c1v/io2ZDGWOz+W3YVQ2L0MJfcQHXWPMHchL4JNhv DHn1b/aw305VqZNkDpAfHnjjeOkyZ8d9sqPufaKsITpAV8+2LF3rAEznX9pVtNwJ3NjN BNxND4HB0xLjpP1dYwGdOC77tkJm9ldl1rCy+O6hcnWyCGGa4vz4TYjt4HNBbJ7KkIZF Fv+lpg6Ef1pTXsSpXpKaXfxN8x0tCmQ6tHO3OxxS98DoSpKI1q3xzIelxMiIOCl+dEY5 fsNANQhmGu8acgk0W+NwiqOJRsOTNCLLLMnrIDiVUGyao8mfutK5hwLBGtYbSulkd9U1 jukQ== X-Received: by 10.50.79.202 with SMTP id l10mr20582igx.46.1450301676081; Wed, 16 Dec 2015 13:34:36 -0800 (PST) Received: from localhost.localdomain (c-76-113-128-183.hsd1.mn.comcast.net. [76.113.128.183]) by smtp.gmail.com with ESMTPSA id c129sm3506124ioe.0.2015.12.16.13.34.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 13:34:35 -0800 (PST) From: Adam Ford To: linux-omap@vger.kernel.org Cc: adam.ford@logicpd.com, tony@atomide.com, Adam Ford Subject: [PATCH V2] ARM: OMAP2+: LogicPD Torpedo + Wireless: Add Bluetooth Date: Wed, 16 Dec 2015 15:34:15 -0600 Message-Id: <1450301655-19904-1-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Bindings for the WL1283 Bluetooth was removed from the shared transport driver in commit c0bd1b9e5895 ("Revert ti-st: add device tree support") Until we havea better binding, we need to use the platform data to initialize Bluetooth. Signed-off-by: Adam Ford --- arch/arm/mach-omap2/pdata-quirks.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index e097055..e781e4f 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -150,6 +150,21 @@ static struct platform_device wl18xx_device = { } }; +static struct ti_st_plat_data wilink7_pdata = { + .nshutdown_gpio = 162, + .dev_name = "/dev/ttyO1", + .flow_cntrl = 1, + .baud_rate = 300000, +}; + +static struct platform_device wl128x_device = { + .name = "kim", + .id = -1, + .dev = { + .platform_data = &wilink7_pdata, + } +}; + static struct platform_device btwilink_device = { .name = "btwilink", .id = -1, @@ -276,6 +291,13 @@ static void __init omap3_tao3530_legacy_init(void) hsmmc2_internal_input_clk(); } +static void __init omap3_logicpd_torpedo_init(void) +{ + omap3_gpio126_127_129(); + platform_device_register(&wl128x_device); + platform_device_register(&btwilink_device); +} + /* omap3pandora legacy devices */ #define PANDORA_WIFI_IRQ_GPIO 21 #define PANDORA_WIFI_NRESET_GPIO 23 @@ -503,7 +525,7 @@ static struct pdata_init pdata_quirks[] __initdata = { { "nokia,omap3-n950", hsmmc2_internal_input_clk, }, { "isee,omap3-igep0020-rev-f", omap3_igep0020_rev_f_legacy_init, }, { "isee,omap3-igep0030-rev-g", omap3_igep0030_rev_g_legacy_init, }, - { "logicpd,dm3730-torpedo-devkit", omap3_gpio126_127_129, }, + { "logicpd,dm3730-torpedo-devkit", omap3_logicpd_torpedo_init, }, { "ti,omap3-evm-37xx", omap3_evm_legacy_init, }, { "ti,am3517-evm", am3517_evm_legacy_init, }, { "technexion,omap3-tao3530", omap3_tao3530_legacy_init, },