From patchwork Tue Oct 15 19:09:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 11191529 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9CA8214DB for ; Tue, 15 Oct 2019 19:10:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A4E120854 for ; Tue, 15 Oct 2019 19:10:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KZNJ2udR"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Qtue6CQg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A4E120854 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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=uoxMPZiDnsv2gpBgyjZK2qRT1z2oZJUYfQz7Z58pwuI=; b=KZN J2udR1gzwMd2TG0OkwG1c7+y3NHHhOI6wCsztwkswtFzK8qMncqpOO8T4swcmX8IIq8to0AFLRwdF jSqeeb++KFP1jMv89l5UDvuXV3rYffxYO2CLq9mYbXO9p1WduQptX3j144nj/YEyB01cpqyJ7VUOc RUAQLyHsPvmIWVEC8TXAv3NHDCjwAcZq5cEYMxPG28++3JxPTHZX/EZE0InSDWTzgtc+WzQVEQ17R I95zVftOUvaZlhW0ZPJS16hvB3chLk4f9B6vA3N6VITRFUj+zuZnjFxgajoQX2wuBSmonM8Hn41NL 4NGXzpAi6LGRGaVBI+LFanWSjrT641w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKSDZ-0007QB-K4; Tue, 15 Oct 2019 19:10:49 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKSD3-0006rf-HD; Tue, 15 Oct 2019 19:10:18 +0000 Received: by mail-wm1-x344.google.com with SMTP id p7so230384wmp.4; 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=gAXQE2EmqIfYcMyOHUEAYVL7DGxhZ840KKyHTHN528AdwuWY5H4yKkObqDPp9Hlsx0 InxGUhj9oj8ssrT7HarTjqIQj1k8gHYCIgKgpAutS3NpKbL+Ym3sMAb2+e/Vh2Te0MHm pj32/tcLBQbrCT/2OrGr+M5Du2x+ntqDVWQxw42jneqzLmiXzyQ+Gsc873xPfi4lD2l8 FRpnDTVmV+Gp8SOrtrnQ+U/JHAIhL/SWQxPOrNS0OLmGz7fhSifAZB9LJgB3r39GDZW4 PshwmnuG4cMFHBowX0w2Sz84fhp1obzKrKmtkteR0UC/foaX3cq3hstnbtS67vuLVm73 8aJQ== X-Gm-Message-State: APjAAAX9AIi5w7TmcUgKf2vlQo++hrB0ywYKrwriGQfHB2ivL8e4kVu3 15JMVdT3leR9VKE5qZPDtpI= X-Google-Smtp-Source: APXvYqzKZdq6eLHh6x7PFZAJKQx0U0RnCiTFPg+KYwQ0VlKMan5QzmHnChRFPM30ZpQC7osTfYxqhA== 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191015_121017_577357_86EA5BCA X-CRM114-Status: GOOD ( 10.61 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:344 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jbx6244[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (jbx6244[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.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 { From patchwork Tue Oct 15 19:10:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 11191531 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E6901390 for ; Tue, 15 Oct 2019 19:10:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C9BF20854 for ; Tue, 15 Oct 2019 19:10:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cSefLYl3"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CQPBccpC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C9BF20854 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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:References: In-Reply-To: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:List-Owner; bh=9BZaji+amuUbwsTvnBz3qDaA3ImrLjW11RMJPadcphM=; b=cSefLYl3G0Dvs07f5b+HBql2nB /tJf84k+bLm8wmTWPHyJBJx1V/CL46IupEybqv3z+rT0n5TVbOTgRs5U41IPHKPFCp7U8Ybn3mnXu dp2XNO0tawDD7PFnFkhUP7NwPbUPb/1y0yXEvzU8+Dgx5kyjCUW6BPntfjn/Uk/ErgnUOJlgIxuFd 39nYWEhKxv99qkRvyx3r/6jpmcNTyb6c8DwZ+Q8lu1JneN9cIf2WrX1hDPvx+gb9ZeeaV0wenvVKJ xG+oRqUBI33ZVLdqwMhtnEEaTiJJEGNJyg65xxSTal6V11OgqmykXHMRPFlAljIO1cwFcmvlssqyl xyGfrCkw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKSDc-0007SO-Re; Tue, 15 Oct 2019 19:10:52 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iKSD3-0006yo-J5; Tue, 15 Oct 2019 19:10:18 +0000 Received: by mail-wm1-x344.google.com with SMTP id r19so243770wmh.2; Tue, 15 Oct 2019 12:10:12 -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:in-reply-to:references; bh=iUvBerQddYmthJVayR0YUavvmPSsApA6rPHT7ry9gZM=; b=CQPBccpCjw/Sso/I1eghm8gDdbDrvw6bhKk463W434QzPsmH/EcDrwH5OjhZgnD85q T979D8d+4CXOBqNJUM+WwpZdgiD0jqvwxuJLKTDtvf14rf4EKtMZN9s76jmm+BhGN8QV JcolqoGCKfGCJMy4tjp7dWc3rsP2kY6Rh4hGk604EgvTKQC+I74h//Fa3MSsvwweztxD +zDgOwHK6PStVZPGrPh2EPP/XkHhCIOzVTnvFAi2MQG3ZtkQMeCmzjnGj7+iRIQyYK2h +23Ndauj8wLvqom7LpzbhcDP4Y8r4OSdIbE+c+DNKJhDUyPmt6IUMdCL48noVtMa1UA9 jsMA== 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:in-reply-to :references; bh=iUvBerQddYmthJVayR0YUavvmPSsApA6rPHT7ry9gZM=; b=G2DrW6+SidbcyDohD75Cq+6h8lVUw4ctYWjR52gCvnb0w3xtdZz1tTDWRf5akvimv9 44soEzccSRnAphkcnj4TWfG0cL++wKUFQI9UImLjmo6X5pGNNz6GgoD3u1Ule1zqbVVF W+uyVwqkpNORWt9cBW91r3AVS+kUp5BPX09hWMSkraU6fTCTDEzztbsZBsPEy5QVOXRt m4hcWVaL5fK9NqeMBlY07PoIsLPhZfNIn0NvfkarYArBtUn6+A/o6FEacBvrK3rZmMD0 CBH9jMVjfzENXQapDAW4B/+MHdwZ41g3MqeqQly+hMnWJrC7Pkns7DMX74V78pDfVAo/ n+fA== X-Gm-Message-State: APjAAAWOVFeRFqH85m8JJrDRNkAQt4nUnr27kf67GKxBJ2rqHdbRgWeX EhUcM48L64c7YUiAzeDv9As= X-Google-Smtp-Source: APXvYqyBlK332ZryIQ0G96MVaBD1a1pECjFocKt//rUbE5ZTMRxlSfCkSM0UjXKmzCeVAUuZhl9iGQ== X-Received: by 2002:a7b:ce89:: with SMTP id q9mr31686wmj.2.1571166611570; Tue, 15 Oct 2019 12:10:11 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Oct 2019 12:10:11 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH 2/2] include: dt-bindings: rockchip: remove RK_FUNC defines Date: Tue, 15 Oct 2019 21:10:00 +0200 Message-Id: <20191015191000.2890-2-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191015191000.2890-1-jbx6244@gmail.com> References: <20191015191000.2890-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191015_121017_625359_D9CA311F X-CRM114-Status: UNSURE ( 9.97 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:344 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jbx6244[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (jbx6244[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org The defines RK_FUNC_1, RK_FUNC_2, RK_FUNC_3 and RK_FUNC_4 are no longer used, so remove them to prevent that someone start using them again. Signed-off-by: Johan Jonker --- include/dt-bindings/pinctrl/rockchip.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h index dc5c1c73d..2798b6c03 100644 --- a/include/dt-bindings/pinctrl/rockchip.h +++ b/include/dt-bindings/pinctrl/rockchip.h @@ -50,9 +50,5 @@ #define RK_PD7 31 #define RK_FUNC_GPIO 0 -#define RK_FUNC_1 1 -#define RK_FUNC_2 2 -#define RK_FUNC_3 3 -#define RK_FUNC_4 4 #endif