From patchwork Tue Mar 1 10:35:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 1599355 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=cq6KoyBx; dkim=pass (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sharedspace-onmicrosoft-com header.b=ur8v4S0b; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K7Gw52C9Kz9sFh for ; Tue, 1 Mar 2022 23:36:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 341EF83B73; Tue, 1 Mar 2022 13:36:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=quarantine dis=none) header.from=wdc.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="cq6KoyBx"; dkim=pass (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="ur8v4S0b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5C63E83A92; Tue, 1 Mar 2022 11:35:52 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 524CF83BBA for ; Tue, 1 Mar 2022 11:35:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=wdc.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=052f00158=Niklas.Cassel@wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1646130947; x=1677666947; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=u/Hbdc2XFsQO0wzvdi3XE1Iyn1hUMiXEMX/tBVLqcVI=; b=cq6KoyBxA101kHBoM66fiOwxuxvo7CwyCBvr85qI3i+wqrseTsnzZ0oi LmzsDmejcN6/SGn88epJrAaXjOHaolwshgfqqCHiB3WRiS24/WyCc3tKg 3JXvL4nXqG4pfe9nVZwq4qnytRv2VKFBnElSre6xoe8zWQPqziak8y+aF 5aEtAbrEjgIgNPBPBhzNeYwhihUKYaNRhpL3d7pY7fuFA65XQDANFz+kZ G0Qs6B56H+h3xclFBaJwvVbVuI1FPgNIBOKlfJJU9fGC/WqhIBmA0d7CY /CtR+NRZCUub+LG0YGop67LAE7hsc6MhRmxb0R4Bkb9itUOHSZ7p6jRlz Q==; X-IronPort-AV: E=Sophos;i="5.90,145,1643644800"; d="scan'208";a="306094516" Received: from mail-dm6nam10lp2100.outbound.protection.outlook.com (HELO NAM10-DM6-obe.outbound.protection.outlook.com) ([104.47.58.100]) by ob1.hgst.iphmx.com with ESMTP; 01 Mar 2022 18:35:42 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lgoUK9JJ2aQsocQA2kaR4KIqCOlS+0sYgnybdFNsX3GRXFCjJF07rsOQ6MYN6jF2Z4Q0FhqQdkoKBJ1jLfBurpOd17ItBYXoOKsyRwtRvc38u5M5VMZTOhFo2Ugh477CV1q8oUq4uM5/uaCcZep2BiVNrnDkXfKIy9spubZdCeDDOVPQHcztEhE3iuQJxCTH2fd1RKGgXsko3NtUTYT2XhxChrLz1YS0qkhrIuoA4b80JZtKYV5kn7G9OwE68ZBArmjzhfXFD8xkTp5cv8VbjnqJ/9amnT56qrUrxt/VEaVTYwLDKBXiRpPZlFEP3+nYRSVzzsOKBi705o8fx9DGyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ygaLlsWFscq2JvyIiS9r7XJdlxZlJtlpueiqGD4kMbE=; b=iQoSF30mrKwvUv9/InRMs+/z0iEGdcmNm1JoHkRnpAVmbUp1J888mYClQsrS/RZUzQ8UQgaUq1v463ZFobc5BaC+ItrBEhcSwugQI76Xq/98KWljS5TudI3vItRppg2UMpx7kZALIKlt+10z03V4rd4OphobDmkZRDSaMYvgfCG2pKIVuYOuM0D+Jo0YRiXjW6z7gjFEz3BmHGpkO0npLhmT4GnL4UtMRmO70Xrm5u4gQ6MxMEWwiCloDUOba8aF8HTvwZJ/V3As4sbkolMpIm5x9c00kCzxPmX3XENBmVKUIxKjgsOcN3HduKUzBe4QgpaOnpTnNl80otCobzh+GA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ygaLlsWFscq2JvyIiS9r7XJdlxZlJtlpueiqGD4kMbE=; b=ur8v4S0bYGoJhcP/AJI2dHGE2c59EdGS1Hu/cPH+Crqej7TTQuUyRynphBjz0HON8srxzrobqUMFL5Anad/12aNUGquvU2hhEwTAGwtDUIbxll/CiDGLYCf02hX8W0PGQcWKMy840AOfgtqWMcbepD9gPETCPnVmGhjCSPOUPaQ= Received: from PH0PR04MB7158.namprd04.prod.outlook.com (2603:10b6:510:8::18) by MN2PR04MB6910.namprd04.prod.outlook.com (2603:10b6:208:1ea::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.23; Tue, 1 Mar 2022 10:35:41 +0000 Received: from PH0PR04MB7158.namprd04.prod.outlook.com ([fe80::f025:4f23:8e46:b2ed]) by PH0PR04MB7158.namprd04.prod.outlook.com ([fe80::f025:4f23:8e46:b2ed%2]) with mapi id 15.20.5017.027; Tue, 1 Mar 2022 10:35:41 +0000 From: Niklas Cassel To: Sean Anderson , Rick Chen , Leo CC: "damien.lemoal@opensource.wdc.com" , Niklas Cassel , "u-boot@lists.denx.de" Subject: [PATCH v2 3/8] k210: dts: align fpioa node with Linux Thread-Topic: [PATCH v2 3/8] k210: dts: align fpioa node with Linux Thread-Index: AQHYLVgZ52wvcS8ghUSB8MjG3eiFSA== Date: Tue, 1 Mar 2022 10:35:41 +0000 Message-ID: <20220301103529.3060257-4-Niklas.Cassel@wdc.com> References: <20220301103529.3060257-1-Niklas.Cassel@wdc.com> In-Reply-To: <20220301103529.3060257-1-Niklas.Cassel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wdc.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ef6da366-e057-42e2-256f-08d9fb6f3c24 x-ms-traffictypediagnostic: MN2PR04MB6910:EE_ x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wUAe7bR9GnE1mTOUxsrvNCji5bTglrYU1vZPYxX0KkI8v9onv7ogOiyx50lINr2C7cfBMUOIpTuCl1cuQI71Ur3j0SwG2pcWZzhYYqONLLahc4JMSXEJNPcV2lU0knk9SR5WZB9YwZUAcNbGVCgPhhpPZ0nMOUxWLSz6V3nmzaMakGpCD+90o0dx0/a8AjTmnlS0ZMH+AyPG6lGnptidCadV/Nf+brML0g5HOt4lx9OcVw/E4FczVSu8hjaYMYreClGghvfqNtKUc3HFL+/JarHNpJ6xBQaMyUwI0yPfVGOxnyU5jr1r36KvNqPxng6gDYu8EkwbjOwNhesV86DGad/8SFXMLh+4AZsbalxu1pmgBLa9pLNiLDgUhnpqVZLUFjqSzVuul12ZYWPpLgmuRCrTduxxwn8hcQS97Yk8qfdrzUVQlKUfBlxqYrjp7JR/dufmYZS2AJ9jEEOEWb49c0IvFpXRXPTHXl/N10JpPByzUalotC7EWhqsq3K4KK4+dlseuI91cgyKAl3HpwEpSBHSD0RNB7CLPh1wbRBCzrGQDfn2RCebCrU2RIbvhnWjhhxEUuRAf40rzT8ggEbO/9ZA4s5fTQFyY8QdH452vsXBGKGhkXpx4CnJHmH6WKajO/TS5gAs/vg2HwGjl2ldw/XNdMBmQ5/GHm4GvnNuoxwieqnBFc7UmsFBka2LvIMU/342AD+jzGyjrNWutTs/5g== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR04MB7158.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(5660300002)(83380400001)(26005)(2906002)(122000001)(186003)(2616005)(1076003)(82960400001)(86362001)(38070700005)(38100700002)(76116006)(508600001)(110136005)(54906003)(91956017)(6506007)(316002)(6512007)(71200400001)(6486002)(66476007)(36756003)(64756008)(66556008)(8936002)(8676002)(4326008)(66946007)(66446008); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?+R5F3jcp0fEVXdMDpISxwtA?= =?iso-8859-1?q?K/e14HX6vyF963iFmAn1eYLNXbnOsrL7qxHqFsZdDfea9AYIXcD75kYLWLs8?= =?iso-8859-1?q?tLPLVxxToRVjGYP4u1bYzDTvhyhvM/XSFCnwlK9ClsKbO6Wm0bq35UWPp0mM?= =?iso-8859-1?q?Po4b4vl4lvkzQ3FqJjDax9ND/SLf4kz4eli0maxZS8PGNYKAfNCiaARVAyce?= =?iso-8859-1?q?I9jNBkyVt4gW7VJB3AU9FMilUfziaeKMufL70fE64MlJdus4JjH9gKDWY/CM?= =?iso-8859-1?q?NPgM6l4v7Xaud8NQF0UZ+pvoCTdLJdCkglErt6j+757wJ2UjfrljGHEuY3Lv?= =?iso-8859-1?q?Z+SZ91aqubQKbsOimLkBK9bNB0OXjO4Hseoe5ucGGrnGNvZ0RFJy5BJ61seL?= =?iso-8859-1?q?x8Scm/aMmpHtNzwyhL1AOIVr/6E8/gK1Kd3ZX0ji7Hhk3EyeJKWlEtTanUOm?= =?iso-8859-1?q?ZAl7XqSa5MnRGLXPBCDdMmdvH7wruRJzsfCt4S1PB1ZvseCn6eECCQO4+BVy?= =?iso-8859-1?q?KLTLF0EDn2utoEnD+Wpm0EdeuXRijDxbRQNmHBtdNA/dznQ/wWvD90rskkh7?= =?iso-8859-1?q?ir3G3+9NEdrU7yLWpXytQV6aGUvFMI036aqbkuoOjRj1ZyeDDZwUuckLwdrC?= =?iso-8859-1?q?hnGDFnOeec00+wD+EW/VV8swAZTNmowuBsKPwxEimv934bdpYKo7SMPrppPz?= =?iso-8859-1?q?4/3dbzz7XD8wtFjNUKcn960YPPlK1GJB/2M+87EyEMJfXAXdFHth8y1hW2X8?= =?iso-8859-1?q?hGaEDvidEAhcCv6dPt/99QaRYtepBxcNtPZkIV9ACy3RwgiQ80Pjt9td5BJl?= =?iso-8859-1?q?ln16GZpmGEIQnMO51oKuMKJsJe+d1+8YmIx3rJhy3Xs1UeSNL1wYDv13DqXt?= =?iso-8859-1?q?P9rYUcarQ33nI13pXyhqOPa0LmPdt8KJrnfu0v1nBRNiTF4boCZ5tC0eB5Eq?= =?iso-8859-1?q?KaDOaMcxP/4Oi/pZMvWzO+o5HsfT9E/WsH1sV3bc6MlEiiBIRf7hcNBRM07x?= =?iso-8859-1?q?sKSVzIH8NxtLVRnwkyrHRd86iHh1qNr/zCzfTBwxc+szd38MppAYdNplkGle?= =?iso-8859-1?q?6w8Ee1Ta+bngHfbMd0XS1p9fBAPIb+ttFzTQLbmy+pQGb/AYRsHuy1z5/w0K?= =?iso-8859-1?q?T6KLY9iNOHFA971kt+bTmSKmIkwH1dEI/3UAjpp+7Hzc+yWhYJ4GkkK+bEuv?= =?iso-8859-1?q?jZTfUMW4fP4xEMa3PIEEs2nJB3wmSAVqWjmUJefGYNaA1WJyoOa9B4jgAKKC?= =?iso-8859-1?q?X5y4CLQ4GGRvvT3epgdXGplzqJMvV9FFP14ZJtPurimpjte3L+4iIUsqjcok?= =?iso-8859-1?q?Gp5ihe5ceDUlIx/5dQQrx1LcLhzamQMXEQ8jkue2PkfcH0v9XcwrG4WdvPZz?= =?iso-8859-1?q?SpS1ZoDqilF5I5mXdXWdJyt8OwNRpmHlg2iXp7HMDRnIdm8C8aI2jWdLbZd/?= =?iso-8859-1?q?PS3nW4MTl0+7BmftWPKIc7OkFIGZIWJ8/Joxu9khzgDGldUmtN0FEq/X5VZW?= =?iso-8859-1?q?pTPFogcH/Wy08jw5aVfrFTPhT4uQZEcQZFXFVbKFnhEhtaxRpHU5rkUNrx+V?= =?iso-8859-1?q?VGrgpG/7TB5LKVNtC9e+VNoEHaGloJb39BIUzTEr5PsJkGSC94H9xf1azRR2?= =?iso-8859-1?q?+7t6t5mXsHF7P8VOSN5j+7kn1kEEXZ2ZRw7CzQp6uujDtWAgsu3FV61EpqFh?= =?iso-8859-1?q?X6oQFarW32+WJmL/pfTbk?= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR04MB7158.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef6da366-e057-42e2-256f-08d9fb6f3c24 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2022 10:35:41.7017 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: rIMumNTIbg0FG5C+XstGV69slBbek+HJypEH33kd2j6B3HUOCrGU7gZ+PE/DDGw+hrQcGvg9y0oMifwQmWiAgg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6910 X-Mailman-Approved-At: Tue, 01 Mar 2022 13:36:28 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: Damien Le Moal Linux kernel fpioa pinctrl driver expects the sysctl phandle and the power bit offset of the fpioa device to be specified as a single property "canaan,k210-sysctl-power". Replace the "canaan,k210-sysctl" and "canaan,k210-power-offset" properties with "canaan,k210-sysctl-power" to satisfy the Linux kernel requirements. This new property is parsed using the existing function dev_read_phandle_with_args(). Signed-off-by: Damien Le Moal Signed-off-by: Niklas Cassel Reviewed-by: Sean Anderson --- arch/riscv/dts/k210.dtsi | 3 +-- drivers/pinctrl/pinctrl-k210.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/arch/riscv/dts/k210.dtsi b/arch/riscv/dts/k210.dtsi index 5c88c8ea8e..cf5c2360fb 100644 --- a/arch/riscv/dts/k210.dtsi +++ b/arch/riscv/dts/k210.dtsi @@ -378,8 +378,7 @@ <&sysclk K210_CLK_APB0>; clock-names = "ref", "pclk"; resets = <&sysrst K210_RST_FPIOA>; - canaan,k210-sysctl = <&sysctl>; - canaan,k210-power-offset = ; + canaan,k210-sysctl-power = <&sysctl K210_SYSCTL_POWER_SEL>; pinctrl-0 = <&fpioa_jtag>; pinctrl-names = "default"; status = "disabled"; diff --git a/drivers/pinctrl/pinctrl-k210.c b/drivers/pinctrl/pinctrl-k210.c index bb5153c673..63084ae837 100644 --- a/drivers/pinctrl/pinctrl-k210.c +++ b/drivers/pinctrl/pinctrl-k210.c @@ -679,6 +679,7 @@ static int k210_pc_probe(struct udevice *dev) { int ret, i, j; struct k210_pc_priv *priv = dev_get_priv(dev); + struct ofnode_phandle_args args; priv->fpioa = dev_read_addr_ptr(dev); if (!priv->fpioa) @@ -692,15 +693,23 @@ static int k210_pc_probe(struct udevice *dev) if (ret && ret != -ENOSYS && ret != -ENOTSUPP) goto err; - priv->sysctl = syscon_regmap_lookup_by_phandle(dev, "canaan,k210-sysctl"); + ret = dev_read_phandle_with_args(dev, "canaan,k210-sysctl-power", + NULL, 1, 0, &args); + if (ret) + goto err; + + if (args.args_count != 1) { + ret = -EINVAL; + goto err; + } + + priv->sysctl = syscon_node_to_regmap(args.node); if (IS_ERR(priv->sysctl)) { - ret = -ENODEV; + ret = PTR_ERR(priv->sysctl); goto err; } - ret = dev_read_u32(dev, "canaan,k210-power-offset", &priv->power_offset); - if (ret) - goto err; + priv->power_offset = args.args[0]; debug("%s: fpioa = %p sysctl = %p power offset = %x\n", __func__, priv->fpioa, (void *)priv->sysctl->ranges[0].start,