From patchwork Fri Aug 12 22:54:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 1062492 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7CN5jJ5019558 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 12 Aug 2011 23:06:07 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qs0lr-0000y7-Gi; Fri, 12 Aug 2011 23:04:09 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qs0g7-0000KG-Al; Fri, 12 Aug 2011 22:58:11 +0000 Received: from avon.wwwdotorg.org ([2001:470:1f0f:bd7::2]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qs0dT-00084X-6B for linux-arm-kernel@lists.infradead.org; Fri, 12 Aug 2011 22:55:29 +0000 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id B440D634F; Fri, 12 Aug 2011 16:56:28 -0600 (MDT) Received: from localhost.localdomain (searspoint.nvidia.com [216.228.112.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id C90A1E4105; Fri, 12 Aug 2011 16:55:23 -0600 (MDT) From: Stephen Warren To: Grant Likely , Colin Cross , Erik Gilling , Olof Johansson Subject: [RFC PATCH 10/12] arm/tegra: Add device tree support to pinmux driver Date: Fri, 12 Aug 2011 16:54:55 -0600 Message-Id: <1313189697-21287-11-git-send-email-swarren@nvidia.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1313189697-21287-1-git-send-email-swarren@nvidia.com> References: <1313189697-21287-1-git-send-email-swarren@nvidia.com> X-Virus-Scanned: clamav-milter 0.96.5 at avon.wwwdotorg.org X-Virus-Status: Clean X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110812_185527_544737_EC75CF57 X-CRM114-Status: GOOD ( 18.15 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- Cc: Russell King , Arnd Bergmann , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, Stephen Warren , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 12 Aug 2011 23:06:07 +0000 (UTC) Signed-off-by: Stephen Warren --- arch/arm/mach-tegra/pinmux.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 115 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c index 05fa1a3..33246c2 100644 --- a/arch/arm/mach-tegra/pinmux.c +++ b/arch/arm/mach-tegra/pinmux.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -147,6 +148,41 @@ static const char *func_name(enum tegra_mux_func func) return tegra_mux_names[func]; } +#ifdef CONFIG_OF +static int func_enum(const char *name, enum tegra_mux_func *func_out) +{ + int func; + + if (!strcmp(name, "RSVD1")) { + *func_out = TEGRA_MUX_RSVD1; + return 0; + } + if (!strcmp(name, "RSVD2")) { + *func_out = TEGRA_MUX_RSVD2; + return 0; + } + if (!strcmp(name, "RSVD3")) { + *func_out = TEGRA_MUX_RSVD3; + return 0; + } + if (!strcmp(name, "RSVD4")) { + *func_out = TEGRA_MUX_RSVD4; + return 0; + } + if (!strcmp(name, "NONE")) { + *func_out = TEGRA_MUX_NONE; + return 0; + } + + for (func = 0; func < TEGRA_MAX_MUX; func++) + if (!strcmp(name, tegra_mux_names[func])) { + *func_out = func; + return 0; + } + + return -EINVAL; +} +#endif static const char *tri_name(unsigned long val) { @@ -666,15 +702,94 @@ void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *co } } +#ifdef CONFIG_OF +static void __init tegra_pinmux_probe_dt(struct platform_device *pdev) +{ + int pg; + + for (pg = 0; pg < TEGRA_MAX_PINGROUP; pg++) { + const char *pg_name = pingroup_name(pg); + struct tegra_pingroup_config config; + struct device_node *pg_node; + int ret; + const char *s; + + pg_node = of_find_child_node_by_name(pdev->dev.of_node, + pg_name); + if (pg_node == NULL) + continue; + + config.pingroup = pg; + + ret = of_property_read_string(pg_node, "nvidia,function", &s); + if (ret < 0) { + dev_err(&pdev->dev, + "%s: Missing property nvidia,function\n", + pg_name); + continue; + } + ret = func_enum(s, &config.func); + if (ret < 0) { + dev_err(&pdev->dev, + "%s: Invalid nvidia,function value %s\n", + pg_name, s); + continue; + } + + ret = of_property_read_string(pg_node, "nvidia,pull", &s); + if (ret >= 0) { + if (!strcmp(s, "up")) + config.pupd = TEGRA_PUPD_PULL_UP; + else if (!strcmp(s, "down")) + config.pupd = TEGRA_PUPD_PULL_DOWN; + else if (!strcmp(s, "normal")) + config.pupd = TEGRA_PUPD_NORMAL; + else { + dev_err(&pdev->dev, + "%s: Invalid nvidia,pull value %s\n", + pg_name, s); + continue; + } + } else + config.pupd = TEGRA_PUPD_NORMAL; + + if (of_find_property(pg_node, "nvidia,tristate", NULL)) + config.tristate = TEGRA_TRI_TRISTATE; + else + config.tristate = TEGRA_TRI_NORMAL; + + dev_err(&pdev->dev, "%s: func %d (%s) pull %d tri %d\n", + pg_name, config.func, func_name(config.func), + config.pupd, config.tristate); + + tegra_pinmux_config_pingroup(&config); + + of_node_put(pg_node); + } +} +#else +static inline void __init tegra_pinmux_probe_dt(struct platform_device *pdev) +{ +} +#endif + static int __init tegra_pinmux_probe(struct platform_device *pdev) { + tegra_pinmux_probe_dt(pdev); + return 0; } +static struct of_device_id tegra_pinmux_of_match[] __devinitdata = { + { .compatible = "nvidia,tegra20-pinmux", }, + { }, +}; + static struct platform_driver tegra_pinmux_driver = { .driver = { .name = "tegra-pinmux", .owner = THIS_MODULE, + .of_match_table = tegra_pinmux_of_match, }, .probe = tegra_pinmux_probe, };