Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Clark Wang <xiaoning.wang@nxp.com>
To:     broonie@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de,
        festevam@gmail.com
Cc:     kernel@pengutronix.de, linux-imx@nxp.com,
        linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] spi: imx: add 16/32 bits per word support for slave mode
Date:   Thu,  8 Apr 2021 18:33:46 +0800
Message-Id: <20210408103347.244313-1-xiaoning.wang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (119.31.174.71) by HK2PR0401CA0017.apcprd04.prod.outlook.com (2603:1096:202:2::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Thu, 8 Apr 2021 10:32:46 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: e73e417b-5481-4f46-94e1-08d8fa79a853
X-MS-TrafficTypeDiagnostic: AM6PR04MB4982:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <AM6PR04MB4982BC7D60B0E4218D250B7DF3749@AM6PR04MB4982.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:2331;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: vR4+QQZ8cLXzqy+LGk02phLk0DY102yAEybP144AnB8XjMSEIQIaBToUfphohUt++XdmWIYVPpg3JPycrBknGEKiYpryDf1DAYmmqXtdLByP5+bWtsuM0KTdv5nYtvHHBBVsWAgUVlxtrZyA4eG7uO1MuLENw/i8RL7Oln3xZ666crQzhNeaVpm48++ACUKvNDvtacbputgfLLP4tfSyyVK27Q8YkGYxAPvE9wYKA84VlQ8i+FvQzpsyCXCmParkHaeo0u5Z24u5fHBiOwVpCM4MwU/TLpAH7WZYnndzZu1tApIIg894rUjUTvkvILQ8pXfagbjVCt7WxFkh4iJVSmU7GqvuwlzAiRJrObaZB5WhhXUzCs2VjkW6LUykw2RnDGpSRWA5KSnOps8HsfoSrajXBCZiC94hz71SqDd8sj0N9M1Nen6Ulsy1haDWbdDJyGiJuADck9EgrBps0w2FkGBVKJkJpFI7E5YYwiMLnvEWHza5dsqM+MjvbuTe37i562aLezTxfqf6shWTEwRhltM+OxSo7SpdhwZtyZjINd/OzEg2lQJYNfhnbejm1ffhuTT7vxcD8dKrSh8NSR9Knqk7oZZXhEcRA7FeYEuanjgNjTScGkTBBVJ0VqIE9fxSNDt9m5Key7MZ6lD6kSJAaXlT3fG2m5Htc4WEu39JATgV5Vlh2oYCR+BRRefEVrS3B4tv8Av9mvUGUlFH5bOakw==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5623.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(376002)(346002)(136003)(39850400004)(396003)(6486002)(66556008)(38350700001)(66476007)(16526019)(86362001)(956004)(2616005)(66946007)(4326008)(8676002)(36756003)(5660300002)(6506007)(38100700001)(52116002)(26005)(69590400012)(2906002)(8936002)(83380400001)(6512007)(316002)(478600001)(1076003)(186003);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?F8NWHqYAdzMRoVlRR0hlMU7qbHBFmleui1IxaX0/OqVyRvUMMxurq/O/xb+n?=
 =?us-ascii?Q?7pYXKCij2NKjD10PisIXIxKp+czk5NUPwRXzYFIeUuxkmtrS9nOF9jeCWVI0?=
 =?us-ascii?Q?6ehr7Kk4rqhnpGkxc2Vgy6Qh+aH9B/J3eXO++S1/Khv3hZ4nyJOPxmyoy0mM?=
 =?us-ascii?Q?3DtoOMb2GWtSXMRBOhHyRaNh8UFalomEIkF4rKPAMDZu0bIFwX3LcaKr94ak?=
 =?us-ascii?Q?ze8dwCmTPwbiia0cneKpTnDLeUw/WCpnzA1ySWoulAvY/mjKH9mDcEaKb5Xw?=
 =?us-ascii?Q?aznIHfqXPCFqkERy2KkShqGb6+OSiT+ZkMgsLh5q+vEf0666m/WV08YsOMr8?=
 =?us-ascii?Q?xPys5qAGmqIfoHJb1dM+Bq7uPnzJG4DvPZQ7N1iZPmyOePoBg/5mkCm/StoF?=
 =?us-ascii?Q?V/BGRc3Bil4VhKER9RKz/Ce8X4eOUBE8VklcIQWjm8KusfdjasZxp9P9w97k?=
 =?us-ascii?Q?x/SXzPjZ5q9BmlQuOYYa7rWPybHkl3c26lxbtG47y2t+lam0epaahfHnCdId?=
 =?us-ascii?Q?Pob70/Cwoujo56G7acRkakx45k0he8CPrZsz8j4wAEkyYy9znnHjMkiycI+m?=
 =?us-ascii?Q?yomsLJRgMLxXhDrCpeoPs63QddvRAvLRiXRXnuEvlqcAvodRzQq7XLvw3KOz?=
 =?us-ascii?Q?/A2LTvXBlNUEy0ouz2GkUUc4CZNxOnkf9Rdzs5B2VzDLAaiXTF/2kHtpHAea?=
 =?us-ascii?Q?igX3IuStHV6JIQ5VuosWc6cX3y8sghVpu2g1wvV7ZEE7Ok//96dNVVolV5KC?=
 =?us-ascii?Q?qDYQMcY7wyVAvRGmQVeEHEBmQTULiKFAy1WdjDbV8fbVjTnc+PnQyJAVa3Bd?=
 =?us-ascii?Q?v8K+AC1EA71jNTGKGIw6rqIqQtvA51gFq+YdLWhNu8HGkvWPbizW3jIQjESW?=
 =?us-ascii?Q?rS7AabjEOIu52oumcMLROkR3PJ5bqBm6vnfiv2j50row8cARf95Kouqk29nq?=
 =?us-ascii?Q?b/VWui/1cCCuyQDMfuqm3zkbN+9zMPbKYB4+mxlxUtwSfwVPiLLaN4AY9J9D?=
 =?us-ascii?Q?bcS/e2rCkseWRqg0e8rKuVb7QjZDt+S3krYWQo9ml1MjBkUA8zE0ew3jSZM8?=
 =?us-ascii?Q?q7OJQdJmRskPzL8/G62w62us9ZCW97vgvskuyrqqZtfStudFdNEu2UAZi5E3?=
 =?us-ascii?Q?bxphWfYy5Nxmo1+EOtS3Lx/QsjpJnNQYACaKhuwxZHMalBFPrOmW6K3Azy0e?=
 =?us-ascii?Q?cAGYSw2sWkSlfLlwt9JeraEJOGHbWq/67GG7pMJySnYanS0UP8AnESvzqMmO?=
 =?us-ascii?Q?d4p9Fv78D25ZQOBGdjY0vDNZs6PR8Uu5njI1nffv3prm78DK3WZ8Z6rmMfr4?=
 =?us-ascii?Q?x7k3zX1YM0Q+/RwTlyTjQHiF?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e73e417b-5481-4f46-94e1-08d8fa79a853
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5623.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 10:32:49.9119
 (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: VAWQ2KFVkrIKZNSN+hVn/Lzc38YtHF5tCREBIbEMOBDtTXGX7DQh2ou45mf3/SIf6rV1sbOwLfYa3+nbXnaQsA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4982
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Enable 16/32 bits per word support for spi-imx slave mode.
It only support 8 bits per word in slave mode before.

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
Reviewed-by: Haibo Chen <haibo.chen@nxp.com>
---
 drivers/spi/spi-imx.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 4fe767acaca7..24ba7ab1b05d 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -386,7 +386,12 @@ static void spi_imx_buf_tx_swap(struct spi_imx_data *spi_imx)
 
 static void mx53_ecspi_rx_slave(struct spi_imx_data *spi_imx)
 {
-	u32 val = be32_to_cpu(readl(spi_imx->base + MXC_CSPIRXDATA));
+	u32 val = readl(spi_imx->base + MXC_CSPIRXDATA);
+
+	if (spi_imx->bits_per_word <= 8)
+		val = be32_to_cpu(val);
+	else if (spi_imx->bits_per_word <= 16)
+		val = (val << 16) | (val >> 16);
 
 	if (spi_imx->rx_buf) {
 		int n_bytes = spi_imx->slave_burst % sizeof(val);
@@ -415,7 +420,11 @@ static void mx53_ecspi_tx_slave(struct spi_imx_data *spi_imx)
 	if (spi_imx->tx_buf) {
 		memcpy(((u8 *)&val) + sizeof(val) - n_bytes,
 		       spi_imx->tx_buf, n_bytes);
-		val = cpu_to_be32(val);
+		if (spi_imx->bits_per_word <= 8)
+			val = cpu_to_be32(val);
+		else if (spi_imx->bits_per_word <= 16)
+			val = (val << 16) | (val >> 16);
+
 		spi_imx->tx_buf += n_bytes;
 	}
 
-- 
2.25.1