From patchwork Mon Jul 17 16:03:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9845599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5437A6037F for ; Mon, 17 Jul 2017 16:08:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47229262AE for ; Mon, 17 Jul 2017 16:08:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3BB9C26E97; Mon, 17 Jul 2017 16:08:54 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 B088B262AE for ; Mon, 17 Jul 2017 16:08: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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To: References:List-Owner; bh=uysNMnuG4luaE4RzqjjMco0wFJYUnOVlRFMBRoK64Ao=; b=hyY /Z5sUvlRGLB29f/oIQ0SxO/Es/XA59NuJWfmcq2WvCOHK4U2ih2ISmk6CJvmklJtPnrkPtWhxJFro K9RxKvAT1TWBo1aBz+OJsBN5WQwJDk5r7gSO9IrFoLIb0SMYtdWHFfpZfL91qtAlyiCCNCpowCmM+ EfbHd2X3juzN9kMUqhPCYtHJbrrxJokozXi64I6ZuejpvyX5pxbGoJml2xy5Kj+2xemt1lsTKE5dk bebnT2m3xaTFDaXso0k7jTAhzTbSztywUOTvCyI9+dnANJ/4Onp82YIV+9cvEuJEHHsg3oReVzysP D4fQ80guJl//k5F3ljV+rSVOckuJNzA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dX8Zp-0000D6-DC; Mon, 17 Jul 2017 16:08:53 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dX8Zn-000095-Kf for linux-amlogic@bombadil.infradead.org; Mon, 17 Jul 2017 16:08:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=YbE+LvQ7wItW+ckE5yoP94+WzlDfh94BykbE2gbpI2w=; b=B4O3wwB3u+S6hrIhcoVvzRlji WDios4U/R7foAj1Qe+3GTSHfoqETrWC+PnJ7fwGvo4Otxneuk1wA03cKJgzTSrq0/CzS4UbN8JdyT yVSGb9Pq1R5+yNNrs9ZCUZlqhdCB2DhpTLTU+pZXmcVFdkZvOYw4jf4jqxC8Jk9slJux1oxvJcTP2 /uPXP3dJtSa6KYR51xNjkmKk6AdzvMoLSc2IfYa14dJfxXOBK8SZk9P0UMkkrrE9eYugiWK81qO0h ry4ZAEeLWFwtRajfMqeexd+a1FUUTRpYbYY+jsjNoNsiJ6Json2yULspuRGaiaE92S1WWrn9R7Uth mCrROPB7A==; Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dX8Ul-0006LP-B7 for linux-amlogic@lists.infradead.org; Mon, 17 Jul 2017 16:03:41 +0000 Received: by mail-wm0-x22a.google.com with SMTP id b134so52960492wma.0 for ; Mon, 17 Jul 2017 09:03:18 -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; bh=YbE+LvQ7wItW+ckE5yoP94+WzlDfh94BykbE2gbpI2w=; b=vRWqji4a3eQeeuhS4j9mHxG5BlK+F5mdyo3ZhwIdX+SBLmLTWUrcVb5oXoXkepZy3e w5sTICKoPUArhoL8ipgk1SA1UkKFZuDBwkMBrT2r/inUOg3L/boxkOjWN2/gW7KuIlAL wpsjsp+v7UMG9U8T3pP04Yc342w+pFz7h9+bmbhB8VtaOstsa5yoD8fzPLffTp1DRqwN fdQU3WMvZ8Bw8fh+3/hKZh8PaRbwlnpjNa86nL+LI0mZw0B20yYAC6qNWGriI/Ba3qQd 6gwzf8AB/kkCVxOJiGk63boGkWyiohFNEwdCNO1GFJCxtnHuX92TxD/tk5rLB0tk6O93 A1Gg== 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; bh=YbE+LvQ7wItW+ckE5yoP94+WzlDfh94BykbE2gbpI2w=; b=E3herpJSU/gZO+PogVrZthXnFNj7JMZYs9RknVEmLVBWnpopKfs0i8L7FmmFz3EY2T UjkAxqKI3tRJWoHuSUMO5TEhXVL7DeqhOA+QzSFgZi70IjkuhGQMlEufcLl6m0NSNQNM TidJRFZPDts6njyfdXobgalssdvHSdrciCXclgycuhnbUDMQ1Z+9Ivia8Ksz8RWOjT0s Qw27ekTH1FzcTXuwALTQZc7U5hZC6CQuAmHE996P7QFVB/PdnEGVdD50q+GV3Jt2HjNv /Bx0CtRvi/wsoV18rRSJeTAZ4C8WX9+lSmojbVZLCK3HkfyKPtzWfFxhjMdBO7xUkpx2 1GFQ== X-Gm-Message-State: AIVw1139gQ2iu1sCZfXqpEyFcyoTIo5Kgx80sDq7RmGDAgVOii91sskm LpybprOOjS5iOIsu X-Received: by 10.28.11.21 with SMTP id 21mr5178311wml.105.1500307397465; Mon, 17 Jul 2017 09:03:17 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id g63sm16121409wrd.11.2017.07.17.09.03.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 09:03:16 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Subject: [PATCH RESEND] ARM64: dts: meson-gxl-s905x-libretech-cc: fixup board definition Date: Mon, 17 Jul 2017 18:03:01 +0200 Message-Id: <20170717160301.32729-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170717_170339_400510_960A6B98 X-CRM114-Status: GOOD ( 10.07 ) 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, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The libretech CC derives less from the p212 than initially thought. Several voltage regulators are different and the capabilities of the sdcard and emmc also differ. Deriving from the p212 is not convient anymore so the libretech is now derived from s905x definition directly. Fixes: cd84aff1d981 ("ARM64: dts: meson-gxl: Add Libre Technology CC support") Signed-off-by: Jerome Brunet --- .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 103 ++++++++++++++++++--- 1 file changed, 91 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts index 890821d6e52b..266fbcf3e47f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts @@ -10,12 +10,20 @@ #include -#include "meson-gxl-s905x-p212.dtsi" +#include "meson-gxl-s905x.dtsi" / { compatible = "libretech,cc", "amlogic,s905x", "amlogic,meson-gxl"; model = "Libre Technology CC"; + aliases { + serial0 = &uart_AO; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + cvbs-connector { compatible = "composite-video-connector"; @@ -26,6 +34,11 @@ }; }; + emmc_pwrseq: emmc-pwrseq { + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; + }; + hdmi-connector { compatible = "hdmi-connector"; type = "a"; @@ -53,6 +66,39 @@ linux,default-trigger = "heartbeat"; }; }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x80000000>; + }; + + vcc_3v3: regulator-vcc_3v3 { + compatible = "regulator-fixed"; + regulator-name = "VCC_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + vcc_card: regulator-vcc-card { + compatible = "regulator-gpio"; + + regulator-name = "VCC_CARD"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; + gpios-states = <0>; + + states = <3300000 0>, + <1800000 1>; + }; + + vddio_boot: regulator-vddio_boot { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_BOOT"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; }; &cvbs_vdac_port { @@ -61,6 +107,16 @@ }; }; +ðmac { + status = "okay"; +}; + +&ir { + status = "okay"; + pinctrl-0 = <&remote_input_ao_pins>; + pinctrl-names = "default"; +}; + &hdmi_tx { status = "okay"; pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; @@ -73,20 +129,43 @@ }; }; -/* - * The following devices exists but are exposed on the general - * purpose GPIO header. End user may well decide to use those pins - * for another purpose - */ +/* SD card */ +&sd_emmc_b { + status = "okay"; + pinctrl-0 = <&sdcard_pins>; + pinctrl-names = "default"; + + bus-width = <4>; + cap-sd-highspeed; + max-frequency = <100000000>; + disable-wp; + + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; + cd-inverted; -&sd_emmc_a { - status = "disabled"; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&vcc_card>; }; -&uart_A { - status = "disabled"; +/* eMMC */ +&sd_emmc_c { + status = "okay"; + pinctrl-0 = <&emmc_pins>; + pinctrl-names = "default"; + + bus-width = <8>; + cap-mmc-highspeed; + max-frequency = <50000000>; + non-removable; + disable-wp; + + mmc-pwrseq = <&emmc_pwrseq>; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&vddio_boot>; }; -&wifi32k { - status = "disabled"; +&uart_AO { + status = "okay"; + pinctrl-0 = <&uart_ao_a_pins>; + pinctrl-names = "default"; };