From patchwork Fri Oct 23 18:18:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11854369 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E50E5C56201 for ; Fri, 23 Oct 2020 18:20:09 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 641ED2192A for ; Fri, 23 Oct 2020 18:20:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qcvIJA8S"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="pk9cTuw5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 641ED2192A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bAsG+UGrxHv70jBAa+wb0qh6sg+9rAdwPsMxJ6093Os=; b=qcvIJA8SrUg9/ETPaP6vOfL/z lnPYW74GLZhLLeNUFGnIj9EYpJNCutr11La7yLdGwovFP2ElWWWtYTSNlfeUoF2bQoDY5SfpnlUjW BpHkklORdexrT93A48epipHAXXJGws3em6mD8CF+SvmCx+K6mRHDUpFf+qK2qeAH81KWBYHy7QmYY v1le6JtzMzQ8lN06Okm+L5pnxUolbCB9BpU2QMQcsXd9SHa8IY23/GG3grsA79PFWc4jjl4hmeKHE txzrAS5+OaouCNSyItewjtUIBFiMIEG+EL/u+uqrlQCr5z75IvfAGRCh8xLKavLDs80dFhOSFjxgs DN624TcQg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kW1eI-0007Qu-VK; Fri, 23 Oct 2020 18:18:47 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kW1e9-0007Ol-N6 for linux-arm-kernel@lists.infradead.org; Fri, 23 Oct 2020 18:18:40 +0000 Received: by mail-pf1-x441.google.com with SMTP id e10so1999284pfj.1 for ; Fri, 23 Oct 2020 11:18:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TodvX9MTBX7vTykdv70rmek7Lo3V0evCYJjQaUL+VJE=; b=pk9cTuw5sWjL9dMKYE/Zfxs3S2rkulRAJrsheIWcrgFP8sZyVF8n+sITafKUJONJr9 lgdBm3Pr4BRoNjcEasVyfAstxqMSmZBHuE8IJ85+q+He1IihI7qo8yPp9K6n5Ehwc4C6 DldFcIvPFLQ3qIVmAatrU9ap8S6guuEdQZKnU= 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=TodvX9MTBX7vTykdv70rmek7Lo3V0evCYJjQaUL+VJE=; b=ZQb/WhAu0x2C11pttfdmdVSxC071CTVIt+qoQkCjHUMQffLruJ8J5A+RTapX4ExrEN 6dMmtKNQHxDmnRC8mDiZsRS8CK/b5mHvWJ9ciYbcFVVO8PCjgE2mFqpJ3mvcm2CIT3AL zKwKwz7uO3BPy73Dvs/qlvOAQRy3fMhPowsNq/yQXfvxTK6tOomewhdgsC8Juoup3PG6 BFRpyM7uVvE3E9kwBsRCdXUjZa4cH7lrZacIWi/1pm3xckeTb36YODqjgz1wTqH1VPfH H4ESi6n7obMO/iHhsbH3hrwBDNJBkWUxvBP3YNok5eFegllOT+vXL2qBeNy8+D/Lpxse P1aA== X-Gm-Message-State: AOAM531uUb/va4kcf9xU0lfBaz6JF6dc+rBy7cuvKRdXMUkfBkVa5xZW ewiDj/eOGZqnByPod0AwQh2TEg== X-Google-Smtp-Source: ABdhPJxQW2pUQfxcv7j3aOU6N98NepZVuSxtJOAGI9h+/OdIr68fiDyV4dSGLx4Br4bp3DQaku7nRQ== X-Received: by 2002:a05:6a00:1742:b029:155:dcd2:9155 with SMTP id j2-20020a056a001742b0290155dcd29155mr3543036pfc.78.1603477116038; Fri, 23 Oct 2020 11:18:36 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7a4:2d08:2249:ad54:d32d]) by smtp.gmail.com with ESMTPSA id q24sm3271162pfn.72.2020.10.23.11.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 11:18:35 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring , Catalin Marinas , Will Deacon Subject: [PATCH 2/2] ARM: dts: rockchip: Add SDIO0 node for VMARC SOM Date: Fri, 23 Oct 2020 23:48:14 +0530 Message-Id: <20201023181814.220974-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201023181814.220974-1-jagan@amarulasolutions.com> References: <20201023181814.220974-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201023_141837_828882_A19C0219 X-CRM114-Status: GOOD ( 15.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Tom Cubie , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Jagan Teki , Suniel Mahesh , linux-amarula , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rockchip RK3288 and RK3399Pro based VMARC SOM has sdio0 for connecting WiFi/BT devices as a pluggable card via M.2 E-Key. Add associated sdio0 nodes, properties. Signed-off-by: Jagan Teki --- arch/arm/boot/dts/rk3288-vmarc-som.dtsi | 40 +++++++++++++++++++ .../dts/rockchip-radxa-dalang-carrier.dtsi | 21 ++++++++++ .../dts/rockchip/rk3399pro-vmarc-som.dtsi | 16 ++++++++ 3 files changed, 77 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-vmarc-som.dtsi b/arch/arm/boot/dts/rk3288-vmarc-som.dtsi index 4a373f5aa600..353d95b9953b 100644 --- a/arch/arm/boot/dts/rk3288-vmarc-som.dtsi +++ b/arch/arm/boot/dts/rk3288-vmarc-som.dtsi @@ -231,6 +231,23 @@ regulator-state-mem { }; }; +&i2c1 { + clock-frequency = <400000>; + status = "okay"; + + hym8563: hym8563@51 { + compatible = "haoyu,hym8563"; + reg = <0x51>; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "hym8563"; + pinctrl-names = "default"; + pinctrl-0 = <&hym8563_int>; + interrupt-parent = <&gpio5>; + interrupts = ; + }; +}; + &i2c5 { status = "okay"; }; @@ -241,10 +258,17 @@ &io_domains { gpio1830-supply = <&vcc_18>; gpio30-supply = <&vcc_io>; sdcard-supply = <&vccio_sd>; + wifi-supply = <&vcc_wl>; status = "okay"; }; &pinctrl { + hym8563 { + hym8563_int: hym8563-int { + rockchip,pins = <5 RK_PC3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma { drive-strength = <8>; }; @@ -260,6 +284,12 @@ pmic_int: pmic-int { }; }; + sdio-pwrseq { + wifi_enable_h: wifi-enable-h { + rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + sdmmc { sdmmc_bus4: sdmmc-bus4 { rockchip,pins = @@ -291,6 +321,16 @@ usb0_en_oc: usb0-en-oc { }; }; +&sdio_pwrseq { + /* + * On the module itself this is one of these (depending + * on the actual card populated): + * - SDIO_RESET_L_WL_REG_ON + * - PDN (power down when low) + */ + reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>; /* WIFI_REG_ON */ +}; + &usbphy { status = "okay"; }; diff --git a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi index 26b53eac4706..da1d548b7330 100644 --- a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi +++ b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi @@ -15,6 +15,14 @@ clkin_gmac: external-gmac-clock { #clock-cells = <0>; }; + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&hym8563>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_enable_h>; + }; + vcc12v_dcin: vcc12v-dcin-regulator { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; @@ -78,6 +86,19 @@ &pwm2 { status = "okay"; }; +&sdio0 { + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + keep-power-in-suspend; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; + sd-uhs-sdr104; + status = "okay"; +}; + &sdmmc { bus-width = <4>; cap-mmc-highspeed; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi index 5d087be04af8..7257494d2831 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi @@ -353,6 +353,12 @@ pmic_int_l: pmic-int-l { }; }; + sdio-pwrseq { + wifi_enable_h: wifi-enable-h { + rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + vbus_host { usb1_en_oc: usb1-en-oc { rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>; @@ -371,6 +377,16 @@ &pmu_io_domains { pmu1830-supply = <&vcc_1v8>; }; +&sdio_pwrseq { + /* + * On the module itself this is one of these (depending + * on the actual card populated): + * - SDIO_RESET_L_WL_REG_ON + * - PDN (power down when low) + */ + reset-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>; +}; + &sdhci { bus-width = <8>; mmc-hs400-1_8v;