From patchwork Wed Oct 21 05:24:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Zhang X-Patchwork-Id: 1385348 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=HIN8JOZl; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CGJpM3jMJz9sSG for ; Wed, 21 Oct 2020 16:24:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440467AbgJUFYG (ORCPT ); Wed, 21 Oct 2020 01:24:06 -0400 Received: from mail-eopbgr40078.outbound.protection.outlook.com ([40.107.4.78]:29223 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2407460AbgJUFYD (ORCPT ); Wed, 21 Oct 2020 01:24:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G2FHJgMQu9NRvziGayr4YsLGNDNhlssRsVExL6i9Xa0Yjpf8t/Fu3+86UUPjmayds6fNRvgKNlcwiHx+9QcussY7zMdJffh6H8JI3yWoc6WYM9vdhgYTJC7tpvnlKsldELSwhECctJkDHjWW/QKO9HIcCuYhYO+PnoMwO4KyOFY+LSFji+jIbngRv9CzhX3OszLHqPAFBbJApWGXOLhaOh71iLThx1Q1b8Fag4qX2kyGRF8rvzC8Wuc+iYgmHxo+kcScHOODKOOkHsmdoXv20wCpae6xH2j4xbStJvi5Q2ee5CtoQ6cABxp9komS1HHLh07fWSboiQ1vW11gqKyPFg== 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-SenderADCheck; bh=tDbAwQnA5enTI3i2f5XQgOnhhQ23eN6woNIFu1j7SmI=; b=MtPJ4pogxHLFryXqmfmeMeTHHyipZ2bJ3OBS7it2lEHCz7Dg03Eq4g8eqKI1dV4u+Q97EY6d7fMQlnH3tWKnShXN0RXH/ztk5mksuz37fq5yKzZm6X2O/Mk2Qh9zWOUxtZRm3oT8hLmAnTpxTMqzzvXt6u3WxqCGJ5R8SOnoDpSRUw6aYWGBPUcEuCeKkP4CKaDeLosZ+/C0oAFtfdvyEcJgHvpQTvCynbmJTuqfZvqRjKC6J42UJJoI0hoaJkFdaLS0m5u7hNNGuBl3ElxcfIrBsgi4ZrS6tvAaUpmfYYB1BBAtIMjh8oE19xWDEfHhfKsKxMhvsYI70XCJyjfqJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tDbAwQnA5enTI3i2f5XQgOnhhQ23eN6woNIFu1j7SmI=; b=HIN8JOZlFIcFeyXyOgje6mkm2cuBiPPJtkbk2YF/RVgv0WPM6ZXmLgISjb3w4nCrsVzv61j3A8vicEiNb2jho7KFuNNM9AyMBLE8a0CQDHp4fBODQodCfiXnAEK3sgVOOM6iWJad76/CqR4OOr6xyFhFPmBQsk/KRFnkQGvt2As= Authentication-Results: pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=none action=none header.from=nxp.com; Received: from DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) by DB6PR0402MB2726.eurprd04.prod.outlook.com (2603:10a6:4:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Wed, 21 Oct 2020 05:23:59 +0000 Received: from DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc]) by DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc%9]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 05:23:59 +0000 From: Joakim Zhang To: mkl@pengutronix.de, robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, linux-imx@nxp.com, victor.liu@nxp.com, linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 1/6] firmware: imx: always export SCU symbols Date: Wed, 21 Oct 2020 13:24:32 +0800 Message-Id: <20201021052437.3763-2-qiangqing.zhang@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201021052437.3763-1-qiangqing.zhang@nxp.com> References: <20201021052437.3763-1-qiangqing.zhang@nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) To DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.71) by SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.9 via Frontend Transport; Wed, 21 Oct 2020 05:23:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 752dec2f-3708-4e08-f412-08d875818368 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2726: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:751; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 86sVCjnLBAO7W6KHhiDPZJmNzuHo7JaMfG5LFIlQanzheAHPys/FrtU7LKtvrNorU9/wJyLyl8bwJ3WtrebsVatYu1mHz54a/V/Gi8e2ruO16HjW969FNllOFBVVjb0q0M642CSzFiEoXHY2zuQmLsUih6yJpQem1PLUDNZYF3y+sA7HdIMywnjPXdAPQXA4e9rpkbkEXQZ/l3B8Ksr4kXYdRTS2QpEwitBKi6Md9jcqMx4jmUwir8brZK62+eTMepQQmXRhOl2w9Fep0stYqqD40NE0UVnsLSGGh9iMVS+rX/WTzscgLGx/1WtCCoJzhsyAo1NUGINplywDsi7Loy06RmWNoLEgthP80rVREZLAxstRq+PBt9zpkQwsJfpR X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR04MB6795.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(376002)(136003)(396003)(366004)(478600001)(8676002)(186003)(16526019)(6506007)(316002)(26005)(52116002)(86362001)(36756003)(4326008)(66476007)(66946007)(66556008)(83380400001)(2616005)(5660300002)(6512007)(6486002)(2906002)(8936002)(6666004)(956004)(69590400008)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: qsXbRmySg72wyrQHIF/55U9pJ9q3jwNY8q69+WAjk33K5AF1MkS1lMetHwa0fleL4DWjHPQ/rxr1Dl3DdAiKv6rCZ87o0IWm1kOFAk/v7usaF2+y/7WjJJjkGEOF56LJb0gpV05ya4meAi5AwOEpSljQWO/BguJ98cxcTACjEDmct9AmH7bB8r8jcYBFxF3lOBp53tIjii7901kclti1CUJESn1B/v7sKyPsKKKKX5Kl5pIFunhVxuNqbgmrq4JBkLT0MifaV7Dj/d8/PMh7THDa2T/smJxk7aiVvyxl10nFqk7QCMkAp3Dh5oJpZTggH/71vi3hw/+4UrO1C+nxk1AZn1cW8JDB2D8a8mO2vqf5hgmFRexJw8+W8SwtI2TsdCloziciWbyt28XugjslN+i8KpYI/lMRpqb66dfiQcRKg7bf0d7SylGoBgrbDDukHT3IfAHkdJaci/iqGRC3fkAt9/oCWUoU8R6eh2P6TGg2UoVDH7rrsyuYQk+WXyX6vkGBo7ME7koHV7XDB7oKYAWLppcrklLfBnPTdkDWvGt5OPQ3JSOCkaZKwlPO2rVDK2igaAK7YDq6oxggoLyKV8vWBRvZTIN0lnRzyj5/SjkxBvDc6SVLZ0cne9ikRS8FWhyPiSiyLJsFCwVJiu9Phw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 752dec2f-3708-4e08-f412-08d875818368 X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB6795.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 05:23:59.0641 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bAJujuX6c8vbR5JtDRfJiVs6kEHXdGREzrASItXAvodjDsJrKw7peXWM3ssmtHvLIoBRSeBPztfEdVvhu+Qa6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2726 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Liu Ying Always export SCU symbols for both SCU SoCs and non-SCU SoCs to avoid build error. Signed-off-by: Liu Ying Signed-off-by: Peng Fan Signed-off-by: Joakim Zhang --- include/linux/firmware/imx/ipc.h | 15 +++++++++++++++ include/linux/firmware/imx/svc/misc.h | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/linux/firmware/imx/ipc.h b/include/linux/firmware/imx/ipc.h index 891057434858..300fa253fc30 100644 --- a/include/linux/firmware/imx/ipc.h +++ b/include/linux/firmware/imx/ipc.h @@ -34,6 +34,7 @@ struct imx_sc_rpc_msg { uint8_t func; }; +#if IS_ENABLED(CONFIG_IMX_SCU) /* * This is an function to send an RPC message over an IPC channel. * It is called by client-side SCFW API function shims. @@ -55,4 +56,18 @@ int imx_scu_call_rpc(struct imx_sc_ipc *ipc, void *msg, bool have_resp); * @return Returns an error code (0 = success, failed if < 0) */ int imx_scu_get_handle(struct imx_sc_ipc **ipc); + +#else +static inline int +imx_scu_call_rpc(struct imx_sc_ipc *ipc, void *msg, bool have_resp) +{ + return -EIO; +} + +static inline int imx_scu_get_handle(struct imx_sc_ipc **ipc) +{ + return -EIO; +} +#endif + #endif /* _SC_IPC_H */ diff --git a/include/linux/firmware/imx/svc/misc.h b/include/linux/firmware/imx/svc/misc.h index 031dd4d3c766..d255048f17de 100644 --- a/include/linux/firmware/imx/svc/misc.h +++ b/include/linux/firmware/imx/svc/misc.h @@ -46,6 +46,7 @@ enum imx_misc_func { * Control Functions */ +#if IS_ENABLED(CONFIG_IMX_SCU) int imx_sc_misc_set_control(struct imx_sc_ipc *ipc, u32 resource, u8 ctrl, u32 val); @@ -55,4 +56,26 @@ int imx_sc_misc_get_control(struct imx_sc_ipc *ipc, u32 resource, int imx_sc_pm_cpu_start(struct imx_sc_ipc *ipc, u32 resource, bool enable, u64 phys_addr); +#else +static inline int +imx_sc_misc_set_control(struct imx_sc_ipc *ipc, u32 resource, + u8 ctrl, u32 val) +{ + return -EIO; +} + +static inline int +imx_sc_misc_get_control(struct imx_sc_ipc *ipc, u32 resource, + u8 ctrl, u32 *val) +{ + return -EIO; +} + +static inline int imx_sc_pm_cpu_start(struct imx_sc_ipc *ipc, u32 resource, + bool enable, u64 phys_addr) +{ + return -EIO; +} +#endif + #endif /* _SC_MISC_API_H */ From patchwork Wed Oct 21 05:24:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Zhang X-Patchwork-Id: 1385347 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=XvYpFWzg; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CGJpH6RCkz9sRk for ; Wed, 21 Oct 2020 16:24:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440485AbgJUFYJ (ORCPT ); Wed, 21 Oct 2020 01:24:09 -0400 Received: from mail-eopbgr40078.outbound.protection.outlook.com ([40.107.4.78]:29223 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2407293AbgJUFYI (ORCPT ); Wed, 21 Oct 2020 01:24:08 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BIXj1Y2J2vf2NN6QlF7XBMMY9ziG6XtqN2uv9C+fqT0CwGOHQ1tCSW+GZvvYKamT2ZIj9r4BU7qk86Djmrvs+a5jw+3XTQ/VVXiyWXyrULzf5bvTkFYys/zN/1tyI2Din2VPbjEGpjDwReDot5WIRjmQDBbl8axtaXjwFoNLLD8BTbFXakMMqywjM6W6NCMpuupMzIC/DUcFkSyQY/lKBhhHIwOcpgUZEO+6nYvBRLRs4VTCIPaetC4O8+NepkVECqRPQQ9wpknwp8DEwOCNjxMQVzk+W2gJnYJvVBo7qK0oheyvyiNS3nWZoYkNwSPwnyjgVpqeyhH14W6MbP/+iQ== 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-SenderADCheck; bh=Ur08Q6AfFGrPIwCDQuAKK4njckBVmBZasrWQCnYHC5c=; b=nGiTVJjDVBWp19QPJymzCGRUIj/wrmAZyg51J+IAebVO7BOlt/0v2n/Voz0/XW+j8kDCAZEs1taL6o18PKaYetOQBEHxz3DFRYe0A4O938afHQZ09aRS2aBi8RAzRPnXPW/jWiYIPZyV8GKmhC593p2xcUF0K17bTsKR/PdL3/j2kfWUDMzCM7zAvbdYoxGFZgbc/VEgwg6FurrlD7hWPmyfAlxl3l+y/BAtRnhUH/Qz5wM5mTwcwN+EHhRu0VIR/uqpNDX4Sr+ECM38DvZGirFH4JBF8KeM5JiF2EMxzj38T2MvI+55ToEtqekG4L0JnwtFl5DPDf/4WYJgUDl/hA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ur08Q6AfFGrPIwCDQuAKK4njckBVmBZasrWQCnYHC5c=; b=XvYpFWzgG83IT0SQCKCuK9VkNSU+5gRzY4+OkLxlcbwM2YDBXHfvRAcdvR0Q+YtZxQwLY8yduA6bWcrTuzXvv2B0/e176vxU34vuIjr8JxJH7ShAXyCnc50MowXazlQ0ygkv6HTbXmA+0TN/Xj6WDSaCQjLMM6tV7CY9hasWP78= Authentication-Results: pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=none action=none header.from=nxp.com; Received: from DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) by DB6PR0402MB2726.eurprd04.prod.outlook.com (2603:10a6:4:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Wed, 21 Oct 2020 05:24:02 +0000 Received: from DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc]) by DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc%9]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 05:24:02 +0000 From: Joakim Zhang To: mkl@pengutronix.de, robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, linux-imx@nxp.com, victor.liu@nxp.com, linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 2/6] dt-bindings: can: flexcan: fix fsl,clk-source property Date: Wed, 21 Oct 2020 13:24:33 +0800 Message-Id: <20201021052437.3763-3-qiangqing.zhang@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201021052437.3763-1-qiangqing.zhang@nxp.com> References: <20201021052437.3763-1-qiangqing.zhang@nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) To DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.71) by SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.9 via Frontend Transport; Wed, 21 Oct 2020 05:23:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c0ecd4e5-e6dc-4cb6-1784-08d875818573 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2726: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iwZ4rNyZEyIE/7GE3CYJ2vhxWqXnRNQtgsSIdER8FDeW5ogPFA+fMZev+3y+L8vvpqL/nELPQKYUzImzIeUDgmV4bzD4yTx0GLk4McSsj2oNPVVZlMBooSfgP/Dvha9j8MlJKhk9FC+pzWioBhaj528fBM4IT+SaI44R5/AuPBHWsbzwMT/Ab+U8l7QwttwpY/PB8EJiuvJWan9Spu02djYM6DHUjk8lqAIJVOXJgaAZMEZqDo/RyEEqiR0k325ZlSzZg5tbAPXgPDeFI4cj9UkWM5JT8JAf1E0CgeyiUG2voSz2XaPagQ3nRCalj8otJ59yMQoD0KmNsW2fdPsnya8sdZLX3kpXv01ivKo1S0MK1owzuwCLKq5zFgbsMAz5 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR04MB6795.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(376002)(136003)(396003)(366004)(478600001)(8676002)(186003)(16526019)(6506007)(316002)(26005)(52116002)(86362001)(36756003)(4326008)(66476007)(66946007)(66556008)(83380400001)(2616005)(5660300002)(6512007)(6486002)(2906002)(8936002)(6666004)(956004)(69590400008)(4744005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: KtCrcwvtGE+ywyE7ly80yEOTWBtDK8mBHZcaft1TZ3yh+XQwLSpMKYS7TvbY6/l8ReCBGJyj8aqAv8jG18YdV6TqG9azkLm4D+N2U+KCI1neXRriIfNKS9OkSqn3u08MPl73u5Sr1FYvscURUaiwfac1EVBoQm9a08kBKLAhVqpCB+Gs0xAahp5LM4fpvyw+8WEMLV86ao9gzbRYQuZv2WF6ijxMLdt1oA05pFv7kHGYS6Q4+maPrb7SSQWOkuePyzypx22Ds27Vnr2OAZWTpSVFKDObHztdRRfxzDlqlAx9R9M35Q1DaNNHrssJrzwgPlRTiGKZq2/GkvtxywBUd99kwahrOaMrweNB+NKj6A+Tt/K2DqG+6noZTOfgMWgu4/rUC30S0kTf/5SRuRD1D8GkGvDAFZfkncZsm72rakZNfIAGetgBIQdCt+Y8s0lG2EJEa+Yd1gLvHDkeuP6Cq0fDiYcw4+TRla6idVjZMJaAwRsGg3euHflXDKO6NgPHhcDKdYX84UG8SckZWRYVaiOvgACxpp3nJ+w8QGW+HLNL2ha4c7zwJ3N7MNXSe0MRdUOpTnHzQGW7yddHZQDXHChAQhLrwOY+NBqqoazuyKB6MkY2cDAq5cl5FC8GzRs9twocHjQontP/efJxsrwqEQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c0ecd4e5-e6dc-4cb6-1784-08d875818573 X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB6795.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 05:24:02.6055 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gd0dk1ItqUmv9cRJs9Pgo8A0SeDh6RsIR0UVgHSZTgG1Gi0z2Wn+lguWI4dacOTcvTuD3FGCWFdvWvOxrWnsAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2726 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Correct fsl,clk-source example since flexcan driver uses "of_property_read_u8" to get this property. Fixes: 9d733992772d ("dt-bindings: can: flexcan: add PE clock source property to device tree") Signed-off-by: Joakim Zhang --- Documentation/devicetree/bindings/net/can/fsl-flexcan.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt index e10b6eb955e1..6af67f5e581c 100644 --- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt +++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt @@ -53,5 +53,5 @@ Example: interrupts = <48 0x2>; interrupt-parent = <&mpic>; clock-frequency = <200000000>; // filled in by bootloader - fsl,clk-source = <0>; // select clock source 0 for PE + fsl,clk-source = /bits/ 8 <0>; // select clock source 0 for PE }; From patchwork Wed Oct 21 05:24:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Zhang X-Patchwork-Id: 1385346 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=mok6cRxx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CGJpF1Q3Mz9sRk for ; Wed, 21 Oct 2020 16:24:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440498AbgJUFYN (ORCPT ); Wed, 21 Oct 2020 01:24:13 -0400 Received: from mail-eopbgr40078.outbound.protection.outlook.com ([40.107.4.78]:29223 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2407460AbgJUFYJ (ORCPT ); Wed, 21 Oct 2020 01:24:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HeTpdTTPPnb2rf+8Gqvx4ZVB1uQiuTGO1O657QkC/d7tIO+/0V6Gni389Ii1o+kG0PcvlL7eFrmd99+jGMALoxwWw2yDOgQxHg5RBgaxyZWIhk8Bl7Ti62JayPHrmIdKjDTyuMTp45SMUdqIIGbUJwKPcZVP8Aj2P3bv8EPkoqVyYQajeCixI5LDGynWDd1dD+BlUK6EFzbaPZtnfazZyKSl3BBTadjXi9fJnQ1uKQuJWPR8UYy3RStR3Jpv0htdVeHoopGbM4vRzWzaR0PSPgSYGqFAYlJEGhOjkhQvuosLpAzPjYytItvhhVznaHanaoqkvgbowik6+l4uU5oThA== 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-SenderADCheck; bh=IkDwRQQnDsJ6l4YhI6BNKWr2jPI/N3rQnuj4f1bPETo=; b=K2X/zur1TLv9lp1YQO9JNZQnFmt/O/f1EM3zRoog7sHX0YN6MTnSPkno+2EsSXt4lyNWi0ZCDcVBbi1IXHI++joPeGgG6bkbPqLO/8TUI78lQLEIJHYFkoMK/6czFCVRoBd7KVB3ZIXaT32dLSOSIsOSUOT47qzPNqJPR8T6DhcSdrm3o8JdWxy6JE0WXFZswm8+LOFWbBIM5YhCgDICCxafw4RcqCpwDZc6//LjBdvQLEGqvHtc9yKPnh7aMBtWDXmu1Lg5jAnJ2h1V5bCoAizl34S4ez5pELPSQi3jx6Z8gwH/GJn0ePaM2m86BE/YGxyngstE4CxCTz61lFfIRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IkDwRQQnDsJ6l4YhI6BNKWr2jPI/N3rQnuj4f1bPETo=; b=mok6cRxxYkyVGguYlg8P8Fmn4q7jLyk+KBob0IQggHF8oOjpfBKAv0uFQy0sPq+RNFg7zfXM4zV3KGRpXQKbAk+paFQH7yLXoxOGvQD/DN5BRoPU91cir+AsEDqXTQyMk7bOsg72pz6Kz4c7C9vC6rN7WcvwMdGI1n83FCPc3jk= Authentication-Results: pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=none action=none header.from=nxp.com; Received: from DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) by DB6PR0402MB2726.eurprd04.prod.outlook.com (2603:10a6:4:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Wed, 21 Oct 2020 05:24:06 +0000 Received: from DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc]) by DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc%9]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 05:24:06 +0000 From: Joakim Zhang To: mkl@pengutronix.de, robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, linux-imx@nxp.com, victor.liu@nxp.com, linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 3/6] dt-bindings: can: flexcan: add fsl,scu-index property to indicate a resource Date: Wed, 21 Oct 2020 13:24:34 +0800 Message-Id: <20201021052437.3763-4-qiangqing.zhang@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201021052437.3763-1-qiangqing.zhang@nxp.com> References: <20201021052437.3763-1-qiangqing.zhang@nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) To DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.71) by SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.9 via Frontend Transport; Wed, 21 Oct 2020 05:24:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d9624453-d16b-4d6d-6f80-08d875818791 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2726: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 00tUj8ACUBG+r7did+GELwGECGzbI1TlR5GTHoRTFjAnD72We3kl8zr+u0Po6Poy5ZClqOiauAIayJT/0Xsq+eGEKe4GvJ456WqfJj806USCgiazICQJq7eB5sfml+ne6LKUtTFIvkKMuq3bpyJ9B2AYU4DzhUSRmv/xMCdwl2wPgFMM4BzZyFHZgB4iDdiDgFmECsLa53kQetf53ki1AS8HkUnvChDfe0Ipi5bKG0d3Ys9VgwG/55aAnCg+l3imNTkL129+2q8eVOEYpz8doRpXvzQLHtbQVUw8MC/Jm0bt6ETCZ6vTc1a1sGGuAlYtOv9vsJ5VVmqLE2wJ2/WYu9DGpRz1/YwtZKAK7zSaxAfYx2gZPOO6p7KQcfFpiGGB X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR04MB6795.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(376002)(136003)(396003)(366004)(478600001)(8676002)(186003)(16526019)(6506007)(316002)(26005)(52116002)(86362001)(36756003)(4326008)(66476007)(66946007)(66556008)(83380400001)(2616005)(5660300002)(6512007)(6486002)(2906002)(8936002)(6666004)(956004)(69590400008)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Pvy5U3Q+cJea0TLz+jCy0rvuxqljHE0zCLSD30Uxs5dPgm084DLi1eZxtgb61EqUarrWGslKWFpSscfeFYnjiiVjtWog8ni6LqjdhA4ZIsV1apw4SILQi5HFD0r3eCJlAmzhEU1K5ZyYFTJVBI+IDrdPgtrImstYwXFcRS+iVUpqQ2WdLRyrCTOCXuOFTtlEt71cHFH8OV8bo3hjhicvOERRo3IFH5ho91WL0EykEVsXV3Jht6OetzI8uDo5HL05PA4oS8J/YKeMjnIopnTIuGf+Wy67aiDfBW8uNzGEebd8w9dssOH0frIqnxMdyaeWx0Vu8Hod6KhGAk+bYQAOOgkXzETms18jx4lBXqLcMj15YTgUk8H/RJ9ls7hOmwTsvQyNeyHoePdZHecRUFQFC7coaYobTofHBUgrRARramBhBJD4bEKRqlLdveMnMYSBpEJ1gEjGi/Ykq5SCi05QbIOdbsEwsEI4o7n/+ehYeMXwk0m2Yc3vG6bKZ9CsluN2iKA00GcDnQdjTx1UXWEhou4VeEgWzHQoCj8FrzGrDqNSUKykdv0eXomT9wmEqU0tA5WPBRlsN2TIbAuvNJqwoN7vYWmqYtgxEH23yjAA1flLyhtUdio6n2AP1lAgBMFyf86fQ9Vlt8PGxFal4+KK2w== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9624453-d16b-4d6d-6f80-08d875818791 X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB6795.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 05:24:06.1926 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Tc09uBXldo6shVoGQHcTljhzyF6iC6alTM5VhcsAiAX7rKzCHIJEi765X7Sh692Mb5js00hrJeMN4HZTX76mPQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2726 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For SoCs with SCU support, need setup stop mode via SCU firmware, so this property can help indicate a resource in SCU firmware. Signed-off-by: Joakim Zhang --- Documentation/devicetree/bindings/net/can/fsl-flexcan.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt index 6af67f5e581c..38a7da4fef3f 100644 --- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt +++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt @@ -43,6 +43,11 @@ Optional properties: 0: clock source 0 (oscillator clock) 1: clock source 1 (peripheral clock) +- fsl,scu-index: The scu index of CAN instance. + For SoCs with SCU support, need setup stop mode via SCU firmware, + so this property can help indicate a resource. It supports up to + 3 CAN instances now, so the value should be 0, 1, or 2. + - wakeup-source: enable CAN remote wakeup Example: @@ -54,4 +59,5 @@ Example: interrupt-parent = <&mpic>; clock-frequency = <200000000>; // filled in by bootloader fsl,clk-source = /bits/ 8 <0>; // select clock source 0 for PE + fsl,scu-index = /bits/ 8 <1>; // the second CAN instance }; From patchwork Wed Oct 21 05:24:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Zhang X-Patchwork-Id: 1385343 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=U+kEjI4g; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CGJnt1jSlz9sTD for ; Wed, 21 Oct 2020 16:24:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440511AbgJUFYP (ORCPT ); Wed, 21 Oct 2020 01:24:15 -0400 Received: from mail-eopbgr40044.outbound.protection.outlook.com ([40.107.4.44]:43649 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2440488AbgJUFYO (ORCPT ); Wed, 21 Oct 2020 01:24:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=luPLObe0PXWkBUEtkw9OY422I9QG0rpWlBXoDsapn1ms9kPcXNqwehM/9gvF0rKJMvKyI5Rv34Jj3kqy/6Qn+AxMYiVfyptDf8YhZ/QMfsM+9VE4y59kSHDMyGQW/IvAuc3JmGBfsFpHiUTI+cpA9M/bDMrVFFTxKYv6w9uIyZr8DnqS7ybXv2NAI8Z5XBbgIpiwvNC+oZPtKFuh7rd2PjKZZ03lLEkyTKoMp4tEbuEp20cgU2baUvLhxVUcprd4EccDCSVf7L8dI2MjPHdOMh2kY6MrmHjqQJYX0s9FCian/Ah+oCMy7jNxedzc/3B6TOwRe61t6iw+8ineLAuCKQ== 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-SenderADCheck; bh=5GuCOGLBfr2TyjQ6iQxEv4ZcuLpQAskKQm+SwOKA27A=; b=MqXltYlcvmFLHRTNumbsa9kUrOgrckbI8VZK65HtnHUydec6DNs2K+yUPOYaum0GnWucrT/o7vu3Eb3rbnTSoioC+NWoUxTyxd3TMs+DpJA+/cNnKShzUpppHGHbX5wVziOv2ZFpLRCxqvDNX8YRmkynVw6S101IL/BLw5HzKM7wxMH4/6JMd+UVxVrkGzulO+g2HiFWhlH2umS7woEYj2i6i8EyOvcJ8o5q/RY/jJCMy+fHxFIr1rSYe41MK69/EviCCiOTaVK6f3eADQ5VQYhRLOcTr770vjcJkT2sSIhq6vfjxPYNQstSNCBn3vcI/A0sSZTGCQ7sKowvzCDOdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5GuCOGLBfr2TyjQ6iQxEv4ZcuLpQAskKQm+SwOKA27A=; b=U+kEjI4gN5/QNZ/25coa1WcE9/aKewr+LslTz8FMhfyo3YNhBUTuTq/lk2Tu+Lor5augy+kBm4IisZrQg2Iw09hyvnFShbHRPbkvfM+0VOFQ9DTe0gwXVDJAN/zy44u2gmFBQba2hCDTRJsL+KOXrjO5YE68Ywx/9hQGkZMzW+Y= Authentication-Results: pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=none action=none header.from=nxp.com; Received: from DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) by DB6PR0402MB2726.eurprd04.prod.outlook.com (2603:10a6:4:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Wed, 21 Oct 2020 05:24:09 +0000 Received: from DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc]) by DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc%9]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 05:24:09 +0000 From: Joakim Zhang To: mkl@pengutronix.de, robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, linux-imx@nxp.com, victor.liu@nxp.com, linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 4/6] can: flexcan: rename macro FLEXCAN_QUIRK_SETUP_STOP_MODE -> FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR Date: Wed, 21 Oct 2020 13:24:35 +0800 Message-Id: <20201021052437.3763-5-qiangqing.zhang@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201021052437.3763-1-qiangqing.zhang@nxp.com> References: <20201021052437.3763-1-qiangqing.zhang@nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) To DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.71) by SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.9 via Frontend Transport; Wed, 21 Oct 2020 05:24:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b5bc1f9e-1f7e-4f5e-0564-08d8758189bb X-MS-TrafficTypeDiagnostic: DB6PR0402MB2726: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:372; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IsCF1hd3Q+mV4ErGchEASl/gqynIrxZuK0IJPz1tfG74euDIsxZ+SirEyRZmLTo6OsPDnMNv0d7zYh11r+oucxeuluYVbqmsKigmlZclI5ehfky0upb1wxbgVjuOkH63eHBMHkt9GyF8LSriroycQCmFM9cEMp/HEDq6KJLmddCUIvGKWXncU5e+tUcE0tWVBzmKIFIlXp1DaOufUuzzsHku16zbKoCwsOGkmdJFDji7BLMm1KGVh2KEv9eJyu4r1nSYGSAKoVvWA5uivH3iqf+ZYhZ5Krzqf+tCnEooxXe25V80UwQ8VoCea727hvO2CHAXrbszx05ciBLW9V/75KWqSSJ3HDOdN/oP3YXT/3Ir28q42iILqwuh3nW2V1yl X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR04MB6795.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(376002)(136003)(396003)(366004)(478600001)(8676002)(186003)(16526019)(6506007)(316002)(26005)(52116002)(86362001)(36756003)(4326008)(66476007)(66946007)(66556008)(83380400001)(2616005)(5660300002)(6512007)(6486002)(2906002)(8936002)(6666004)(956004)(69590400008)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HhK71kKMdFtV7yEXfKqZiKYQ1+U1ap5YNeVTuLzNgpvGBP6k78GbtegbUQPlW1+U2hH0c6fjodmVVLjRdiAQOFA4F07PtY7DiKAJX6xBoRtsO/XM6w4vzWgze4XvCICDVrEiVr+ATYGVtyAREyJmjZmODpwhhEX1R4d2dF5B+gzKDb0dWk5sW1FZT9Zjlo0KgnAawlkgnn0rJm7zr5ss9EbWcfxnP1vq1LLBI2El4dLZUjBBacF/rYPVUXPIEEOG8IbFLeaEscy9fx4Q2ZQuASxp1mWpeQW33znZdDo2d5KdOuhLrWMr3WZx3277WfIMGQl0cauf9vuxN9CakJ6SbR6DDfhDcr7073+7Nu9wX5frQDnyfhAqSVoM+Vl7ElDCPUm5mrCE0KVCql0g0Oo/q7ZBYLQw1jR6M9xYdByyRU6Vb4ky9yrscty3mHhsWU28yPFn1EYiCh45Y+if6ccNWc/GdrDK5p+0bNByzOm/PvYR9Qk50HfXaD1uhck2e4/T8UZsQArRfaEndeEKV6PGwXGQ51ifyFqJiOeyYslv8PkY4G33239h2vGIy6Wxt1h0nqufVOg2ZO3nfI0OsMmaRuE/tKaTaoz22vptAJMWPFdODUGGZGPWqErx/Y3L94CWtTAVOusoR5lSvHKLKIbiCg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5bc1f9e-1f7e-4f5e-0564-08d8758189bb X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB6795.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 05:24:09.6593 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BLXxP++h5saVBDYSFAKTzVo+cr35SAlZOuSDjQkEzuWp27TZa2nnJiwF4FPdoBae9CscQpzZzN6ouMz9jCBjfw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2726 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch intends to rename FLEXCAN_QUIRK_SETUP_STOP_MODE quirk to FLEXCAN_QUIRK_SETUP_STOP_MODE_GRP for non-scu SoCs, coming patch will add quirk for scu SoCs. For non-scu SoCs, setup stop mode with GPR register. For scu SoCs, setup stop mode with SCU firmware. Signed-off-by: Joakim Zhang --- drivers/net/can/flexcan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 881799bd9c5e..8f578c867493 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -236,8 +236,8 @@ #define FLEXCAN_QUIRK_BROKEN_PERR_STATE BIT(6) /* default to BE register access */ #define FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN BIT(7) -/* Setup stop mode to support wakeup */ -#define FLEXCAN_QUIRK_SETUP_STOP_MODE BIT(8) +/* Setup stop mode with GPR to support wakeup */ +#define FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR BIT(8) /* Support CAN-FD mode */ #define FLEXCAN_QUIRK_SUPPORT_FD BIT(9) /* support memory detection and correction */ @@ -381,7 +381,7 @@ static const struct flexcan_devtype_data fsl_imx28_devtype_data = { static const struct flexcan_devtype_data fsl_imx6q_devtype_data = { .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | FLEXCAN_QUIRK_BROKEN_PERR_STATE | - FLEXCAN_QUIRK_SETUP_STOP_MODE, + FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR, }; static const struct flexcan_devtype_data fsl_imx8qm_devtype_data = { @@ -393,7 +393,7 @@ static const struct flexcan_devtype_data fsl_imx8qm_devtype_data = { static struct flexcan_devtype_data fsl_imx8mp_devtype_data = { .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | - FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SETUP_STOP_MODE | + FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR | FLEXCAN_QUIRK_SUPPORT_FD | FLEXCAN_QUIRK_SUPPORT_ECC, }; @@ -2043,7 +2043,7 @@ static int flexcan_probe(struct platform_device *pdev) of_can_transceiver(dev); devm_can_led_init(dev); - if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE) { + if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR) { err = flexcan_setup_stop_mode(pdev); if (err) dev_dbg(&pdev->dev, "failed to setup stop-mode\n"); From patchwork Wed Oct 21 05:24:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Zhang X-Patchwork-Id: 1385344 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=ch5OEa9e; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CGJnw72FQz9sTK for ; Wed, 21 Oct 2020 16:24:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440526AbgJUFYT (ORCPT ); Wed, 21 Oct 2020 01:24:19 -0400 Received: from mail-eopbgr40057.outbound.protection.outlook.com ([40.107.4.57]:16960 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2440508AbgJUFYR (ORCPT ); Wed, 21 Oct 2020 01:24:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oAabtkRPRsiT7GszTGzucNuG2hcq1fQ2bbtd0TDscNxL+g29y5zzHHl/wc9uqXWpM08MUMZV2pwgYImUtgFBypummel2aLM483vcbUytL+gIzemxd1JC4jjROEi/49zWbDgKmstLSFqND16D2K8Jy493Wmf0lZRrOMEOZGCPl9zmrT+C9NytaDSD3YSQNg2Zuvg7mx7BS7gXuB7zAvSm9bOEoJQejBk0n5+RxbiiWzMxerHE0JFpz0s+b28tfyYsNzPdj2BekFJZmSzW0Kd2PugVLIFdQR9S0xrI8twUoquFQpL8xYVpuj50C09levfUqR7UxnY6BjSg3cFnNkdWrg== 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-SenderADCheck; bh=wUOZIqE1JsQqp45rMHW0ZDhnFdxyz6s07VtATqXuNFc=; b=AZbQLF8bMwgueqZfHZC0ytO2waKLo3+Sd6lczm1uMbkSQHFFCN+rcoIOSzu87L/FK+37PbMDwIjdvp9+hgraoUu/JsPMCDDMRNRncK6vtBIkdG7BLqZOShM+mzglvl5jI9B1eaQfYI9hwqV6VWLkxW68czNTP0TiTSVj+7vUiXHG8w9XGvffCAQKyNQ1VDAeGh6uBMdZUb7cSz6XQOmFLyO765GC5ajl/Y4rcwua+zCa2mfpyGZ84q2+Xq2rFRlJohi9eEQ6e6lhUZ7+SEGkg4AygK6yIhlSv0tYfrg+zVMyXRfYZuDx9skKJSGrHuQO4G1UWLRk2ZYex0JTjdEmgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wUOZIqE1JsQqp45rMHW0ZDhnFdxyz6s07VtATqXuNFc=; b=ch5OEa9emFKiaA6OPMM3dqRZy/cqgQSlP3+UbylUPIi9oKmb3yA101ViO2faYbOLAxT3idlcZzKmQ63IPEPmzGzZLPNwh02GW2k0Xp/KYU4xBdpMZeGIwTG5j+Jcw9AWDGvmpVQSLAQcF2TyIMs4X/hMyWzV2jLY4g69/SSb/1E= Authentication-Results: pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=none action=none header.from=nxp.com; Received: from DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) by DB6PR0402MB2726.eurprd04.prod.outlook.com (2603:10a6:4:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Wed, 21 Oct 2020 05:24:13 +0000 Received: from DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc]) by DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc%9]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 05:24:13 +0000 From: Joakim Zhang To: mkl@pengutronix.de, robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, linux-imx@nxp.com, victor.liu@nxp.com, linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 5/6] dt-bindings: firmware: add IMX_SC_R_CAN(x) macro for CAN Date: Wed, 21 Oct 2020 13:24:36 +0800 Message-Id: <20201021052437.3763-6-qiangqing.zhang@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201021052437.3763-1-qiangqing.zhang@nxp.com> References: <20201021052437.3763-1-qiangqing.zhang@nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) To DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.71) by SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.9 via Frontend Transport; Wed, 21 Oct 2020 05:24:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 42fc110b-fe88-4d8d-c78d-08d875818bbe X-MS-TrafficTypeDiagnostic: DB6PR0402MB2726: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1079; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GVlGqBYS8yf29jfiaYHLOfJZNLSH2IKYUD1Ervct6PA9g0k4nEAbKT0cOhBm7U1IhL8Z92qQhV9Q6EA5onw2EChDvmUqCp2fmIgsHl4+GzuRLFQ+vagPP3UzE1O8ePl6hwQiGVER4HClvI/oAbBBlgY7HxCpdnO8P0nGNbXsATsiAbqEE0vOcqBYQDtQXCPosBF4CjScr6DJvlYyjIFBO9oTuL3JZTWXXgR/BnyzpFHXM7JFTFkSQ3p99W4gBwP9Uy59GMr6hZxO3d6zoS2Qk/NtkM5nYHi0ECxtnWhbBxt0nC95xahTmLE7OuuMqsZCLQZ4CnSuP4UXfR3zDIVRJS2e7jD9sfeRMLyVvQPc7rfoc6scOrRyVGSAdGu4fkJN X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR04MB6795.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(376002)(136003)(396003)(366004)(478600001)(8676002)(186003)(16526019)(6506007)(316002)(26005)(52116002)(86362001)(36756003)(4326008)(66476007)(66946007)(66556008)(2616005)(5660300002)(6512007)(6486002)(2906002)(8936002)(6666004)(956004)(69590400008)(4744005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: qQ9putH91+gxCF3Z31msNQ16Ml7caTgsDlCMs6M98IcXKYqLttSQEqrU5kSxlQ8+BYQilPRK+VIz4rRpfCJ4WTGfBhuJQ+VSdkztgXotD0wO2Ty6m4ZLzdigag9jLEdrFH8hT49S3tAjOsygC0fuRZ2w03zZ/QtJO7PwcvlcE7H4gFWWQjNslauE7hL3agzPjA1QpDEpvB2jS7FG+1AUIR2qOTjiSqXtL+loTifrn+EjqA0EjjpI+eioR6FMNiVkAxZu8XUMXgMx97wHAU5EsUHNxVj/gAcurhSnTLBVde3cQ0dT+CocjAYmGkcxwUX5gu3GXWh6yvUaH9UNB1SlicXT42E6FH1BQVyxiDeAd/+B1ZUnK1VHF4h/owaOUYanqXKe8hZT2OpeTYfk1eJHR+o+vvavtUeSb7IcFJivepMJTtir9ZSf4CSJOsk7X7xH16p9+71zEw0+yzmYuI2t9XOGLCcgxsc/O8KgB2EE9LUzK1Da0PRokHeDwSefoZfA3fbb+YJuePO0JPJOMhycHEooGwLQ7lBL0gFHJMEkn4OKN13KPlK3rwW/Rjor1SPN5CzpBBHZkG2KpS+Fsl775zDOPbtSEN4T02V57nI3Pip37g06VrH3H7FEEpt5xRChb7tD/kEZa4Vs2qveCtZPmw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42fc110b-fe88-4d8d-c78d-08d875818bbe X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB6795.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 05:24:13.2087 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: D05KR88zCFB/dUGmG6NO3UX7x50cY9xpi1cvYkdO6mcbcHaZmEA7VNLxeB1BJs3jlHTvt1MxSsZUbEG4N3KaKA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2726 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add IMX_SC_R_CAN(x) macro for CAN. Suggested-by: Marc Kleine-Budde Signed-off-by: Joakim Zhang Acked-by: Shawn Guo --- include/dt-bindings/firmware/imx/rsrc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dt-bindings/firmware/imx/rsrc.h b/include/dt-bindings/firmware/imx/rsrc.h index 54278d5c1856..43885056557c 100644 --- a/include/dt-bindings/firmware/imx/rsrc.h +++ b/include/dt-bindings/firmware/imx/rsrc.h @@ -111,6 +111,7 @@ #define IMX_SC_R_CAN_0 105 #define IMX_SC_R_CAN_1 106 #define IMX_SC_R_CAN_2 107 +#define IMX_SC_R_CAN(x) (IMX_SC_R_CAN_0 + (x)) #define IMX_SC_R_DMA_1_CH0 108 #define IMX_SC_R_DMA_1_CH1 109 #define IMX_SC_R_DMA_1_CH2 110 From patchwork Wed Oct 21 05:24:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Zhang X-Patchwork-Id: 1385345 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=lFe/Lfm5; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CGJp15FbDz9sSG for ; Wed, 21 Oct 2020 16:24:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440539AbgJUFYY (ORCPT ); Wed, 21 Oct 2020 01:24:24 -0400 Received: from mail-eopbgr40051.outbound.protection.outlook.com ([40.107.4.51]:19620 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2440525AbgJUFYW (ORCPT ); Wed, 21 Oct 2020 01:24:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eQTlceujRrf/DzWN9EQ+b0lk7Vx3uwtJDNxHz6jLYMdjJ+Nyco6q4bq64k0E3oAPUF2gw04wDNk4jHIg1yLN9e3gSNJ4voRe9HNLIXPyY8SAlXVrNnvbdnCML8vNaIyXygD6oa7P+QzUMI/SdWxJ7yn8TK2TrQOVpZi39svsldiYkytyC6xTuf2dc+pJHoembwSF3N8hZspnByv9rff8y9ANYlhp3ecSFXrMx2KsJTkITaX2solveRt668KAcyfuhje3moPCiIq4kvt+Di7xvSclI6Es8eNjNtw1vEad7/MKjLofmUS1mtELg/Owxzy5WHknQ1DZq2+w01jnlEWEvQ== 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-SenderADCheck; bh=UPdi4TMvfuVY4MIhW30erBO+x4l5jTA885N1BnSQykM=; b=HCc3uSZqjaaYirlWPf6cowkPnBsOGfKFWfXPDnjdXaoLsCEFrjOihySB5QIAGkVvUJLRVafZGR3ITyKE1joq4PrC5eZ0JrRkoNDFrmO5cb2cjZhwApfslEAp3SU68KhQRr9t17PQoas1rEGJfPKEWccg0RpTs5ztD1hcCWl/VgAlAJFfsUv0wn+04oka01LK5bRY0cgUZlTpp/DOwWw84WMLOvhcjQLZw1gWNSfSgSnan0YxKgjOEzQrWV4CUiHSpbnucv8UdNWINLY3atFRst85GnbP3qMn1Nr7mBAHXrHcLSEnUnEln6VdiJXrazJG0g8sqgigP4lArPcxs4LbCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UPdi4TMvfuVY4MIhW30erBO+x4l5jTA885N1BnSQykM=; b=lFe/Lfm5wCrKnsuCxHGTjU7w4MW/P9Vo4pKSVhIhcpci9KBf80nFZHbWiJpIJH+gllAy/vM4oa+mT3Vm1/fjFimZykPQLaFOQTaX3IOl9qsfTUbA0zvPhCA8QM+EXvYEvsp4nnHkx3c8K3Wa9RV0foZ+FcFGGQUFfmMmlydaILA= Authentication-Results: pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=none action=none header.from=nxp.com; Received: from DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) by DB6PR0402MB2726.eurprd04.prod.outlook.com (2603:10a6:4:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Wed, 21 Oct 2020 05:24:16 +0000 Received: from DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc]) by DB8PR04MB6795.eurprd04.prod.outlook.com ([fe80::3c3a:58b9:a1cc:cbcc%9]) with mapi id 15.20.3477.028; Wed, 21 Oct 2020 05:24:16 +0000 From: Joakim Zhang To: mkl@pengutronix.de, robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, linux-imx@nxp.com, victor.liu@nxp.com, linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 6/6] can: flexcan: add CAN wakeup function for i.MX8QM Date: Wed, 21 Oct 2020 13:24:37 +0800 Message-Id: <20201021052437.3763-7-qiangqing.zhang@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201021052437.3763-1-qiangqing.zhang@nxp.com> References: <20201021052437.3763-1-qiangqing.zhang@nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) To DB8PR04MB6795.eurprd04.prod.outlook.com (2603:10a6:10:fa::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.71) by SG2PR03CA0157.apcprd03.prod.outlook.com (2603:1096:4:c9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.9 via Frontend Transport; Wed, 21 Oct 2020 05:24:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a2b8671f-e87b-4fb7-3641-08d875818ddc X-MS-TrafficTypeDiagnostic: DB6PR0402MB2726: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2657; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 37Pk2wktnxkRKPAIkZWzmxIjBOEclE0lHyez6FXGwv8DL8Y8GDGNr/mPPcmF9RJ4n3gibxUgeS8mf4cy5qZP0eLp2VmI4nDLElbG1jk3Xd8VMY/1Lkojm/1Uzw6zOZRe3M/EErn1laDTXfLSiVlurc3tbfXgdywF10Kj6R0viXcs60gCV5Wq1jDaY9xlOmnpgbD6/xiqaXP/o99yRvLzlChxqOjT9bixBc8T/ydRNc7kPMhP8t1ipLv+IyGOkiFVMxqZk5plDfGnUgWYw7wcv5mK0IzOEL5Ne/zwNIwrpkQxjr0PaV8N0/wh/5XsCSoNDCLL0PbuewW+twgKWJR+xRHEAwsmpJ1fBGZ7aATgM1KEhUm7y5xp+zVnBxwIBQtU X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR04MB6795.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(376002)(136003)(396003)(366004)(478600001)(8676002)(186003)(16526019)(6506007)(316002)(26005)(52116002)(86362001)(36756003)(4326008)(66476007)(66946007)(66556008)(83380400001)(2616005)(5660300002)(6512007)(6486002)(2906002)(8936002)(6666004)(956004)(69590400008)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: J3gEfsx24AluGaPyUa1noqGhM6PBNuS0ElM0ZHrk14P9tLF/QqmzL+n3M/t7v+EtTXrZev94dW+tEX6IPXAV2oxd21ciApbCdZ4eNYyHubHcKzDfZOfBGuQrjSkiefIb2ao9vYc6FBZNgKpf6tlNgCI5ncNGGrQiT/unLJTUAaewKz0r0kVnQlPnA3UIiE8GpjxlcjAsXq/WV19MzPilQGf//8K6HCbg+rEezRnBAbf/BsIOUGQTjuVk1XUo/OzgyWENCNGm3y9jw9cIqJiSxBbNFUUbwHJu/P0zH1W/YZyXeWNcWpaSYD4m50LSkh7NRzp4/CmIJ+F5Y1f3I0z0AzZPPhVIL1iktu4JYW6TAIKDJ5ym1vwLLVlxkxXc0r781fts02vNTtTNkka4QfZikl1uzhA+De/1BGrrkdNZPZeVKGBiPMY/JhBVMV09NkJFpxZcJUoWxHounW0htMrjtXhNPslOG8Ruy/Eh75CN+i9vxt8zMxtPlpbFIboWejy3BPPmHiOYcNM1WaFZ5KO9JaVCmwkttqJu/oo/a+kX4gsVIV5d00Wgctn0rxLG7ePZgeAfRjUQzLR0nYQ3mxW+cN9KWllVlb5LA8htPhCPZoqqK4K8P6zYU3y80VAAgsaCMiZN/4tqeYPTtmh9G5o2bg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2b8671f-e87b-4fb7-3641-08d875818ddc X-MS-Exchange-CrossTenant-AuthSource: DB8PR04MB6795.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2020 05:24:16.6385 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: L9fMP8ZI1iU5LQKFuyqczWXCU5iofoLHe+5WW2BxHRHlWjL4msopnP9ruklB4/SI7mIg8Xl98H9XEQ7AWSEeRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2726 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The System Controller Firmware (SCFW) is a low-level system function which runs on a dedicated Cortex-M core to provide power, clock, and resource management. It exists on some i.MX8 processors. e.g. i.MX8QM (QM, QP), and i.MX8QX (QXP, DX). SCU driver manages the IPC interface between host CPU and the SCU firmware running on M4. For i.MX8QM, stop mode request is controlled by System Controller Unit(SCU) firmware, this patch introduces FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW quirk for this function. Signed-off-by: Joakim Zhang --- drivers/net/can/flexcan.c | 123 ++++++++++++++++++++++++++++++++------ 1 file changed, 106 insertions(+), 17 deletions(-) diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 8f578c867493..1f2adbc606f5 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -9,6 +9,7 @@ // // Based on code originally by Andrey Volkov +#include #include #include #include @@ -17,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -242,6 +244,8 @@ #define FLEXCAN_QUIRK_SUPPORT_FD BIT(9) /* support memory detection and correction */ #define FLEXCAN_QUIRK_SUPPORT_ECC BIT(10) +/* Setup stop mode with SCU firmware to support wakeup */ +#define FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW BIT(11) /* Structure of the message buffer */ struct flexcan_mb { @@ -347,6 +351,7 @@ struct flexcan_priv { u8 mb_count; u8 mb_size; u8 clk_src; /* clock source of CAN Protocol Engine */ + u8 scu_idx; u64 rx_mask; u64 tx_mask; @@ -358,6 +363,9 @@ struct flexcan_priv { struct regulator *reg_xceiver; struct flexcan_stop_mode stm; + /* IPC handle when setup stop mode by System Controller firmware(scfw) */ + struct imx_sc_ipc *sc_ipc_handle; + /* Read and Write APIs */ u32 (*read)(void __iomem *addr); void (*write)(u32 val, void __iomem *addr); @@ -387,7 +395,7 @@ static const struct flexcan_devtype_data fsl_imx6q_devtype_data = { static const struct flexcan_devtype_data fsl_imx8qm_devtype_data = { .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | FLEXCAN_QUIRK_BROKEN_PERR_STATE | - FLEXCAN_QUIRK_SUPPORT_FD, + FLEXCAN_QUIRK_SUPPORT_FD | FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW, }; static struct flexcan_devtype_data fsl_imx8mp_devtype_data = { @@ -546,18 +554,42 @@ static void flexcan_enable_wakeup_irq(struct flexcan_priv *priv, bool enable) priv->write(reg_mcr, ®s->mcr); } +static int flexcan_stop_mode_enable_scfw(struct flexcan_priv *priv, bool enabled) +{ + u8 idx = priv->scu_idx; + u32 rsrc_id, val; + + rsrc_id = IMX_SC_R_CAN(idx); + + if (enabled) + val = 1; + else + val = 0; + + /* stop mode request via scu firmware */ + return imx_sc_misc_set_control(priv->sc_ipc_handle, rsrc_id, + IMX_SC_C_IPG_STOP, val); +} + static inline int flexcan_enter_stop_mode(struct flexcan_priv *priv) { struct flexcan_regs __iomem *regs = priv->regs; u32 reg_mcr; + int ret; reg_mcr = priv->read(®s->mcr); reg_mcr |= FLEXCAN_MCR_SLF_WAK; priv->write(reg_mcr, ®s->mcr); /* enable stop request */ - regmap_update_bits(priv->stm.gpr, priv->stm.req_gpr, - 1 << priv->stm.req_bit, 1 << priv->stm.req_bit); + if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW) { + ret = flexcan_stop_mode_enable_scfw(priv, true); + if (ret < 0) + return ret; + } else { + regmap_update_bits(priv->stm.gpr, priv->stm.req_gpr, + 1 << priv->stm.req_bit, 1 << priv->stm.req_bit); + } return flexcan_low_power_enter_ack(priv); } @@ -566,10 +598,17 @@ static inline int flexcan_exit_stop_mode(struct flexcan_priv *priv) { struct flexcan_regs __iomem *regs = priv->regs; u32 reg_mcr; + int ret; /* remove stop request */ - regmap_update_bits(priv->stm.gpr, priv->stm.req_gpr, - 1 << priv->stm.req_bit, 0); + if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW) { + ret = flexcan_stop_mode_enable_scfw(priv, false); + if (ret < 0) + return ret; + } else { + regmap_update_bits(priv->stm.gpr, priv->stm.req_gpr, + 1 << priv->stm.req_bit, 0); + } reg_mcr = priv->read(®s->mcr); reg_mcr &= ~FLEXCAN_MCR_SLF_WAK; @@ -1838,7 +1877,7 @@ static void unregister_flexcandev(struct net_device *dev) unregister_candev(dev); } -static int flexcan_setup_stop_mode(struct platform_device *pdev) +static int flexcan_setup_stop_mode_gpr(struct platform_device *pdev) { struct net_device *dev = platform_get_drvdata(pdev); struct device_node *np = pdev->dev.of_node; @@ -1883,11 +1922,6 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev) "gpr %s req_gpr=0x02%x req_bit=%u\n", gpr_np->full_name, priv->stm.req_gpr, priv->stm.req_bit); - device_set_wakeup_capable(&pdev->dev, true); - - if (of_property_read_bool(np, "wakeup-source")) - device_set_wakeup_enable(&pdev->dev, true); - return 0; out_put_node: @@ -1895,6 +1929,58 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev) return ret; } +static int flexcan_setup_stop_mode_scfw(struct platform_device *pdev) +{ + struct net_device *dev = platform_get_drvdata(pdev); + struct flexcan_priv *priv; + u8 scu_idx; + int ret; + + ret = of_property_read_u8(pdev->dev.of_node, "fsl,scu-index", &scu_idx); + if (ret < 0) { + dev_dbg(&pdev->dev, "failed to get scu index\n"); + return ret; + } + + priv = netdev_priv(dev); + priv->scu_idx = scu_idx; + + /* this function could be defered probe, return -EPROBE_DEFER */ + return imx_scu_get_handle(&priv->sc_ipc_handle); +} + +/* flexcan_setup_stop_mode - Setup stop mode for wakeup + * + * Return: = 0 setup stop mode successfully or doesn't support this feature + * < 0 fail to setup stop mode (could be defered probe) + */ +static int flexcan_setup_stop_mode(struct platform_device *pdev) +{ + struct net_device *dev = platform_get_drvdata(pdev); + struct flexcan_priv *priv; + int ret; + + priv = netdev_priv(dev); + + if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW) + ret = flexcan_setup_stop_mode_scfw(pdev); + else if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR) + ret = flexcan_setup_stop_mode_gpr(pdev); + else + /* return 0 directly if doesn't support stop mode feature */ + return 0; + + if (ret) + return ret; + + device_set_wakeup_capable(&pdev->dev, true); + + if (of_property_read_bool(pdev->dev.of_node, "wakeup-source")) + device_set_wakeup_enable(&pdev->dev, true); + + return 0; +} + static const struct of_device_id flexcan_of_match[] = { { .compatible = "fsl,imx8qm-flexcan", .data = &fsl_imx8qm_devtype_data, }, { .compatible = "fsl,imx8mp-flexcan", .data = &fsl_imx8mp_devtype_data, }, @@ -2040,17 +2126,20 @@ static int flexcan_probe(struct platform_device *pdev) goto failed_register; } + err = flexcan_setup_stop_mode(pdev); + if (err < 0) { + if (err != -EPROBE_DEFER) + dev_err(&pdev->dev, "setup stop mode failed\n"); + goto failed_setup_stop_mode; + } + of_can_transceiver(dev); devm_can_led_init(dev); - if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR) { - err = flexcan_setup_stop_mode(pdev); - if (err) - dev_dbg(&pdev->dev, "failed to setup stop-mode\n"); - } - return 0; + failed_setup_stop_mode: + unregister_flexcandev(dev); failed_register: pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev);