From patchwork Mon Nov 22 12:56:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aswath Govindraju X-Patchwork-Id: 12631873 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E9726C433F5 for ; Mon, 22 Nov 2021 12:59:19 +0000 (UTC) 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=zR6srX56p599u8UMF2XFCkJTIsQo4cNMHQevorq2Zys=; b=3GMU2E2orZ+l6F KOtk5DICDxA161nmbFb6n1R0I+LEZFZTEIUo9+A+yyJtn0LAJ3QfAu6fhwEOOXJM5ckJCiTbz4H8f /uO1Y2pko8fhrAeMno5V3yS40bTcMWC866A7l8JU8zyNZMALb58muRpTOe+4k9RckRekBH5SWy7ZJ hbQmteMTlv4tN0gmm/pyZnsImuCarB/h3bZAAsKXu63fDalrFGnIIWOUXm0q5AHWYhhnsq6W+YEFw +DUW4JErlSr4nj4LFXTr8J3WC7wIShWCvjxgpL4G8EoZgnUprRcaLVNxQSh2AvEIwOY5nnl3o6hdi nSRg8OoYPGDw1zFjWD/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mp8ul-00GXUf-8b; Mon, 22 Nov 2021 12:59:19 +0000 Received: from fllv0015.ext.ti.com ([198.47.19.141]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mp8sE-00GWLP-5F for linux-phy@lists.infradead.org; Mon, 22 Nov 2021 12:56:43 +0000 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 1AMCuahA088056; Mon, 22 Nov 2021 06:56:36 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1637585796; bh=Og3+O1jskQm9r1BZRRkEZXp0Ecf5L2wGQtT+0FYWQMo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Z70SGHG9BCzzhjYF4IVyCQ++6Yy2b8dy+8qnoAQy3jfZgBbYkzt+9Bj6cQCQjsXZH bv3DbaiFJxXP781ujLXZAqnzyYMLshik+G3FDAt5P2WZKIJysJnu0TOAJY1QxtmZ4n f4j5ksnQ+GA5iqDu+eFvbmMt43ATXOxJPzHePP7c= Received: from DFLE104.ent.ti.com (dfle104.ent.ti.com [10.64.6.25]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 1AMCuaZl118596 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 22 Nov 2021 06:56:36 -0600 Received: from DFLE104.ent.ti.com (10.64.6.25) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Mon, 22 Nov 2021 06:56:35 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Mon, 22 Nov 2021 06:56:35 -0600 Received: from gsaswath-HP-ProBook-640-G5.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 1AMCuQi0109786; Mon, 22 Nov 2021 06:56:32 -0600 From: Aswath Govindraju To: CC: Nishanth Menon , Vignesh Raghavendra , Aswath Govindraju , Peter Rosin , Rob Herring , Wolfgang Grandegger , Marc Kleine-Budde , Kishon Vijay Abraham I , Vinod Koul , , , , Subject: [PATCH RFC v2 1/4] dt-bindings: mux: Increase the number of arguments in mux-controls Date: Mon, 22 Nov 2021 18:26:21 +0530 Message-ID: <20211122125624.6431-2-a-govindraju@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211122125624.6431-1-a-govindraju@ti.com> References: <20211122125624.6431-1-a-govindraju@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211122_045642_321643_F56D8DCB X-CRM114-Status: GOOD ( 10.31 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Increase the allowed number of arguments in mux-controls to add support for passing information regarding the state of the mux to be set, for a given device. Signed-off-by: Aswath Govindraju --- Documentation/devicetree/bindings/mux/gpio-mux.yaml | 2 +- Documentation/devicetree/bindings/mux/mux-controller.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/mux/gpio-mux.yaml b/Documentation/devicetree/bindings/mux/gpio-mux.yaml index 0a7c8d64981a..c810b7df39de 100644 --- a/Documentation/devicetree/bindings/mux/gpio-mux.yaml +++ b/Documentation/devicetree/bindings/mux/gpio-mux.yaml @@ -26,7 +26,7 @@ properties: List of gpios used to control the multiplexer, least significant bit first. '#mux-control-cells': - const: 0 + enum: [ 0, 1, 2 ] idle-state: default: -1 diff --git a/Documentation/devicetree/bindings/mux/mux-controller.yaml b/Documentation/devicetree/bindings/mux/mux-controller.yaml index 736a84c3b6a5..0b4b067a97bf 100644 --- a/Documentation/devicetree/bindings/mux/mux-controller.yaml +++ b/Documentation/devicetree/bindings/mux/mux-controller.yaml @@ -73,7 +73,7 @@ properties: pattern: '^mux-controller(@.*|-[0-9a-f]+)?$' '#mux-control-cells': - enum: [ 0, 1 ] + enum: [ 0, 1, 2 ] idle-state: $ref: /schemas/types.yaml#/definitions/int32 From patchwork Mon Nov 22 12:56:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aswath Govindraju X-Patchwork-Id: 12631877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 603CFC433FE for ; Mon, 22 Nov 2021 12:59:20 +0000 (UTC) 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=LVn2v7vQWu9Q7UBUnvAzgrRRN3RJIO3gcQDfaT/e98M=; b=g7Lx2CPQxtpDn8 eImNG3nuDSbf+h1nw3ynE2LxzmSKYuERpSaZMVuS/OvlsmpjwZqI4ykRHbGM31gF5evrD/V89Xkqm q3RsuuBAjPTzBiA45/XGffmse6JBLAb8sr14T+/8q+MHhLF1ke8L7HAPsqx8Qua0vwTV4UqmCvdLF haeQAyc5E26fH4T8YKKqK9fUfynYteaEbez7RAGkdgvbSyOTBEN0wA4BT5RvlOFX4jd3YAXPg+Cok ySZHeMaHwY/53/YDCNb7N3vj/kd8xDwQcTHpuZICzKT3uZLBcXMn2hC6/1rLTchMwtzEjjPTG3A9w 7vxh+1d9NcGfVNoSQerg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mp8ul-00GXV0-JN; Mon, 22 Nov 2021 12:59:19 +0000 Received: from lelv0143.ext.ti.com ([198.47.23.248]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mp8sM-00GWNq-Ma for linux-phy@lists.infradead.org; Mon, 22 Nov 2021 12:56:52 +0000 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 1AMCufmH065907; Mon, 22 Nov 2021 06:56:41 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1637585801; bh=F9DCa620EBhOWSMGuwO/rTA9ebG6ER5N7DJdYv3qsog=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=QOZ88aKaWMs23vkOcj5pK806A1u4PINGnbPsstP5gPlRynhj8y6zvZ7fWTgfaHa4s JD7q0sV6NFbiRyEZmHeyx2qPjIJ+gzDATEMGOgzLc691Djfe9B72v/OLJWgrW8VBt8 OjP4O2c1p3EnCg0/3EkNPCbnlBz7vtB++nIp3ew8= Received: from DLEE105.ent.ti.com (dlee105.ent.ti.com [157.170.170.35]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 1AMCufZa118648 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 22 Nov 2021 06:56:41 -0600 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Mon, 22 Nov 2021 06:56:41 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Mon, 22 Nov 2021 06:56:41 -0600 Received: from gsaswath-HP-ProBook-640-G5.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 1AMCuQi1109786; Mon, 22 Nov 2021 06:56:37 -0600 From: Aswath Govindraju To: CC: Nishanth Menon , Vignesh Raghavendra , Aswath Govindraju , Peter Rosin , Rob Herring , Wolfgang Grandegger , Marc Kleine-Budde , Kishon Vijay Abraham I , Vinod Koul , , , , Subject: [PATCH RFC v2 2/4] dt-bindings: phy: ti, tcan104x-can: Document mux-controls property Date: Mon, 22 Nov 2021 18:26:22 +0530 Message-ID: <20211122125624.6431-3-a-govindraju@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211122125624.6431-1-a-govindraju@ti.com> References: <20211122125624.6431-1-a-govindraju@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211122_045650_861757_B6C0A50E X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org On some boards, for routing CAN signals from controller to transceivers, muxes might need to be set. Use mux-controls property can be used for model this. Signed-off-by: Aswath Govindraju --- .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/devicetree/bindings/phy/ti,tcan104x-can.yaml b/Documentation/devicetree/bindings/phy/ti,tcan104x-can.yaml index 6107880e5246..7392088cf060 100644 --- a/Documentation/devicetree/bindings/phy/ti,tcan104x-can.yaml +++ b/Documentation/devicetree/bindings/phy/ti,tcan104x-can.yaml @@ -37,6 +37,13 @@ properties: max bit rate supported in bps minimum: 1 + mux-controls: + description: + mux controller node to route the signals from controller to + transceiver. The first and second arguments can be used + representing the line in the mux-controller to control and + the state to be set in the given line respectively. + required: - compatible - '#phy-cells' @@ -53,4 +60,5 @@ examples: max-bitrate = <5000000>; standby-gpios = <&wakeup_gpio1 16 GPIO_ACTIVE_LOW>; enable-gpios = <&main_gpio1 67 GPIO_ACTIVE_HIGH>; + mux-controls = <&mux0 0 1>; }; From patchwork Mon Nov 22 12:56:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aswath Govindraju X-Patchwork-Id: 12631879 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E1EEBC4332F for ; Mon, 22 Nov 2021 12:59:20 +0000 (UTC) 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=K6gUMtNK3zJcajhAHJAqXYm6uJyVynSGLgbfKehdKuA=; b=gEeAzFmD6QhJGM eKy3UlUgaVKFovy0kvZ6d+XNDL11DVGcBEZLH9lfIdjZDTBQVnq3jRMx8GGKJLGACxV3Fcs/Bj+Fg UnaSh/ZQonNIZiFmreQ63mrdzgmNTLUv7R7T3Vm5pYHjGxWRG17EJFwb1bs1UmJ5Oyfzq4dH08jle QpLfblOX2b1AbzmNdtaKZmEv+UhIIxegLppBANEGeqMG66/eW2NvJd54xXXg/HyDIy3hmGe7drteL 3kGprLnfp0KGmMuvBSv06VqzTQiHTsB8ly4nzLnpI8R41VjBy42X9NFwBabqf6Yfx+qkN6wgvzJhT ALB3ymrznyRhLbcQu3Ug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mp8ul-00GXVG-V5; Mon, 22 Nov 2021 12:59:19 +0000 Received: from lelv0142.ext.ti.com ([198.47.23.249]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mp8sP-00GWQL-F8 for linux-phy@lists.infradead.org; Mon, 22 Nov 2021 12:56:55 +0000 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 1AMCuls8116345; Mon, 22 Nov 2021 06:56:47 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1637585807; bh=eVWmINi4lrTAVn2s9bs20xrtU+Q+mEUZO+xNmE4+t6I=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=y1yvVryoYzJrK7Rmy9jxlGw6WFPs4QALqtfqOk//IDdtrZ1JZ+/jttiZNDfRsBPm+ 5cvDIUsLqCz92Ct7I81GUebWqHquPcN8uZm8TchIN3noAFPk+Ky9xoafpqd3244g/R GztTF93h+DgeLVrROU9e7ebO7Ea1h/7MfbqFVato= Received: from DLEE107.ent.ti.com (dlee107.ent.ti.com [157.170.170.37]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 1AMCulL3066716 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 22 Nov 2021 06:56:47 -0600 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Mon, 22 Nov 2021 06:56:46 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Mon, 22 Nov 2021 06:56:46 -0600 Received: from gsaswath-HP-ProBook-640-G5.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 1AMCuQi2109786; Mon, 22 Nov 2021 06:56:43 -0600 From: Aswath Govindraju To: CC: Nishanth Menon , Vignesh Raghavendra , Aswath Govindraju , Peter Rosin , Rob Herring , Wolfgang Grandegger , Marc Kleine-Budde , Kishon Vijay Abraham I , Vinod Koul , , , , Subject: [PATCH RFC v2 3/4] mux: Add support for reading mux enable state from DT Date: Mon, 22 Nov 2021 18:26:23 +0530 Message-ID: <20211122125624.6431-4-a-govindraju@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211122125624.6431-1-a-govindraju@ti.com> References: <20211122125624.6431-1-a-govindraju@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211122_045653_631067_C593CBA5 X-CRM114-Status: GOOD ( 17.63 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org In some cases, we might need to provide the state of the mux to be set for the operation of a given peripheral. Therefore, pass this information using the second argument of the mux-controls property. Signed-off-by: Aswath Govindraju --- Notes: - The function mux_control_get() always return the mux_control for a single line. So, control for mutiple lines cannot be represented in the mux-controls property. - For representing multiple lines of control, multiple entries need to be used along with mux-names for reading them. - If a device uses both the states of the mux line then #mux-control-cells can be set to 1 and enable_state will not be set in this case. drivers/mux/core.c | 20 ++++++++++++++++++-- include/linux/mux/consumer.h | 1 + include/linux/mux/driver.h | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/mux/core.c b/drivers/mux/core.c index 22f4709768d1..51140748d2d6 100644 --- a/drivers/mux/core.c +++ b/drivers/mux/core.c @@ -294,6 +294,18 @@ unsigned int mux_control_states(struct mux_control *mux) } EXPORT_SYMBOL_GPL(mux_control_states); +/** + * mux_control_enable_state() - Query for the enable state. + * @mux: The mux-control to query. + * + * Return: State to be set in the mux to enable a given device + */ +unsigned int mux_control_enable_state(struct mux_control *mux) +{ + return mux->enable_state; +} +EXPORT_SYMBOL_GPL(mux_control_enable_state); + /* * The mux->lock must be down when calling this function. */ @@ -481,8 +493,7 @@ struct mux_control *mux_control_get(struct device *dev, const char *mux_name) if (!mux_chip) return ERR_PTR(-EPROBE_DEFER); - if (args.args_count > 1 || - (!args.args_count && (mux_chip->controllers > 1))) { + if (!args.args_count && mux_chip->controllers > 1) { dev_err(dev, "%pOF: wrong #mux-control-cells for %pOF\n", np, args.np); put_device(&mux_chip->dev); @@ -500,6 +511,11 @@ struct mux_control *mux_control_get(struct device *dev, const char *mux_name) return ERR_PTR(-EINVAL); } + if (args.args_count == 2) { + mux_chip->mux[controller].enable_state = args.args[1]; + mux_chip->mux[controller].idle_state = !args.args[1]; + } + return &mux_chip->mux[controller]; } EXPORT_SYMBOL_GPL(mux_control_get); diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h index 7a09b040ac39..cb861eab8aad 100644 --- a/include/linux/mux/consumer.h +++ b/include/linux/mux/consumer.h @@ -16,6 +16,7 @@ struct device; struct mux_control; unsigned int mux_control_states(struct mux_control *mux); +unsigned int mux_control_enable_state(struct mux_control *mux); int __must_check mux_control_select_delay(struct mux_control *mux, unsigned int state, unsigned int delay_us); diff --git a/include/linux/mux/driver.h b/include/linux/mux/driver.h index 18824064f8c0..7db378dabdb2 100644 --- a/include/linux/mux/driver.h +++ b/include/linux/mux/driver.h @@ -48,6 +48,7 @@ struct mux_control { int cached_state; unsigned int states; + unsigned int enable_state; int idle_state; ktime_t last_change; From patchwork Mon Nov 22 12:56:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aswath Govindraju X-Patchwork-Id: 12631875 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 233EEC43219 for ; Mon, 22 Nov 2021 12:59:21 +0000 (UTC) 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=MJKuXSp1ftqKbRYJ6tVtKla/3xFrodEw8/wqPkfY+lU=; b=j2XW+1wXaneELK hsHdOXiJcOd6fE1frf5Drn4p/I9ldEYVJbxKBRFZXm+LkBpYTmYyTcOszAyJKUBqVqef+ye/u53px Un5x7S05nlhpzu26fB0JSDOCFevLCQm1JlqYv9HbLmPSm3yND/O9MGcY8/De4hhjcoujSSH1+2ijz pWzohduUBtv7b/KqnQOi8HDim2BMRBdrPVw+Ok5ZA21N9cMxCNZRcYt/tFYtbZ4bSPz92RKpvrjpj +HgjRbmpoOv6OwCcaHvng8JQSPg2ozAR37vjsccd5nB8HgLwbcTxepNzVeQ2qsMe6KTt3+gHD9Zu0 ISugM7UeAaRbcw9ZZSBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mp8um-00GXVa-8V; Mon, 22 Nov 2021 12:59:20 +0000 Received: from fllv0015.ext.ti.com ([198.47.19.141]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mp8sU-00GWT5-6L for linux-phy@lists.infradead.org; Mon, 22 Nov 2021 12:56:59 +0000 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 1AMCuqUj088078; Mon, 22 Nov 2021 06:56:52 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1637585812; bh=201VFbQiGQ4XtlfCzVLgxMzLOwwlv2IozZLdJGUR3dY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=yGiyvmXC0PSldBAXjpXtnmUOk45cjVLyYoC1hkBmf652NJv7lreIyfnkaYZ9dbA3m tdh49N0z4KReD75RUQ2sL3uJXucQjHCZEmhTBBEQO894/dxnC0B/T/Yr96cMXRwp5Z bLiwJQzchQXJgDW8Qovx1YynpP5q4cbb38HGSO9Y= Received: from DFLE104.ent.ti.com (dfle104.ent.ti.com [10.64.6.25]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 1AMCuqYa118761 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 22 Nov 2021 06:56:52 -0600 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Mon, 22 Nov 2021 06:56:51 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Mon, 22 Nov 2021 06:56:51 -0600 Received: from gsaswath-HP-ProBook-640-G5.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 1AMCuQi3109786; Mon, 22 Nov 2021 06:56:48 -0600 From: Aswath Govindraju To: CC: Nishanth Menon , Vignesh Raghavendra , Aswath Govindraju , Peter Rosin , Rob Herring , Wolfgang Grandegger , Marc Kleine-Budde , Kishon Vijay Abraham I , Vinod Koul , , , , Subject: [PATCH RFC v2 4/4] phy: phy-can-transceiver: Add support for setting mux Date: Mon, 22 Nov 2021 18:26:24 +0530 Message-ID: <20211122125624.6431-5-a-govindraju@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211122125624.6431-1-a-govindraju@ti.com> References: <20211122125624.6431-1-a-govindraju@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211122_045658_352045_E7C43D0E X-CRM114-Status: GOOD ( 14.40 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org On some boards, for routing CAN signals from controller to transceiver, muxes might need to be set. Therefore, add support for setting the mux by reading the mux-controls property from the device tree node. Signed-off-by: Aswath Govindraju --- drivers/phy/phy-can-transceiver.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/phy/phy-can-transceiver.c b/drivers/phy/phy-can-transceiver.c index 6f3fe37dee0e..15056b9d68ba 100644 --- a/drivers/phy/phy-can-transceiver.c +++ b/drivers/phy/phy-can-transceiver.c @@ -10,6 +10,7 @@ #include #include #include +#include struct can_transceiver_data { u32 flags; @@ -21,13 +22,23 @@ struct can_transceiver_phy { struct phy *generic_phy; struct gpio_desc *standby_gpio; struct gpio_desc *enable_gpio; + struct mux_control *mux_ctrl; }; /* Power on function */ static int can_transceiver_phy_power_on(struct phy *phy) { + int ret; struct can_transceiver_phy *can_transceiver_phy = phy_get_drvdata(phy); + if (can_transceiver_phy->mux_ctrl) { + ret = mux_control_select(can_transceiver_phy->mux_ctrl, + mux_control_enable_state(can_transceiver_phy->mux_ctrl)); + if (ret) { + dev_err(&phy->dev, "Failed to select CAN mux: %d\n", ret); + return ret; + } + } if (can_transceiver_phy->standby_gpio) gpiod_set_value_cansleep(can_transceiver_phy->standby_gpio, 0); if (can_transceiver_phy->enable_gpio) @@ -45,6 +56,8 @@ static int can_transceiver_phy_power_off(struct phy *phy) gpiod_set_value_cansleep(can_transceiver_phy->standby_gpio, 1); if (can_transceiver_phy->enable_gpio) gpiod_set_value_cansleep(can_transceiver_phy->enable_gpio, 0); + if (can_transceiver_phy->mux_ctrl) + mux_control_deselect(can_transceiver_phy->mux_ctrl); return 0; } @@ -95,6 +108,19 @@ static int can_transceiver_phy_probe(struct platform_device *pdev) match = of_match_node(can_transceiver_phy_ids, pdev->dev.of_node); drvdata = match->data; + if (of_property_read_bool(dev->of_node, "mux-controls")) { + struct mux_control *control; + int ret; + + control = devm_mux_control_get(dev, NULL); + if (IS_ERR(control)) { + ret = PTR_ERR(control); + dev_err_probe(&pdev->dev, ret, "failed to get mux\n"); + return PTR_ERR(control); + } + can_transceiver_phy->mux_ctrl = control; + } + phy = devm_phy_create(dev, dev->of_node, &can_transceiver_phy_ops); if (IS_ERR(phy)) {