From patchwork Tue Aug 22 14:30:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 13361015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 083BAEE4993 for ; Tue, 22 Aug 2023 14:31:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BnF3hbo9cNe6xKjNt2DeYHZJ48Kqq4PJzRx2+QsoIDo=; b=QAJbikitCrNNg7 ckzufHOmTcd85Lg7Pzl/OEBjWPh7qhWH3k3Edq1NUnp01D5YcJENAYx9bempGsoL9uZ8bqvGUQOav Pl2nNqSYwJV1OU2IsDyJ2xJjXXMa5mO/xf9DsNEAyP7XVN03u3dUieXsxuUvnituMJQmOoZMDkd9p cnOpWgp02JwVO4NcOOcMRxUDLtr4k5Cu1ocYL01+KtDbhsUD40EYhILA7jHsRFug+qdkEtyeFvbrL YiC9zBkvzoVT0z6vk+T/D62Fk6CLLWRs1c5PgC08k79mVrZ4p5CPsYEndTai5T7ig+5AbzqXv+FnQ cxQx7ThExdXCl1Vuf6Dw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qYSPe-00GDO4-22; Tue, 22 Aug 2023 14:31:18 +0000 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qYSPY-00GDJo-0O for linux-arm-kernel@lists.infradead.org; Tue, 22 Aug 2023 14:31:13 +0000 Received: by mail-qt1-x82b.google.com with SMTP id d75a77b69052e-410994a240aso13089621cf.1 for ; Tue, 22 Aug 2023 07:31:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692714669; x=1693319469; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+1y0ssjEfvJL8cH6v7C8R2TDxgKl3uHam44e68F6Nws=; b=iYFY4QyvlIde0zN55CBSvnBwK56ICgT/hvPvw4PlDQ9HgN0lGjs6J8gQjp6Vm3iPZB SS/bZYQzN+D9CNcOs4LbTP4/MMgck5hV7mWB095eJ2mNl0/BQdNq2+lRYyw3EoFd4PTc zV3Ve8DZHft1Crj6FL7hCCpgdb9P/Ez6JNK4KR07pRkCIuAWb3nAiLziEu49rTzal91l 59vi6A6ixMLXxJ32oqIHjU55VNapXAfSuZPHLaCy9EIbXNhY9eEbpZs5SYc8X7qRX34V pHPlK+g8i2sxlj+gQ8Jd50yx+qseoIpuznwc2SUwRXIls8ZjMBMnuSpXeBHZ1u46Kqab pesg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692714669; x=1693319469; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+1y0ssjEfvJL8cH6v7C8R2TDxgKl3uHam44e68F6Nws=; b=Rw/w3O7lkw5TcHWEboF9jOC3XSrxbASZZXR/9sAxVlCJQxw3qhfcdOudse5Wtqm66s zJ+ZkKkH8pNRi4B6LVmQ9UdNYbgm8tK52fUnJOEwAPaZh8vxqShlZbeiPVG3C6hlx7u0 zAndDme8+dRGory1cn87V+OWq3kCMU0u/zp+KtXogSL95npNhMU2e6MghbqHZdK+5+4/ sy7dssEq0taQnGtQnQOASu6yru9BVUSBaMv3pEQQ6Y5pLveGHoQ4hKHh7h4lcz51d3Oi zInPDtFi8CPMR1mTedanxK0+SU/V7hGBwiK+qMfqzOn3HvzNGRN9wynSZ4s108z26x2T N9QA== X-Gm-Message-State: AOJu0YxPK3QYcLJNWnz6LXTl+4FsESgN0eIIOcWw8ebYA48JMUMCJmLh bPbOyazCIn9Crb+S3uuzV30= X-Google-Smtp-Source: AGHT+IG5gfkKQlRt4vF/85xVOFuI+mEbQ2tCzjo7GsAhNErl14UR0XTSkZFe+qKxh56k5k0x6p9/0g== X-Received: by 2002:ac8:5c42:0:b0:410:8b14:a324 with SMTP id j2-20020ac85c42000000b004108b14a324mr12735362qtj.10.1692714668883; Tue, 22 Aug 2023 07:31:08 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id e19-20020ac86713000000b00407ffb2c24dsm3055750qtp.63.2023.08.22.07.31.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 07:31:08 -0700 (PDT) From: Trevor Woerner To: robertcnelson@gmail.com, drew@beagleboard.org, =?utf-8?q?Beno=C3=AEt_Cou?= =?utf-8?q?sson?= , Tony Lindgren , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH v3 3/4] ARM: dts: am335x-pocketbeagle: enable pru Date: Tue, 22 Aug 2023 10:30:49 -0400 Message-ID: <20230822143051.7640-4-twoerner@gmail.com> X-Mailer: git-send-email 2.41.0.327.gaa9166bcc0ba In-Reply-To: <20230822143051.7640-1-twoerner@gmail.com> References: <20230822143051.7640-1-twoerner@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230822_073112_166915_E3B7868A X-CRM114-Status: GOOD ( 16.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that the PRU code is upstream and can be loaded via remoteproc, adjust the device tree to enable it and adjust the pin muxing so that the default setting of the pins matches what's is given on the silkscreen and/or pocketbeagle wiring. Caveat: In most cases, the silkscreen will indicate, for example, "PRU0.7", but it doesn't indicate whether that pin should be enabled for input or output. On the PRU a different MODE is used for input versus output. So it is unclear which mode to enable (MODE5 = output, MODE6 = input). In cases where there is a choice (PRU1.11, PRU0.7, PRU0.4, PRU0.1, PRU1.10, PRU0.6, PRU0.3, PRU0.2, and PRU0.5) output is assumed (MODE5). The remaining PRU silkscreen pins do not have a choice and are set as follows: PRU0.16 MODE5 input PRU0.15i MODE6 input Signed-off-by: Trevor Woerner --- .../boot/dts/ti/omap/am335x-pocketbeagle.dts | 46 +++++++++++++++---- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts b/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts index d4d1770657da..e35d84ca5706 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts @@ -121,7 +121,7 @@ &gpio1 { "P2.24", "P2.33", "P2.22", - "P2.18", + "P2.18 [PRU0.15i]", "NC", "NC", "P2.01 [PWM1A]", @@ -271,15 +271,6 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_AD14, PIN_INPUT_PULLUP, MUX_MODE7) pinctrl-single,bias-pulldown = < 0x10 0x00 0x10 0x18>; }; - /* P2_18 (ZCZ ball U13) gpio1_15 0x83c PIN 15 */ - P2_18_gpio: P2-18-gpio-pins { - pinctrl-single,pins = < - AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT_PULLUP, MUX_MODE7) - >; - pinctrl-single,bias-pullup = < 0x10 0x10 0x00 0x18>; - pinctrl-single,bias-pulldown = < 0x10 0x00 0x10 0x18>; - }; - /* P2_10 (ZCZ ball R14) gpio1_20 0x850 PIN 20 */ P2_10_gpio: P2-10-gpio-pins { pinctrl-single,pins = < @@ -405,6 +396,27 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_WAIT0, PIN_INPUT_PULLUP, MUX_MODE6) /* (T17) gpmc AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_OUTPUT_PULLDOWN, MUX_MODE6) /* (U17) gpmc_wpn.uart4_txd */ >; }; + + pru0_pins: pinmux-pru0-pins { + pinctrl-single,pins = < + AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_INPUT_PULLUP, MUX_MODE5)/* (D14) xdma_event_intr1.pr1_pru0_pru_r31_16 */ + AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_OUTPUT_PULLDOWN, MUX_MODE5)/* (A14) mcasp0_ahclkx.pr1_pru0_pru_r30_7 */ + AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_OUTPUT_PULLDOWN, MUX_MODE5) /* (B12) mcasp0_acklr.pr1_pru0_pru_r30_4 */ + AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_OUTPUT_PULLDOWN, MUX_MODE5) /* (B13) mcasp0_fsx.pr1_pru0_pru_r30_1 */ + AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT_PULLUP, MUX_MODE6) /* (U13) gpmc_ad15.pr1_pru0_pru_r31_15 */ + AM33XX_PADCONF(AM335X_PIN_MCASP0_AXR1, PIN_OUTPUT_PULLDOWN, MUX_MODE5) /* (D13) mcasp0_axr1.pr1_pru0_pru_r30_6 */ + AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKR, PIN_OUTPUT_PULLDOWN, MUX_MODE5)/* (C12) mcasp0_ahclkr.pr1_pru0_pru_r30_3 */ + AM33XX_PADCONF(AM335X_PIN_MCASP0_AXR0, PIN_OUTPUT_PULLDOWN, MUX_MODE5) /* (D12) mcasp0_axr0.pr1_pru0_pru_r30_2 */ + AM33XX_PADCONF(AM335X_PIN_MCASP0_FSR, PIN_OUTPUT_PULLDOWN, MUX_MODE5) /* (C13) mcasp0_fsr.pr1_pru0_pru_r30_5 */ + >; + }; + + pru1_pins: pinmux-pru1-pins { + pinctrl-single,pins = < + AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE5)/*(R6) lcd_ac_bias_en.pr1_pru1_pru_r30_11 */ + AM33XX_PADCONF(AM335X_PIN_LCD_PCLK, PIN_OUTPUT_PULLDOWN, MUX_MODE5) /* (V5) lcd_pclk.pr1_pru1_pru_r30_10 */ + >; + }; }; &epwmss0 { @@ -486,3 +498,17 @@ &usb0 { &usb1 { dr_mode = "host"; }; + +&pruss_tm { + status = "okay"; +}; + +&pru0 { + pinctrl-names = "default"; + pinctrl-0 = <&pru0_pins>; +}; + +&pru1 { + pinctrl-names = "default"; + pinctrl-0 = <&pru1_pins>; +};