From patchwork Thu Feb 28 15:45:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 159402 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp795133jad; Thu, 28 Feb 2019 07:45:39 -0800 (PST) X-Google-Smtp-Source: AHgI3IY6Vh2Fpt3Vr0bnp+IhizwiVylNpZevLHGHvN/8LW3x2VihuXDs/V7DwnD+sh+CpMmiy68d X-Received: by 2002:a62:cf02:: with SMTP id b2mr216748pfg.71.1551368739680; Thu, 28 Feb 2019 07:45:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551368739; cv=none; d=google.com; s=arc-20160816; b=FgX6Y16teOPO7YcZWfJgT3cIK7aWo1sylTrFXjEkIVC9PTjAdg+SR5RXwEybk23lJ1 J5gAhuRjwrEDm1+78VGmBpSXw5gHzlRtRMm/cypGKgVuMCzCB/0Bi4XGc0MN5d27zHS6 +yPTck0KzGPGJFS7Js8xh3gqmdh/j8hF5746tUyT7VBga/OZiDX13IoFLmX7jQU6S9OP 4uNEjHFvbpvsIAevdCVbsTBIrKByDNPInS8x8f7zxE1KeUAgIOO1Qa4DvcXvAMn768oR heMXmEkbj8zmQRjmVMDKZMKsa2Yl527jgCayVMzD6+jM2wB8/Fma8/tNqhfsmjiA+dih zRQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=UlIvDrB8jEqxMcTRJrwwAoaBexZYNRihPSUXhNkMYCo=; b=CBREhvCmDC3BhbWVq/JgaY5GQodA2vmlYWNmbSDC7eGmRgbsfK59JT5bTaFn+wLYQe XhdmwBp6oxNcZr8953DQAaieC9ASFdmTc+E7tFhUQqfedZSwk61NKblhwOPaCgED+bx0 nPDz7U6B/ZHTKr37+a671PHIWI/XUO/b28uBAwmW9CFm06BWfB0+YCRBwpWarZxRreCZ rjx+UsXD80Wfp/AYvoE2/Plfpe/5lvQ9WKbVdseAYwpgXF816Kt3umBfd4wVheUdBjy/ mgnS1YVFRymRNJme6QOpILlQiST7TUUP4Aw728dPj2dF9yDhWbQ3GNbsFPk5RFN9adLA Djvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z9i3uLpK; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r9si17784893pfh.188.2019.02.28.07.45.39; Thu, 28 Feb 2019 07:45:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z9i3uLpK; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733081AbfB1Ppi (ORCPT + 7 others); Thu, 28 Feb 2019 10:45:38 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:36300 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731175AbfB1Ppi (ORCPT ); Thu, 28 Feb 2019 10:45:38 -0500 Received: by mail-pg1-f194.google.com with SMTP id r124so9904437pgr.3 for ; Thu, 28 Feb 2019 07:45:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UlIvDrB8jEqxMcTRJrwwAoaBexZYNRihPSUXhNkMYCo=; b=Z9i3uLpKTrJ8YPmOgp6eUBBfB+cDVGhrKtQmPq4iGIzAdX6jtFeVIp/rtB6R6ONi93 PkrZj/1nKA3DIrcP0/wlxyv2inKTwnsb+A9fQziCnrG/wjcNs9LpDsNES886UmTZhUb+ LXTjf2JyP4voCKqen7fRAZxrT5bkIQJ1ntV+SEgWnvKyBNyEk0UH1FB5XaxJMs4sMYyU CmWU2ft/l5YVjocpzxnKMWfsPxb2SoFrTxsrWcHD6iXBI6XGRfD3EB9aGiCQqECOfrLr NeV8YrGtY/NEIpDFdMmP6WH24nffNWwtCtMS93AtE91atfuEUzSS1LTxemZ/Chj6OwpB 43aw== 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=UlIvDrB8jEqxMcTRJrwwAoaBexZYNRihPSUXhNkMYCo=; b=b1nasdFXh+7N25tUQLvpT6fhcrxStQGPBd9jY2xRTiuR7nIABfvfCMrodN4N8IPjze zndyTq4TABYfTPF5Z00CGbnlWx1X8ZrdbIEHNa5NkvX8Az0dH/l17MYHYbCZhbAzgGEu OXYJjem7T/60821Ti+7ulYt91khcWZPgeJAKrrsJDJ98sBIySmHFEF4z+Yn5OYCNzWsP IwB8q2ShUe3VJwUygWqhv31rWqO9h/w8Poiq7wBTUIDiScETJPWaAKvjd5mUtKYphaC9 2M2Yu0AM8zSEknprFBJqECtwU9Vb0qSMlhHzYJ+HoL+iBD2zxbY5NzuwcHSWtPgDrlXN LEFg== X-Gm-Message-State: AHQUAubiWum3drr0o1v6z2Z8kvz67CEy0QIAUHKWYj9mxgOCDJGhTspT 9y22nGLujljXupHrEOUSFwCc X-Received: by 2002:a63:d49:: with SMTP id 9mr9024690pgn.27.1551368737474; Thu, 28 Feb 2019 07:45:37 -0800 (PST) Received: from localhost.localdomain ([2409:4072:905:9c3:2dd3:3db1:5145:4da9]) by smtp.gmail.com with ESMTPSA id m13sm37485286pff.175.2019.02.28.07.45.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 07:45:36 -0800 (PST) From: Manivannan Sadhasivam To: xuwei5@hisilicon.com, robh+dt@kernel.org Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, john.stultz@linaro.org, amit.kucheria@linaro.org, guodong.xu@linaro.org, Manivannan Sadhasivam Subject: [PATCH 2/3] arm64: dts: hisilicon: hi3670: Add MMC controller support Date: Thu, 28 Feb 2019 21:15:10 +0530 Message-Id: <20190228154511.17566-3-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228154511.17566-1-manivannan.sadhasivam@linaro.org> References: <20190228154511.17566-1-manivannan.sadhasivam@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add MMC controller support for HiSilicon HI3670 SoC reusing the HI3660 Designware MMC driver. There are 2 DWMMC controllers present in this SoC: 1. DWMMC1 is used for SD card (SD) 2. DWMMC2 is used for WiFi (SDIO) Signed-off-by: Manivannan Sadhasivam --- arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) -- 2.17.1 diff --git a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi index 9864cf59ebd8..080d6ba5ae39 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi @@ -671,5 +671,42 @@ resets = <&crg_rst 0x84 12>; reset-names = "rst"; }; + + /* SD */ + dwmmc1: dwmmc1@ff37f000 { + compatible = "hisilicon,hi3670-dw-mshc", + "hisilicon,hi3660-dw-mshc"; + reg = <0x0 0xff37f000 0x0 0x1000>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = ; + clocks = <&crg_ctrl HI3670_CLK_GATE_SD>, + <&crg_ctrl HI3670_HCLK_GATE_SD>; + clock-names = "ciu", "biu"; + clock-frequency = <3200000>; + resets = <&crg_rst 0x94 18>; + reset-names = "reset"; + hisilicon,peripheral-syscon = <&sctrl>; + card-detect-delay = <200>; + status = "disabled"; + }; + + /* SDIO */ + dwmmc2: dwmmc2@fc183000 { + compatible = "hisilicon,hi3670-dw-mshc", + "hisilicon,hi3660-dw-mshc"; + reg = <0x0 0xfc183000 0x0 0x1000>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = ; + clocks = <&crg_ctrl HI3670_CLK_GATE_SDIO>, + <&crg_ctrl HI3670_HCLK_GATE_SDIO>; + clock-names = "ciu", "biu"; + clock-frequency = <3200000>; + resets = <&crg_rst 0x94 20>; + reset-names = "reset"; + card-detect-delay = <200>; + status = "disabled"; + }; }; }; From patchwork Thu Feb 28 15:45:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 159403 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp795246jad; Thu, 28 Feb 2019 07:45:45 -0800 (PST) X-Google-Smtp-Source: APXvYqxQvHyOEer9jQ5MNdnBYiKCm5v4rlhiDNmBcbTuFK5jY4zKgRmnhwSg8iPm3NJGhz/NB+Vk X-Received: by 2002:a17:902:aa06:: with SMTP id be6mr9588plb.57.1551368745116; Thu, 28 Feb 2019 07:45:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551368745; cv=none; d=google.com; s=arc-20160816; b=Y8FswZ/cJB9O+etYN1oT5SDty2buKxU7mSGyQNoVVAWw6xxLnwh+HsvMFJdsuxzl/3 OesoGIbtej4yOOBCoDAk23EnbANfLhqwR0uIIfQZm85D/DzYWpygtqbODNczUk/uyBZ4 1QuhcIoAO1hR6DIzMyanTx95+mts+7Tr9IrIDth6EnVhcEyv2OeC/qqItwB045hphafq ouzQghlx/ZROYoh/YVfchN3GrY86YWTxSz2mPH+0EVFxaevKVeHaROppQTVAfPPT1TwD u4CAfocomoYI69EQ1pYogCyEp1zpWREC0A+VOr7VWJDd4AupW79aWyPLED3r6kEShtpG WsIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=c+AELDY17wHmxjiCNCeFeLqIyPtQM6I4vkrBuOGF1VU=; b=QpY4WLlGrArg4+of1dUE83fbJBDjl6pKAJLKG7JWC1NeAsD4SGrxEDM3OasrEtHoFS 1eD/9ZiZYH94bFx/npJUa08kvYUmHkuAZDRhwpYdmJ5YOgO1JOLfus2bqmi1BnK3rMRF jtJTYjYbOzNe+KfYVKb0gL/FeTqpK8B4ICSeT47NZ4AGy/m3O1uDYbwlY1K4hB8KMIEu c545HjCLum7yUgDdntNdKH1ZUw493l2nEFy2CRoo69uGbWEU/rM4sZz5Ty3oE8BMVso/ uQoxpcJkmH1Nlbtemam3NdPYR/I04+PKnmYh9+7ZmcUGNDmx1T4npTzN14ECqaSNIxmv dVew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Uv+SiUFF; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d4si8518723pla.112.2019.02.28.07.45.44; Thu, 28 Feb 2019 07:45:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Uv+SiUFF; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733256AbfB1Ppo (ORCPT + 7 others); Thu, 28 Feb 2019 10:45:44 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:41116 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730870AbfB1Ppn (ORCPT ); Thu, 28 Feb 2019 10:45:43 -0500 Received: by mail-pf1-f195.google.com with SMTP id d25so9901073pfn.8 for ; Thu, 28 Feb 2019 07:45:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=c+AELDY17wHmxjiCNCeFeLqIyPtQM6I4vkrBuOGF1VU=; b=Uv+SiUFFLWsLlKGPC2nF6SSc0x20Zh50g5+rEr8hKxKL6mQdh2m83YW+tgeWvxSo0x Y9IYNmegzPnSeM4yeLPKwHvtpVfjVuW8dK8hAXWh8XMeo9OcNQgHOvCs0XZ+s7iG+2tc T3ewzdeukLgjDjHtf2ynCaOoJeHIA8sa0lpGN0NJza//OloVREbW1+I9UUZVz95QReBE g28nDI+7PhlE85/TY8FQfxEfLURNam7LMvvI4pnzHZ+62sNh3H31I3Oxjg6RrvCwsPx5 9rj7jL+nLy812pGtD/NPheWNtW4QbKg5VSsuhoGCfKvlTRo8dWWaOotYnn6KNT1023uR sCEg== 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=c+AELDY17wHmxjiCNCeFeLqIyPtQM6I4vkrBuOGF1VU=; b=d7GcrQYujZwEFta4Jsxcc2ZTr9NJXO3jKj5EKAhaiwbR68+Ahp3Jkoki83Kh+Be7ax mrIZ8Hxcmrg4/kKSaDQBxbZCQmlYMwtpacn4L/BkWBGBf4k4WzxiD8NGuU8lPq15lsvm 5ugmBp3VKswdcSe2MhtSJF8mPxlDZXNaFZNwhP5ed7tBIXlIKCkmSk5vEOpOXdY45e2/ jcqtSsxseHOpZ3hRKcBX0Q55z4tijQe8wr6TnB8rTK6ppssb5qrZAtArpJPkalfH/4zq 6Z60k4kAQwgTcfQk+Kuf6+gZwGWdZM+m4oTYgjFhtucJHpr6JQb3JJccmVa6oOz1qhd0 Rh5A== X-Gm-Message-State: AHQUAuY4tqwwLvZdLVwMfOYMaX1DsuvgSgm0N2uM6dN6wSEl0gN2X1rs IUn2E354YYU0glcPk7sOaP8K X-Received: by 2002:aa7:9102:: with SMTP id 2mr199296pfh.179.1551368742712; Thu, 28 Feb 2019 07:45:42 -0800 (PST) Received: from localhost.localdomain ([2409:4072:905:9c3:2dd3:3db1:5145:4da9]) by smtp.gmail.com with ESMTPSA id m13sm37485286pff.175.2019.02.28.07.45.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 07:45:42 -0800 (PST) From: Manivannan Sadhasivam To: xuwei5@hisilicon.com, robh+dt@kernel.org Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, john.stultz@linaro.org, amit.kucheria@linaro.org, guodong.xu@linaro.org, Manivannan Sadhasivam Subject: [PATCH 3/3] arm64: dts: hisilicon: hikey970: Add SD and WiFi support Date: Thu, 28 Feb 2019 21:15:11 +0530 Message-Id: <20190228154511.17566-4-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228154511.17566-1-manivannan.sadhasivam@linaro.org> References: <20190228154511.17566-1-manivannan.sadhasivam@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add SD and WiFi support for HiKey970 board based on HI3670 SoC. Due to the absence of the PMIC driver, fixed regulators are sourced to make the driver working. Signed-off-by: Manivannan Sadhasivam --- .../boot/dts/hisilicon/hi3670-hikey970.dts | 75 ++++++++++++ .../boot/dts/hisilicon/hikey970-pinctrl.dtsi | 115 ++++++++++++++++++ 2 files changed, 190 insertions(+) -- 2.17.1 diff --git a/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts b/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts index c9775b66629f..7dac33d4fd5c 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts @@ -8,6 +8,7 @@ */ /dts-v1/; +#include #include "hi3670.dtsi" #include "hikey970-pinctrl.dtsi" @@ -17,6 +18,8 @@ compatible = "hisilicon,hi3670-hikey970", "hisilicon,hi3670"; aliases { + mshc1 = &dwmmc1; + mshc2 = &dwmmc2; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; @@ -35,6 +38,37 @@ /* expect bootloader to fill in this region */ reg = <0x0 0x0 0x0 0x0>; }; + + sd_1v8: regulator-1v8 { + compatible = "regulator-fixed"; + regulator-name = "fixed-1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + sd_3v3: regulator-3v3 { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + wlan_en: wlan-en-1-8v { + compatible = "regulator-fixed"; + regulator-name = "wlan-en-regulator"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + /* GPIO_051_WIFI_EN */ + gpio = <&gpio6 3 0>; + + /* WLAN card specific delay */ + startup-delay-us = <70000>; + enable-active-high; + }; }; /* @@ -354,6 +388,47 @@ "GPIO_231_HDMI_INT"; }; +&dwmmc1 { + bus-width = <0x4>; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + cap-sd-highspeed; + disable-wp; + cd-inverted; + cd-gpios = <&gpio25 5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&sd_pmx_func + &sd_clk_cfg_func + &sd_cfg_func>; + vmmc-supply = <&sd_3v3>; + vqmmc-supply = <&sd_1v8>; + status = "okay"; +}; + +&dwmmc2 { /* WIFI */ + bus-width = <0x4>; + non-removable; + broken-cd; + cap-power-off-card; + pinctrl-names = "default"; + pinctrl-0 = <&sdio_pmx_func + &sdio_clk_cfg_func + &sdio_cfg_func>; + /* WL_EN */ + vmmc-supply = <&wlan_en>; + status = "ok"; + + wlcore: wlcore@2 { + compatible = "ti,wl1837"; + reg = <2>; /* sdio func num */ + /* WL_IRQ, GPIO_177_WL_WAKEUP_AP */ + interrupt-parent = <&gpio22>; + interrupts = <1 IRQ_TYPE_EDGE_RISING>; + }; +}; + &uart0 { /* On High speed expansion header */ label = "HS-UART0"; diff --git a/arch/arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi b/arch/arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi index 67bb52d43619..d456b0aa6f58 100644 --- a/arch/arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi @@ -196,6 +196,16 @@ /* pin base, nr pins & gpio function */ pinctrl-single,gpio-range = <&range 0 10 0>; + sdio_pmx_func: sdio_pmx_func { + pinctrl-single,pins = < + 0x000 MUX_M1 /* SDIO_CLK */ + 0x004 MUX_M1 /* SDIO_CMD */ + 0x008 MUX_M1 /* SDIO_DATA0 */ + 0x00c MUX_M1 /* SDIO_DATA1 */ + 0x010 MUX_M1 /* SDIO_DATA2 */ + 0x014 MUX_M1 /* SDIO_DATA3 */ + >; + }; }; pmx6: pinmux@fc182800 { @@ -203,6 +213,52 @@ reg = <0x0 0xfc182800 0x0 0x028>; #pinctrl-cells = <1>; pinctrl-single,register-width = <0x20>; + + sdio_clk_cfg_func: sdio_clk_cfg_func { + pinctrl-single,pins = < + 0x000 0x0 /* SDIO_CLK */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE6_32MA DRIVE6_MASK + >; + }; + + sdio_cfg_func: sdio_cfg_func { + pinctrl-single,pins = < + 0x004 0x0 /* SDIO_CMD */ + 0x008 0x0 /* SDIO_DATA0 */ + 0x00c 0x0 /* SDIO_DATA1 */ + 0x010 0x0 /* SDIO_DATA2 */ + 0x014 0x0 /* SDIO_DATA3 */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_UP + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE6_19MA DRIVE6_MASK + >; + }; }; pmx7: pinmux@ff37e000 { @@ -214,6 +270,17 @@ pinctrl-single,function-mask = <7>; /* pin base, nr pins & gpio function */ pinctrl-single,gpio-range = <&range 0 12 0>; + + sd_pmx_func: sd_pmx_func { + pinctrl-single,pins = < + 0x000 MUX_M1 /* SD_CLK */ + 0x004 MUX_M1 /* SD_CMD */ + 0x008 MUX_M1 /* SD_DATA0 */ + 0x00c MUX_M1 /* SD_DATA1 */ + 0x010 MUX_M1 /* SD_DATA2 */ + 0x014 MUX_M1 /* SD_DATA3 */ + >; + }; }; pmx8: pinmux@ff37e800 { @@ -221,6 +288,54 @@ reg = <0x0 0xff37e800 0x0 0x030>; #pinctrl-cells = <1>; pinctrl-single,register-width = <0x20>; + + sd_clk_cfg_func: sd_clk_cfg_func { + pinctrl-single,pins = < + 0x000 0x0 /* SD_CLK */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE6_32MA + DRIVE6_MASK + >; + }; + + sd_cfg_func: sd_cfg_func { + pinctrl-single,pins = < + 0x004 0x0 /* SD_CMD */ + 0x008 0x0 /* SD_DATA0 */ + 0x00c 0x0 /* SD_DATA1 */ + 0x010 0x0 /* SD_DATA2 */ + 0x014 0x0 /* SD_DATA3 */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_UP + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE6_19MA + DRIVE6_MASK + >; + }; }; pmx1: pinmux@fff11000 {