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: 107996 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp4698774qge; Mon, 17 Jul 2017 09:03:24 -0700 (PDT) X-Received: by 10.84.232.207 with SMTP id x15mr5936382plm.18.1500307404400; Mon, 17 Jul 2017 09:03:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500307404; cv=none; d=google.com; s=arc-20160816; b=y8cAcIueI+buU5SRleu7l4ZzT0CSwJSAjHfDKfdVSdc+vN6JJAb/tBfGBKLp5J5Tnl NzHXP6hhhWrFtVn0Yn2Fm6+ZzkOMOZ9ltQeaW3t6IR71JWAWRx8SlLmq2FiEzGwda+MI d3dlxohYplaaNjIckTUzosVcybCrN9/40pNESS5cJRANPGlnAydrTxnsu+gbdBwvoNbw jCo2weTNybndHFo2zzmu8ywX4c382fd2Ezs0biCIK0zSeKayudDrjn5Ml/aP2ZP/BWpf hKnV6oWXg9Nyl7v8Cw0kbseMgoCpBfWRdMjabhrZ2WJUMXUF/3eE9AW+tk6fe8kaHh9A 9baA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=YbE+LvQ7wItW+ckE5yoP94+WzlDfh94BykbE2gbpI2w=; b=C6vmByNaS1u/YfTmjUIwF0oAhQlOI9sxmcuD16cPr8lUktsR27+dSvJgDYzhg3x5P4 rRo5mYCY4fNyoKJElscKwtoJSAxK/FUJPpNRJGNvAabKzT/TCOI8nYam0DwLJMKJ1gqO 4TzZW0j0DbnGnOnHRIjmwT4JfOwTBogEbU7inngsJlVGk6KK94E7bA6m8Rz855pqiSvF hVPipReIZb/KEdRvoJpX0qPfThtLEjoWGjjits0svUDXYx6qJ1PoTWBRxpnCIW3jOkhl MaljaTvuCZWFoXjo/DJ/UqKxhJT1utYR0F9mW4zf/Mp98GIYLUOKtEIVyJBthiKdLrO8 IMrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.b=vRWqji4a; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 74si12881102pfx.268.2017.07.17.09.03.24; Mon, 17 Jul 2017 09:03:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@baylibre-com.20150623.gappssmtp.com header.b=vRWqji4a; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751500AbdGQQDV (ORCPT + 25 others); Mon, 17 Jul 2017 12:03:21 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:38527 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751314AbdGQQDS (ORCPT ); Mon, 17 Jul 2017 12:03:18 -0400 Received: by mail-wm0-f43.google.com with SMTP id f67so88817179wmh.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=FXVZxAFSCTc/xjd7BFpiEy83u4krVLsIQPDXHUlwAVFbJNpLQE/8PwMAPeojfP/VSi TaY+rNoZht/Su7n9ZNAiYR7g/GIM6Ze5PvHz7rvEjLKznpnZE7P8jy7b+6YHTwdRERzQ CpiKRXhQdi8Mgd1uK6OYYxBNcELqdX4o8HbP1JSrIxAb20xbUUsP9gUdRwj7+4ayMo6Q AVJnEpEieKVZBtiX4Ms7UbTHUF+GRFzF76jbd6KmrVVWzxqxUL8tKHnrp3di+KykZCw8 H1zm66HiI606LYxor72t2g78A2uujovq+1YAhkxake3+OV/a/zWW1oZ7oRs+vRUPB7WA HBZg== X-Gm-Message-State: AIVw112RueulvdCgPRNqrQaaRSs0icY7ncnHqY+bGr2OSinONQsWJhCC V5p0zMl6hLbbknKk 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 Cc: Jerome Brunet , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.4 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"; };