From patchwork Mon Jul 17 15:35:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 107994 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp4668543qge; Mon, 17 Jul 2017 08:35:54 -0700 (PDT) X-Received: by 10.98.26.211 with SMTP id a202mr20086728pfa.30.1500305754472; Mon, 17 Jul 2017 08:35:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500305754; cv=none; d=google.com; s=arc-20160816; b=wdVqGyRQiewR54DNhhJxHMp8xTnFXmcYZmrOSonTBTQT/H2PxZ3tZfPhIJODaBqoMS 8OZaDOFvOOzqvyd6Rllj0KsOy3XmAaqPodCvV7ueNyXgz780Metno8sfxavTbHK7folU VA9ZyTSER6jbaXspYLOQnKDAblumk1dGecdONH0kuFsxDFosEmseO9g0tk/rC4wx8DuM u6DYs1Z73q/Z8vuHiFzAh15I6w8ina3hafGYdjitpesNXnsuD1oi7G6argxBilZJ1gEe 0g7/NxnIbAfxizFpjsbseb93Yp+sy/uDw2meXSZpqgjNKD4Nu1UeyEnK2pYv3QeTxS+n z5bQ== 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=pdxQCiEPYYpXiqF5H6WxPH2DP9a71wtJ3voCQsabxoh8pNlCtc/O0WF+wpgsq0Y/bb Fq5cx/CeKQtWH+TmRx5udrcfBJJs/xe1qgTk7GKO+LpeHXbEVStpdEI7MIcDufAmAqWz OSwZSkT69MNOjHKPoBh4KztAYPmyL9bVK1iPi4rYCcmNCgvYVX19IojXdG/mT8YktvF1 nvjfFSmjTOqRAB8bQJsDFtireExzoh/sCOW8jLl9wHJH80gLyW7qxlX7+yKUDqqgLpbQ iJaZhLIk7Brh6v5a+mxKlggEWAySBmzEJO9t0Q/qsefCmPfPORjlQwp3rLaRxZxvxWXS /4DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.b=kdX8spOQ; 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 a90si13217876plc.78.2017.07.17.08.35.54; Mon, 17 Jul 2017 08:35:54 -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=kdX8spOQ; 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 S1751366AbdGQPfu (ORCPT + 25 others); Mon, 17 Jul 2017 11:35:50 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:38008 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751286AbdGQPfp (ORCPT ); Mon, 17 Jul 2017 11:35:45 -0400 Received: by mail-wm0-f52.google.com with SMTP id f67so87989970wmh.1 for ; Mon, 17 Jul 2017 08:35:44 -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=kdX8spOQAGuW7+J81/vKB7rEPDVSBKECw+KecY3630F6KzR6+L1sXU0sL/tYhEVQl6 8eaeT9lEhE0MqdJjHSTuEmLUNSDsVBiI3dgyEUof483P4x0v6ru+ZiWOIzYxWtoIt47q GnLBOFbC2kdLv41DCpGGeNnVxxR+zT2HMYRf4AQV83OtosCrZQRpFLgU4uOBKNEvPZ/w Z0Py0SNA7pW1pGIf7aoENxm2g7cXBfHqPgAxRoA8/E1w60rsS0k6r+ESkEAi+qU1R46C +ljOTXLPUhuAiRBWzIWDLt+9EmTgxzkITU8lUyz7FsKG10phAdp7c98XlDqX1dLRBZDp To0g== 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=CF9lq244p2o1uU5oNyaJabsaqO7WxY9+ucSbtxR85k6Vwr4lXkKkh+yjT3xcO6y6qM Wvr6g3LkC2KVo7eF9fNWKd8iGTwGLffTqsdmGJyoo77LLW0TexgBMyfCfvxaARxP5FzM EuHvM1wZlxPYYIq6uiSCv3r1OIBgEsJROYsHS6+Nklxnp72K8QnL/xSFplqybS9xOhYB fYy8BgJsj8jeguld0yJ7KexBYeaeeWcI8empLcz2RUdxLbd79T8BpfF2oyLYkCSntKHF Q6wDKfmrbP/JVYQSKPdkGE3VBs1DSrdBK+/VyTv1GdNq2F87Lh+RjsAHBKi6/vshrr2N D7yg== X-Gm-Message-State: AIVw113JEbsYCQEVL59HS6Jdyv00oQSDFoQitHtBEjFyRbyeuSpOQrQp eepwgt/1TWKx0z2/ X-Received: by 10.28.1.65 with SMTP id 62mr4624166wmb.100.1500305744186; Mon, 17 Jul 2017 08:35:44 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id 35sm11805184wrp.63.2017.07.17.08.35.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 08:35:43 -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] ARM64: dts: fixup libretech cc definition Date: Mon, 17 Jul 2017 17:35:37 +0200 Message-Id: <20170717153537.18330-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"; };