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