From patchwork Sat May 6 07:40:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bough Chen X-Patchwork-Id: 679691 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6571FC77B73 for ; Sat, 6 May 2023 07:38:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229889AbjEFHid (ORCPT ); Sat, 6 May 2023 03:38:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229709AbjEFHib (ORCPT ); Sat, 6 May 2023 03:38:31 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2050.outbound.protection.outlook.com [40.107.13.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7731CC3; Sat, 6 May 2023 00:38:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d1X+7UtxkmCLOI09FPFcwJWwQCOfdj3K/M5K66Pn5v5qxpVyEXMUgSLLMeBJvvFdZIsqHRkojZTT36Zf+sEW7xaepaCt4nyBSun1lx6XoMG8rsiZJ565orz3/ooGk7TffKNsP153ibwhmDxtYitshTo4Ftsj1j4OAp2wZi2u4sibSrxEIqOLBpMS6JESho1myvIzVAjB+t0WflcLCEZKUkO8/nR+Kqn7A3IxDOn4TEYZbD/NzUaIU+l16RVQUY3vSXyBZ8CCp+y1w5Tzd65A/vjUEqUa6fUSq2/ypfqs+9dc5lZR9g4mt0v/DmRilp3mq+WYsm5U1IgORd9uaSMaQw== 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=zmRqw0xnNjHn24bXPAqPFwrvaUgl+uJL6cuf8sR2fJw=; b=CioszYn11lp49jFykshyjXv1fUkFijup/QRpfezhN9UH/rLldHUaQqk1GG2vhLzDnnQC2GgfXnkUlJ55lYoKpwcqbBVd4yhKmrJIDX2FXdtSDX54j8MHEO+0Ko7HINJXclT1kXBJZIRc7jhIEkjun8RbE/m1Cc14SvbJwuP14CEZfCHz7eLKSFgvaBNh10FoCiuHDj/j9dECYZy24s06vdOqYaCns9cBo/ULXUAATQ6wv3u80TncCpHFnff4mdc5ZMf5YyviR4TbkBCO2DSn4kpavmBEd1NEAT9dop3/av4uDCbCB7szBIoOthCgjbyuwP4RiTRmDUVPVJRkJXefzA== 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=zmRqw0xnNjHn24bXPAqPFwrvaUgl+uJL6cuf8sR2fJw=; b=WmLJRa4rXpeI+JT9nKcFhTPLU7exoBfY+L0A1u+KiOCUpeNnH1uV8aomLDz9641QKglL5DAT9tQWj3DyHArvF2sbtgh04g1bJaEPkgK+p7nL3+OXxpru2cdoQrHCFvK1hkLKy9EYHwz7DcZsdPUAvU88GfhhOIZIErlpAinV8fY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB7PR04MB4010.eurprd04.prod.outlook.com (2603:10a6:5:21::30) by AS8PR04MB7798.eurprd04.prod.outlook.com (2603:10a6:20b:2a3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.29; Sat, 6 May 2023 07:38:27 +0000 Received: from DB7PR04MB4010.eurprd04.prod.outlook.com ([fe80::86a3:5425:d6fd:2346]) by DB7PR04MB4010.eurprd04.prod.outlook.com ([fe80::86a3:5425:d6fd:2346%4]) with mapi id 15.20.6363.028; Sat, 6 May 2023 07:38:27 +0000 From: haibo.chen@nxp.com To: adrian.hunter@intel.com, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: linux-imx@nxp.com, haibo.chen@nxp.com, kernel@pengutronix.de, festevam@gmail.com, cniedermaier@dh-electronics.com, devicetree@vger.kernel.org, kernel@dh-electronics.com Subject: [PATCH v2 1/4] mmc: sdhci-esdhc-imx: remove unused enum cd_types Date: Sat, 6 May 2023 15:40:34 +0800 Message-Id: <20230506074037.522961-2-haibo.chen@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230506074037.522961-1-haibo.chen@nxp.com> References: <20230506074037.522961-1-haibo.chen@nxp.com> X-ClientProxiedBy: SI2PR01CA0030.apcprd01.prod.exchangelabs.com (2603:1096:4:192::15) To DB7PR04MB4010.eurprd04.prod.outlook.com (2603:10a6:5:21::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR04MB4010:EE_|AS8PR04MB7798:EE_ X-MS-Office365-Filtering-Correlation-Id: 2021f02d-eb60-4bf1-ab11-08db4e04e18d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Hde7J2Qp4UhWMLa8IbwZDEsL109JtL8XUgzp70N8ak7oMFDhQVrg1waqBnRJ40aaAk8hpyxctYW8XiyYpLqtcBzs3guCbPzca1/1djHMVMCr19tNrupoJ6ipZbmbvK1OeZ8Wn7ZVeK1vp5XEAD8dvMQrtBPSpEESkBpuYTLN0CCe6OZxzU369EXEyMBvB4tRAl7vPn3boJYYgqkgjz+sgJOw2bXgSQUDDVXjQWQ2jgM+OvkH6QwNqSnec+Fiy6WdAVFVTX/7+rUtc/+fSpyAyV86uXP7G3w0uJ9Uono0lvnu5WCy8a6vB685UhSl8NJanUzMU3iOBF8Q/2Qvj4VgGALDMpYgRo3Q/VeYWPo2x8dIdoIEddPWqnGdgNReIXOWuRBNSSaRb7HluvBFl3IszRZddPvzz4/TarIVw8aULD+sU4talnZUWJS1p79UiN0Lk6BK6RDEIp3nyPxzLzh9W+t1MUBEt64S7MWHhDzaNjbgSa0dG0BW5/nxLkk1g2wKeW/c1uGW6AzoGU969Y97WspSPRGLwPCQSvtnvaZnPlYdCCLv362y0o1ft9nUFWRbGu0A0At7J/YDnlxRCpeofKDFg1jZZgM+D4otve0uin2DUs0wVsI1bxaGdtxBfav1 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR04MB4010.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(136003)(376002)(346002)(396003)(39860400002)(451199021)(26005)(41300700001)(2906002)(186003)(83380400001)(478600001)(2616005)(6666004)(316002)(6512007)(6506007)(1076003)(9686003)(8936002)(8676002)(7416002)(86362001)(4326008)(5660300002)(38350700002)(36756003)(38100700002)(6486002)(66476007)(66556008)(52116002)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: f4l05NNam6GDt/F0UFeD4FqVP2+HxbqMYKv6vr2pkUV9KDp4XOJry7s/iaQWg73dJbWxG2nOldUmO7POJMnrygapajRzmQ5Fz8t/xW+i5TBlEUm9nv5riot9Nd+pof9mDL1s9krzJwL6Nc49qDI3qHBRmUJkWr3V6oEtki9KwcSGrpzYs5ZiJ7B9IUdSflooQEltdXn+6gtVO9V0OODgCxv8PCpoerwb+1Uj5DDm2/IsoRDd8DEHzDY5ivQ94ip8WFTAKIkood3CMrv4GTBXr8V+8W07bPRTchckvwRczbXynPNzk81FeQRf5ECSrezdGpIVrkUqaNwWQ5wX1H7k6liZyx287WVfsTCi8bYv9IFJlZLCtXjQSAk0YFIyml+ZUZECz71tj4D07tWPA+1meXaOzDbM59be+ff9DPpjcU90dGXW9bCcKEKRHd5s7IFjR1n5hO15QZvtfHqcRpICT2Vi18gbcIy/a22279vz16LiJtUxstRJ8QeAtyUSM61WpdDXoTzCz5P1bCoXWL5ShJEGpbQZVRuW2F7EoN++W9Ac5HCqn2wlrIXF3uNy7cLh65C2QQerkm5lUi0Z5yZq0lV2VvdQ1EUuTsh1VvKoXOsPQZsPyfipn2PTUws6CMhkt83WGdVybJTH2ywYiMJumH/0MgaPsOK6q541w3O5R8kw/aph2cPM8gjzB5qWXzQOEtfjSKOPa0nYeasOK7StUSUQ5XuJHpUfdJrsiAIm9uTrqy4tn6SLU05b3o+annWETO5UnhDKoSux+ptfmF9L4HclqQpnjThsNQSkldIKd2dl0Pb+RiYb6KpsETZVzIspW/bHAEulBqTzWG3vMbVoGVW1NGmKHbv5VeNNELm/rLRni4rU3+njfCsHasSwfDMB+Mu3+lGCEt4/0J4Q+zEmDlUh2iDn72u6imna4tm/4hwMKnyNREm/z5WPY4C4M2Iwk6SGPFrMw69K8ZTguRkCzeJnAgJbZnEVyqYCYy8ziqnLBF/Fni9hqD9SZrW7aHC6wLBQUp38Bjnz/R9Jif81hQ7ixgPfXig3934TWM4jg/Az8X14PeYa/MiYhzxuAQzRnQfgEE/uF4csAh/tKU3w0k78qPM49gjE6LFbWhIiF1ozP0SdYe1I65Te8Zy5lAm1UwDprdpQY5CnENvSE8sO7AZw/fvqNaDawWsBv9j0Dol01T31vaMQdY0HRVnWy9rWxy1aljj+sgFcqNVz+3dksFpNYvUiH43N3OBnp9zyVMrlkeYVamvZbQh+ms6//d7kYN2RxfDooEK3Tamdk8RHYHf8TPE5k30onG6Z/U+JTgmqXh1jBkPtalC5eHG9fdZLrPoCPHIILL+qcXhmtsvb/zcDZWvphtN6DvqDBGNf78pW5lEEF2jX/3YP9CDLBQOE6OxM7uDmvYkcvDlifTM8ypG9IFY8bmXyFe26dbwSleh7n5W2JuXG4N4f4o92tVB418kj1RabTAYesPyyjcUWKUYsWV1X2/gCVqkcdmarcrrrQ6T7DCat3Vr1klG69zAONxxl6eWn17P2SHcjk45iAu+Ed5/XOHp+PQ58x+O0oPXghmRsYYaNJxsJfvweTt+o X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2021f02d-eb60-4bf1-ab11-08db4e04e18d X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB4010.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2023 07:38:27.7019 (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: BZ2GQTTUXcMg7tHeuKC6vQFkVWAFOAZ2fFbCY6xCusT1iYqyp06Kkib6jNzuyFlumDCLaA1dcAYlJYR4xewEAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7798 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Haibo Chen enum cd_types is no more used, so remove it here. Signed-off-by: Haibo Chen Acked-by: Adrian Hunter --- drivers/mmc/host/sdhci-esdhc-imx.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index eebf94604a7f..c7db742f729c 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -207,25 +207,16 @@ enum wp_types { ESDHC_WP_GPIO, /* external gpio pin for WP */ }; -enum cd_types { - ESDHC_CD_NONE, /* no CD, neither controller nor gpio */ - ESDHC_CD_CONTROLLER, /* mmc controller internal CD */ - ESDHC_CD_GPIO, /* external gpio pin for CD */ - ESDHC_CD_PERMANENT, /* no CD, card permanently wired to host */ -}; - /* * struct esdhc_platform_data - platform data for esdhc on i.MX * * ESDHC_WP(CD)_CONTROLLER type is not available on i.MX25/35. * * @wp_type: type of write_protect method (see wp_types enum above) - * @cd_type: type of card_detect method (see cd_types enum above) */ struct esdhc_platform_data { enum wp_types wp_type; - enum cd_types cd_type; int max_bus_width; unsigned int delay_line; unsigned int tuning_step; /* The delay cell steps in tuning procedure */ From patchwork Sat May 6 07:40:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bough Chen X-Patchwork-Id: 680121 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27BAEC77B75 for ; Sat, 6 May 2023 07:38:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229709AbjEFHih (ORCPT ); Sat, 6 May 2023 03:38:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230383AbjEFHig (ORCPT ); Sat, 6 May 2023 03:38:36 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2043.outbound.protection.outlook.com [40.107.13.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0D311160E; Sat, 6 May 2023 00:38:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zh6oRZWm6/yW/VaXwrd1kGFq4NtBx+JoEufBYlTJS41ku6caEXvUgrw5Oi3Ia5oGd3l47uWyAmS7vGxwemBlFoE7htLyJwbuB+5zUx29c4biJKU+uYP+pXHj4Jd+N7+JH0mSTYzLR1keTGDe8taBMI2l9yuHX3S7M8Fceas4dH8q0t7Wp1t362cgVYkOMtQif+lfBm8Su/zwQOKy8EjT6jhRuTkCraAw2ZtdWZ7ZGnUzb8QUpYpRUjkFqHkSbH5fDINuF67uJsFZ3EA9wWHdYDSgSUsM7YkTZjlsmCC1MW8J3qrxaBFPixQMJPwiwCZ5bBsb9boyAguWqFvBkz/oyA== 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=+k1mx8fDIGWP0iLTt0GLKxlUYwIIkQ4nAg6dUaaZEX4=; b=Vd9AvgQ4G3qDZqnIi4zl3bb9+QG/VQdHae7pByM91faI8ukNsLB0K7cL6GZX0hc1+SPNYfOEK6r9eUAY9AyQG8Q0Vyzefqp9kTXqJ8m4lpcnE5CYVArsG1mY6QtBx8qwXQgwlQVrVEhTvOCvlBPTxI1751KRuPubZfDavzkkHjreXOwNRl/eBqiybI+JJrzOB2+3M/3OJEoM+DE31GJEDrlqA+SQh77hJZTgv2PTpzcMooM8LsN0TWhhjip9bVcCYC1071Z6IaxPN1CCE7lM6TiijW/mTs5O3zUccaI4v7qTNi6awaWosGtxx2XSHBpjQO0y9s7quvvJTW3VyVyf4g== 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=+k1mx8fDIGWP0iLTt0GLKxlUYwIIkQ4nAg6dUaaZEX4=; b=rL/exIQATAWDcQd8jQk3wDxiWSqthUfkeyXpk+wTSdAzDcr4YOQy73qvI4AG11rakk5af4A3k0eWWsU7lgYNnroDhCjD73uQe0cwgtId3sgx76mf2B3ODmR4PJgZaNqaIL17UTHhWnxRidrW+W0s1tadoXp5TIS0pTXcqqxoBMk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB7PR04MB4010.eurprd04.prod.outlook.com (2603:10a6:5:21::30) by AS8PR04MB7798.eurprd04.prod.outlook.com (2603:10a6:20b:2a3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.29; Sat, 6 May 2023 07:38:32 +0000 Received: from DB7PR04MB4010.eurprd04.prod.outlook.com ([fe80::86a3:5425:d6fd:2346]) by DB7PR04MB4010.eurprd04.prod.outlook.com ([fe80::86a3:5425:d6fd:2346%4]) with mapi id 15.20.6363.028; Sat, 6 May 2023 07:38:32 +0000 From: haibo.chen@nxp.com To: adrian.hunter@intel.com, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: linux-imx@nxp.com, haibo.chen@nxp.com, kernel@pengutronix.de, festevam@gmail.com, cniedermaier@dh-electronics.com, devicetree@vger.kernel.org, kernel@dh-electronics.com Subject: [PATCH v2 2/4] mmc: sdhci-esdhc-imx: remove redundant write protect code Date: Sat, 6 May 2023 15:40:35 +0800 Message-Id: <20230506074037.522961-3-haibo.chen@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230506074037.522961-1-haibo.chen@nxp.com> References: <20230506074037.522961-1-haibo.chen@nxp.com> X-ClientProxiedBy: SI2PR01CA0030.apcprd01.prod.exchangelabs.com (2603:1096:4:192::15) To DB7PR04MB4010.eurprd04.prod.outlook.com (2603:10a6:5:21::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR04MB4010:EE_|AS8PR04MB7798:EE_ X-MS-Office365-Filtering-Correlation-Id: d2a97bda-71ba-4f57-ce25-08db4e04e426 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EVU+7fWGgzJIHIYayYfxAAPkTPYxeZkhVk8OJ4kuyK++Rtzy4wPFob2NYDRbvuXuKqEhXWyPqFER48e5qO7dZg39gMAJsfJblCLsTLju8f0xThwDBCRJJmpSuggHKzdCER3WIHjtqhHErA4WWTXqbpOZGFCRI/0e5MoY7oKR0UVZ6pmr8iHWgOuQJSUClBONhKewC8ghB531EVMGxear3dCJWjRa5o7vBsM69MMPonGT4+qsc6qioL6aYrRVfM5To5zzHFL6BqVj8MLy4CF2Rb10xT7ttpyNwp/cDTLpHVn0dCl6OlDCQfC53l7jrFNZE66Ige5S747LgDOS5wiCBzHr/c8OEM1uOLT/9elxF1EFlGQG7oxeit8w02FkH8l74jWxLR99h+o/MgubbZUC9u3ukhqporfpWlFuQzfk4zGeJcR5RlXozibDpnObTTH5u+zNRRPXLInpVmS8TlgCZpamYq8ZlSRAs8BmKNIx6LZMux00gKMylAZ1HEzWeftMlqu+t49WiKxniWYq7zMw5c7HfEGCei+DMVhVd11YPvVop7Qi93cP7Yt969ezwBXgasq8/aKtBgjIdvnKfagILXhHZ/zuq2+LmEJjsPvgSz5hHfPeiWIn/DnGOLEWGWZJ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR04MB4010.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(136003)(376002)(346002)(396003)(39860400002)(451199021)(26005)(41300700001)(2906002)(186003)(83380400001)(478600001)(2616005)(316002)(6512007)(6506007)(1076003)(9686003)(8936002)(8676002)(7416002)(86362001)(4326008)(5660300002)(38350700002)(36756003)(38100700002)(6486002)(66476007)(66556008)(52116002)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: A0Yhtw+v1HVXZOR0uDOZE+/rdMo91teqovTN8y+8TtD8RbVNbxuEuAwYsPtM3Ku2Neiw+GJNl4XrrKBjmC1/KdwMPOabA8Vzxt3D01dvbNP2M+sdWC71AU0CpxGZ4LERtlnEQDu0IHBe1x+acxj99uVfkfe7v07wpmJNukt6CnBzbV9g6MdizfbqkP9Q36tBW5HVqzHTQdkfTj4rkCEAI/Pf6VDeJZXoElrKjHiBxXUTyodBLsZYUPDOuLKROyq7TcxNkLsJwJp0YgTW34jUMCbKZ2Toi0lO8c08tCosaGSOXv+NCW+zY26euffUaYaQjC7dmB92eB78EF5skxRhDwcr7WNjcCS8dpjFrFuWHlb6aNtVOQj76wR8op3bqtRN1NJHWXaX5jd+GNdDnuqDdHGBJGU0762Nbl8LKGm5/xlHzlyOR56mWzK5HtEQKOOWet26wObzTbDORPI0fa/fhYlAeR5LFCjB/FcCUK8AKYQnsHNvW/8crRfq34J0gM+xTLTsN51POykJzCWfHn5hrNNjC4PMImKEkfRSOAPXjHGBuz2gAy+V1pbmjmOgOIEWQihnYAuClpCk4xQ6U9YNgA57EtXC29Mrh7zYo1xMOMGYbXxsesQscnqcrIU8alsl44H6HxB0NeFxridYcuqgeoIOfbdMtGxJbL1pkIJsDsdeytlJA69q3yeHViI5sHb95gB86KYxmJV+SE2GCXN3BPe18BGlHuENpd/X5JOCIo8SN7p9MBNzYgd0Ng/55Jga9CjbRMgUuV9t/87zhApLjM9yevFyHj3ffesncPAhQlQ0dcjA7sdsxWMJfETB+lbyDRFA8HAdZiaEDd0B6AYhN110WtHqu7lhp5iUvVFmc8Ztoo99SSs5Weqlk1gcnKCEUQXzLhZVM4TKzUQzyGI2zU+skpR2Q4/+828Ef7nhtSqoCKCYVI3IB/R7IJoHzCg3mVegfXkNlpylXvHpH1i5jk3c2U0GXLO+UARiLCP7s/LH6dWJB6p965wPJ0Go9x6IT2saqoegaApr//OxhMNVCPcw2YBAVEfX8XqlMlxDByMFax3FHg7VN5EGuurruF7t2VGjMmMF4l2kj4RIt3NKU20lHOszqMVF6dj8curxY5RPf5OUG0Y6RtvIToiL8MLfOfltCa80W3F8xRsJiIiS+3ogXplFCHon94tKuUKdNlbqcjlefzJs+Ijety2B4MS+BkPB9IwXgCgnb6el4FcBK0P9EvqwXzjO5ipeJcQWd2GhrHxfldjAycxh+pqWshCewCC04Rfk0U0fALghh7ng8okaHEWy1GayODWNdn6u/00nGVkH2TmeWnWL9ieGP8MiJi1TnZR+oYA3OnEiL0f2j3bBgkhWqfmUfuIjjAriLpObSfskknS0vxs+TcJyS8vkIVGJEEw5fBazPprEtD0BaOlLmJqGml1D8qP5Hq3CNpDzGVOG5qihFof1NE83TPfUGyqyBVqpRTPwV6vS4xyPlM0EeFSLFIYmSv5GOYrwZk9hC939LPmsy7NyK3zycSXQzvuMf1wG7MxTag5hVm9dn6vmomdSIAWRTXsBw4e1sdBbQj9pHBRcKM5XjhVaG50e X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2a97bda-71ba-4f57-ce25-08db4e04e426 X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB4010.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2023 07:38:32.0698 (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: gSKWxQznmz+3xZNl7GefAA14GYd/WcXKzct/XCiutizHNP2Ia9efx1I+Hx3U2mleudX1GCwcXZ5HmOISfomYVQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7798 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Haibo Chen The logic of the esdhc_pltfm_get_ro() is just the same with common code sdhci_check_ro(). So remove this redundant code, depends on mmc_of_parse() and sdhci_check_ro() to cover the write protect logic. Signed-off-by: Haibo Chen --- drivers/mmc/host/sdhci-esdhc-imx.c | 47 +----------------------------- 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index c7db742f729c..54531aab70f0 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -201,22 +201,8 @@ /* ERR004536 is not applicable for the IP */ #define ESDHC_FLAG_SKIP_ERR004536 BIT(17) -enum wp_types { - ESDHC_WP_NONE, /* no WP, neither controller nor gpio */ - ESDHC_WP_CONTROLLER, /* mmc controller internal WP */ - ESDHC_WP_GPIO, /* external gpio pin for WP */ -}; - -/* - * struct esdhc_platform_data - platform data for esdhc on i.MX - * - * ESDHC_WP(CD)_CONTROLLER type is not available on i.MX25/35. - * - * @wp_type: type of write_protect method (see wp_types enum above) - */ - +/* struct esdhc_platform_data - platform data for esdhc on i.MX */ struct esdhc_platform_data { - enum wp_types wp_type; int max_bus_width; unsigned int delay_line; unsigned int tuning_step; /* The delay cell steps in tuning procedure */ @@ -994,25 +980,6 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host, } -static unsigned int esdhc_pltfm_get_ro(struct sdhci_host *host) -{ - struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host); - struct esdhc_platform_data *boarddata = &imx_data->boarddata; - - switch (boarddata->wp_type) { - case ESDHC_WP_GPIO: - return mmc_gpio_get_ro(host->mmc); - case ESDHC_WP_CONTROLLER: - return !(readl(host->ioaddr + SDHCI_PRESENT_STATE) & - SDHCI_WRITE_PROTECT); - case ESDHC_WP_NONE: - break; - } - - return -ENOSYS; -} - static void esdhc_pltfm_set_bus_width(struct sdhci_host *host, int width) { u32 ctrl; @@ -1380,7 +1347,6 @@ static struct sdhci_ops sdhci_esdhc_ops = { .get_max_clock = esdhc_pltfm_get_max_clock, .get_min_clock = esdhc_pltfm_get_min_clock, .get_max_timeout_count = esdhc_get_max_timeout_count, - .get_ro = esdhc_pltfm_get_ro, .set_timeout = esdhc_set_timeout, .set_bus_width = esdhc_pltfm_set_bus_width, .set_uhs_signaling = esdhc_set_uhs_signaling, @@ -1588,17 +1554,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, struct esdhc_platform_data *boarddata = &imx_data->boarddata; int ret; - if (of_property_read_bool(np, "fsl,wp-controller")) - boarddata->wp_type = ESDHC_WP_CONTROLLER; - - /* - * If we have this property, then activate WP check. - * Retrieveing and requesting the actual WP GPIO will happen - * in the call to mmc_of_parse(). - */ - if (of_property_read_bool(np, "wp-gpios")) - boarddata->wp_type = ESDHC_WP_GPIO; - of_property_read_u32(np, "fsl,tuning-step", &boarddata->tuning_step); of_property_read_u32(np, "fsl,tuning-start-tap", &boarddata->tuning_start_tap); From patchwork Sat May 6 07:40:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bough Chen X-Patchwork-Id: 679690 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6E95C77B75 for ; Sat, 6 May 2023 07:38:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231127AbjEFHil (ORCPT ); Sat, 6 May 2023 03:38:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230383AbjEFHik (ORCPT ); Sat, 6 May 2023 03:38:40 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2087.outbound.protection.outlook.com [40.107.13.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C82C81BE2; Sat, 6 May 2023 00:38:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WQrJhD6Mz8mM0SkpiIZdGktSbHNebqyqVlO3fXb9Sdi+s433/MfhgI5cjOSRjLwqw/OoeCWWg1PkbpwDPTitKRNwCeoz+ylV/IqILkL1CoxlUxCceJOwv7Rb2VZnZx+Z45jL/PsrgzbGzU2nGPrnnx//ZvBoZEJuNHwnb4isBHum+tmOI39BYyZnYc/hyuV2sGqeweGXu+c8GtcPnk/SI//8yYtOkD77XYyVhZda0QubYdhlpX/Re7PaR1od1Kv2MWS794E+/prF/qkS84jMQJlfVHvSonp1446tf1sG7wpNmogElD14W5ssFUiJZf3CEEG0WCRp+C0ALbxxfwX9ZA== 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=PwoOrVm0pKb2cYqC43CdM1jL455leu+gPCJXbdFkY6E=; b=NOU601bgI08Vd+S8nJeA2fF7Cy53eG/QIkdgZoTW1K3IUZuOcIHeem1YqUoSUtJzLL/OOOb/9+dIj/JB5kS0/NS1bu6Xy3RR1fzTH4anBTb2V63g/0WvtjT8ZJu43qEjKXABwdcZY6vJGyEvV79aD2cRautzeC9npZGuot+Udsecb6GWfuMB78ZcyQtQ7nUYcYLJIZ/etPNOOfYJLk2Jt/mQvsdO9HYwdLxLARpZ+6/+k0NUm1Pw6Web6gBFucgzNUlA4dExt346PliYBdiI9LlAmf8t0vrEZWvjj0ZBPIj+LFSp+MUnDACF/nHt3zMCDZ4NTQjS6cfu4X41PIawOA== 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=PwoOrVm0pKb2cYqC43CdM1jL455leu+gPCJXbdFkY6E=; b=D4Hs9FGkaaEOpzEWtv8Xf1m4UYlUMsv86Xc8kHvdH7nZwFD0czMwIKHx2fy01iyDga8xCkA94DhArw/SV6W99kUAsuHSiHSL0ggFTsvdSP5Jt2a6o4OCQkIaaeE5mAfoqN7rYrLO4NrhQCuFc3xvFr8hhtWOkek5e/BMLbcq3sE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB7PR04MB4010.eurprd04.prod.outlook.com (2603:10a6:5:21::30) by AS8PR04MB7798.eurprd04.prod.outlook.com (2603:10a6:20b:2a3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.29; Sat, 6 May 2023 07:38:36 +0000 Received: from DB7PR04MB4010.eurprd04.prod.outlook.com ([fe80::86a3:5425:d6fd:2346]) by DB7PR04MB4010.eurprd04.prod.outlook.com ([fe80::86a3:5425:d6fd:2346%4]) with mapi id 15.20.6363.028; Sat, 6 May 2023 07:38:36 +0000 From: haibo.chen@nxp.com To: adrian.hunter@intel.com, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: linux-imx@nxp.com, haibo.chen@nxp.com, kernel@pengutronix.de, festevam@gmail.com, cniedermaier@dh-electronics.com, devicetree@vger.kernel.org, kernel@dh-electronics.com Subject: [PATCH v2 3/4] dt-bindings: mmc: fsl-imx-esdhc: remove property "fsl,wp-controller" Date: Sat, 6 May 2023 15:40:36 +0800 Message-Id: <20230506074037.522961-4-haibo.chen@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230506074037.522961-1-haibo.chen@nxp.com> References: <20230506074037.522961-1-haibo.chen@nxp.com> X-ClientProxiedBy: SI2PR01CA0030.apcprd01.prod.exchangelabs.com (2603:1096:4:192::15) To DB7PR04MB4010.eurprd04.prod.outlook.com (2603:10a6:5:21::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR04MB4010:EE_|AS8PR04MB7798:EE_ X-MS-Office365-Filtering-Correlation-Id: b2506270-5d64-470b-5394-08db4e04e6c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c0DAI+cNSOYGMp39yjT4M6yq4fWZAjUtU3z6Kb5uoPiHXmWCvU/bCJ9zrtdR92GE9WTaIRRya9D2IIXfsytF9Zk6QZd/5haRI2wmHbYEGssu4/fFP1BGAUOa67SEj5rZLU+SqM8GK+ghJHlXO3PdvjHoC1OvPlgKtJT4gEElScvcpSImaw8rpSB8qOff5vorB1Zrl4PS7LhI/xJgHscmqQPf8TnOpkS2B5vVsDz59Wt48t+GGJZZecMLDx4KBXE56C6t6nu4ZbRPk02edwnFVacSBzJoKI/9ulbSMSWw89X9W3lIWPIw9j+3vzNfHBgYNLy5RVDgIXPyQ8J5S6G9JoQFKWIBFhF9E5Ea9BHuaCLLDwC35aCwEaoJoNH9qCPjNYqDnuHNMlBKqMpG183CEkF0OmNDPSewS0LGhpVkNLFKGoL5s7htqMWgNILTRwQFAIxtXOJAGkeodcWFD6c0YRr7q18sTz4T1T+9JoOnvhUhPfoYANG05ZAeeRXlWX2gy0Lj8gxmW03/rnG50LDGruX8h5xVCqEia9VYBmcs4ZVxkxepAvQ5Y3SpTTbjd0DvC+1yI1Kh+5Z2oLpK8zh7EuoXPOCCJ3p/MC5Isb+DejazlIXW/N+I/LSFBa+QW5kd X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR04MB4010.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(136003)(376002)(346002)(396003)(39860400002)(451199021)(26005)(41300700001)(2906002)(186003)(83380400001)(478600001)(2616005)(316002)(6512007)(6506007)(1076003)(9686003)(8936002)(8676002)(7416002)(86362001)(4326008)(5660300002)(38350700002)(36756003)(38100700002)(6486002)(66476007)(66556008)(52116002)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Lw8/GAnpgJDxQp01vRp3nDcBNovltTDW9sLDwN/0xfTEjn512RduEIvBw/34WQEu49wZJfQGygCf8Yg4GseQ1vQNYH0jDBRqIcBBjcagdlb2bhvPVfaQV+CqZ2CqiOkpp09JkY35j1L9v1Y79hvHBklTFTOXHrMQ+PKdzVjI+4AwNaDIW14LndfpeZwdWCmrVx0MNLDUu37/Jvh5J+Iotjz3rTlywxEXIkj+AD0u7YJ5DLdhEFX3VKv8oLs7xa18OxWsP8m0JMqzjXjNAcP2mD3YOy0G5p4yMGM9ypHVAg+9xHMy9VjNl70OX7ZVUuey7fQh75+Kr9ey5p52yWTUq4Q0uzl+abLs3LEp4kr6dQUND7554wsXebcXcUdr0BMKsqpTj4/1/c2lTy9CzfLIsCqUpkO6x+zaSmSQB9mNhU8AlZ8HYjHWi0C/4d0CnzeoP2PCxiZ8R4us3KCQGYFkdfomXQtCrACFAzNkKn3MN8mMOs03EGEuR45b2cTlnTbTd79wnthrT/A2GWsg0KBmwnhn2TYLq8J8//XrlJxv5Zh77tFR1BzedHK39jXQ1wk86pzGBHgRP59PIPYfpm18/yOZG3en4R1XfKXyO6Xcvx/IvRX5rYdMgjmwtPmb4T5SADcV4HF2wOwD8BAeCRqKWGDCVv3wG5nb0gbLfWrfoWLq+e7dMERUbWHa8V/5HiqVcghcTbKp1hlEfBKLuarOAqNFUrDD7xRYGkBYGUFooExG5Gg44EpHvMj/27g4cd+ldw/pJIHlPX6BEAF9KMpzPjM9koGZ37Y1/zmjV5e6G177pgfGYBgMHuNC+2javkrWv0qhHCPFKlC+3OcUwnfWWOGj5RM93YZivCW2lA90p1Qk3uZWOTMxKn2FCmDkIbcdGRkcC2n5Kf3pTB+Dob9JgAz/Jar/IxvYWEbNukF6J9lu2DO4KXoeY3Jrt+D3ejmilSBOzRsten0AsxJ81svjc5KB7xiFi8o9o/EeurHUWpHVDRcA+zAMrXqk1SYAooLwEP+OV1HKy7GTWCZlKgOm6V7wIn6KZByfa+0m8wYo58tw68F8F4nR/jQORsmRT4dY2ql9fDDuoA7lRzHtjS7MW0lEqNmaK/g8RHQXvtkHJ4KPmbjFn+IaUmItm/6a6WUxvgM5dY+Owf7KNt2baM6F0Ui5d5RPiROQmt7UEzHAewoZEuif2bOsJftF6usBzW3cYOvQFtvSVNjcKBb2QITy9vQtc3H1vCnCFLiS7UYWfUBasskdD06p+Km4FIs5BSHtmwt7hG2nRoNToTtS4P/loi8YSeY0fvAwCukzj7cLw6NDc3gs6XE58kt9IwWQzGSSc8I/BZ31vdZ8JkUGPyaOYkwMqlks+21fA40nJhkpMc5iWwqMKotEwZxPHl26/+o+poa7mWgEQZZDW4DoBxa/0RMcQRA4c6MafCu1R7aF1bUSQN0eE6vM/shP8DNPSI9/qLG3v/m9fsAZB5QFje8A01CmRE9NrDS9r7u+LG1GQkRXh205Hom3i9GqBAZfByioUjHEN8w9IxelcV9GHN2c0d/hih6bf2Ys18fG16jvfxsV51nNC1UF137C9mjBHV/Y X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2506270-5d64-470b-5394-08db4e04e6c2 X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB4010.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2023 07:38:36.4491 (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: DaUrtpPqVZw9A9kU0hW1VArwoVs2YnsmbvI3IqyP4YnJIUWj7QJZkF6TjeF82xUbGAuJacgY8vLUc2sndeUB0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7798 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Haibo Chen Driver do not use this property, so remove it here. Signed-off-by: Haibo Chen --- v2: -fix dt-binding-check issue, also remove "fsl,wp-controller" in examples. --- Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml index fbfd822b9270..e34b4fb4778a 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml @@ -96,11 +96,6 @@ properties: interrupts: maxItems: 1 - fsl,wp-controller: - description: | - boolean, if present, indicate to use controller internal write protection. - type: boolean - fsl,delay-line: $ref: /schemas/types.yaml#/definitions/uint32 description: | @@ -190,7 +185,6 @@ examples: compatible = "fsl,imx51-esdhc"; reg = <0x70004000 0x4000>; interrupts = <1>; - fsl,wp-controller; }; mmc@70008000 { From patchwork Sat May 6 07:40:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bough Chen X-Patchwork-Id: 680120 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 598FCC77B75 for ; Sat, 6 May 2023 07:38:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230383AbjEFHiq (ORCPT ); Sat, 6 May 2023 03:38:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231162AbjEFHip (ORCPT ); Sat, 6 May 2023 03:38:45 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2043.outbound.protection.outlook.com [40.107.13.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66B45E46; Sat, 6 May 2023 00:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ipxnnO2EzEZN9tG5yISamuzrJGFy+pvidmdn3SYwbyLKxQRfs/M4TLBxevQOH7/fXhuHh8W3lmfGEGK33ZSGFcT3PPppFrNjSuTTIe3mEu+tv2g/QWE808cyCHNQENNnIPYpUA+SpQ0C0aRCqBn2NgcO6VEYU/Hk2s2FphmIJ/7ViTdzokqKxzWOocgwEtBxPQRavgLCNHvwOnMhQMeEFKVBquKFypOFhWUrmsw10Eon/san/eHOEj1dolu1Pcya2LuEtyDh+sTYNE5Ru+70j0p2clAjwk6pAMulp+pOLf+fcCj153AzfgpgswK+bcUFokCPWzI8sjgBrZUlsXbUMQ== 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=e/SOJD09I6MyT3dBVZkKU7DLkeL0WF+RZkNcyD+yXTk=; b=fsI2MxxjkyOp6y3jBiO0xkVfG7NjfcS6RnXjX2u80FT6zZp6J99QH5nJP/HA+9QaIib+KTeG/n6+wGewzYpm2fCBmK7V5gSmuBFynAae34zobILjjiIlcITcrurDR41VQpg56ORpa6tZlznYjXT0edkXbKSwlBflt2IDoRRP6mMpuWpBo/gEjkbpL9YEAxvpnNP9xzd89th22/zHt7k7JFcP/xqxjeEvxyiRhblSvHgWNFXZsYbLb0ElmfVLfdlSQHRzVdaf+c2ho+bgXkP425GCrtgd0HonkHQhm8MeXxKOcRiIxKQC5nCg6Un/ebONiDhWSWWrq3Cig6qA7SVPYA== 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=e/SOJD09I6MyT3dBVZkKU7DLkeL0WF+RZkNcyD+yXTk=; b=eH3TKUPDt2D9YaqkPhw3xDgEc1hCVALScRvcpyEVn3k/sXowXSbrUGnYT5qN47OoNM8rPjnClg2Jybda2RCJBJGW1597OvFz44Se0JE+pOr4vmSCJZsFwmLeoSYR0YEIL/SciX2A6f+8e0IErsLYlcxPJhaWnLz0O+e+IBnNMcw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB7PR04MB4010.eurprd04.prod.outlook.com (2603:10a6:5:21::30) by AS8PR04MB7798.eurprd04.prod.outlook.com (2603:10a6:20b:2a3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.29; Sat, 6 May 2023 07:38:40 +0000 Received: from DB7PR04MB4010.eurprd04.prod.outlook.com ([fe80::86a3:5425:d6fd:2346]) by DB7PR04MB4010.eurprd04.prod.outlook.com ([fe80::86a3:5425:d6fd:2346%4]) with mapi id 15.20.6363.028; Sat, 6 May 2023 07:38:40 +0000 From: haibo.chen@nxp.com To: adrian.hunter@intel.com, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: linux-imx@nxp.com, haibo.chen@nxp.com, kernel@pengutronix.de, festevam@gmail.com, cniedermaier@dh-electronics.com, devicetree@vger.kernel.org, kernel@dh-electronics.com Subject: [PATCH v2 4/4] arm: dts: imx: remove "fsl, wp-controller" since it is dropped Date: Sat, 6 May 2023 15:40:37 +0800 Message-Id: <20230506074037.522961-5-haibo.chen@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230506074037.522961-1-haibo.chen@nxp.com> References: <20230506074037.522961-1-haibo.chen@nxp.com> X-ClientProxiedBy: SI2PR01CA0030.apcprd01.prod.exchangelabs.com (2603:1096:4:192::15) To DB7PR04MB4010.eurprd04.prod.outlook.com (2603:10a6:5:21::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR04MB4010:EE_|AS8PR04MB7798:EE_ X-MS-Office365-Filtering-Correlation-Id: a8660c82-45c3-4cf1-d90a-08db4e04e95d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hvKqdAOIGjWPLaikFDLrIVOarc+RWF6yitAMspoZz27MrA6xZ6CMqEtufs+fjo8ygkETnJW2t8VUV5KbVdmvHhEtE65VVZq+t1spRmRZ3LpkRwNmpaTaq6K+vRVpzlqxEQhFlLiaU2gJPA3d3IiDEvHo9tGTCSoQOhm7069MHiD1+XFXeeFZwb3vcuirGJxkYpNijlv0Z64KXmLAWOgfoEJAGbjHAkZi8jXX4wreJX9HaYrrq/v0rD9JwCYpLs6qQk+YGNmyfqxOe2JL7Mls9Wyn/sq4UzQ245+GTunblPP8j7ByfkTjiWSG8r5n2fYUrd5Lj1BjMcGSZZF/cxR/yWJ6ENgmRJwRzxY7MWPMvGXXehjCg3xyeqyT7Q4ZZQqvQNBwJ3EXBcZWY4eQUneLvAr6b4VitWR70BorsI0ZOxgD9O+aFugAA/0pUhDt1S4znMvPGFrl2D7JmKSTMi4SFLCjfO7aavdL22xjX1OqmUZMG8az2MrFVSl4dBBrfyQTFEZzjx82C76xfKLwWasMQmc0PhiLXPETSrzL1msXtDMqrA2E4emw8n0VsxNGr8fbwkpNn/cu/UGE+xD0ft7P5iRO+fzgPOEByLutWH047xP/yUpHsd/PQvAdeOl0Pc8g X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR04MB4010.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(136003)(376002)(346002)(396003)(39860400002)(451199021)(26005)(41300700001)(2906002)(186003)(83380400001)(478600001)(2616005)(6666004)(316002)(6512007)(6506007)(1076003)(9686003)(8936002)(8676002)(7416002)(86362001)(4326008)(5660300002)(38350700002)(36756003)(38100700002)(6486002)(66476007)(66556008)(52116002)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sRCu8SANe9pL3lLhzcBn5El8R4mCfhiHxJoVuC5l5jsBkgV0crv2e2K3az2IXG6DwVmDOyh9FV6rE9lpWbSVsHpQt2cyow/EawXx6cm5JStwC9DpK1T4WcCw18L1RN0mnbzIYb9xjtDkZ3NqYehsFNNbxsQ0/EMS9f4NKAJco3mRiTUoYwrkjrnt9w2umC4HndtqXbtmb7UupSXVHQo8ZPTuIYwL61wbVtemxiW2v9Wy0GCse++dO1Dmz2mTw34vBSyRadGOFGTQi6EyMqVeeGU4jI3Xj7pddo9iXyrcc4gBsm01SzURZdSYsMFzHl4V89B+VapTt4aUG9/MGT123nRO21t27Sz3TLQqhXIlGPfU0YGex4DwyPCU2L7pOoFtQFa94HwhgIpHcl+5IPMAwvSGwK9+LzJuJZgasqwqvSbKmIbfvHhL7Jl/w/uarz9Cbn5Z9AwNzYXYKDygJ5Z343OY5rXS01yIUUzIdGyPfBoS8mpG5dM9DUVw0be9L8QBwJV2lOp0W02Yms9+CZCKIY0uMlIeFbNbNhoSiO9zl6vnj4iSv2XCV22JAFKwEiPZQmy49gunLzAjcf7BUev4BXYOoDo192SYvUtGpl1c6UmmAvu/Uq4sgdYmTij93sjoAbsQA3eGcssGCfmx5ssFhhzE0wXGp7SwaQub36jTohvaaCnirVWwdTPUyjGV2FD7wIDU/NorB8I4G7hKKFKfL43MpxTvgvHXmwXr36vkOFay+Usn7Bw1jJlXir82oKnPwlKQAUK3u9J+V0p7pmY+gWMBi3gTZoDXNeWNNZxR8LFAZhow0pSXEiQcsY8QpkCrrwM8lcCwGtj0a1BJ28QO/XCReADdkeVugXiJ/lewXCIgPC/BxTdaz5d0GgI4bx3RE4zL9X9u8pQ9KgoPEcDwLDPMld6r1hARw1rIHWWdQ4zK5PDznG2m0P8ZA93Hs4D1Lph6K4O6WuWUx+OL6Ujoa4s+njFrrU+XsfE9+8iPBitO19izZCr+wkrnskiToj/41cMLLibPf4abo7D1Qm7daWJr+0uNZzX+NbcrP+KBIGyzhEJIbkDmjFZ2gOEDESlxb2tbpkBMCokCkes+tfliJIkvIGMTMpI/cgLcFajlEPjScsLD4BGeEo9j4KZdgIaXlWhUvBX842DYedFBW+4G654l6sVKlQ/M1MZ6YMBPN0ZdJZwZDvhSiPDME0P3V6h5FtCvD/wDOKQ7J1djhFElHrXbZAlcLKVSPLodnc4/jVA9beLr+iROBKFt43nan0kGacHgNwlZRFsgLS1AZ1c/Oua1+Kxg6zFxKxk54myuRBJAs4WOKsB3sPty8L7Q4EGVlMJTrHRj1uiRAe3tpc4u//pCeQxU2kp9Jt4NPnm9pcw/g4kTuZ3EgPlps6rstC9fd3agM70m8N0Luo0/CpxL3w49ooHmqZO5BZy28iEXoJ5svK5LoWYN7PMWjqlaHfXqNde5xLNfO0QCkSalfjTWRh0dbs6F/jeEA9LsBFQgqAmSishprga1Op8YaBZWS3zyoE+A/mgAVVkeVXE2vY0IfvqtCO20Gb0aK7nbw3oz0KCq1m2PhYKfu1gmYFWIBm7O X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8660c82-45c3-4cf1-d90a-08db4e04e95d X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB4010.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2023 07:38:40.7926 (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: 7KTgo/Rw6iNLmqK4I1fnbx9zh0TSeDt2cEhEKe01E7Bdv53GXtggT5gEAcg0dj2D11FNFohwLpZEyuuvwM3x8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7798 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Haibo Chen The driver sdhci-esdhc-imx.c drop the "fsl,wp-controller", so do a clean up in the dts file. Now the logic of write protect is: if want to use gpio method to implement the write protect, need to add "wp-gpios" in dts file, otherwise will use the controller internal logic to implement the write protect. This controller method need to config one pin as a specific write protect function used for the controller. If not do this config or the board do not has this pin connect to card socket, then the write is enabled. So now remove "fsl,wp-controller" will not involve any logic change. Signed-off-by: Haibo Chen --- arch/arm/boot/dts/imx53-sk-imx53.dts | 1 - arch/arm/boot/dts/imx53-tx53.dtsi | 2 -- arch/arm/boot/dts/imx6dl-tx6s-8035.dts | 1 - arch/arm/boot/dts/imx6dl-tx6u-8033.dts | 1 - arch/arm/boot/dts/imx6q-bosch-acc.dts | 2 -- arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts | 1 - arch/arm/boot/dts/imx6q-tx6q-1020.dts | 1 - arch/arm/boot/dts/imx6q-tx6q-1036.dts | 1 - arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi | 1 - arch/arm/boot/dts/imx6qdl-emcon.dtsi | 2 -- arch/arm/boot/dts/imx6qdl-ts4900.dtsi | 1 - arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 1 - arch/arm/boot/dts/imx6qdl-tx6.dtsi | 2 -- arch/arm/boot/dts/imx6qp-tx6qp-8037.dts | 1 - arch/arm/boot/dts/imx6qp-tx6qp-8137.dts | 1 - arch/arm/boot/dts/imx6ul-tx6ul-0011.dts | 1 - arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 - arch/arm/boot/dts/imxrt1050.dtsi | 1 - 18 files changed, 22 deletions(-) diff --git a/arch/arm/boot/dts/imx53-sk-imx53.dts b/arch/arm/boot/dts/imx53-sk-imx53.dts index 103e73176e47..071e8b4b0a7e 100644 --- a/arch/arm/boot/dts/imx53-sk-imx53.dts +++ b/arch/arm/boot/dts/imx53-sk-imx53.dts @@ -76,7 +76,6 @@ &ecspi2 { &esdhc1 { cd-gpios = <&gpio3 14 GPIO_ACTIVE_LOW>; - fsl,wp-controller; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc1>; status = "okay"; diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi index a439a47fb65a..4bef504008cc 100644 --- a/arch/arm/boot/dts/imx53-tx53.dtsi +++ b/arch/arm/boot/dts/imx53-tx53.dtsi @@ -196,7 +196,6 @@ &gpio3 19 GPIO_ACTIVE_HIGH &esdhc1 { cd-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>; - fsl,wp-controller; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc1>; status = "okay"; @@ -204,7 +203,6 @@ &esdhc1 { &esdhc2 { cd-gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; - fsl,wp-controller; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_esdhc2>; status = "okay"; diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8035.dts b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts index a5532ecc18c5..63f043372931 100644 --- a/arch/arm/boot/dts/imx6dl-tx6s-8035.dts +++ b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts @@ -67,7 +67,6 @@ &usdhc4 { bus-width = <4>; non-removable; no-1-8-v; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6dl-tx6u-8033.dts b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts index 7030b2654bbd..2d24dae7dbfc 100644 --- a/arch/arm/boot/dts/imx6dl-tx6u-8033.dts +++ b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts @@ -63,7 +63,6 @@ &usdhc4 { bus-width = <4>; non-removable; no-1-8-v; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-bosch-acc.dts b/arch/arm/boot/dts/imx6q-bosch-acc.dts index 8263bfef9bf8..26794f425a59 100644 --- a/arch/arm/boot/dts/imx6q-bosch-acc.dts +++ b/arch/arm/boot/dts/imx6q-bosch-acc.dts @@ -573,7 +573,6 @@ &usdhc2 { wakeup-source; voltage-ranges = <3300 3300>; vmmc-supply = <®_sw4>; - fsl,wp-controller; status = "okay"; }; @@ -586,7 +585,6 @@ &usdhc4 { keep-power-in-suspend; voltage-ranges = <3300 3300>; vmmc-supply = <®_sw4>; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts index a773f252816c..15956a92fe8b 100644 --- a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts +++ b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts @@ -91,7 +91,6 @@ &usdhc4 { pinctrl-0 = <&pinctrl_usdhc4>; bus-width = <4>; no-1-8-v; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020.dts b/arch/arm/boot/dts/imx6q-tx6q-1020.dts index 0a4daec8d3ad..9dc92773c2f1 100644 --- a/arch/arm/boot/dts/imx6q-tx6q-1020.dts +++ b/arch/arm/boot/dts/imx6q-tx6q-1020.dts @@ -67,7 +67,6 @@ &usdhc4 { bus-width = <4>; non-removable; no-1-8-v; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1036.dts b/arch/arm/boot/dts/imx6q-tx6q-1036.dts index cb2fcb4896c6..24eba1d2afd9 100644 --- a/arch/arm/boot/dts/imx6q-tx6q-1036.dts +++ b/arch/arm/boot/dts/imx6q-tx6q-1036.dts @@ -67,7 +67,6 @@ &usdhc4 { bus-width = <4>; non-removable; no-1-8-v; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi b/arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi index eaa87b333164..f8b985029f51 100644 --- a/arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi +++ b/arch/arm/boot/dts/imx6qdl-dhcom-som.dtsi @@ -412,7 +412,6 @@ &usdhc2 { /* External SD card via DHCOM */ &usdhc3 { /* Micro SD card on module */ cd-gpios = <&gpio7 8 GPIO_ACTIVE_LOW>; - fsl,wp-controller; keep-power-in-suspend; pinctrl-0 = <&pinctrl_usdhc3>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/imx6qdl-emcon.dtsi b/arch/arm/boot/dts/imx6qdl-emcon.dtsi index ee2dd75cead6..61306e6da6bd 100644 --- a/arch/arm/boot/dts/imx6qdl-emcon.dtsi +++ b/arch/arm/boot/dts/imx6qdl-emcon.dtsi @@ -792,13 +792,11 @@ &usbotg { &usdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1>; - fsl,wp-controller; }; &usdhc2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2>; - fsl,wp-controller; }; &usdhc3 { diff --git a/arch/arm/boot/dts/imx6qdl-ts4900.dtsi b/arch/arm/boot/dts/imx6qdl-ts4900.dtsi index f88da757edda..6d2f04434d6c 100644 --- a/arch/arm/boot/dts/imx6qdl-ts4900.dtsi +++ b/arch/arm/boot/dts/imx6qdl-ts4900.dtsi @@ -464,7 +464,6 @@ &usdhc2 { pinctrl-0 = <&pinctrl_usdhc2>; vmmc-supply = <®_3p3v>; bus-width = <4>; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi index 1e0a041e9f60..d4c967971f6a 100644 --- a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi +++ b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi @@ -579,7 +579,6 @@ &usdhc2 { pinctrl-0 = <&pinctrl_usdhc2>; vmmc-supply = <®_3p3v>; bus-width = <4>; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi index a197bac95cba..e74fb3171656 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi @@ -777,7 +777,6 @@ &usdhc1 { bus-width = <4>; no-1-8-v; cd-gpios = <&gpio7 2 GPIO_ACTIVE_LOW>; - fsl,wp-controller; status = "okay"; }; @@ -787,6 +786,5 @@ &usdhc2 { bus-width = <4>; no-1-8-v; cd-gpios = <&gpio7 3 GPIO_ACTIVE_LOW>; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qp-tx6qp-8037.dts b/arch/arm/boot/dts/imx6qp-tx6qp-8037.dts index ffc0f2ee11d2..18cda0d42826 100644 --- a/arch/arm/boot/dts/imx6qp-tx6qp-8037.dts +++ b/arch/arm/boot/dts/imx6qp-tx6qp-8037.dts @@ -67,7 +67,6 @@ &usdhc4 { bus-width = <4>; non-removable; no-1-8-v; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qp-tx6qp-8137.dts b/arch/arm/boot/dts/imx6qp-tx6qp-8137.dts index dd494d587014..7478ae7535f4 100644 --- a/arch/arm/boot/dts/imx6qp-tx6qp-8137.dts +++ b/arch/arm/boot/dts/imx6qp-tx6qp-8137.dts @@ -71,7 +71,6 @@ &usdhc4 { bus-width = <4>; non-removable; no-1-8-v; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ul-tx6ul-0011.dts b/arch/arm/boot/dts/imx6ul-tx6ul-0011.dts index d82698e7d50f..5a2e8edf149e 100644 --- a/arch/arm/boot/dts/imx6ul-tx6ul-0011.dts +++ b/arch/arm/boot/dts/imx6ul-tx6ul-0011.dts @@ -63,6 +63,5 @@ &usdhc2 { bus-width = <4>; no-1-8-v; non-removable; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi index 70cef5e817bd..62c96884bfda 100644 --- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi @@ -575,7 +575,6 @@ &usdhc1 { bus-width = <4>; no-1-8-v; cd-gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; - fsl,wp-controller; status = "okay"; }; diff --git a/arch/arm/boot/dts/imxrt1050.dtsi b/arch/arm/boot/dts/imxrt1050.dtsi index 852861558b47..7e983c52ebcd 100644 --- a/arch/arm/boot/dts/imxrt1050.dtsi +++ b/arch/arm/boot/dts/imxrt1050.dtsi @@ -91,7 +91,6 @@ usdhc1: mmc@402c0000 { <&clks IMXRT1050_CLK_USDHC1>; clock-names = "ipg", "ahb", "per"; bus-width = <4>; - fsl,wp-controller; no-1-8-v; max-frequency = <200000000>; fsl,tuning-start-tap = <20>;