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: 9845499 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 F30BE60393 for ; Mon, 17 Jul 2017 15:36:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E550228531 for ; Mon, 17 Jul 2017 15:36:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA22C28544; Mon, 17 Jul 2017 15:36:16 +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 85B6328549 for ; Mon, 17 Jul 2017 15:36:16 +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=i5b 9vlsLflEEhsJyGjf2DIeI0ivI9hfaELbAF3MRSW0NDg1mTJ/bIp1HiRV/UDb1P6rGLXAf6DoIASb+ sp6+FdLUMwY+O+sNem/pen/lYm2Qds2MTY3PgZsHZ3/vx0i7ePsXnS6lH3Nx1GaL5zz7iVeo7EIi0 Ei3kMUoguKBj9BKn1xeP+++opSSD5QWZ2S/ls9ffzJunMRPdNQIXy8Q0EP6ywwPTM336z9hsMFeS/ Wpp5wDOYL2XHOAsq7IZ0UfUAjqtPgJxF/7Fc+MZsSytaxGZ9WUMPZZsIUn0AyC+Yo0/csGD6qC941 PGSILY9GxgQLY7SaHb5i9B29jWHvkZg==; 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 1dX84C-0007NF-L2; Mon, 17 Jul 2017 15:36:12 +0000 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dX847-0007Jw-GZ for linux-arm-kernel@lists.infradead.org; Mon, 17 Jul 2017 15:36:10 +0000 Received: by mail-wm0-x236.google.com with SMTP id b134so52140091wma.0 for ; Mon, 17 Jul 2017 08:35:45 -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=Rw0eiWTfOhA1pYYy9mHsYsOp/W6x5b9aRweZyGMoab4IoXkXL+bmg6torbhqyqmrj5 fgkplURLCCMaAUSTsQd+R0++Rt/kV79JRemiCI67IZ9vJN2TI4AZZFai3m0Z+v7ozUhp cpr/8xOlOAYt524P9ShPBBBpvx+KZr2znp/2fB6DSCKFUiXUBJlJ+XazmLHagzOi3w5v aB+3DPIr6W843fxP+ev1gDOxaWSYAT5GwkCaPwTwtGR9WDyC7ER8/RLJKi84eYFS5djI WWJ5VW6L8nVvsOqCgvCSaoH1u3q6YV7iaVv+eXrI2sstivmT1Wl53a7xJIGkixmx6mhz mq9A== X-Gm-Message-State: AIVw110Di6bMVEHeQSkGbJnkeSGoaQOT6+sCp5X/Q0Nbf1fF96K0ZzDE l8mqwewpniapwrHx 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170717_083607_712878_4963FA6E X-CRM114-Status: GOOD ( 10.75 ) 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"; };