From patchwork Mon Jun 3 10:03:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10972693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 943A814B6 for ; Mon, 3 Jun 2019 10:04:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80FE5288FD for ; Mon, 3 Jun 2019 10:04:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 751C52890C; Mon, 3 Jun 2019 10:04:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 07EB628911 for ; Mon, 3 Jun 2019 10:04:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=arBoFgHz7P5znZF+X2E15rnpEedFVSBzqKl92SUfxkE=; b=HGrJgGqBjZg25O lGpjOyYH1Bc8bmMindQUAuIQu4IoFfgbcA/08MqFjAyj5QI3Oa6fBBGG3qWmwDYzHG2BS8m3z8uFX QZqlQV959zgeLsszrxsDFu8JFvKfGFiaiLoKsW94PS6z0ZkoMSUTssyEfDUJnJUOyaB1Q39Th8/lJ 6LRmfvzMQ8CildJfN0H45ai+jmY43zUmwA/TpRvPRmfLi9ppT0QeTo45Ldto7P2s7tzuqLSz5UfXc 09oUuN9nyVNWc53ul2/bcsX27IsAMBpdJi8d9bbB0/1fLKyKchHzTv5XQK9sTfthtUjfPGmnwve5i OtKcWjR88RtanpR6qyWA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXjpI-00072Z-7F; Mon, 03 Jun 2019 10:04:24 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXjov-0006Te-QS for linux-amlogic@lists.infradead.org; Mon, 03 Jun 2019 10:04:04 +0000 Received: by mail-wr1-x444.google.com with SMTP id n4so8314424wrs.3 for ; Mon, 03 Jun 2019 03:04:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NwPSWWGObMkHXMOeR+gIVa53r6KxHy0rClRR5SSOu0s=; b=LaIe2IKRve/90fzL0agIqUjbzlX+PnoIr8C4ZdXb6ufSpMEAPi3+sMsyto+a3Nmapr 96FD0oG9ZgU9Io3EsEyulge8RBTorN7CTO+dip+1qKE8RdkLQvU2gZrmjC3dZOz5R4oU AA2w53Jlk20uuHZS3He4++2BeNtLS2cbykFarzF7DXYXVrOsvTUV3RZd56ey8COZU6Cj l7iMn0Mek6XykBR1AQp6D4++P8dNd1VaizxSc4KlQRiZ+pOJWQlOm6PhRO0f6W1n7YG2 mTTlV4TQO+YIHBG6f0fn1oSYGZbqWjPSS8AW/gbrzLZ09Ui6yblFSk76wVX5t5lruqiO eHIw== 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=NwPSWWGObMkHXMOeR+gIVa53r6KxHy0rClRR5SSOu0s=; b=nRjk0WxNAXxuOr4xuqf+bWfFrQ01AFEogtzGdDpeZz+UDToAdjkkfg209boBqQbwU1 ceYqh4nPx4GpMUeIJeGrgMjs9hY1K9FVabXMGkmT/NiEMccuaafGy9MqmDb9q52DCJFl 1gXPYHe9VfczckT0EYPM7INQTNluwrwjRN5EP+8R1cHU6gnIn211UpyiH9/FJhVOKpdJ /9FjpjMV1cd2gpsZ/kKfB5rbkXZNaxf2QtmWx3W5vo4FE9bSi2gWoc7s/KM3I6iKIUmB 7bSoe4BDaeB0giXG179GLdKs5AAAG+MVGD+bdD6GnNKaHP/00mQhFvW8Gq/tEU2mtmST 9DXQ== X-Gm-Message-State: APjAAAWZJ59BiD6SL9miC2vfM+VIewjYRAdBMpxE5PzFA5WVEKvmYZLE iO+T3ohaQun9Bf3aZzP+doTUUg== X-Google-Smtp-Source: APXvYqxyGuUH/KVeKqqLhvxZgkmMQha/6dftUknznXW10S/gBILTtO4dIUOAhBdtBbaazM61NZR8Mg== X-Received: by 2002:a5d:6745:: with SMTP id l5mr1726471wrw.160.1559556240219; Mon, 03 Jun 2019 03:04:00 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id o3sm11282098wrv.94.2019.06.03.03.03.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Jun 2019 03:03:59 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 1/4] arm64: dts: meson: g12a: add SDIO controller Date: Mon, 3 Jun 2019 12:03:54 +0200 Message-Id: <20190603100357.16799-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190603100357.16799-1-narmstrong@baylibre.com> References: <20190603100357.16799-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190603_030401_851400_92DB05D0 X-CRM114-Status: UNSURE ( 9.89 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, Neil Armstrong , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jerome Brunet The Amlogic G12A SDIO Controller has a bug preventing direct DDR access, add the port A (SDIO) pinctrl and controller nodes and mark this specific controller with the amlogic,dram-access-quirk property. Signed-off-by: Jerome Brunet Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 37 +++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 840dab606110..9139913387ab 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -1313,6 +1313,30 @@ }; }; + sdio_pins: sdio { + mux { + groups = "sdio_d0", + "sdio_d1", + "sdio_d2", + "sdio_d3", + "sdio_cmd", + "sdio_clk"; + function = "sdio"; + bias-disable; + drive-strength-microamp = <4000>; + }; + }; + + sdio_clk_gate_pins: sdio_clk_gate { + mux { + groups = "GPIOX_4"; + function = "gpio_periphs"; + bias-pull-down; + drive-strength-microamp = <4000>; + }; + }; + + uart_a_pins: uart-a { mux { groups = "uart_a_tx", @@ -2303,6 +2327,19 @@ resets = <&reset RESET_SD_EMMC_C>; }; + sd_emmc_a: sd@ffe03000 { + compatible = "amlogic,meson-axg-mmc"; + reg = <0x0 0xffe03000 0x0 0x800>; + interrupts = ; + status = "disabled"; + clocks = <&clkc CLKID_SD_EMMC_A>, + <&clkc CLKID_SD_EMMC_A_CLK0>, + <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "clkin0", "clkin1"; + resets = <&reset RESET_SD_EMMC_A>; + amlogic,dram-access-quirk; + }; + usb: usb@ffe09000 { status = "disabled"; compatible = "amlogic,meson-g12a-usb-ctrl"; From patchwork Mon Jun 3 10:03:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10972697 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3CF7E6C5 for ; Mon, 3 Jun 2019 10:04:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B9E5288DC for ; Mon, 3 Jun 2019 10:04:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F88A2890C; Mon, 3 Jun 2019 10:04:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C10DE288DC for ; Mon, 3 Jun 2019 10:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=f+0GuHXU7yaOMPLsApJPeBzNwFsEXofMXH7vqPtV3VA=; b=kH2O2JwqSfMdyf 7lQMldki9ptyoHXIy/FLvCQFpdrsxlMa47StO5NvbB5YlqUDfWYgut0gLwZMVA4qJjizHelugrmYQ ExdwcrvXJTQ67ZJ/CywuA73HEtUcBqGaMEaeo+vV67/MCjqVIv3Q9VRAcIos84lCP0+iEQqJF4kFU Mo7sl4RV4puiK+R2UdqdxuYEX1OqMeTc95X1XxXscOUvhNL418wfzWpjrvGBgOlxm7Q3rFlZUkEMf /Be9/5rOE4QgKjttfaRDFiVMywXSlJeSHoQuASFg1OlaU0Exqqd7z8ScJFWrWAJkB0+ARNF3EcdSp KitV9s1mmPJkE6LRgsrw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXjpU-0007Je-Qs; Mon, 03 Jun 2019 10:04:36 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXjow-0006Tz-Bg for linux-amlogic@lists.infradead.org; Mon, 03 Jun 2019 10:04:04 +0000 Received: by mail-wr1-x444.google.com with SMTP id b18so11321624wrq.12 for ; Mon, 03 Jun 2019 03:04:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4v96Sj0Qqu2ejZctq3FfqZCKiRWA7yMLpPyqtKhrPu8=; b=mQjf4XGRiMhjsw15YSdxSbc4D532wGUB1SC1JiM96Iuh4ExSD4X4vMaXYztqMT1xUc GF6Ez8SgjvVVD5eP6GKe87SrgMMDrTJdO5e7VKnX5hWXYkhlc3lDcX5AIlILYf8wtePK +m/w6M19ox54sQdzt6EZzaeMP/cf3NbfmpaZG4J3VWjt2DC61rKdAevIQkt2oVk61GO0 kSWAeo/ulhesWM/Zea3Y7cxS4r/umA3QotghlhN8CTOCJc1Rr6S76lp9WahxPiDbfgDV OiEy/ZsnSjOMCbwzHzpaRJm2oT1flAJO5GVRcASt9aG2JmOHpgK36PdkZChnqsqGt94T +hqQ== 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=4v96Sj0Qqu2ejZctq3FfqZCKiRWA7yMLpPyqtKhrPu8=; b=OQ7geEP1fUydXxVNbkGw8flLgBGJmzHN6r1hVM7Mcml5M7lBORx8wxqHN4f6yySMfv Tnxjzdktozu+bI/UruGiIho30Ag5tr8l3zsDdhsJlIW5g2xwqaIi6IziVczV6rsRTjAM 5iRBrnk0lTh3nppHQqYEweYrPbGEybwK4YuQNXvGmAhhI0Qa3esM16xznbmFEdQ0P7ZM 3vexpVc1nn3ewr6HtxobDMAaW3F12OTZWt1OR/u1iC3UJk+05cNfgW2i9mH4a64h1bA9 DzrAom41QEYyDjrdGkx76YQwPpageGooPIyOuTC7AYBLkZOytfjwsoX8lRh1cetz3NIz vJag== X-Gm-Message-State: APjAAAV7nyXBffgYsuLTkLsgbBBHi5MecIWwuCUhmxbwfjRxtzZEJmwj bhCIB2Rce+dSN3+pSxVs8u0/+g== X-Google-Smtp-Source: APXvYqzlpNzQaH9IoXOQExNqojzpEeThG85jB71pNzHO58lbsxgDEDHdv44UZx74BlqdIfJdRiKwtw== X-Received: by 2002:a5d:6b12:: with SMTP id v18mr15831689wrw.306.1559556240934; Mon, 03 Jun 2019 03:04:00 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id o3sm11282098wrv.94.2019.06.03.03.04.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Jun 2019 03:04:00 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 2/4] arm64: dts: meson-g12a-x96-max: add support for sdcard and emmc Date: Mon, 3 Jun 2019 12:03:55 +0200 Message-Id: <20190603100357.16799-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190603100357.16799-1-narmstrong@baylibre.com> References: <20190603100357.16799-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190603_030402_468338_C47C4834 X-CRM114-Status: GOOD ( 11.14 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, Guillaume La Roque , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Guillaume La Roque Add nodes to support SDCard and onboard eMMC on the X96 Max. Signed-off-by: Guillaume La Roque Signed-off-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- .../boot/dts/amlogic/meson-g12a-x96-max.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts index 5cdc263b03e6..69aae6c03dc5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts @@ -45,6 +45,11 @@ }; }; + emmc_pwrseq: emmc-pwrseq { + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; + }; + flash_1v8: regulator-flash_1v8 { compatible = "regulator-fixed"; regulator-name = "FLASH_1V8"; @@ -172,3 +177,38 @@ status = "okay"; dr_mode = "host"; }; + +/* SD card */ +&sd_emmc_b { + status = "okay"; + pinctrl-0 = <&sdcard_c_pins>; + pinctrl-1 = <&sdcard_clk_gate_c_pins>; + pinctrl-names = "default", "clk-gate"; + + bus-width = <4>; + cap-sd-highspeed; + max-frequency = <100000000>; + disable-wp; + + cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&vddao_3v3>; +}; + +/* eMMC */ +&sd_emmc_c { + status = "okay"; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; + + bus-width = <8>; + cap-mmc-highspeed; + max-frequency = <100000000>; + non-removable; + disable-wp; + + mmc-pwrseq = <&emmc_pwrseq>; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&flash_1v8>; +}; From patchwork Mon Jun 3 10:03:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10972701 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6CB1A76 for ; Mon, 3 Jun 2019 10:04:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BCE4288DC for ; Mon, 3 Jun 2019 10:04:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 502DA2890C; Mon, 3 Jun 2019 10:04:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 05471288DC for ; Mon, 3 Jun 2019 10:04:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=F9bgQ16uW/8LgOTZWw8ld/LmRquq1HwGecbiUcJZfPI=; b=dVLVyxigpnchco MZBDmmEWlNd+0w0HDHW+fCyBa5WGGu+SJO+GLYim6A6Bz7aYWm/fe8ziEVH7QqJtEWtMuaMyvpeVe VAyOQhRkJMxf1113z9YNZeAAKpJtg8m+oY8frJB1b/Uxw55ViNrwC5A8fAmSBobsdCwRHpZexGnkU xcNbm6gUTaIchjNCFMlABm7X7rmGuEhJ3AH02SRd0WILB9L7qbVV75b/JiHNTGoLyi2IE8Uu0aULD mp9X8ZUEkKr6TkHShtbLB8Q4lXVXbSW3GfGQSTraIEvxAXiokuwIWVs23mRSCc39d7lgJyq7tcFqf OniNJUxtZogpPoOFzEVQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXjpj-0007cM-NX; Mon, 03 Jun 2019 10:04:51 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXjox-0006Uv-3z for linux-amlogic@lists.infradead.org; Mon, 03 Jun 2019 10:04:05 +0000 Received: by mail-wr1-x444.google.com with SMTP id w13so11329031wru.11 for ; Mon, 03 Jun 2019 03:04:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q9lcLmPi8XMHiXaXMu2ntTG9e0dgqGl+ZMcMDCcYGe4=; b=gEBC5aL1kPVPR+LUHjfVvz0ksvv2DkipPibJaPYpBIPdIqcM+Wcug6FummvXcULaSt /Ak+nz2LW/+jWrdpXj/9L3uqCtc/L/EQhvRcc+qNcnX+sa7SEKxtWOQmPJc+djEPENPL ag8UllJ6ZX10pf/GraIjEOQZE+zOnxTzDRK7nWjNgtib/eG3aucWdr1ZVJu/DJ64w9J2 eGtUk6ICjuCy73lD1JthOtI4xIwTtmD6KtJColr4X0ifGIEAfakyl+9LAP6HVYhw9xPv ipt8IIFLV7TXnaHsvB9MpKt745rrzjKVNxLpXCcD6NGOCkhz2U60c9CV9mZhFlJk/RdP 1OMw== 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=Q9lcLmPi8XMHiXaXMu2ntTG9e0dgqGl+ZMcMDCcYGe4=; b=IypPEci10/I+aiuWj3X/ExWDZsF4wyDwIv+7Qo/sMkqkRawMJIGYzBFAIyaP0DqZAq Zu5dPNB/ie0lP4U6AQAT6l1yyGtfoLB5ORL6eHvChOyWRSsoCdS6+gXtNqy+/5A0Lvug iWBnJhteNoylCyynFi+bBqOBjn8flA7KMf9S0k1QpE7OcqVGaMmvzNk716gtPwZVy0il e6gB2np5inoThUi3X8zgtXqbb8y+QlVRrr1YUCHZV+Dxzz1vt2UFZIn7opjrMVxvObYC 90cWWLm8UAxRH+SEqnlU1Dxl9mGqrxvpFt9qOaKY+x7ZoPTWWKVaV5PsUFcfBzSq87YO fskA== X-Gm-Message-State: APjAAAW56x34SHFioFub9fXBqMKFFX5bcjYUdjW5t8eStwd7ogTIZNsf BlZcDBm2x+XqmxS2vaMgY9Twfw== X-Google-Smtp-Source: APXvYqwdNaVQrH1Hfwg41zEcu8yAiSsSfc+9kG7/WdtS15tQvV/Gq7PthCS+3NtUj9DsCTd99kW1+w== X-Received: by 2002:adf:e30d:: with SMTP id b13mr1845319wrj.246.1559556241668; Mon, 03 Jun 2019 03:04:01 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id o3sm11282098wrv.94.2019.06.03.03.04.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Jun 2019 03:04:01 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 3/4] arm64: dts: meson-g12a-x96-max: Enable Wifi SDIO Module Date: Mon, 3 Jun 2019 12:03:56 +0200 Message-Id: <20190603100357.16799-4-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190603100357.16799-1-narmstrong@baylibre.com> References: <20190603100357.16799-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190603_030403_166950_3B8CC26B X-CRM114-Status: GOOD ( 11.36 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The X96 Max embeds an AP6398S SDIO module, let's add the corresponding SDIO, PWM clock and mmc-pwrseq nodes. Signed-off-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- .../boot/dts/amlogic/meson-g12a-x96-max.dts | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts index 69aae6c03dc5..8b263ec1e7a2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts @@ -50,6 +50,13 @@ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; }; + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; + clocks = <&wifi32k>; + clock-names = "ext_clock"; + }; + flash_1v8: regulator-flash_1v8 { compatible = "regulator-fixed"; regulator-name = "FLASH_1V8"; @@ -114,6 +121,13 @@ vin-supply = <&dc_in>; regulator-always-on; }; + + wifi32k: wifi32k { + compatible = "pwm-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + }; }; &cec_AO { @@ -155,6 +169,12 @@ pinctrl-names = "default"; }; +&pwm_ef { + status = "okay"; + pinctrl-0 = <&pwm_e_pins>; + pinctrl-names = "default"; +}; + &uart_A { status = "okay"; pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; @@ -178,6 +198,34 @@ dr_mode = "host"; }; +/* SDIO */ +&sd_emmc_a { + status = "okay"; + pinctrl-0 = <&sdio_pins>; + pinctrl-1 = <&sdio_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; + #address-cells = <1>; + #size-cells = <0>; + + bus-width = <4>; + cap-sd-highspeed; + sd-uhs-sdr50; + max-frequency = <100000000>; + + non-removable; + disable-wp; + + mmc-pwrseq = <&sdio_pwrseq>; + + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&vddao_1v8>; + + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; + /* SD card */ &sd_emmc_b { status = "okay"; From patchwork Mon Jun 3 10:03:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10972703 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2FC3B6C5 for ; Mon, 3 Jun 2019 10:04:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EAF3287D2 for ; Mon, 3 Jun 2019 10:04:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1187D2890C; Mon, 3 Jun 2019 10:04:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 84880288DC for ; Mon, 3 Jun 2019 10:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=3h38rh9Ph6Z3JRCALSW3bQlsAYgf3fLrteGPHTeTZ2Y=; b=LB+N9dmwxCPPWV pAU9dRx3zBUidlhM8L7o838+cSFgnR5jCZjYCLAxEcdhlDlr7d8nwjAB4A+LVlyyinhGUam9UwMdn xoM/1Y77OvAaS1VMG0P/d0LHI4avY1dDlMp5SrnZHxW5R0zO5nBHQRTyTMTFxnzirLRmYSxbW0Ezi mSZouCOU0W0qUNN5dPSPu48sS5dlL6/YXA8OnCdIbRo6NjFUjJozQN0s8pgTLuu7k09XIqfF6CULM efZCCa/ApSJs85/cinso0yEadhFjFBTthxwWGUJEuKFtTq+F1xhMXp+xgsB6CaGtTr7AZtLWr2Hxe UN76NAZdIedpj5tAOj4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXjpl-0007f4-MT; Mon, 03 Jun 2019 10:04:53 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXjoy-0006Vi-0x for linux-amlogic@lists.infradead.org; Mon, 03 Jun 2019 10:04:06 +0000 Received: by mail-wm1-x341.google.com with SMTP id g135so7303632wme.4 for ; Mon, 03 Jun 2019 03:04:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YMQH+YmMqEi+gsXseHBWQuJ/Imet99lfOVHmWm+WY1U=; b=DdmABLlIarebcQdqi3kcWqkFCKN8OCuNG59wewyDGcKAmrYKfr4JXLl1AP6wzl3YnU cafRtqasdDcyAiVJ1sbLHANKERnpmh+6duZfsY8gKWAXzaEw+YRofetU93bp1TwWWjT1 2JQCeHyGP0sIj91aN+eYFRhbHw7QgLBofq5ImYTNMbTpKVhB3SI7gIdVQXuZs93/kyBY PHLRTZXOWh4QigbIJpr+9Plzf4c58yNlDaY1APglo5023V6SHJdFFiQgB5lpbkMjZGZh 0j26+h44qPOXglXqXVh/dkcJ2Rfq5Qrmim/TrYizfEvchBGLPcnAvQplDPEl/jktQQJ5 qilA== 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=YMQH+YmMqEi+gsXseHBWQuJ/Imet99lfOVHmWm+WY1U=; b=fzgNdirBHd25IyvvYuY0/qXmQTkUSmcR5WWMiLmWoyTmVld9yOmMxgPHrVejy2Qphn Bwss61S4Da/EHsb3wZ4gBCnlubVkKFKmObCVh4kEj7ze+YU4vr84kW2WcxNMDKpv7Rhf UIYTCoVsFCEoWTf31dBhUtuYtMj9m073Rkkv00UKDB5WxLjUaUJP7xkdV3ARHIjDqMX2 /mbtCGe6TD94959ztLodvoQGV79ZkEEO8m+QmEjYxT6Ine/3rmOVBBaPmGR7gEiufLSq lgAm/6O4dyy/NpMaYEUdU1EjpbVLTCp5lqx9bIVaEpuF01Wn3D3XCXHahe9D5OICOtUz jOjQ== X-Gm-Message-State: APjAAAUvcKhrx5oReN/IYMBIVxHBW9Htkc0KRafbtlG64ZDG6TPzg/t9 YXZbbOkBqcPNT+7LRFvKN0XauQ== X-Google-Smtp-Source: APXvYqxdgJNt/Z8H7RA95G1FQJxTUqwXFFclxWFD9X0UAVrW1pgptWbzt5ot7MgiYRg+s06Hj5jzqw== X-Received: by 2002:a1c:5546:: with SMTP id j67mr1855939wmb.80.1559556242355; Mon, 03 Jun 2019 03:04:02 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id o3sm11282098wrv.94.2019.06.03.03.04.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Jun 2019 03:04:01 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 4/4] arm64: dts: meson-g12a-sei510: Enable Wifi SDIO module Date: Mon, 3 Jun 2019 12:03:57 +0200 Message-Id: <20190603100357.16799-5-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190603100357.16799-1-narmstrong@baylibre.com> References: <20190603100357.16799-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190603_030404_179427_782B5253 X-CRM114-Status: GOOD ( 11.43 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The SEI510 embeds an AP6398S SDIO module, let's add the corresponding SDIO, PWM clock and mmc-pwrseq nodes. Signed-off-by: Neil Armstrong Acked-by: Martin Blumenstingl --- .../boot/dts/amlogic/meson-g12a-sei510.dts | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts index be1d9ed6d521..5a97379f2417 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts @@ -128,6 +128,20 @@ no-map; }; }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; + clocks = <&wifi32k>; + clock-names = "ext_clock"; + }; + + wifi32k: wifi32k { + compatible = "pwm-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + }; }; &cec_AO { @@ -174,11 +188,45 @@ pinctrl-names = "default"; }; +&pwm_ef { + status = "okay"; + pinctrl-0 = <&pwm_e_pins>; + pinctrl-names = "default"; +}; + &saradc { status = "okay"; vref-supply = <&vddio_ao1v8>; }; +/* SDIO */ +&sd_emmc_a { + status = "okay"; + pinctrl-0 = <&sdio_pins>; + pinctrl-1 = <&sdio_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; + #address-cells = <1>; + #size-cells = <0>; + + bus-width = <4>; + cap-sd-highspeed; + sd-uhs-sdr50; + max-frequency = <100000000>; + + non-removable; + disable-wp; + + mmc-pwrseq = <&sdio_pwrseq>; + + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&vddio_ao1v8>; + + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; + /* SD card */ &sd_emmc_b { status = "okay";