From patchwork Tue May 16 08:01:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9728503 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C827B602B4 for ; Tue, 16 May 2017 08:01:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B34F7284ED for ; Tue, 16 May 2017 08:01:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7E2F2875D; Tue, 16 May 2017 08:01:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0A6C284ED for ; Tue, 16 May 2017 08:01:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751901AbdEPIBx (ORCPT ); Tue, 16 May 2017 04:01:53 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:25809 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751823AbdEPIBw (ORCPT ); Tue, 16 May 2017 04:01:52 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 16 May 2017 17:01:50 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id A8C05790D3; Tue, 16 May 2017 17:01:50 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.38,348,1491231600"; d="scan'208";a="243045854" Received: from mail-pu1apc01lp0021.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.21]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 16 May 2017 17:01:49 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=GT3X4UDXxuBmsRJGRGP7eh3qHvri62OaF2sPGzI7sIc=; b=G89HPnp3f/pbPZFakt21BDVGdTOr5RrvSgh5WHyv6hIyc3xHQwo8fgIosJG15ZiusiIOMZ0HcDYZ9b4/XBwAfQH7J3HJCFRsN2gmvznvbEjJDJoSxj0k4MNeG4c8Y+lLY2ZSPk8beco/pYC9XVW/g5AsL739khftg4v8galsd88= Authentication-Results: verge.net.au; dkim=none (message not signed) header.d=none; verge.net.au; dmarc=none action=none header.from=renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by KL1PR0601MB1879.apcprd06.prod.outlook.com (2603:1096:802:8::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1084.16; Tue, 16 May 2017 08:01:47 +0000 Message-ID: <87r2zpw7xt.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Simon , Geert Uytterhoeven CC: Magnus , Linux-Renesas Subject: [PATCH] pinctrl: sh-pfc: r8a7795-es1: SSI_{WS/SCK}34 -> SSI_{WS/SCK}349 User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 16 May 2017 08:01:47 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: SG2PR06CA0041.apcprd06.prod.outlook.com (2a01:111:e400:b428::51) To KL1PR0601MB1879.apcprd06.prod.outlook.com (2603:1096:802:8::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5efbc1ad-267a-42a1-5658-08d49c31cd7e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:KL1PR0601MB1879; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 3:wANBp3IsxJSmglBKqKCGVG0lqSeN36NdZRjEqLnQtmiiWCzYiTooakUKOPJ7Hed03lZvkf5i7xunU1b2i1hihyBMwxy1DSeVFIV7SOHxxLaK02aW9wnecHtP4I9covf6aqlJD3szFaVFqa4Wew5cCR+3C7sPjw/V8qzR+PpQO0Ia/ij69sslboBgNQzDZtu7gm0QxAg4M8Sz5/n9v01SYdb7eJ12ZJwszb6DcQgAO8Se14ik74y5Bbm6N5KgWdYrHvfFLJtJ9Q4j7LMPYoT55muxN1hV7GlYSblwdxJ7TVPenh1bVz0yX2Yr4aK7+ep+2gCULKU5cAdbA3hi+JFXnV7nqZlsYCSZIyjuvvrj4YA=; 25:ZzvG0uOlZ23q/eNGhH3m8i2zdJ+UTq9dmiXV2jxpHn5TpOFtcdjP3NG2vvKmUIM3PMcOz+gFbL66TCHto2X1pLAnZzsC7c8eLgsvvW5FrYpQ29EhZOpEJXf+gZINlyigouDNi2UY44o0F5PNqx8TAqzm+uuDklhvEQg/9XRh3jXRfbEuUB37JsOi8UKtVzinCRjFlvb8rNXLTarGqvd5IqyezuDiH8A9GTgv/EH1J4FTjkbkHolbdhCOcmP94ZqSKj6MbnWe4SSw47ric6+0Aop5yovln5Lm46xr/chVkI8iHPDPZW0vjkFYHn1KDyk6Ce0a2vZlH9y0c4ywCda3qYXXX4/2TOG3I3PTILFXYJ5pC7LqDyolVFmYLCqbFwriU50ZYf05ogRfc0LUZxWJdDsJyvigRC3AyZllhxHkKx5WDYb+IUzH4S9KWk5ISmYRfitNap+A2+hB35Km4SMRlm4faSefAqJzJVxUJwghhqc= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 31:1tIkz0jssiOO8KG1H8bzAtLi7ZZeHIscPQ4xYUdUn3EdojF/6OdI2RtCeQtVZ/Xs2j6BEKBO51lz7Xelsr9CL0y/B/DHe4y5MKPCR4z0rpY4NZaUra+maZpggPRaQmn1MiNjQ5rApUGLajjlVQSXVnNPGUBOsYu1MUUJP85QGh3OAePzY+kHWC+JS8kZZB64Aii9P3YjP3twYQhBZxNe8a9H0x7YzewKj9pdC1+S56z5lnfahRf/2p0iq2TOGfBb; 20:Za4gRGfPCczrQQdpWM8x9IZ4G11zTR/hCLod6/JAUeOmcKr02IyodFtWNSaYgUwEeJfhkbYqA0Aa0cdoEaQeNTiVNb5IjymyCwL/XFpp6iRp5PUa9TyZTyuJwgsHdjBJ5+VlDhTkIT078PtNV3IggcSLlVH2BS/HPFtw7cUsO2HEdfaXYYM5I+7pvSqFHD+8nSymhYSV8JiO9XIkJbjLic2KsnlQscqXy5sX4bPVWaQxNWLmDTqKWSsFMMOYGBdHOFTzwLtxTZmdif7tis0U56d3i8FcafftuBfBpWFWHN2QhRjwTl2ms/b3leLyuSagKWIYFZKdDG1FnhfhWUDuTzjKPoUumV34A6aEbdNmNf0X85SSS++0WhhIXBWcbfOF0S+EpD1D0Db8eZ2cXBcvkm25iFdwlSlZIhuzDsHQOWw4BusHmA1VOfz09b32d6Gn9xNLu+mLytC5c9VBvO1iga1DuPLChvtCrth0Dxrs6EadGeOWnM6WKftlFFCvjV4T X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123560025)(6072148); SRVR:KL1PR0601MB1879; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1879; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 4:QyRWTrXWMbQwDIDdi/tMSdpZAi349slEbrk3/QKjLkolX/bHYO35jbm7Scp5Sw9CyROmWE5VIahbmo9gQ5e72BqxBpKRxOBXljvjJkLppei0s4vLVfDY9P0S4WpGUOPbYZ6i4vAckfn+7KeIns1ND+l4didRZcMf+iA0NAUi6jWSYe4dpriRrphwqqw9BJf0s9NF8C4xCVENNz4+6GOeEqyoRQjiC4u9ykjs/uYmbaTzdDnCLXlDG9qZ//CRKVJr4TY5izvIKw4WhIVXxyX8BozjeDMr8HS+/CxDSSGiB4w0tISQYa/W2mjwFFpQ+P79i5Ej6HuJ0vcFmYgWF+A5MMObs/WKa1vAyBEEvPKmZV+ZuLLauzCqXMQx/UeEIj+Qq3v6GFTHEhI60U0WE1K5zZFV9dDG9gVgcc1In2gd08aoCKy7PGosfDpTC/meEh76IfNkMh5py7nDE2e3G5mhCXYLYliuy05S1FuLtdgmckvIttssMqKqSO7NKr6t7TU4PBcApn9ToAOqkEmRFLpPvs05+c3j+JCsylFZtGRU1CaOIVTOg4SxT3ZhHgALIaTGVakpY0vIcKc5ssxHeJpdEZIHA40uqwFM+WVfiRU6Diiha4VvaJc8nngMpEhiEZzLLKhmgjmGyYSQ1Ig49fWIvVtpJ4QF9wqwuaGUQnCuRi/SLHDVfV9wQ36gmT5x2gu89Qni+EHhVUtYNENbPyfRCULolBNqgV9P7stYX4qIQmHxc1T9DMaTsrF/3bwi04I3KQtoKOEzjJiZiZaYGvtmBNsPuEuPnHGsOQkJ3N3qD88= X-Forefront-PRVS: 03094A4065 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39850400002)(39400400002)(39410400002)(39860400002)(39450400003)(66066001)(23726003)(47776003)(305945005)(54906002)(50986999)(33646002)(54356999)(46406003)(36756003)(6486002)(4001350100001)(42186005)(53416004)(3846002)(50466002)(6116002)(7736002)(53936002)(83506001)(86362001)(38730400002)(189998001)(81166006)(5660300001)(478600001)(8676002)(25786009)(2906002)(4326008)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1879; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1879; 23:gimF2C5d3QjqQh3Ea0JQas4zbQHo6SDMQkMYg//?= =?us-ascii?Q?yGuQI9TgyMTAS/KbujKlNetIdPUWWlIP4ttX++nxVJyLG0kZhfy1N8HD9ELM?= =?us-ascii?Q?Kvt4zmZZL/+7YxFWmN/I5NNBZOUs0vbanA+n+bgRzy6BquGu8+dZCu9h6QIp?= =?us-ascii?Q?ypglwZqmOGQItvatWI1EgZU8gXnqDrMck4mONWFnBfx77arufgB5trZXoEr+?= =?us-ascii?Q?Yha/wbOztZkRp7OFs0CJQ2waS+12Hoo4Zqss6PAc/OAkmqsDqpMVGwh+6OxN?= =?us-ascii?Q?ggSVYquGs3cADOW2O8lVCZl1BrbUIynhL8q2I9FnlifgrbUiCM0O4tFD6CiX?= =?us-ascii?Q?A99KEASwbSGSRaEaiD9Jdko45tdvRfPXv5Dj1MMphLKsCJPlHAz96TWarES/?= =?us-ascii?Q?zRR6BsSD/zpT9N2Cjc3FF9A6PG67dMgkRHE1PKUWvCaNJvBL2otAZZ+X1ulG?= =?us-ascii?Q?YS+xblUCbzN7pTEqmrGDqAaDqncbOQsyhFpU9BBUAkcc+FBFBwjtapEr6eu5?= =?us-ascii?Q?E46kYNr9O15wFoTODS4bc2+ha36KkUl/XCnLKKWjS9fU5eO2vWUWmNRNYndN?= =?us-ascii?Q?QhwXIma+xbydP1I5E1Ye+3UhEokDI2yRVpHoCdQJF4JO7d2u9Q0IBtQ2kx+M?= =?us-ascii?Q?dqCEi7uqceSZ+e1H/6dsv9VYnKy3k2xUzcpR6gZNOkIN7UZ7zBW7fQbceyZl?= =?us-ascii?Q?bhKEZo7xLnevWYrSJTB3PAZV5Npn06RfaBgZ7ntnoc8XfAyktAZYZYQa8Bli?= =?us-ascii?Q?JXE+EcQKk5+FcccgwxMYDu8HMb4LoI+lkEcPpk62mZD+bx7Vx3mi00oMi79/?= =?us-ascii?Q?T7PmqaJmNtbTaQiEQBlkMrUajul/hLB/zv6cUhE7sAcYp5ogFaQzLjTWKfvx?= =?us-ascii?Q?xWsanyvFZyFtMQw9XFrj1HoPUjZPozO32oEIjrfehD4MezIJq4K3FP4QOkeK?= =?us-ascii?Q?piyrUeeRBKziGKEqpHCsQFRrjxRCaOcWFeXvPOvLB6/a8nJsVouuX+4+W5LL?= =?us-ascii?Q?J3E0=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 6:3uk3FVtFOyXOcDirUo6MlrhlUwrceay9VeV27aaqYNxysfVxmHyzzmkNQ52EeIL3FsYpWOoOM+ZiHVGsVcWIRJAu9ApU3AgVIqzbrOIX9WwLMfPk7L5JnVRtVyWchmKXI71Hpu8Gd+JZQxzIPAWqZJH19fatPJNnVmDHioKPZJKtI0Ru5JKMI26/OXAL64NWEZqP0RUDUeJ9A/RanJ9EUQ+P9L6zV/FPWV7nI76Hio6Jg54CdJmQ2N7Rp5D0AAFx3Q5e9r4+OIqCy8iWaK9iKLkJ3dHgrrb2QvkQmNQmhQjjHxmMx7pSZTj7hkLDnkn5Id9vB5i6Oev72XdviRO/scxXg65Hx/oP1dXBQr1UzFKf8ScFEP4MhBdNea5zdtYVy7ppfXIfy/m54A0UVyu0dx4bSflRH3he2XDG48BYzH7xAtm8A6lLVdm5ThUKf/ejf5iP6wD7IGQ4vZnbrRgbz+BnZGm/Nf8/Cn8ZLBGVwqZn5gWFi7Ozs2aDPrTuyvEdNU74TxH5z9JhiH+tf/RdPQq13VCOXGy/KWWB6aNiDaI=; 5:rnnCraR5D4p9DoRFKLUKom82FpC79Kp8fahsadqN5Rw01RP4LDyF8HpHak+j2jmdIHcfrmMZj8v45c7mwtigKSQQxeZrjShd0mN5G5JFhnGeAyjZybvQSxWybhVKQ1Ofk0u7QzQK9/Bnx7Lslj0w4w==; 24:jyDEpfWS34Ml1dLKPW/77oaRrvTxOtrsKsmy3gp8iU4T6rT7/Z5uS6fCAORg2YWYkgYCWzYy9S0dxvS0/VQIU2HfB9TPPIYw0xd2c7wshPw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 7:ynsHHyLI2evNiTPJHKAQDR/RVFqQp+CQZXEoHQhYmHCURqgr0r/Lg1Q+QQUm/Fl0XsToWfv02nxUbU4M2c7DzlbMndrVyJyn2T8ouFAPXv3FoTTBd7uN7dEx03f1guekvClCrd6sYSz7b1GiLDG/QG/15FHJbhcwoWMFGlvpYo8ZOApAx/Aj+gTZ9tE0wBT/g2RmRIoZxu3QLM5P8gZyiBlxsTnwU3qL++RvOnEMmc//6FWPWwbaCFBzqUR1QSc7ty+fYMqQBPEDk2PsquvU6NnhNo8BRsCaaZV3DTjYgfDmFz0pcTWBkLemBUUgBcJ1y35cjj84EM4/zBFEonBZQg==; 20:FBAVe1GDtnVAU+VzR6PnooBupwhNU4PHauUqnzg4vdZuS81jCRo4/q7owEJvYpyvQ5oRkan287P8sisyEyZsWvvz1HQgPtrgmrMwEDe60AL1he1ASBfWoG+QwsiRcQjWbtavEuNUv83xNikAqsgnOdZeHxelLMcPr6kKGxarThE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2017 08:01:47.4986 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1879 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto R-Car Gen3 is using SSI_{WS/SCK}_349 instead of SSI_{WS/SCK}_34. But, current code is based on old datasheet which had typo. This patch fixes this typo. Signed-off-by: Kuninori Morimoto --- drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c index 081efda..e6a967a 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c @@ -192,8 +192,8 @@ #define GPSR6_9 F_(SSI_WS4, IP14_27_24) #define GPSR6_8 F_(SSI_SCK4, IP14_23_20) #define GPSR6_7 F_(SSI_SDATA3, IP14_19_16) -#define GPSR6_6 F_(SSI_WS34, IP14_15_12) -#define GPSR6_5 F_(SSI_SCK34, IP14_11_8) +#define GPSR6_6 F_(SSI_WS349, IP14_15_12) +#define GPSR6_5 F_(SSI_SCK349, IP14_11_8) #define GPSR6_4 F_(SSI_SDATA2_A, IP14_7_4) #define GPSR6_3 F_(SSI_SDATA1_A, IP14_3_0) #define GPSR6_2 F_(SSI_SDATA0, IP13_31_28) @@ -328,8 +328,8 @@ #define IP13_31_28 FM(SSI_SDATA0) F_(0, 0) FM(MSIOF1_SS2_F) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP14_3_0 FM(SSI_SDATA1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP14_7_4 FM(SSI_SDATA2_A) F_(0, 0) F_(0, 0) F_(0, 0) FM(SSI_SCK1_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP14_11_8 FM(SSI_SCK34) F_(0, 0) FM(MSIOF1_SS1_A) F_(0, 0) F_(0, 0) F_(0, 0) FM(STP_OPWM_0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP14_15_12 FM(SSI_WS34) FM(HCTS2_N_A) FM(MSIOF1_SS2_A) F_(0, 0) F_(0, 0) F_(0, 0) FM(STP_IVCXO27_0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP14_11_8 FM(SSI_SCK349) F_(0, 0) FM(MSIOF1_SS1_A) F_(0, 0) F_(0, 0) F_(0, 0) FM(STP_OPWM_0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP14_15_12 FM(SSI_WS349) FM(HCTS2_N_A) FM(MSIOF1_SS2_A) F_(0, 0) F_(0, 0) F_(0, 0) FM(STP_IVCXO27_0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP14_19_16 FM(SSI_SDATA3) FM(HRTS2_N_A) FM(MSIOF1_TXD_A) F_(0, 0) F_(0, 0) FM(TS_SCK0_A) FM(STP_ISCLK_0_A) FM(RIF0_D1_A) FM(RIF2_D0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP14_23_20 FM(SSI_SCK4) FM(HRX2_A) FM(MSIOF1_SCK_A) F_(0, 0) F_(0, 0) FM(TS_SDAT0_A) FM(STP_ISD_0_A) FM(RIF0_CLK_A) FM(RIF2_CLK_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) #define IP14_27_24 FM(SSI_WS4) FM(HTX2_A) FM(MSIOF1_SYNC_A) F_(0, 0) F_(0, 0) FM(TS_SDEN0_A) FM(STP_ISEN_0_A) FM(RIF0_SYNC_A) FM(RIF2_SYNC_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) @@ -1256,11 +1256,11 @@ enum { PINMUX_IPSR_MSEL(IP14_7_4, SSI_SDATA2_A, SEL_SSI_0), PINMUX_IPSR_MSEL(IP14_7_4, SSI_SCK1_B, SEL_SSI_1), - PINMUX_IPSR_GPSR(IP14_11_8, SSI_SCK34), + PINMUX_IPSR_GPSR(IP14_11_8, SSI_SCK349), PINMUX_IPSR_MSEL(IP14_11_8, MSIOF1_SS1_A, SEL_MSIOF1_0), PINMUX_IPSR_MSEL(IP14_11_8, STP_OPWM_0_A, SEL_SSP1_0_0), - PINMUX_IPSR_GPSR(IP14_15_12, SSI_WS34), + PINMUX_IPSR_GPSR(IP14_15_12, SSI_WS349), PINMUX_IPSR_MSEL(IP14_15_12, HCTS2_N_A, SEL_HSCIF2_0), PINMUX_IPSR_MSEL(IP14_15_12, MSIOF1_SS2_A, SEL_MSIOF1_0), PINMUX_IPSR_MSEL(IP14_15_12, STP_IVCXO27_0_A, SEL_SSP1_0_0), @@ -3650,12 +3650,12 @@ enum { static const unsigned int ssi3_data_mux[] = { SSI_SDATA3_MARK, }; -static const unsigned int ssi34_ctrl_pins[] = { +static const unsigned int ssi349_ctrl_pins[] = { /* SCK, WS */ RCAR_GP_PIN(6, 5), RCAR_GP_PIN(6, 6), }; -static const unsigned int ssi34_ctrl_mux[] = { - SSI_SCK34_MARK, SSI_WS34_MARK, +static const unsigned int ssi349_ctrl_mux[] = { + SSI_SCK349_MARK, SSI_WS349_MARK, }; static const unsigned int ssi4_data_pins[] = { /* SDATA */ @@ -4063,7 +4063,7 @@ enum { SH_PFC_PIN_GROUP(ssi2_ctrl_a), SH_PFC_PIN_GROUP(ssi2_ctrl_b), SH_PFC_PIN_GROUP(ssi3_data), - SH_PFC_PIN_GROUP(ssi34_ctrl), + SH_PFC_PIN_GROUP(ssi349_ctrl), SH_PFC_PIN_GROUP(ssi4_data), SH_PFC_PIN_GROUP(ssi4_ctrl), SH_PFC_PIN_GROUP(ssi5_data), @@ -5356,8 +5356,8 @@ enum { { RCAR_GP_PIN(6, 2), 24, 3 }, /* SSI_SDATA0 */ { RCAR_GP_PIN(6, 3), 20, 3 }, /* SSI_SDATA1 */ { RCAR_GP_PIN(6, 4), 16, 3 }, /* SSI_SDATA2 */ - { RCAR_GP_PIN(6, 5), 12, 3 }, /* SSI_SCK34 */ - { RCAR_GP_PIN(6, 6), 8, 3 }, /* SSI_WS34 */ + { RCAR_GP_PIN(6, 5), 12, 3 }, /* SSI_SCK349 */ + { RCAR_GP_PIN(6, 6), 8, 3 }, /* SSI_WS349 */ { RCAR_GP_PIN(6, 7), 4, 3 }, /* SSI_SDATA3 */ { RCAR_GP_PIN(6, 8), 0, 3 }, /* SSI_SCK4 */ } }, @@ -5604,8 +5604,8 @@ static int r8a7795es1_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin, { RCAR_GP_PIN(6, 9), PU5, 16 }, /* SSI_WS4 */ { RCAR_GP_PIN(6, 8), PU5, 15 }, /* SSI_SCK4 */ { RCAR_GP_PIN(6, 7), PU5, 14 }, /* SSI_SDATA3 */ - { RCAR_GP_PIN(6, 6), PU5, 13 }, /* SSI_WS34 */ - { RCAR_GP_PIN(6, 5), PU5, 12 }, /* SSI_SCK34 */ + { RCAR_GP_PIN(6, 6), PU5, 13 }, /* SSI_WS349 */ + { RCAR_GP_PIN(6, 5), PU5, 12 }, /* SSI_SCK349 */ { RCAR_GP_PIN(6, 4), PU5, 11 }, /* SSI_SDATA2_A */ { RCAR_GP_PIN(6, 3), PU5, 10 }, /* SSI_SDATA1_A */ { RCAR_GP_PIN(6, 2), PU5, 9 }, /* SSI_SDATA0 */