Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp6406964ybp; Tue, 15 Oct 2019 14:36:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqwZFO3KpRQFzl4FGwvjNdsMtQIGj9z3IE5b97bltO0iFmRQ5+gYEowhFo+oDTs2weIxI0cY X-Received: by 2002:a50:935d:: with SMTP id n29mr35592193eda.167.1571175366380; Tue, 15 Oct 2019 14:36:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571175366; cv=none; d=google.com; s=arc-20160816; b=A1+iBDAceY9HHgDGS3A7xwydenYYiXpbSCZjdESr+7AUlxKs0na/jpg554DL66eBSN TGITSQlD8aoJ1WlWvSwdOB0gwBSVWWh8OHyR/QXMHchImRx9pV5+kYPXe5tru8m8lDfp qLAPYybspyR0A89GRiQdnjETdXeZe9lum5lfZKhorkDRq8VDc9Vo873l5XzTNTcgG+vY LOqoWCdxAYam0XKraxT/cSHMJ+OyVc3fGr5Sn/Cc7OWAWneA/W0Lsjj/AD8Qxth0v+c5 Rxi0ErZp74KjzYUTYMiiAP0fCijhgGM1K4qmOeFBipMfSU1LbLV63CHFLyS4Q1Azf3wn 407A== 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=q85wWT1Ntix0umS+jHesJR+Bc8njDJ95cdjzzQg8isg=; b=JxQdmhS+69xqYIkELsU2tq6u82Ziwgw26lIuNs7nlx5XPhP0JZpqDmedH5SUJAYBXB ecwYK+HbveMVB+l8GplcMjjmxdQBXd/sF6vBOvlBSfumb9/IwsW/0gVJmocySWpINIxp PJ7/X2MoVXWg/hMWl8fxY1Mv/oBkFy3ztND4ZCCcS1V/UoKFpklIdHaEqmpG4Trrq1lI AqoXlSKEHDDoXf/oeLzckxn/mo8EUjOpLMlhg84h19/c+VFPsRR1lZAwgljKB76T2/AP Y/nnrOiVheLHkweIZkSOo3x7kLUze5GBs4ucAv6hv+pZQc/USu7A4NuPnzlEnpcDYDzZ TGAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Qtue6CQg; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l18si13677775ejg.248.2019.10.15.14.35.43; Tue, 15 Oct 2019 14:36:06 -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=@gmail.com header.s=20161025 header.b=Qtue6CQg; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389302AbfJOTKN (ORCPT + 99 others); Tue, 15 Oct 2019 15:10:13 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:52770 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389296AbfJOTKM (ORCPT ); Tue, 15 Oct 2019 15:10:12 -0400 Received: by mail-wm1-f67.google.com with SMTP id r19so243735wmh.2; Tue, 15 Oct 2019 12:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=q85wWT1Ntix0umS+jHesJR+Bc8njDJ95cdjzzQg8isg=; b=Qtue6CQgRcmNCCevDgHkx1nw6nwFmlUixidcjbgaIDm4CTFvf9nEgb5BaqJwTwk33t qDClhJVxShLHZtTLCcaqSqt1ubXo5CHnT1ckRwUGXiQb06xdXNw8cAWPvChjA/mQidDW 3Xa6unKQyCYmR+lI0WDYtykal4JiuA690wKtJ8Kmclf0Ot8Lajas8/OG3zshPSp044Gd ZuUssuVp1oVhFQyWdfoCXOa5v6ofDAuiaou4inXUVvR/KbSVqwpwI4hAr9oDnrnJaCj6 +PxyeVYecH51/ZEKinF324uy+IMrEfsgDT5hV3ha/+xaBnEGP22pQplalarGlqT19JF3 vldA== 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=q85wWT1Ntix0umS+jHesJR+Bc8njDJ95cdjzzQg8isg=; b=FDhgsged6qpW4RbYoOnEmLdMWB3ge7impcfuEYBN7CkJ7+Txlrti1BAmFKmKA0xj93 hJl8yn1G4vaWxucY9c9jsKwzOE/OWvO5ZWUuY9GjblvtlgHmlvgcp2wKjjQovYsYLWV4 xAcR2lx6r9Bv6kr1NRdHLg/pRzYJFY9+KtIPx5sUh86+GmpQK4i8R1mMO6XOS0q78oQu zFH1479Dtzfa9tbKwB3vcGlHpUiAvUvJ9apGzRPME7JnJq20nrq+tYfTjgA60ne2HZyQ xVuUUPj/PWvM/TdDbC+zl+q3VxxCHE/7YG+HfSowrrGyj5MaNK2maSfidtPv7VuMCsuW ZSXA== X-Gm-Message-State: APjAAAV7oMxq3ENDGaAJ/sjzqQdBGkz8+VAz5J3N0ce99a0l053/PjqC BydJEWx7SsGfLpFaHXOn7vfrCyO8 X-Received: by 2002:a7b:cd87:: with SMTP id y7mr61400wmj.93.1571166610784; Tue, 15 Oct 2019 12:10:10 -0700 (PDT) Received: from debian.home (ip51ccf9cd.speed.planet.nl. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id u26sm25089984wrd.87.2019.10.15.12.10.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Oct 2019 12:10:10 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: robh+dt@kernel.org, mark.rutland@arm.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] arm64: dts: rockchip: rk3399-rock-pi-4: restyle rockchip,pins Date: Tue, 15 Oct 2019 21:09:59 +0200 Message-Id: <20191015191000.2890-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The define RK_FUNC_1 is no longer used, so restyle the rockchip,pins definitions. Signed-off-by: Johan Jonker --- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts index 1ae1ebd4e..188d9dfc2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts @@ -486,21 +486,18 @@ sdio0 { sdio0_bus4: sdio0-bus4 { - rockchip,pins = - <2 20 RK_FUNC_1 &pcfg_pull_up_20ma>, - <2 21 RK_FUNC_1 &pcfg_pull_up_20ma>, - <2 22 RK_FUNC_1 &pcfg_pull_up_20ma>, - <2 23 RK_FUNC_1 &pcfg_pull_up_20ma>; + rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>, + <2 RK_PC5 1 &pcfg_pull_up_20ma>, + <2 RK_PC6 1 &pcfg_pull_up_20ma>, + <2 RK_PC7 1 &pcfg_pull_up_20ma>; }; sdio0_cmd: sdio0-cmd { - rockchip,pins = - <2 24 RK_FUNC_1 &pcfg_pull_up_20ma>; + rockchip,pins = <2 RK_PD0 1 &pcfg_pull_up_20ma>; }; sdio0_clk: sdio0-clk { - rockchip,pins = - <2 25 RK_FUNC_1 &pcfg_pull_none_20ma>; + rockchip,pins = <2 RK_PD1 1 &pcfg_pull_none_20ma>; }; }; @@ -532,8 +529,7 @@ wifi { wifi_enable_h: wifi-enable-h { - rockchip,pins = - <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; }; wifi_host_wake_l: wifi-host-wake-l { -- 2.11.0