From patchwork Sat Jan 12 09:47:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 1023858 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XXiytOBk"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43cFKM3JQRz9s55 for ; Sat, 12 Jan 2019 20:48:07 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 23081C2226D; Sat, 12 Jan 2019 09:47:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CF374C22238; Sat, 12 Jan 2019 09:47:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 07156C21F07; Sat, 12 Jan 2019 09:47:38 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id A98AEC21D8A for ; Sat, 12 Jan 2019 09:47:38 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id s12so17699756wrt.4 for ; Sat, 12 Jan 2019 01:47:38 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Y0RgaS6Pw9+IElehXgqEVoKg6u/QsEcKzYBtRggbNAo=; b=XXiytOBkif0R7bNR/gDce/509iQ20obO3UJPjNDliIxzmmo2pnqo+TZ38KsmmXrkA4 DNnFkfHr2gaGl3GN3YW8CcA5fPfj4MofNoe+VPxNov/Q6FI/4KICpwE40w58grP3W1nb vH5hvpvuYITWNoLA9URFHJV3kridcme8pEGphIMC7RAgeoCxp9zPatqXWvZ8EEpUKRn9 o5V185ttHQoaCbNUwoWLDR1/NXGUuOg6s8J1bwUUzACgNzgJMVVWrfFC18yGPMjYbuoz 4W1ifKrFsEbdYd+8GCCqe5YAzc3uhQrEPowX007QCeksDQmh0HbiFQ+ZU2OYEmpzu7Fu X3vw== 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:mime-version:content-transfer-encoding; bh=Y0RgaS6Pw9+IElehXgqEVoKg6u/QsEcKzYBtRggbNAo=; b=rZbwovqzAtucYdN1vJ7+x3yiqff0buZUWFMwLlpS6t7lgS1EHGUy8MNW0GoCsfUhE2 9DRYm7kHvepRsUPnyDh+XNFWABLZ2X4ACUfvuLQ+BHOfuczdaf2LRw7+3rbgz2EhEwiL /If3lRbTgZg0USZOglNdqFUdB8Sq4QxEK3VIdD0cbu/ryAH/2adeUkVy2+OawS978v1H YJb4uIcSPhy6EBULIbrDEG3pgMprA4pjE5VBcqFbfUUYjyD1WLwIsPfYe3maORFMx65U pVjw7DGO6gbGQc2uCZqaBxDHpmRZLhu9GzXeZxNHVDc2njs5xTjogljgEhR64rw+pi7N gdkg== X-Gm-Message-State: AJcUukcPNiGi4dusOwVnxp7moipOdvEKykuXniJQMLuZ9sUVp+ACZURM Nq7P3+I8WVbWV8yVRAekaoVKMlARRaA= X-Google-Smtp-Source: ALg8bN4aeDH25NQwz4m+r+hkvbjgBDNjJL2FtN/HWeYGVYu/xNbIkIyhqF1FVUJXLO+3r6JcFmKU7A== X-Received: by 2002:adf:f401:: with SMTP id g1mr17341103wro.103.1547286457969; Sat, 12 Jan 2019 01:47:37 -0800 (PST) Received: from localhost.localdomain ([141.226.31.91]) by smtp.gmail.com with ESMTPSA id 67sm102270684wra.37.2019.01.12.01.47.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 01:47:37 -0800 (PST) From: Ramon Fried To: u-boot@lists.denx.de Date: Sat, 12 Jan 2019 11:47:24 +0200 Message-Id: <20190112094728.14189-2-ramon.fried@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190112094728.14189-1-ramon.fried@gmail.com> References: <20190112094728.14189-1-ramon.fried@gmail.com> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH v1 1/5] arm: mach-snapdragon: db820c: Actually init PLL for serial X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The PLL for the UART was not set, and relied on previous initializtion made by LK. add the appropriate initialization. Signed-off-by: Ramon Fried --- arch/arm/mach-snapdragon/clock-apq8096.c | 34 +++++++++++++++++++ .../include/mach/sysmap-apq8096.h | 9 +++++ 2 files changed, 43 insertions(+) diff --git a/arch/arm/mach-snapdragon/clock-apq8096.c b/arch/arm/mach-snapdragon/clock-apq8096.c index 628c38785b..e5011be8f2 100644 --- a/arch/arm/mach-snapdragon/clock-apq8096.c +++ b/arch/arm/mach-snapdragon/clock-apq8096.c @@ -34,6 +34,12 @@ static const struct pll_vote_clk gpll0_vote_clk = { .vote_bit = APCS_GPLL_ENA_VOTE_GPLL0, }; +static struct vote_clk gcc_blsp2_ahb_clk = { + .cbcr_reg = BLSP2_AHB_CBCR, + .ena_vote = APCS_CLOCK_BRANCH_ENA_VOTE, + .vote_bit = BIT(15), +}; + static int clk_init_sdc(struct msm_clk_priv *priv, uint rate) { int div = 3; @@ -47,6 +53,32 @@ static int clk_init_sdc(struct msm_clk_priv *priv, uint rate) return rate; } +static const struct bcr_regs uart2_regs = { + .cfg_rcgr = BLSP2_UART2_APPS_CFG_RCGR, + .cmd_rcgr = BLSP2_UART2_APPS_CMD_RCGR, + .M = BLSP2_UART2_APPS_M, + .N = BLSP2_UART2_APPS_N, + .D = BLSP2_UART2_APPS_D, +}; + +static int clk_init_uart(struct msm_clk_priv *priv) +{ + /* Enable AHB clock */ + clk_enable_vote_clk(priv->base, &gcc_blsp2_ahb_clk); + + /* 7372800 uart block clock @ GPLL0 */ + clk_rcg_set_rate_mnd(priv->base, &uart2_regs, 1, 192, 15625, + CFG_CLK_SRC_GPLL0); + + /* Vote for gpll0 clock */ + clk_enable_gpll0(priv->base, &gpll0_vote_clk); + + /* Enable core clk */ + clk_enable_cbc(priv->base + BLSP2_UART2_APPS_CBCR); + + return 0; +} + ulong msm_set_rate(struct clk *clk, ulong rate) { struct msm_clk_priv *priv = dev_get_priv(clk->dev); @@ -55,6 +87,8 @@ ulong msm_set_rate(struct clk *clk, ulong rate) case 0: /* SDC1 */ return clk_init_sdc(priv, rate); break; + case 4: /*UART2*/ + return clk_init_uart(priv); default: return 0; } diff --git a/arch/arm/mach-snapdragon/include/mach/sysmap-apq8096.h b/arch/arm/mach-snapdragon/include/mach/sysmap-apq8096.h index 14febb6487..36a902bd92 100644 --- a/arch/arm/mach-snapdragon/include/mach/sysmap-apq8096.h +++ b/arch/arm/mach-snapdragon/include/mach/sysmap-apq8096.h @@ -15,6 +15,7 @@ /* Clocks: (from CLK_CTL_BASE) */ #define GPLL0_STATUS (0x0000) #define APCS_GPLL_ENA_VOTE (0x52000) +#define APCS_CLOCK_BRANCH_ENA_VOTE (0x52004) #define SDCC2_BCR (0x14000) /* block reset */ #define SDCC2_APPS_CBCR (0x14004) /* branch control */ @@ -25,4 +26,12 @@ #define SDCC2_N (0x1401C) #define SDCC2_D (0x14020) +#define BLSP2_AHB_CBCR (0x25004) +#define BLSP2_UART2_APPS_CBCR (0x29004) +#define BLSP2_UART2_APPS_CMD_RCGR (0x2900C) +#define BLSP2_UART2_APPS_CFG_RCGR (0x29010) +#define BLSP2_UART2_APPS_M (0x29014) +#define BLSP2_UART2_APPS_N (0x29018) +#define BLSP2_UART2_APPS_D (0x2901C) + #endif From patchwork Sat Jan 12 09:47:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 1023860 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hhMZF1AV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43cFMG2DlZz9sD4 for ; Sat, 12 Jan 2019 20:49:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CEEF4C2224B; Sat, 12 Jan 2019 09:48:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7CD9CC22256; Sat, 12 Jan 2019 09:47:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 517D7C22254; Sat, 12 Jan 2019 09:47:44 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id F1792C22241 for ; Sat, 12 Jan 2019 09:47:39 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id j2so17754001wrw.1 for ; Sat, 12 Jan 2019 01:47:39 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=nkz+ydmSPdBWBYEal38kR7A2Oc264SuAi04o+IOrEzM=; b=hhMZF1AV+yMzqQlUXcN0KDMXPK9AkjEOjQuuu/5KcaoipF+MBZ03ofDKItAzbzNSEP pOooR49UumJ4iaooHvcDFDimlFyjdlvlvk28EwfdvlJqq58Qp1k69PqOUvi5ymIN9+Z3 rq6dB/4/8xe+o8E0uESyDupvff4duAd3AskhqM6e2V4SlBX4MY6WIPStTnuE5/UuAMul dIUIZ1FWxH+HCf+TgAuqld/UeL3ZI7+aSWYb0TdxDGvtGqmvLdSJAhLtW3V9ymQByfjD Vkb47ngtT91CcdjSyLNUhrl0saHgY4ZzkpXmxeCvnfiMz4qkTKkduC0ifxcDpIoMkb9x kjIA== 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:mime-version:content-transfer-encoding; bh=nkz+ydmSPdBWBYEal38kR7A2Oc264SuAi04o+IOrEzM=; b=In1zvFfoifnbzHKUYNytrlfaC7mb8YSvPaPCceKElaL2Ox5yzm3Ax1ldR4eK+xzzNn 4eeZGzRXXgp4quRa5v3CeoGIfbv4IbyenEhiiUVVAG5liRhCCGKLBb2A3Guiz+CKAaB1 EqUPM+71R9Wgmwem5oy2SRMuW1dqHn9xiDyEENw3EFzVD5cQYMOn+YjP1YYCvunNTezE sFVUeAtdWkWalaCk+Db7SF7f/VPscVlS8BuxDYFpK6dSamOuNeAa3bz+GmaywgLIz52p azQ0vvWIoUe25HG93e5pia7An6/ZxwRO4lCBwobND3thbKqRu20AFFMJWrlmyiYsA47n y/HQ== X-Gm-Message-State: AJcUukfnPX5MmyXDCfzU8h3jZSnnn0cYN3umd6U16nkvTtRKjSZZZSfU AbXxsvu+qVRCkKEOWVIq9da2jljBcEk= X-Google-Smtp-Source: ALg8bN7pY1104pjwAOdM2BcE+gNUYXgjEzAT7Bi6nN2fYrWSD9bcsifwn0QNxAETDDTvDtjNYo8q0Q== X-Received: by 2002:adf:e34b:: with SMTP id n11mr15899895wrj.91.1547286459227; Sat, 12 Jan 2019 01:47:39 -0800 (PST) Received: from localhost.localdomain ([141.226.31.91]) by smtp.gmail.com with ESMTPSA id 67sm102270684wra.37.2019.01.12.01.47.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 01:47:38 -0800 (PST) From: Ramon Fried To: u-boot@lists.denx.de Date: Sat, 12 Jan 2019 11:47:25 +0200 Message-Id: <20190112094728.14189-3-ramon.fried@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190112094728.14189-1-ramon.fried@gmail.com> References: <20190112094728.14189-1-ramon.fried@gmail.com> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH v1 2/5] arm: mach-snapdragon: add pinctrl driver for db820c X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add pinctrl driver for Dragonboard820c, currently with only one mux func to initialize pins for serial console. Signed-off-by: Ramon Fried --- arch/arm/mach-snapdragon/Makefile | 5 +- arch/arm/mach-snapdragon/pinctrl-apq8096.c | 56 +++++++++++++++++++ arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 2 +- arch/arm/mach-snapdragon/pinctrl-snapdragon.h | 1 + 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 arch/arm/mach-snapdragon/pinctrl-apq8096.c diff --git a/arch/arm/mach-snapdragon/Makefile b/arch/arm/mach-snapdragon/Makefile index 2d94083600..709919fce4 100644 --- a/arch/arm/mach-snapdragon/Makefile +++ b/arch/arm/mach-snapdragon/Makefile @@ -6,8 +6,9 @@ obj-$(CONFIG_TARGET_DRAGONBOARD820C) += clock-apq8096.o obj-$(CONFIG_TARGET_DRAGONBOARD820C) += sysmap-apq8096.o obj-$(CONFIG_TARGET_DRAGONBOARD410C) += clock-apq8016.o obj-$(CONFIG_TARGET_DRAGONBOARD410C) += sysmap-apq8016.o -obj-$(CONFIG_TARGET_DRAGONBOARD410C) += pinctrl-apq8016.o -obj-$(CONFIG_TARGET_DRAGONBOARD410C) += pinctrl-snapdragon.o obj-y += misc.o obj-y += clock-snapdragon.o obj-y += dram.o +obj-y += pinctrl-snapdragon.o +obj-y += pinctrl-apq8016.o +obj-y += pinctrl-apq8096.o diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8096.c b/arch/arm/mach-snapdragon/pinctrl-apq8096.c new file mode 100644 index 0000000000..20a71c319b --- /dev/null +++ b/arch/arm/mach-snapdragon/pinctrl-apq8096.c @@ -0,0 +1,56 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Qualcomm APQ8096 pinctrl + * + * (C) Copyright 2019 Ramon Fried + * + */ + +#include "pinctrl-snapdragon.h" +#include + +#define MAX_PIN_NAME_LEN 32 +static char pin_name[MAX_PIN_NAME_LEN]; +static const char * const msm_pinctrl_pins[] = { + "SDC1_CLK", + "SDC1_CMD", + "SDC1_DATA", + "SDC2_CLK", + "SDC2_CMD", + "SDC2_DATA", + "SDC1_RCLK", +}; + +static const struct pinctrl_function msm_pinctrl_functions[] = { + {"blsp_uart8", 2}, +}; + +static const char *apq8096_get_function_name(struct udevice *dev, + unsigned int selector) +{ + return msm_pinctrl_functions[selector].name; +} + +static const char *apq8096_get_pin_name(struct udevice *dev, + unsigned int selector) +{ + if (selector < 150) { + snprintf(pin_name, MAX_PIN_NAME_LEN, "GPIO_%u", selector); + return pin_name; + } else { + return msm_pinctrl_pins[selector - 150]; + } +} + +static unsigned int apq8096_get_function_mux(unsigned int selector) +{ + return msm_pinctrl_functions[selector].val; +} + +struct msm_pinctrl_data apq8096_data = { + .pin_count = 157, + .functions_count = ARRAY_SIZE(msm_pinctrl_functions), + .get_function_name = apq8096_get_function_name, + .get_function_mux = apq8096_get_function_mux, + .get_pin_name = apq8096_get_pin_name, +}; diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c index 5365ccdb70..ac511d9ee5 100644 --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c +++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c @@ -113,8 +113,8 @@ static struct pinctrl_ops msm_pinctrl_ops = { }; static const struct udevice_id msm_pinctrl_ids[] = { - { .compatible = "qcom,tlmm-msm8916", .data = (ulong)&apq8016_data }, { .compatible = "qcom,tlmm-apq8016", .data = (ulong)&apq8016_data }, + { .compatible = "qcom,tlmm-apq8096", .data = (ulong)&apq8096_data }, { } }; diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.h b/arch/arm/mach-snapdragon/pinctrl-snapdragon.h index c47d988af4..24f8863f59 100644 --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.h +++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.h @@ -26,5 +26,6 @@ struct pinctrl_function { }; extern struct msm_pinctrl_data apq8016_data; +extern struct msm_pinctrl_data apq8096_data; #endif From patchwork Sat Jan 12 09:47:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 1023859 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SnZWG7WS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43cFLt12q9z9s55 for ; Sat, 12 Jan 2019 20:49:26 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C9C27C2224B; Sat, 12 Jan 2019 09:48:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9491DC22237; Sat, 12 Jan 2019 09:47:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6D090C2223A; Sat, 12 Jan 2019 09:47:44 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by lists.denx.de (Postfix) with ESMTPS id 41967C2225A for ; Sat, 12 Jan 2019 09:47:41 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id m1so4525434wml.2 for ; Sat, 12 Jan 2019 01:47:41 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=WFmKTBQM+OawW/hyAAagsBBlWj6ka997/hXQWy0Sdk4=; b=SnZWG7WSTaHm3VfG9EMMe45Vigs2699cxXrZCLGcSAr9QmnjUsM60vM5rw6EuaVkbD pkhwDclUs0GUQLWJ8gRCffqFDlOr/XDMJrmUWqwGUqDZEq33/URPQP8Tz42nWGYEIlRm Xh80uwDdZxNvCrGmxYJffhv+Df/0IlK2fiqWCc9+SdAn4Egn1viojTmcDWt2yzQLCX09 FcIhQfBLuDDUtuKNM81bwL5kC7/caMBJ/CoJ+FkWKMru9bRNDQleihQK4Jr9VOwqF694 4oZ7YbvPsS4zuTqDqZW01PfMlCP9JsKzPSzKaKeGoFF30DDdmATsJZDEc6WS2qBOHqpZ JO4w== 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:mime-version:content-transfer-encoding; bh=WFmKTBQM+OawW/hyAAagsBBlWj6ka997/hXQWy0Sdk4=; b=kLj4lllLKaM31EBsDOIEFglluE8c6KskgPCqdYAdQoHs5fIqNG+kqho4YBuQyeOA2F 2Owi2k7YI5e6Xwx3jb1f/Dxe2ATKzTk45UpRBjXygJolfkf2lr7DE+C+00pnbZQLBsF6 5riZ/GVNZENwloWA8EUyYxo4aA/I0QCqKYEZxT7QAvCcluu/65bABVebal18nhK2KuWd joklBgjCIgDK3nON5Y6QT2R8sw/utnjwwYX48hxUlUq3cRcwzNtvFusMT9qTb845lKy0 2yBv8s4pMKFsIYJB2v3wpXGI3xVaVzyL+Usz3sacwajlMp4bQbkVPK+WswKtvMvBOM8w d3jA== X-Gm-Message-State: AJcUukerBcrwahf8mzHYTSO1vzF7Fju/GjM9n4yeXqO/Q+az1yOGWkj0 Fd6UNgGFHNR19EREqGMDPuNhMYkADCU= X-Google-Smtp-Source: ALg8bN7I3Yw6twQg6TwGMmPPkj0LsLSIOuoZWp0tC7v1kHxPJ8yXLn5lXr55x6nFqx8aUK+b7nmbgg== X-Received: by 2002:a1c:bbd6:: with SMTP id l205mr4913991wmf.97.1547286460563; Sat, 12 Jan 2019 01:47:40 -0800 (PST) Received: from localhost.localdomain ([141.226.31.91]) by smtp.gmail.com with ESMTPSA id 67sm102270684wra.37.2019.01.12.01.47.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 01:47:40 -0800 (PST) From: Ramon Fried To: u-boot@lists.denx.de Date: Sat, 12 Jan 2019 11:47:26 +0200 Message-Id: <20190112094728.14189-4-ramon.fried@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190112094728.14189-1-ramon.fried@gmail.com> References: <20190112094728.14189-1-ramon.fried@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v1 3/5] configs: dragonboard820c: Enable pinctrl/mux config X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Ramon Fried --- configs/dragonboard820c_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/dragonboard820c_defconfig b/configs/dragonboard820c_defconfig index d1e0b77717..20a6ba9b61 100644 --- a/configs/dragonboard820c_defconfig +++ b/configs/dragonboard820c_defconfig @@ -31,6 +31,8 @@ CONFIG_PM8916_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_MSM=y +CONFIG_PINCTRL=y +CONFIG_PINCONF=y CONFIG_DM_PMIC=y CONFIG_PMIC_PM8916=y CONFIG_MSM_SERIAL=y From patchwork Sat Jan 12 09:47:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 1023861 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LC3KYNa4"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43cFNJ1JTqz9sD4 for ; Sat, 12 Jan 2019 20:50:40 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DDF5CC2227D; Sat, 12 Jan 2019 09:48:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5378FC22254; Sat, 12 Jan 2019 09:48:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0C6B3C22227; Sat, 12 Jan 2019 09:47:45 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 8E18AC22243 for ; Sat, 12 Jan 2019 09:47:42 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id b11so4533112wmj.1 for ; Sat, 12 Jan 2019 01:47:42 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=N6hRM2fLUjAY3zgkh2bzgYeiw4PSfV+Fym54nRFkkr8=; b=LC3KYNa4X3B2DrNjlj+tF2FxC0VXTW6m3gwUIt0yFXhw2hfKWmQi/HcbB961cZhHWH 2/xZSjOVG3pKyw3O7sXrhvX5k+0rcupizJxlg0s8EucX5A+5y+VpNHdfiguo6Khba6hi Q5cz7FnPN1OhRjES/nSVfo0QZs8yZXetkq93t9uI4MHCXgZXrysGfn7XZxlbcVvTchFq +zD0kAdP0UPHwnriu+GyEmx8xl3m5UQky69iaH+rHItD2+NmfPhbvTb8RBOLAhKblItW a8TlEB3w+5E473PvebZnHratwiS+CT6oP4AxWovgJcWoui9Un+Zj4Gv/OPjx+niXQQka zWmA== 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:mime-version:content-transfer-encoding; bh=N6hRM2fLUjAY3zgkh2bzgYeiw4PSfV+Fym54nRFkkr8=; b=lP2i242BA8GVQQ45cVLOllcKEnJeuCodLD0Fs2JBvBZxfsWqoqAa35kVQ++jYLnB1g 1ZHDceirGPw0dEid6kX/BF8NXFTOh+piKD3qA0o0xnaEYxGIfMd+A/7sBLar+cyTxd7W RkXyB6imY2lEo/lOjiU/UjafHzEhqcYQTJwg5uhUsuSNZTIOv6JCV1qZywqQd+zIdEnH n8KZNUEZIH1qCfR6+TtKdwUexVnb3Y2gJ9akg8itN5DjF87RWz0Ahk1XP0CXXIgA3O+Q NzJckGk8DjXKJVzL85jpGu0RX4AZQzEUZAQN683PzfSn81Mh4+MGLbegbQQVhYce6xnN vomg== X-Gm-Message-State: AJcUukeV3a9Pwasha4XVcEGQobb6w4xO1r9necc88E5a3+Ff6w4Rh6oj PoQ4TeiVJCNNYICGOvNjzB9Zxyay7EM= X-Google-Smtp-Source: ALg8bN5+0ulQir+sZR7rAqlPSCzBysEyrur2SI+k9NZjfZ2wOBuIFC0J8RzxviuKpDfUYVkMSpthAw== X-Received: by 2002:a1c:5fd7:: with SMTP id t206mr5492434wmb.145.1547286461847; Sat, 12 Jan 2019 01:47:41 -0800 (PST) Received: from localhost.localdomain ([141.226.31.91]) by smtp.gmail.com with ESMTPSA id 67sm102270684wra.37.2019.01.12.01.47.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 01:47:41 -0800 (PST) From: Ramon Fried To: u-boot@lists.denx.de Date: Sat, 12 Jan 2019 11:47:27 +0200 Message-Id: <20190112094728.14189-5-ramon.fried@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190112094728.14189-1-ramon.fried@gmail.com> References: <20190112094728.14189-1-ramon.fried@gmail.com> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH v1 4/5] arm: mach-snapdragon: pinctrl: clarify gpio disable bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The TLMM_GPIO_ENABLE bit is actually use to disable the GPIO. change it to TLMM_GPIO_DISABLE so it's clearer. Signed-off-by: Ramon Fried --- arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c index ac511d9ee5..9ba8fdd729 100644 --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c +++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c @@ -22,7 +22,7 @@ struct msm_pinctrl_priv { #define TLMM_GPIO_PULL_MASK GENMASK(1, 0) #define TLMM_FUNC_SEL_MASK GENMASK(5, 2) #define TLMM_DRV_STRENGTH_MASK GENMASK(8, 6) -#define TLMM_GPIO_ENABLE BIT(9) +#define TLMM_GPIO_DISABLE BIT(9) static const struct pinconf_param msm_conf_params[] = { { "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 3 }, @@ -74,7 +74,7 @@ static int msm_pinmux_set(struct udevice *dev, unsigned int pin_selector, struct msm_pinctrl_priv *priv = dev_get_priv(dev); clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector), - TLMM_FUNC_SEL_MASK | TLMM_GPIO_ENABLE, + TLMM_FUNC_SEL_MASK | TLMM_GPIO_DISABLE, priv->data->get_function_mux(func_selector) << 2); return 0; } From patchwork Sat Jan 12 09:47:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 1023862 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KYKO5Hb6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43cFP15Kp9z9sDB for ; Sat, 12 Jan 2019 20:51:17 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7525FC2228B; Sat, 12 Jan 2019 09:49:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4B6ADC2229B; Sat, 12 Jan 2019 09:48:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 30DD1C2223A; Sat, 12 Jan 2019 09:47:47 +0000 (UTC) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by lists.denx.de (Postfix) with ESMTPS id C8729C22235 for ; Sat, 12 Jan 2019 09:47:43 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id y8so4503836wmi.4 for ; Sat, 12 Jan 2019 01:47:43 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=tBMJzhWHSPpBR0nJcBW1PkkKuDLceFhW1SnU4itBlQI=; b=KYKO5Hb64BKsJB8eZcY69tMogqs4Fi5X1l7FQtw6xWtWdJG7O04F+88dVhq51iG3UD V/GgZdRxdfxki1lJPx365j+kNu8kjMlw5ffhQY823Y/eFTlJjxtBNdyTT9Kft3xV/uUl Qrjh6ZAaM5J0q9QLD59/h0938GPrQxGVRsEzQyKVx9iHjwYYvI1QKhrywUGrUDqSRvJn Sauyw5TzwYvdNzBuVgwHsr83hmta2juJpFE/eF7RoI8wN7vfClg4dj6Og26ZUNNImJ+h Vr5rhGa5AW+xqFzcVl4gcO1acQv1AhD6m4ilaqRwtKvRVzOP9+lyy2ZSNVWxabWUAZkO oSNw== 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:mime-version:content-transfer-encoding; bh=tBMJzhWHSPpBR0nJcBW1PkkKuDLceFhW1SnU4itBlQI=; b=emQqxCYM5OAwHMra059zRj70YIavXKsdVVaRWulMdJRB4tj27ceUUw9FNWEmxCAbrF T0CJKEWA5md32LxSz8Z6+FboqosrEj5Mz85L5hX15Y0qMTsl5TpHOR9qdjB+LQ6Y9gXi y3ApAgxvZiLR2L3nSblckfl0mJwpqqH2jiC9aAH1CW17vN7aI5gV6NP0YXxQZ0PQHPZc ap1mZvxbNg4hihCOrf9yCC9kvvIuG31zd3kxurE5DU+PGTTeYowo79bHqomnLfzTZzBu veTgYwXnIdXIGKvWRr9rz1s7+mVCDqbjSVgim/Me+Mz7CxyqWEGHRPVumuNlQGN+rlQq AhTQ== X-Gm-Message-State: AJcUukd32BhoAVikKeuFRw2zDMd3o8mUUr6Z9+fPL36qFsP2JdR+vtxe 8C7RTHN/BVVvOwksgs7U1DuhBiOmVNY= X-Google-Smtp-Source: ALg8bN4xxLoK9N/KUTDADsxFt1aKn5h0QytyJbye0ekPOocSXx+etxYzNY/riT0bjPMsWOH1yhfHzg== X-Received: by 2002:a1c:b687:: with SMTP id g129mr5136606wmf.59.1547286463162; Sat, 12 Jan 2019 01:47:43 -0800 (PST) Received: from localhost.localdomain ([141.226.31.91]) by smtp.gmail.com with ESMTPSA id 67sm102270684wra.37.2019.01.12.01.47.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 01:47:42 -0800 (PST) From: Ramon Fried To: u-boot@lists.denx.de Date: Sat, 12 Jan 2019 11:47:28 +0200 Message-Id: <20190112094728.14189-6-ramon.fried@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190112094728.14189-1-ramon.fried@gmail.com> References: <20190112094728.14189-1-ramon.fried@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v1 5/5] dts: 820c: Add pinctrl node and uart mux X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" * Add pinctrl node for TLMM and add mux request for uart node. * Rename uart to the actual board uart port. * Fix indentendation of sdhc2 node. Signed-off-by: Ramon Fried --- arch/arm/dts/dragonboard820c-uboot.dtsi | 10 ++++++++- arch/arm/dts/dragonboard820c.dts | 29 +++++++++++++++++++------ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/dragonboard820c-uboot.dtsi b/arch/arm/dts/dragonboard820c-uboot.dtsi index d60aa04494..8610d7ec37 100644 --- a/arch/arm/dts/dragonboard820c-uboot.dtsi +++ b/arch/arm/dts/dragonboard820c-uboot.dtsi @@ -13,14 +13,22 @@ soc { u-boot,dm-pre-reloc; + qcom,tlmm@1010000 { + u-boot,dm-pre-reloc; + + uart { + u-boot,dm-pre-reloc; + }; + }; + clock-controller@300000 { u-boot,dm-pre-reloc; }; serial@75b0000 { u-boot,dm-pre-reloc; - }; }; + }; }; &pm8994_pon { diff --git a/arch/arm/dts/dragonboard820c.dts b/arch/arm/dts/dragonboard820c.dts index 34abbc9110..dac15775dd 100644 --- a/arch/arm/dts/dragonboard820c.dts +++ b/arch/arm/dts/dragonboard820c.dts @@ -8,6 +8,7 @@ /dts-v1/; #include "skeleton64.dtsi" +#include / { model = "Qualcomm Technologies, Inc. DB820c"; @@ -16,7 +17,7 @@ #size-cells = <2>; aliases { - serial0 = &blsp2_uart1; + serial0 = &blsp2_uart2; }; chosen { @@ -63,18 +64,32 @@ reg = <0x300000 0x90000>; }; - blsp2_uart1: serial@75b0000 { + pinctrl: qcom,tlmm@1010000 { + compatible = "qcom,tlmm-apq8096"; + reg = <0x1010000 0x400000>; + + blsp8_uart: uart { + function = "blsp_uart8"; + pins = "GPIO_4", "GPIO_5"; + drive-strength = ; + bias-disable; + }; + }; + + blsp2_uart2: serial@75b0000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x75b0000 0x1000>; clock = <&gcc 4>; + pinctrl-names = "uart"; + pinctrl-0 = <&blsp8_uart>; }; sdhc2: sdhci@74a4900 { - compatible = "qcom,sdhci-msm-v4"; - reg = <0x74a4900 0x314>, <0x74a4000 0x800>; - index = <0x0>; - bus-width = <4>; - clock = <&gcc 0>; + compatible = "qcom,sdhci-msm-v4"; + reg = <0x74a4900 0x314>, <0x74a4000 0x800>; + index = <0x0>; + bus-width = <4>; + clock = <&gcc 0>; clock-frequency = <200000000>; };