From patchwork Sat Aug 28 11:12:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12463431 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEFE3C432BE for ; Sat, 28 Aug 2021 11:12:55 +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 BA4D9608FB for ; Sat, 28 Aug 2021 11:12:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BA4D9608FB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :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=clS+ycZ6uTVQ6q34ssCyCo1LBtgQ0l2p6S9M7bGM4Us=; b=jrmXD3q5yYWd7s 4yKuG7D0evoBcCc221nxhe8sUzKM+wWDGrCKLMEg1WorCBAiWVuPPVj4pJjq3U3BRqRqE9Ya6hXVS 8x6CQ6Oi17nzUXyABkAWJmTwO++j24a/PeDUFwGAFbWxWV0u9wak272IVpfjrshNaCTRjTSOItIu/ zrYY2VD0SVAHORLPuVwd1iUDUdyUo0ny0UTfj6IiEc/jMX5EHGDy68FqWj9E+7/pMp58wK7UaWjhM VJ5hnUz9L5AkU7fBkM96PlpbQRWT0DI6sIOkWIuMFN0enFswA4kTytx7ujJVZEQSUlMqFEzVBf5az 1GKvbO0pkWyNYxwH+O+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJwGZ-00E8Gh-Ij; Sat, 28 Aug 2021 11:12:51 +0000 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJwGB-00E88q-5z; Sat, 28 Aug 2021 11:12:28 +0000 Received: by mail-ed1-x530.google.com with SMTP id q3so13839640edt.5; Sat, 28 Aug 2021 04:12:26 -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:mime-version :content-transfer-encoding; bh=HNPNHeMY1pAufWRJDKpC4YVFgerQ8O6XdjZUjWL0NoY=; b=od/uqxeoSDEa9+9amuQv5t1T0uCN5kAoalGAmHeKNc/9b1GHvJ+kgInOP9Dr+pNw73 idHtIMeA/Yk+H+B2awdqAf7Z6c+YX5/ZBQNkVH2hCTSg6KjoeSBC5AjxVjXfsaGcGhGz /lG4DhzvDy04x33Nle0X+TCL0nDTDH/dUF90vT34KXjsh7B6eRvTvSc5mbEeZJvjk+gK ksPws+Td9ORVhizSgv+ELhNvtcB6mJ0UNbABLCsSxT1/xIQwggBMVAnh5TO2LBICsmfy pqJqeDD6+Ddq1t1YHO2UrcTyOcv2+0jZ2LkLJYbZBdXfFnpIIHgteCBsFUHgh+clORZO /aXw== 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:mime-version :content-transfer-encoding; bh=HNPNHeMY1pAufWRJDKpC4YVFgerQ8O6XdjZUjWL0NoY=; b=DnpSEphcWQKLB/WWNHj2H3Lp5pPfYkfo3aNYOAAIUwwiI5LLmh+fTG2hY4jPnF9sLW xg2mcJ1MCTuxR/78sPv46cO+qw/MVZdhuyCwNn0w0BbUKa8A/CWzSjqBddMgEpATahKo r7tLqbrD17IEY95S0Ub/lj7ZRP/pUBsHLIKJSwB/kdoj6aByo/u6eJP5RJPfvXCazZou Hc3sHbqYRnet8m9vaugSo0FcZlaPIlXtP2V7I6o4OSUtmjtNR4ee//H3uUAGhec7l+5l GTlg3JYek7vn2a2zChE78QzQAgfVOBmaN1T0aaNZY8uAQBUhB6ozc4UyIMehWCUtFd/T clIg== X-Gm-Message-State: AOAM533pVzZYGBg0m1r97yArTkq2r4H6dMwjJ5kit8uIacNInXLZhBst oS0nSNZh/oYb1gMM+SgdPwQ= X-Google-Smtp-Source: ABdhPJx/9ZaL2hFLYRlQE0A/LhxFewkqLdwXnHDwwrzuHk6sG8gJjsxZEccPC8iEZ1cIJpk1osFc1A== X-Received: by 2002:aa7:dc56:: with SMTP id g22mr14613669edu.187.1630149145258; Sat, 28 Aug 2021 04:12:25 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id z15sm4716665edr.80.2021.08.28.04.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Aug 2021 04:12:24 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: robh+dt@kernel.org, kishon@ti.com, vkoul@kernel.org, linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] dt-bindings: phy: rockchip: remove usb-phy fallback string for rk3066a/rk3188 Date: Sat, 28 Aug 2021 13:12:17 +0200 Message-Id: <20210828111218.10026-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210828_041227_283827_0DD1BC65 X-CRM114-Status: UNSURE ( 8.50 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org With the conversion of rockchip-usb-phy.yaml a long time used fallback string for rk3066a/rk3188 was added. The linux driver doesn't do much with the GRF phy address range, however the u-boot driver rockchip_usb2_phy.c does. The bits in GRF_UOC0_CON2 for rk3066a/rk3188 and rk3288 for example don't match. Remove the usb-phy fallback string for rk3066a/rk3188 to prevent possible strange side effects. Signed-off-by: Johan Jonker Acked-by: Rob Herring --- .../devicetree/bindings/phy/rockchip-usb-phy.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml index f0fc8275d..499d55131 100644 --- a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml +++ b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml @@ -11,13 +11,10 @@ maintainers: properties: compatible: - oneOf: - - const: rockchip,rk3288-usb-phy - - items: - - enum: - - rockchip,rk3066a-usb-phy - - rockchip,rk3188-usb-phy - - const: rockchip,rk3288-usb-phy + enum: + - rockchip,rk3066a-usb-phy + - rockchip,rk3188-usb-phy + - rockchip,rk3288-usb-phy "#address-cells": const: 1 From patchwork Sat Aug 28 11:12:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Jonker X-Patchwork-Id: 12463433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96DD4C432BE for ; Sat, 28 Aug 2021 11:13:12 +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 4FF2E606A5 for ; Sat, 28 Aug 2021 11:13:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4FF2E606A5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=eETdAUdpSGiNBTI6DUlqIN/Gx293pehdRqjYzi/90N8=; b=w8zNlmN//e/NaU krZRnsnBqPZjhWWP2JYjvNGoOnbo/d2CH/L7VrMU9HEA5tMZcAJj81Wdyoo97wVBavaE1SjSEY6qD 2RZnsEPpyIMAg4XwCJ1Bb+88t3FouyrY5o+6UNGOP4MMNVl7fFzB6x5Z6GEGdTkVUKZVkozOMbtcr bwVfCRXLCtGOi3gn73KiFFnWRA1oSYU7KKxPEm6Uv6VT+iuOljkfrm+VDFOkDkd14GHAIFmLrXnHL 5iFlFrgInJAxVQd+HLPg04r8C1aRV01UKInpyOdzy2SZjbs13QVPuYVigfWJI0B3C9nhftNn1PzRR 9q3GNe/DBXsinbxizt0A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJwGp-00E8PD-6R; Sat, 28 Aug 2021 11:13:07 +0000 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJwGB-00E88x-L1; Sat, 28 Aug 2021 11:12:29 +0000 Received: by mail-ed1-x534.google.com with SMTP id eb14so4641147edb.8; Sat, 28 Aug 2021 04:12:26 -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 :mime-version:content-transfer-encoding; bh=39v55ZA/hFZsNg0cEUPwV28i0EcogCJUViGDxeBmNP0=; b=Go5JKD/tmYkY3YuHZlTBp+5EYiY2mNFdn8wZVUGahl57SoxGHkpsPRKaZjr6LIErI1 fE6E7ue5Qz9KRucuw5VkHF7iFweJhI2vAC6Yxs2f28Cr3WrxSu3XFPUqBfWDHv5Exkf9 DQisnJ+aHT7P2NflCdf+Soc6evqXEI8o3Uz3vqyQtRIHo2agoj03zpnE8G16ceIMlB3P rPGZE2oNZNsVZDIwfpnycFbHjZdjovhLQVbOKOsaYHr4DBKcIq+vMxu8tyJjKJByrflX lIsDvGgTVx9Ynb8kOdzQ+ajKFFeKY+yDDJy4QT/0sYZ6KM4zSRV99JvJJ0A7eJ2Yk+/3 8BZA== 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:mime-version:content-transfer-encoding; bh=39v55ZA/hFZsNg0cEUPwV28i0EcogCJUViGDxeBmNP0=; b=qz3WeapEMSxpV/VYsyOYpQFN8wPYBHyNrpVpknG2hLJHTAnkJU8rj4EfqiOL0F9eEc UuKJzbKPJ5eHb3WDO7GljZx2SCSCdRpUiDDObVRICpQGvv6vg4eVkyGQKhn/VCqoUqwB QDFJw6Er5vl5xyUaT9/qja8/VaGzpkW2JonyqLwbaTeoo0WDX4Sssaw5pMGHwlUgeMdE FVevIFa6USDRfvMu1U/9nemTCb3YD7uek00TLgHfN65vH2mfEnf/SftRB4y6qU6cP/yu 0HC8Hh3O9OOyHm4xY7QxNTj3Mwppzbcx4Bdnmo9wgXis8UafuzcoU7c2iP3fFEtF1RJF kcTA== X-Gm-Message-State: AOAM530zv4Wk69OnzB+wSTEv/P8nUa86D7IkfnSXXI2vJJagyvAsPOTm a2vUCB5SgTuHnpXz10untUE= X-Google-Smtp-Source: ABdhPJyFVgO1IZ9+J0PUFNVZUQajZxjvIXNmcv8b82h16QoexlUvvJXIevofKX6SYchlQWKZuN4WPA== X-Received: by 2002:a50:cb83:: with SMTP id k3mr15017614edi.102.1630149145908; Sat, 28 Aug 2021 04:12:25 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id z15sm4716665edr.80.2021.08.28.04.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Aug 2021 04:12:25 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: robh+dt@kernel.org, kishon@ti.com, vkoul@kernel.org, linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ARM: dts: rockchip: remove usb-phy fallback string for rk3066a/rk3188 Date: Sat, 28 Aug 2021 13:12:18 +0200 Message-Id: <20210828111218.10026-2-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210828111218.10026-1-jbx6244@gmail.com> References: <20210828111218.10026-1-jbx6244@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210828_041227_745353_2A87D500 X-CRM114-Status: GOOD ( 12.02 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org With the conversion of rockchip-usb-phy.yaml a long time used fallback string for rk3066a/rk3188 was added. The linux driver doesn't do much with the GRF phy address range, however the u-boot driver rockchip_usb2_phy.c does. The bits in GRF_UOC0_CON2 for rk3066a/rk3188 and rk3288 for example don't match. Remove the usb-phy fallback string for rk3066a/rk3188 to prevent possible strange side effects. Signed-off-by: Johan Jonker --- arch/arm/boot/dts/rk3066a.dtsi | 3 +-- arch/arm/boot/dts/rk3188.dtsi | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi index cc701a4e0..10392e096 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -681,8 +681,7 @@ compatible = "rockchip,rk3066-grf", "syscon", "simple-mfd"; usbphy: usbphy { - compatible = "rockchip,rk3066a-usb-phy", - "rockchip,rk3288-usb-phy"; + compatible = "rockchip,rk3066a-usb-phy"; #address-cells = <1>; #size-cells = <0>; status = "disabled"; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index d6a946a2a..922290892 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -647,8 +647,7 @@ }; usbphy: usbphy { - compatible = "rockchip,rk3188-usb-phy", - "rockchip,rk3288-usb-phy"; + compatible = "rockchip,rk3188-usb-phy"; #address-cells = <1>; #size-cells = <0>; status = "disabled";