From patchwork Sun Sep 23 15:37:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 10611805 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA83F5A4 for ; Sun, 23 Sep 2018 15:37:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C73F829573 for ; Sun, 23 Sep 2018 15:37:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B947529597; Sun, 23 Sep 2018 15:37:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 715ED29594 for ; Sun, 23 Sep 2018 15:37:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=lWD0BAbdnLzsS5oOGYgNboFuiW4kDO5vSjJLLS2JIIs=; b=CDr DjuhOirEL7FVz+IXEnscM1p5lnCAxKDIcJIOsrZgiJVRbUVbGUHgN/P4nnNs9csYteAgOa0cXSU5q 1VuZuuRPy1ayPOHTi69TBPuOBHrakCRLEAkjUFJA08EApxO3TLhD6Zel+gsAuY506zJok67sxGGHs LTEE4g/boma5jniE+0rV7eDj1f9snjLq11fSrdodWHbX/NZdYaMLbR+WtKkwcqqvP3UQs/YpHWuf1 INZ91qqBNBLz3GpB16hozK35b/mHSg8l5XjbcugVVg1SI2srKSdRde7nzrVkuXwGhOBJCAKpwQVng 2b5TgyuyIC/Ak2ySBwdf8L9jRA3+EFg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g46SD-0002mU-T1; Sun, 23 Sep 2018 15:37:49 +0000 Received: from mail-it1-x143.google.com ([2607:f8b0:4864:20::143]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g46S6-0002ig-Os for linux-arm-kernel@lists.infradead.org; Sun, 23 Sep 2018 15:37:47 +0000 Received: by mail-it1-x143.google.com with SMTP id e14-v6so7539498itf.1 for ; Sun, 23 Sep 2018 08:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/+9ukedm13GKdfnsBzmtP+FY4aftCm5t98vYMhcLGAY=; b=mfJQcUHTOryfhX3qixHk0Ws+4T0Ru6Q8VOVkG/JTTy0YbwyEsv9y6xbRrptnn/vJaA iY7lw+3X/FFQxIJhWWHemMICYIrkUdTr21dyN0V+jQgInSbXqpHx4JhcdQiCFp/In4gR di2yL+uimF/uLO+TrLCBB/5U7rVlO5e0hyPMiFuhaiHwzEbqN/SmC9jbxbAznEanjKOa ww3O/Vki6HwrqA4XTQ618ib6//5ev5e1OWYX2GL24aBPsaeB9KokF7KvSfVzBHzkagqZ nUcg3OMqqPNYFHXydetRHBEHenFqTIqLviIuL5bMBJ8pBnPPmMBiVd7HkvOR01tqFYb0 G+Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/+9ukedm13GKdfnsBzmtP+FY4aftCm5t98vYMhcLGAY=; b=GL3TKHuUiR4DRUMIIoloh3eeClW85rsDSAoH2+NuT6ULAZJbZESEeqn3EN/PhP63ow JkG7jtUf0zj0h8KqwwhCAvQ4zHiA9NS70mipdeic2/7QtDx6T7tedM9UMfo5Huzh+kef 85KZi50fHHZ69qcOreODHJhVDNLd3Ofb/A7evmoDjPuQJe8W0PkQmXsP4qyuAoXgft+z yXzGGFX0Zf7FWM9i/3ikb/yvODL7P0YkodJ8K+KviPS7277IGTkUB1u+Gh7Oc9U8k0OJ k3rvpXsvy4G+LMomcsCwT4v3YiJKniUJB8Tu9y03aqNa1Opk/tcshC87HlUkX0k6gKhr VY9w== X-Gm-Message-State: APzg51Bzg5LUZVYcV5Jo7KcWlE99NE3TTCOBynCgTbTzBX7mxn9SAfEX mRS2NjEmD3NnisuP8H6J9Qw= X-Google-Smtp-Source: ANB0VdbqHr+C85ixY62J7IW9HpFIOZgWSPnRtNPtok4nxIgv+fMbM7pajRA8r3pPl5p06HjJ2+mPDQ== X-Received: by 2002:a02:5916:: with SMTP id p22-v6mr5795905jab.113.1537717051005; Sun, 23 Sep 2018 08:37:31 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id o141-v6sm2132531itg.35.2018.09.23.08.37.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Sep 2018 08:37:30 -0700 (PDT) From: Adam Ford To: linux-omap@vger.kernel.org Subject: [PATCH 1/3] ARM: configs: omap2plus: Add tlv320aic23 as module Date: Sun, 23 Sep 2018 10:37:16 -0500 Message-Id: <20180923153718.15095-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180923_083742_908549_8CAA78A3 X-CRM114-Status: GOOD ( 10.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Tony Lindgren , linux-kernel@vger.kernel.org, Mark Brown , Takashi Iwai , Russell King , Liam Girdwood , Peter Ujfalusi , Rob Herring , linux-arm-kernel@lists.infradead.org, =?utf-8?q?Beno=C3=AEt_Cousson?= , Jaroslav Kysela , Adam Ford , Jarkko Nikula MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The AM3517 EVM has an expander board which has two tlv320aic23 codecs. This enables the driver for these codecs as a module. Signed-off-by: Adam Ford diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 6491419b1dad..21cabb7ad970 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -389,6 +389,7 @@ CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m CONFIG_SND_SOC_CPCAP=m +CONFIG_SND_SOC_TLV320AIC23_I2C=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m CONFIG_HID_GENERIC=m From patchwork Sun Sep 23 15:37:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 10611807 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 26F71112B for ; Sun, 23 Sep 2018 15:38:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1243529FE8 for ; Sun, 23 Sep 2018 15:38:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0434029FEF; Sun, 23 Sep 2018 15:38:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4ADFD29FE8 for ; Sun, 23 Sep 2018 15:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=2WNAi2qYjzpMx8NjbCFhAleNlle/0CpLb2RFJn2+TKc=; b=SdlEftwPCt8m1Dkz5hFbKkiB/k vvnqR9mHsi3TxtE6vlxDlnkwlQqWvJQhDkyPqyboLBHv6NqJIR7E+JOQeOviDGqNqaw065brqKwgO 6Bm5bSp+EV7rysFO+W6GEfJdWIpl14M+1m8+/aaqjx8XFwM533TB/3AL9A1/2woyIhevCL1KEjZaY jRG00sRxM8TcUkAU1fg/XyFRcnWlfeUJCGYsIXgCp69xYZF/5NhjUKa3C8xv4zygtTb23S+tSxNyc z50u75nR0DRPa6gRWDtR++BWESAqskuCkGaru/UFJCbed6o0YhXE+niK9zwZmQKHb3s8FWnXIrGyZ bICo8jnA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g46Sw-000354-CX; Sun, 23 Sep 2018 15:38:34 +0000 Received: from mail-it1-x143.google.com ([2607:f8b0:4864:20::143]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g46S6-0002ij-PI for linux-arm-kernel@lists.infradead.org; Sun, 23 Sep 2018 15:37:49 +0000 Received: by mail-it1-x143.google.com with SMTP id 139-v6so7570430itf.0 for ; Sun, 23 Sep 2018 08:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gD26wjGkbbVePHSu1FAQANtFZ8tqNNl0c4g4gtzYc/o=; b=S796dWnnxVw3jWdFMGqKx//dZFmhsp+5DFtBvphS3YrJK1ltv/+5lRyyyBLiVie/3g FT7XRfOn2zwyak2qYGOT7RSCRWIHTWE/gAHPPtnTPDCKQeirGc4J8lqQFuE/trUg+WWX vmV66L1vc/D9wjk6Aple9eOTM0Ke2DMAoCQMLF6UwXX5GQgZyrHz8OBjxyG8b/5jNkar DAySyX+GAzb19P+lgt+TzR3wZ3XBWwkXR2iKq5aNPIF+EaqkikWLPhPq+JaI8gv061tT e22zydlwDrzpRRkApEvvvgHSv1ZJ9xgRT5i+fMCmzApMEoZSvI9EejOV6vDXG8ZZoWWk +LfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gD26wjGkbbVePHSu1FAQANtFZ8tqNNl0c4g4gtzYc/o=; b=jcfavIOEuV1IOw6YnOBNSkyXfVWOrDl2JkLGFeqhUqwox8AakiSk01wQ93jQX2Ea45 QsZFksh5LG/WspSu6Qsei+dgvrtfJdP6httoDUsocyccic+pwA9VVVfPXO1EC2bCFPZk eBiWhNJI9CbENXvksFdgDC1qCtFZNIBzZciyO3TmJFAlrzZix+042mxEiTK4SfXk3n42 prsUwYhGPpnxt9vMx+Tmk4MjQg0voP4haT+wCAyB+WxKADWVKZLbUKXKfynQOLWJpa8v T3FBQu1ej0QP3+UlZM/MJLrG96vyHpxNcRIgtKbz1BlxKQemPjGRswt2/Ct7JYIBMzro adQg== X-Gm-Message-State: APzg51DWnAZcW8sFkX6mpgGAuvnq6zTuUT4xI+Ck/Cn3n7NTlqYabfhd Qx+1EFIvQ8m6mC4+XBADqpA= X-Google-Smtp-Source: ANB0Vda9WfV5x43/5fS4T4mwRDboebpU7e/PuhPSXc3bn4XCVd5tAxysr3xOniCqmyS9DK4YjW172g== X-Received: by 2002:a02:3d02:: with SMTP id n2-v6mr5784712jan.79.1537717052701; Sun, 23 Sep 2018 08:37:32 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id o141-v6sm2132531itg.35.2018.09.23.08.37.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Sep 2018 08:37:32 -0700 (PDT) From: Adam Ford To: linux-omap@vger.kernel.org Subject: [PATCH 2/3] ARM: DTS: AM3517-EVM: Add support for UI board and Audio Date: Sun, 23 Sep 2018 10:37:17 -0500 Message-Id: <20180923153718.15095-2-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180923153718.15095-1-aford173@gmail.com> References: <20180923153718.15095-1-aford173@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180923_083742_899060_6F0749B6 X-CRM114-Status: GOOD ( 17.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Tony Lindgren , linux-kernel@vger.kernel.org, Mark Brown , Takashi Iwai , Russell King , Liam Girdwood , Peter Ujfalusi , Rob Herring , linux-arm-kernel@lists.infradead.org, =?utf-8?q?Beno=C3=AEt_Cousson?= , Jaroslav Kysela , Adam Ford , Jarkko Nikula MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The full AM3517-EVM shipped with an add-on board which contained two Audio codecs, a GPIO expander with a variety of buttons, and some other features. This patch enables these portions of the UI board because they don't directly conflict with existing features. Signed-off-by: Adam Ford diff --git a/arch/arm/boot/dts/am3517-evm-ui.dtsi b/arch/arm/boot/dts/am3517-evm-ui.dtsi new file mode 100644 index 000000000000..e841918c1c26 --- /dev/null +++ b/arch/arm/boot/dts/am3517-evm-ui.dtsi @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2018 Logic PD, Inc - http://www.logicpd.com/ + * + * 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 + +/ { + codec1 { + compatible = "simple-audio-card"; + simple-audio-card,name = "tlv320aic23-hifi"; + + simple-audio-card,widgets = + "Microphone", "Mic In", + "Line", "Line In", + "Line", "Line Out"; + + simple-audio-card,routing = + "Line Out", "LOUT", + "Line Out", "ROUT", + "LLINEIN", "Line In", + "RLINEIN", "Line In", + "MICIN", "Mic In"; + + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&sound_master>; + simple-audio-card,frame-master = <&sound_master>; + + simple-audio-card,cpu { + sound-dai = <&mcbsp1>; + }; + + sound_master: simple-audio-card,codec { + sound-dai = <&tlv320aic23_1>; + system-clock-frequency = <12000000>; + }; + }; + + codec2 { + compatible = "simple-audio-card"; + simple-audio-card,name = "tlv320aic23-hifi"; + + simple-audio-card,widgets = + "Microphone", "Mic In", + "Line", "Line In", + "Line", "Line Out"; + + simple-audio-card,routing = + "Line Out", "LOUT", + "Line Out", "ROUT", + "LLINEIN", "Line In", + "RLINEIN", "Line In", + "MICIN", "Mic In"; + + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&sound_master2>; + simple-audio-card,frame-master = <&sound_master2>; + + simple-audio-card,cpu { + sound-dai = <&mcbsp2>; + }; + + sound_master2: simple-audio-card,codec { + sound-dai = <&tlv320aic23_2>; + system-clock-frequency = <12000000>; + }; + }; + + expander-keys { + compatible = "gpio-keys-polled"; + poll-interval = <100>; + + record { + label = "Record"; + /* linux,code = ; */ + gpios = <&tca6416_2 15 GPIO_ACTIVE_LOW>; + }; + + play { + label = "Play"; + linux,code = ; + gpios = <&tca6416_2 14 GPIO_ACTIVE_LOW>; + }; + + Stop { + label = "Stop"; + linux,code = ; + gpios = <&tca6416_2 13 GPIO_ACTIVE_LOW>; + }; + + fwd { + label = "FWD"; + linux,code = ; + gpios = <&tca6416_2 12 GPIO_ACTIVE_LOW>; + }; + + rwd { + label = "RWD"; + linux,code = ; + gpios = <&tca6416_2 11 GPIO_ACTIVE_LOW>; + }; + + shift { + label = "Shift"; + linux,code = ; + gpios = <&tca6416_2 10 GPIO_ACTIVE_LOW>; + }; + + Mode { + label = "Mode"; + linux,code = ; + gpios = <&tca6416_2 9 GPIO_ACTIVE_LOW>; + }; + + Menu { + label = "Menu"; + linux,code = ; + gpios = <&tca6416_2 8 GPIO_ACTIVE_LOW>; + }; + + Up { + label = "Up"; + linux,code = ; + gpios = <&tca6416_2 7 GPIO_ACTIVE_LOW>; + }; + + Down { + label = "Down"; + linux,code = ; + gpios = <&tca6416_2 6 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&i2c2 { + /* Audio codecs */ + tlv320aic23_1: codec@1a { + compatible = "ti,tlv320aic23"; + reg = <0x1a>; + #sound-dai-cells= <0>; + status = "okay"; + }; + + tlv320aic23_2: codec@1b { + compatible = "ti,tlv320aic23"; + reg = <0x1b>; + #sound-dai-cells= <0>; + status = "okay"; + }; +}; + +&i2c3 { + /* Audio codecs */ + tlv320aic23_3: codec@1a { + compatible = "ti,tlv320aic23"; + reg = <0x1a>; + #sound-dai-cells= <0>; + status = "okay"; + }; + + /* GPIO Expanders */ + tca6416_2: gpio@20 { + compatible = "ti,tca6416"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + vcc-supply = <&vdd_io_reg>; + }; + + tca6416_3: gpio@21 { + compatible = "ti,tca6416"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + vcc-supply = <&vdd_io_reg>; + }; + + /* TVP5146 Analog Video decoder input */ + tvp5146@5c { + compatible = "ti,tvp5146m2"; + reg = <0x5c>; + }; +}; + +&mcbsp1 { + status = "ok"; + #sound-dai-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&mcbsp1_pins>; +}; + +&mcbsp2 { + status = "ok"; + #sound-dai-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&mcbsp2_pins>; +}; + +&omap3_pmx_core { + mcbsp1_pins: pinmux_mcbsp1_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x2190, PIN_OUTPUT | MUX_MODE0) /* mcbsp1_dx.mcbsp1_dx */ + OMAP3_CORE1_IOPAD(0x2192, PIN_INPUT | MUX_MODE0) /* mcbsp1_dx.mcbsp1_dr */ + OMAP3_CORE1_IOPAD(0x2196, PIN_INPUT | MUX_MODE0) /* mcbsp_clks.mcbsp1_fsx */ + OMAP3_CORE1_IOPAD(0x2198, PIN_INPUT | MUX_MODE0) /* mcbsp1_clkx.mcbsp1_clkx */ + >; + }; + + mcbsp2_pins: pinmux_mcbsp2_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0) /* mcbsp2_fsx.mcbsp2_fsx */ + OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0) /* mcbsp2_clkx.mcbsp2_clkx */ + OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0) /* mcbsp2_dr.mcbsp2.dr */ + OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0) /* mcbsp2_dx.mcbsp2_dx */ + >; + }; +}; diff --git a/arch/arm/boot/dts/am3517-evm.dts b/arch/arm/boot/dts/am3517-evm.dts index 1d158cfda15f..d4d33cd7adad 100644 --- a/arch/arm/boot/dts/am3517-evm.dts +++ b/arch/arm/boot/dts/am3517-evm.dts @@ -9,6 +9,7 @@ #include "am3517.dtsi" #include "am3517-som.dtsi" +#include "am3517-evm-ui.dtsi" #include / { From patchwork Sun Sep 23 15:37:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 10611809 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 51988112B for ; Sun, 23 Sep 2018 15:39:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F40029FE8 for ; Sun, 23 Sep 2018 15:39:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 333A529FEF; Sun, 23 Sep 2018 15:39:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 89C6C29FE8 for ; Sun, 23 Sep 2018 15:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=lXOyqQeXahjPGAOnx8Owgy1lQJSX5qvQq5VAT4aFp5A=; b=rUevAvMVOIgL6oQ1Fvc+aAFjIN p3dXrKgs0/xKz/xZ0rzYB4P3OC9ZxuJC5a3XyWccOrNg5mC48wcIVWYESWeFuCm7TO4rYdNU22m4/ K6kCifhKtuj2lh8R4M2c0aF2YtrAP9p/UPiPoK6ZLlqFLyMkfeeiO+NkyUPJ0i6Oi36pSo4jVmv2l T4cahc7hs1zW/QPJVeMDlvfmhO5CGcwNfDC3j4U1a0075Q2PejcRd6NkWPO/afBNOyHGfzxzeBGm2 2VMWQiy0zrfKwrdCOQutC2W6tpOo66hUeaPs179/k+x9qDzcDHLuMJDrcdfWdIVEOwh6ZwvIoczov C64VR7FA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g46TX-0003Nr-H0; Sun, 23 Sep 2018 15:39:11 +0000 Received: from mail-io1-xd44.google.com ([2607:f8b0:4864:20::d44]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g46SA-0002ik-0n for linux-arm-kernel@lists.infradead.org; Sun, 23 Sep 2018 15:37:51 +0000 Received: by mail-io1-xd44.google.com with SMTP id l25-v6so2740022ioj.0 for ; Sun, 23 Sep 2018 08:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xF2FHSdnYQ6IpyaYZuKMhwbEWwsjIT0kM/Z/tpeuthw=; b=FqrXRmG0AM82aaQOsVb0eenNCTsNtBSZlXeFSb1Q9az8JEZyGQXdOTBBeeK2kKucxd KA6VHkemEOE87ZNS+KLUuxxS77ivxSpbX/Tb07OfNl+iPk1FdhAYuzjewDuVYUp3kbQ/ rTTJ9ncI1WFtzn4BzYOfQjaI1l8wfiaB+A9H3m1wH8bXEksXERGJXM1Q1tua7etOAUzT Vf2Oee3S4V+o0CCYEgMjG08TRWJuIqpB0U2NsF6UeUoHqy+LrT/D3mW9UE/a2jk7fJse YsJjDEVLDTSfpPhUFltq1LvpOj8NhgnQKUumUa1OHgY3ehBAm9mbr2ofIEfm9WDS7Tkb cVww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xF2FHSdnYQ6IpyaYZuKMhwbEWwsjIT0kM/Z/tpeuthw=; b=erZA9ECMz7E766uC57jcShi72s+W7ki9UqU3GjI4RGP4ZkYnmhGui2Gf+OJ3t6B/3t Upq9Zp11zoV8fid+OU+DHEKJhRWBE+mhAEQX9jAnKZybnK1VEsHIuiTmRYzMVbLoIXF2 qUJINy2fApjBaTrB+1gXdXpTrRvWx/u3TVVb/mXwK+imtcMSfb9WEiMrKQX1UwmAQoK3 Yqocr+mvjvvXqCgbSDWrxWrVXi5DhhzWKdIJV02jqYKTnJF2KVP0i61QJ+ugHxw8CSOM fd/y1NJ/r33urB5twN24qrpBd1HOcwXQAh8kEqGcEMGJHp2JoXjUaEWwqsSyTu9jhpDU VBxA== X-Gm-Message-State: ABuFfoiTKDfiUVg3zVwDAhLDGKyuZnDwG3l/lVFZpRwksqOrK1F8XkCe hH5WlrYDDS4qAN2E0Yo+EeI= X-Google-Smtp-Source: ACcGV63v0WmpXCqvn1M6OqIfKWv6wZMnP5GATwXYor67sAlRefRwNwS8Z2PDPVjPMHcSDQo4Z0lOZw== X-Received: by 2002:a6b:5903:: with SMTP id n3-v6mr5307421iob.176.1537717054514; Sun, 23 Sep 2018 08:37:34 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id o141-v6sm2132531itg.35.2018.09.23.08.37.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Sep 2018 08:37:33 -0700 (PDT) From: Adam Ford To: linux-omap@vger.kernel.org Subject: [PATCH 3/3] ARM: OMAP2PLUS: Remove references to AM3517-EVM since it's in DT Date: Sun, 23 Sep 2018 10:37:18 -0500 Message-Id: <20180923153718.15095-3-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180923153718.15095-1-aford173@gmail.com> References: <20180923153718.15095-1-aford173@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180923_083746_136607_7B3561D8 X-CRM114-Status: GOOD ( 21.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Tony Lindgren , linux-kernel@vger.kernel.org, Mark Brown , Takashi Iwai , Russell King , Liam Girdwood , Peter Ujfalusi , Rob Herring , linux-arm-kernel@lists.infradead.org, =?utf-8?q?Beno=C3=AEt_Cousson?= , Jaroslav Kysela , Adam Ford , Jarkko Nikula MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since the audio codecs used on the AM3517-EVM are now available in device tree, and the audio driver wasn't really being used anyway, this patch removes the remaining AM3517 legacy board options and sound soc drivers. Signed-off-by: Adam Ford Acked-by: Jarkko Nikula Acked-by: Tony Lindgren diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 9f27b486a536..7473a88c3201 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -196,11 +196,6 @@ config MACH_OMAP2_TUSB6010 depends on ARCH_OMAP2 && SOC_OMAP2420 default y if MACH_NOKIA_N8X0 -config MACH_OMAP3517EVM - bool "OMAP3517/ AM3517 EVM board" - depends on ARCH_OMAP3 - default y - config MACH_OMAP3_PANDORA bool "OMAP3 Pandora" depends on ARCH_OMAP3 diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 6dccea6fdaeb..3d418482d242 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -78,15 +78,6 @@ config SND_OMAP_SOC_OSK5912 help Say Y if you want to add support for SoC audio on osk5912. -config SND_OMAP_SOC_AM3517EVM - tristate "SoC Audio support for OMAP3517 / AM3517 EVM" - depends on SND_SDMA_SOC && MACH_OMAP3517EVM && I2C - select SND_OMAP_SOC_MCBSP - select SND_SOC_TLV320AIC23_I2C - help - Say Y if you want to add support for SoC audio on the OMAP3517 / AM3517 - EVM. - config SND_OMAP_SOC_OMAP_TWL4030 tristate "SoC Audio support for TI SoC based boards with twl4030 codec" depends on TWL4030_CORE && SND_SDMA_SOC diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 53eba3413485..af50cdd6eea9 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -17,7 +17,6 @@ snd-soc-n810-objs := n810.o snd-soc-rx51-objs := rx51.o snd-soc-ams-delta-objs := ams-delta.o snd-soc-osk5912-objs := osk5912.o -snd-soc-am3517evm-objs := am3517evm.o snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o snd-soc-omap-twl4030-objs := omap-twl4030.o snd-soc-omap3pandora-objs := omap3pandora.o @@ -26,7 +25,6 @@ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o -obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o obj-$(CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o obj-$(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) += snd-soc-omap-twl4030.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c deleted file mode 100644 index d5651026ec10..000000000000 --- a/sound/soc/omap/am3517evm.c +++ /dev/null @@ -1,141 +0,0 @@ -/* - * am3517evm.c -- ALSA SoC support for OMAP3517 / AM3517 EVM - * - * Author: Anuj Aggarwal - * - * Based on sound/soc/omap/beagle.c by Steve Sakoman - * - * Copyright (C) 2009 Texas Instruments Incorporated - * - * 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 version 2. - * - * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind, - * whether express or implied; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - */ - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "omap-mcbsp.h" - -#include "../codecs/tlv320aic23.h" - -#define CODEC_CLOCK 12000000 - -static int am3517evm_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *codec_dai = rtd->codec_dai; - int ret; - - /* Set the codec system clock for DAC and ADC */ - ret = snd_soc_dai_set_sysclk(codec_dai, 0, - CODEC_CLOCK, SND_SOC_CLOCK_IN); - if (ret < 0) - printk(KERN_ERR "can't set codec system clock\n"); - - return ret; -} - -static const struct snd_soc_ops am3517evm_ops = { - .hw_params = am3517evm_hw_params, -}; - -/* am3517evm machine dapm widgets */ -static const struct snd_soc_dapm_widget tlv320aic23_dapm_widgets[] = { - SND_SOC_DAPM_HP("Line Out", NULL), - SND_SOC_DAPM_LINE("Line In", NULL), - SND_SOC_DAPM_MIC("Mic In", NULL), -}; - -static const struct snd_soc_dapm_route audio_map[] = { - /* Line Out connected to LLOUT, RLOUT */ - {"Line Out", NULL, "LOUT"}, - {"Line Out", NULL, "ROUT"}, - - {"LLINEIN", NULL, "Line In"}, - {"RLINEIN", NULL, "Line In"}, - - {"MICIN", NULL, "Mic In"}, -}; - -/* Digital audio interface glue - connects codec <--> CPU */ -static struct snd_soc_dai_link am3517evm_dai = { - .name = "TLV320AIC23", - .stream_name = "AIC23", - .cpu_dai_name = "omap-mcbsp.1", - .codec_dai_name = "tlv320aic23-hifi", - .platform_name = "omap-mcbsp.1", - .codec_name = "tlv320aic23-codec.2-001a", - .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBM_CFM, - .ops = &am3517evm_ops, -}; - -/* Audio machine driver */ -static struct snd_soc_card snd_soc_am3517evm = { - .name = "am3517evm", - .owner = THIS_MODULE, - .dai_link = &am3517evm_dai, - .num_links = 1, - - .dapm_widgets = tlv320aic23_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets), - .dapm_routes = audio_map, - .num_dapm_routes = ARRAY_SIZE(audio_map), -}; - -static struct platform_device *am3517evm_snd_device; - -static int __init am3517evm_soc_init(void) -{ - int ret; - - if (!machine_is_omap3517evm()) - return -ENODEV; - pr_info("OMAP3517 / AM3517 EVM SoC init\n"); - - am3517evm_snd_device = platform_device_alloc("soc-audio", -1); - if (!am3517evm_snd_device) { - printk(KERN_ERR "Platform device allocation failed\n"); - return -ENOMEM; - } - - platform_set_drvdata(am3517evm_snd_device, &snd_soc_am3517evm); - - ret = platform_device_add(am3517evm_snd_device); - if (ret) - goto err1; - - return 0; - -err1: - printk(KERN_ERR "Unable to add platform device\n"); - platform_device_put(am3517evm_snd_device); - - return ret; -} - -static void __exit am3517evm_soc_exit(void) -{ - platform_device_unregister(am3517evm_snd_device); -} - -module_init(am3517evm_soc_init); -module_exit(am3517evm_soc_exit); - -MODULE_AUTHOR("Anuj Aggarwal "); -MODULE_DESCRIPTION("ALSA SoC OMAP3517 / AM3517 EVM"); -MODULE_LICENSE("GPL v2");