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: 9845533 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 05D7A6037F for ; Mon, 17 Jul 2017 16:03:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED32F23B3C for ; Mon, 17 Jul 2017 16:03:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1F832623C; Mon, 17 Jul 2017 16:03:52 +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 8237D23B3C for ; Mon, 17 Jul 2017 16:03:52 +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=3ThcENjV2rw/MxNc9zJRC0WuikNe44YSYTMQypy89wU=; b=Rl9 jj7GOY9wh0vuWxzxxziTfPBfGsYw2Q0UK3BzBWHHtNDbtpnE8fwJGFY3IAmE05rSxflPV6tSzPW7v /6cvnI77O3GcJuEpMWVAgZ9pJiOWf2S2kCudPh4sulCVVyvC4FXmLtePwe8mpjwWxa2ox4+mtMZKA sBrPfHcWt+AowJQ6nFO/9+JY2wZ6lnZJ5KTHrPbNN2qU8gwazZUOwqTAhNuVyye+Z+bx8z2NRZMHK gHn3iuzvUIDHoIdA90XJh7fIukP3ZMUJgT9nW//6x7gA2I5a+KD2T+UFJ/BoIJVJLvI2RO6iec7UJ S3EX0kbtZxnFndW9yDi2cCciKbqlmoQ==; 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 1dX8Uv-00059E-JX; Mon, 17 Jul 2017 16:03:49 +0000 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dX8Ul-0004xK-8b for linux-arm-kernel@lists.infradead.org; Mon, 17 Jul 2017 16:03:48 +0000 Received: by mail-wm0-x233.google.com with SMTP id t70so19978157wmt.1 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=Np0kyDEcUPKWLQOTx0lLKLKATETECY29q0rsDbR00hZnxExu7f7dXrxd/MjUiDtkuV Gp9P58+KDXQjopb0hzAtDp7GjoIeq1L3nCXgaaaC12WZew8wox13pvbwkHFH0W4OHOL8 wqkBl4sk+/OcC/bs/l0/afFmgGSXzeJXGlxfQvvK5hOQWgQwqAHDa1vahuAGBb9A4iZ0 aNL9oSQ/3kDfNQ9i+VMWi+sT1+F14AxohxB2kOeYANUyziSQ4CV7FDVl/K0I3dEbJSoj VChvdf2Ut2YRDjrddHgiKZkLzIHq74CR9cDyZluUbLSoJXaIyytvTZEqu6F66B6ehoas 0Nyg== X-Gm-Message-State: AIVw112OeoOumF9ubme6S451Z6xkzuEWLcP422WKzSetChJ4XyH/l0vD lqs+sA74Yc67B1nX 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_090339_460784_851AC562 X-CRM114-Status: GOOD ( 11.13 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=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"; };