From patchwork Wed Jan 9 13:44:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loys Ollivier X-Patchwork-Id: 155067 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp723895jaa; Wed, 9 Jan 2019 05:44:38 -0800 (PST) X-Google-Smtp-Source: ALg8bN5v1acgfz2cS9nWjY4uYMNu7RFdIruS/WiDYB+RO/XQ7bhnfYXBJSn8yPgx9ZTTji8rzTwo X-Received: by 2002:a63:cd4c:: with SMTP id a12mr5560810pgj.252.1547041478697; Wed, 09 Jan 2019 05:44:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547041478; cv=none; d=google.com; s=arc-20160816; b=NWXZxv+OlaToqpJ8gO1cJooePt24iI9TjH2Jn2f0pkgmYD2r/gQKHf+ZFSveRamj8A 4Gqfl3m6ClCO6lYv6NbOnaE3K1NosNUCHjkFVJ1T3M1qRB2a1DgFZmXgkrQ3qPGyJ7M1 RQKUMTd8aKSHIbmdVOkMOaJAicRSYUpMkQqrfiGDolx0jr4k48+HXLaxbrM227fB/h/1 EqQcUnXmuckFAwLlyi7fo3tPRR77xphPgg9M9aH+FuchQzePtGR2tT6h+XcVgN26k3ZY 1y8+B0bM6sDQqKrCf2xzGJS6efeiOflKmUlvoRJExPs9w4KOc9LKd7RFIjw7ANI3VoQT pSsQ== 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; bh=JEBXqUpS/wGintq8ltKUFwHDispDsI/Kg8/rpJ3o2s4=; b=WySOxxohiHcNR8NG976SHIP4vcILp5sZgXzc8KWgUJadzGRGajWk2oo+4sbycO3piK 5hquSXf/5W5R3UkSqxBLlPf//OGsmFwvm3LY/7Sgt4wgWL3b0ZZ4OIG0oo+6JexlitT+ 6tSkD+gTC95ah7NTX9vJXaEFpxERA2N2gVpWPf4eYJlSfuroS7wOMB81TsEEFp5F7lTO uvvx38WyNUwkiunO2Rqx8nsmUMAUSCzpQLTet6Q4W38RGfMciO5kXaqJTMcPfCzH8rX6 M2VX1MvRrbSBh7OuaUEZ+WuXQR4SdFp0CyNd/6C3J8VrjFO7XOq0sb/2RJMupTqRHpbK OKww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=1qVaedeW; 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 c30si58889028pgn.52.2019.01.09.05.44.38; Wed, 09 Jan 2019 05:44:38 -0800 (PST) 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.s=20150623 header.b=1qVaedeW; 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 S1731070AbfAINoh (ORCPT + 31 others); Wed, 9 Jan 2019 08:44:37 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39689 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727627AbfAINog (ORCPT ); Wed, 9 Jan 2019 08:44:36 -0500 Received: by mail-wm1-f66.google.com with SMTP id f81so8256878wmd.4 for ; Wed, 09 Jan 2019 05:44:35 -0800 (PST) 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=JEBXqUpS/wGintq8ltKUFwHDispDsI/Kg8/rpJ3o2s4=; b=1qVaedeWtoHf5peQQnwniSJkL43QfYVuevm6yDv3d6l+p3LB6IKjneffXHSLE80+/v IFqG+mRBUHUqzDatF/sPoGPT2P2AZTZct+7wYZAGiwFoav+7ts+OWfKqBzjSlrEb3Awx nS+N/HOdsZb0zy9aUvG8y7CyNb7WYjawtomHmfs5ogwOivo4EnXQ71pBpLMvwfyvBfaN RHTBG+pojqrg70N9fFldIQMhoAdZg8xIKTjtbLVf00wR62MSx6jSuh4UxW8VQ8BSqknY V27hQxo0huw0RI7X3tk5DQR2Mbwc3RIrFCKPU6d2AAJoe2I2ms3KVnoqbXdfsi5TG1NF nz0g== 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=JEBXqUpS/wGintq8ltKUFwHDispDsI/Kg8/rpJ3o2s4=; b=te8CqP8Ww7AugaqwZWgLuJkG90YEU41JsIqkQPkuLgKJd6ureuyddC0j2mr5W6oIiG jSLhV9Nk40t2vXn5ev8Y4R3JwwP34Ootuy+1sIsvXlFBbiW9pyVTFhg/5Oq16zxV0ggm 4f2bG2GHiWt2c54gJnEgri3SCxaPWz6LgF1zdhmKkHZG15QL9r/HkVfYDrqTWK3zx75B 2Cxzwuyfq1CQ4J3fyWUzPHopzeh1JELDMdiyCZCeaJ3x9lnnjlY6w9QmtdItc+Je7a86 rbThBEBPA4mkClkYUJqYzwDfBMMtkF1iXQbr8EG4QgF6oyMKSSaYpfcYSnGinb2QN7KT g8tQ== X-Gm-Message-State: AJcUukemHyt8Yu7y8f53jBidwfpviQ445HL/7xZcNurR/dDUdMjEbHkN frJvfaGbcTJNBF39twHHpDs4dw== X-Received: by 2002:a1c:f613:: with SMTP id w19mr5740452wmc.0.1547041474447; Wed, 09 Jan 2019 05:44:34 -0800 (PST) Received: from loys-ubuntu-BY1835A49200471.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id y34sm161053815wrd.68.2019.01.09.05.44.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Jan 2019 05:44:33 -0800 (PST) From: Loys Ollivier To: devicetree@vger.kernel.org, Kevin Hilman , linux-amlogic@lists.infradead.org Cc: Loys Ollivier , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij , Jerome Brunet , Martin Blumenstingl Subject: [PATCH] arm64: dts: meson: Fix mmc cd-gpio polarity Date: Wed, 9 Jan 2019 14:44:30 +0100 Message-Id: <1547041470-6422-1-git-send-email-lollivier@baylibre.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 89a5e15bcba8 ("gpio/mmc/of: Respect polarity in the device tree") changed the behavior of "cd-inverted" to follow the device tree bindings specification. Lines specifying "cd-inverted" are now "acitve high". Fix the SD card for meson by setting the cd-gpio as "active low" according to the boards specifications. Fixes: 89a5e15bcba8 ("gpio/mmc/of: Respect polarity in the device tree") Signed-off-by: Loys Ollivier --- arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 3 +-- arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 3 +-- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 3 +-- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 3 +-- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 3 +-- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 3 +-- arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +-- arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 3 +-- arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) -- 2.7.4 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts index 8cd50b75171d..ade2ee09ae96 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -305,8 +305,7 @@ max-frequency = <200000000>; disable-wp; - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; vmmc-supply = <&vddio_ao3v3>; vqmmc-supply = <&vddio_tf>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index 4cf7f6e80c6a..25105ac96d55 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -238,8 +238,7 @@ max-frequency = <100000000>; disable-wp; - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; vmmc-supply = <&vddao_3v3>; vqmmc-supply = <&vddio_card>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index 2e1cd5e3a246..1cc9dc68ef00 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -258,8 +258,7 @@ max-frequency = <100000000>; disable-wp; - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; vmmc-supply = <&tflash_vdd>; vqmmc-supply = <&tf_io>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts index f1c410e2da2b..796baea7a0bf 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts @@ -131,8 +131,7 @@ max-frequency = <100000000>; disable-wp; - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; vmmc-supply = <&vddao_3v3>; vqmmc-supply = <&vddio_card>; 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 db293440e4ca..255cede7b447 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 @@ -238,8 +238,7 @@ max-frequency = <100000000>; disable-wp; - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; vmmc-supply = <&vcc_3v3>; vqmmc-supply = <&vcc_card>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts index 6739697be1de..9cbdb85fb591 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts @@ -183,8 +183,7 @@ max-frequency = <100000000>; disable-wp; - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; vmmc-supply = <&vddao_3v3>; vqmmc-supply = <&vddio_card>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts index 3c3a667a8df8..3f086ed7de05 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -356,8 +356,7 @@ max-frequency = <100000000>; disable-wp; - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; vmmc-supply = <&vddao_3v3>; vqmmc-supply = <&vddio_boot>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts index f7a1cffab4a8..8acfd40090d2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts @@ -147,8 +147,7 @@ max-frequency = <100000000>; disable-wp; - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; vmmc-supply = <&vddao_3v3>; vqmmc-supply = <&vddio_boot>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts index 7212dc4531e4..7fa20a8ede17 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts @@ -170,8 +170,7 @@ max-frequency = <100000000>; disable-wp; - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; vmmc-supply = <&vddao_3v3>; vqmmc-supply = <&vddio_boot>;