From patchwork Fri Nov 20 07:35:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 329142 Delivered-To: patch@linaro.org Received: by 2002:a17:907:2110:0:0:0:0 with SMTP id qn16csp1049309ejb; Thu, 19 Nov 2020 23:36:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJyAiUHOXqIw19izI+ZozMzDZ1W3F+g2BnTtACwRsGWtfXOUf7hLjjMaU0Fjz4gGiaYkk0Nm X-Received: by 2002:a17:906:b01:: with SMTP id u1mr32993589ejg.427.1605857800713; Thu, 19 Nov 2020 23:36:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605857800; cv=none; d=google.com; s=arc-20160816; b=tQB9f3rht22kRf+ha5wVPyC8PjUGkOYXmDhusv5DBpnL67F8mWfD7mxYMjy6qxt/cq pAtC6X5KGr4O73c8jPxv0kDip+WeBHefxRiShcXvsRP1WHZ40Lm+amyr0+76l/IZ1wwn 9dGYbbWezC3qvzLDDDEjlfwUSZCyDmmgqcQQZkXlJHt3QuuFPc5v/7pfCSDx2Ou3nHPv JEce2s+mshKTzMincp0TQpD0VW1jy2oFsBA7d+V+biDyu+OFTvSdEsSZHUpHsPKx55aY hkHFX69FJ990JT1JAiF93o3xkZB4jNQfItv8GyskTrt1ncR0BTMjorAQ/WEkqz1whg2z s7fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ka305g9Wih6EMyf9XOXG43a6Vtb/HkkXTQoC5oJWRwU=; b=0l9JRruF1cpkR9bMt+TMX4Cq+GFXbTXqBd5DwCT162pLMHoRbUTJSMpBcz4C3SO5YU MiiKiD3WgidJZNTiga4/oT79ewhoanmUkiYQGc2AfjPUqbTkhsF6fs8cjK+zaTjeALcD KnssvqaCJIsraqoR98WjhM9HXf97zSclkhDt9RURikvnej4tptgvQ0JwqOYwGtgGG3Sf KAW9ilYTwYqTAf9h1ymTFJStZWdMpPDuhjY3Xql0JUjxZKItXHiChv11cQmMZgs5I0ky FqmObcEQ11gPljLtWh91QwCWbHm0kjuI+oKJGZN8HhT2ujfl5ei/RU9nkZsk0rOfEy0q qp6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="oyltxBa/"; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w8si1289572ejv.263.2020.11.19.23.36.40; Thu, 19 Nov 2020 23:36:40 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="oyltxBa/"; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727118AbgKTHex (ORCPT + 6 others); Fri, 20 Nov 2020 02:34:53 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:40524 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727076AbgKTHew (ORCPT ); Fri, 20 Nov 2020 02:34:52 -0500 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 0AK7YkoM047000; Fri, 20 Nov 2020 01:34:46 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1605857686; bh=ka305g9Wih6EMyf9XOXG43a6Vtb/HkkXTQoC5oJWRwU=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=oyltxBa/LuwDGjoW9KCFG+f/hcglGEcDbSnoH24PCpiVGUn+QAS7Lr+TFs+KJt2GT cBxP3hhUEniwqpKg26GA9bila/t9SIAPHb+ajYMDU8wjgH0WvWRCpeDtCGMYgLaPOm u4TkZdJGflTPi90ApEZw2hh9cZB0gz2VvYr5SWbs= Received: from DLEE107.ent.ti.com (dlee107.ent.ti.com [157.170.170.37]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 0AK7YkVi083857 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 20 Nov 2020 01:34:46 -0600 Received: from DLEE108.ent.ti.com (157.170.170.38) 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.1979.3; Fri, 20 Nov 2020 01:34:46 -0600 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Fri, 20 Nov 2020 01:34:46 -0600 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 0AK7YftW089749; Fri, 20 Nov 2020 01:34:44 -0600 From: Peter Ujfalusi To: , CC: , , , , Subject: [PATCH v2 1/2] arm64: dts: ti: k3-j7200-som-p0: main_i2c0 have an ioexpander on the SOM Date: Fri, 20 Nov 2020 09:35:32 +0200 Message-ID: <20201120073533.24486-2-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201120073533.24486-1-peter.ujfalusi@ti.com> References: <20201120073533.24486-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The J7200 SOM have additional io expander which is used to control several SOM level muxes to make sure that the correct signals are routed to the correct pin on the SOM <-> CPB connectors. Signed-off-by: Peter Ujfalusi Reviewed-by: Vignesh Raghavendra --- .../dts/ti/k3-j7200-common-proc-board.dts | 11 -------- arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 26 +++++++++++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts index 6b3863108571..2721137d8943 100644 --- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts @@ -43,13 +43,6 @@ J721E_WKUP_IOPAD(0x0098, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */ }; &main_pmx0 { - main_i2c0_pins_default: main-i2c0-pins-default { - pinctrl-single,pins = < - J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */ - J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */ - >; - }; - main_i2c1_pins_default: main-i2c1-pins-default { pinctrl-single,pins = < J721E_IOPAD(0xdc, PIN_INPUT_PULLUP, 3) /* (U3) ECAP0_IN_APWM_OUT.I2C1_SCL */ @@ -146,10 +139,6 @@ &cpsw_port1 { }; &main_i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&main_i2c0_pins_default>; - clock-frequency = <400000>; - exp1: gpio@20 { compatible = "ti,tca6416"; reg = <0x20>; diff --git a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi index fbd17d38f6b6..7b5e9aa0324e 100644 --- a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi @@ -48,6 +48,15 @@ J721E_WKUP_IOPAD(0x28, PIN_INPUT, 1) /* (A7) MCU_OSPI0_D7.MCU_HYPERBUS0_DQ7 */ }; }; +&main_pmx0 { + main_i2c0_pins_default: main-i2c0-pins-default { + pinctrl-single,pins = < + J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */ + J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */ + >; + }; +}; + &hbmc { /* OSPI and HBMC are muxed inside FSS, Bootloader will enable * appropriate node based on board detection @@ -131,3 +140,20 @@ &mailbox0_cluster10 { &mailbox0_cluster11 { status = "disabled"; }; + +&main_i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&main_i2c0_pins_default>; + clock-frequency = <400000>; + + exp_som: gpio@21 { + compatible = "ti,tca6408"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = "USB2.0_MUX_SEL", "CANUART_MUX1_SEL0", + "CANUART_MUX2_SEL0", "CANUART_MUX_SEL1", + "UART/LIN_MUX_SEL", "TRC_D17/AUDIO_REFCLK_SEL", + "GPIO_LIN_EN", "CAN_STB"; + }; +}; From patchwork Fri Nov 20 07:35:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 329140 Delivered-To: patch@linaro.org Received: by 2002:a17:907:2110:0:0:0:0 with SMTP id qn16csp1049282ejb; Thu, 19 Nov 2020 23:36:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJxfhb6p0Oe4MzIBDezrjQji1pUfpzyi/xquTpWCT/ao2mDh/fr9qKWq3ZX4MWocz820o4oI X-Received: by 2002:a50:fd06:: with SMTP id i6mr35494870eds.318.1605857798570; Thu, 19 Nov 2020 23:36:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605857798; cv=none; d=google.com; s=arc-20160816; b=Y0I9rF0siImOpd2HrjYH5QsdrgAm5DamvKlnWf7lww8sXTz1crdva8Ie+jHWavlyLo QdfoDo0jILGzGYYisgYI1TZqAmvvHtF1YmgUAgW+PE8Tj4ZtotrDsfRo0pVYa/M+gP79 JgCgcV60ytrw6PiBxl/fx3odzK1b1fBaKf1gBGtyPXEY6LvcHVX2U+3cA+fYRNgU0iRL 1JPrR6jKZ+A2sz6GkfdbnborwLBWOWU2XGTeKGeZlbEBBTat72DiEbmOosn0iVicxnOt NoqeJ577Cu4ksSeuwzkNPII+A3KZOZuEjF5KCEDFjEqvJ5aKAjkg8b4XT4gvLFU47qxj TcNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=keWuZXmMWanYbVCT7h7x7bRuK4QQGCy9wcihJZJ4H8c=; b=nCsXi8A6/cAM5E0e6YY1IEqRDZJh3uxfvvpShCsqMJNGe4u5luSEylWmrN9q/4KMAv REaFVkpgmxhBk4/o3dS/fXu9ZKR0IS0rac70sdzv2hMj9zf3cx7oeHCjKolo8/J74PBz JLd6naHtrC5F8sxXw6OXikUPTmE2WYlF1ET0awrlosK+1vevwK4EvXZROkiglP4sS6XY OQgI/JOuzkZwnBf0lMfWjyRSJCoLDRxbjuXCWsrNwoHzelqVcQyK2PSCxVJINxkqXMAR ncOfFXf+Kiihar4EM7ls7jFFZv9b0XBAkGd31bMJvakiJ4K5IxUVol9BD59tj4hJTBRU K6yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=d7+ZXiUD; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w8si1289572ejv.263.2020.11.19.23.36.38; Thu, 19 Nov 2020 23:36:38 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=d7+ZXiUD; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726983AbgKTHev (ORCPT + 6 others); Fri, 20 Nov 2020 02:34:51 -0500 Received: from fllv0015.ext.ti.com ([198.47.19.141]:40732 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726554AbgKTHev (ORCPT ); Fri, 20 Nov 2020 02:34:51 -0500 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 0AK7Ymk2083277; Fri, 20 Nov 2020 01:34:48 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1605857688; bh=keWuZXmMWanYbVCT7h7x7bRuK4QQGCy9wcihJZJ4H8c=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=d7+ZXiUDDm+ii7BY8oS0XSfQP22xCGWjwhyCD0KIkqkk/zHFb43jgPMQ8gaOYyDDP q6s9toDEYKrjyWBNwOaWoPV9M2HQ+g3PE3bidvPTmTu4t1UXWDwwKISgeJjFyf1wHv ms7u2UgokSyo3+REgwWgA3Rw/sp23751j9ro/8ZU= Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 0AK7Ymgi092729 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 20 Nov 2020 01:34:48 -0600 Received: from DLEE110.ent.ti.com (157.170.170.21) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Fri, 20 Nov 2020 01:34:48 -0600 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Fri, 20 Nov 2020 01:34:48 -0600 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 0AK7YftX089749; Fri, 20 Nov 2020 01:34:46 -0600 From: Peter Ujfalusi To: , CC: , , , , Subject: [PATCH v2 2/2] arm64: dts: ti: k3-j7200-common-proc-board: Correct the name of io expander on main_i2c1 Date: Fri, 20 Nov 2020 09:35:33 +0200 Message-ID: <20201120073533.24486-3-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201120073533.24486-1-peter.ujfalusi@ti.com> References: <20201120073533.24486-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org J7200 main_i2c1 is connected to the i2c bus on the CPB marked as main_i2c3 The i2c1 devices on the CPB are _not_ connected to the SoC, they are not usable with the J7200 SOM. Correct the expander name from exp4 to exp3 and at the same time add the line names as well. Signed-off-by: Peter Ujfalusi Reviewed-by: Vignesh Raghavendra --- .../arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts index 2721137d8943..7110ef3e4092 100644 --- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts @@ -154,16 +154,26 @@ exp2: gpio@22 { }; }; +/* + * The j7200 CPB board is identical to the CPB used for J721E, the SOMs can be + * swapped on the CPB. + * + * main_i2c1 of J7200 is connected to the CPB i2c bus labeled as i2c3. + * The i2c1 of the CPB (as it is labeled) is not connected to j7200. + */ &main_i2c1 { pinctrl-names = "default"; pinctrl-0 = <&main_i2c1_pins_default>; clock-frequency = <400000>; - exp4: gpio@20 { + exp3: gpio@20 { compatible = "ti,tca6408"; reg = <0x20>; gpio-controller; #gpio-cells = <2>; + gpio-line-names = "CODEC_RSTz", "CODEC_SPARE1", "UB926_RESETn", + "UB926_LOCK", "UB926_PWR_SW_CNTRL", + "UB926_TUNER_RESET", "UB926_GPIO_SPARE", ""; }; };