From patchwork Tue May 16 08:04:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9728517 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 47BC8602B4 for ; Tue, 16 May 2017 08:05:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 392C228844 for ; Tue, 16 May 2017 08:05:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DC7828A0B; Tue, 16 May 2017 08:05:09 +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 75AC428844 for ; Tue, 16 May 2017 08:05:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751436AbdEPIFH (ORCPT ); Tue, 16 May 2017 04:05:07 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:63905 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751027AbdEPIFD (ORCPT ); Tue, 16 May 2017 04:05:03 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 16 May 2017 17:05:02 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id EE1117932D; Tue, 16 May 2017 17:05:01 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.38,348,1491231600"; d="scan'208";a="243046310" Received: from mail-pu1apc01lp0017.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.17]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 16 May 2017 17:05:01 +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=nw1irAaYYL2C9uXWbSaWfr/MXpsWUJt+YUKKoK9Qu8E=; b=lyDRKDCCu5vkWm1t1NZzzFCZ9P4PjZdNHl2kjuNo6Zi303AJJRoVEM9a4VSDkkYUKdDYa4fWWycl7Ah6jL17zrtbUrWIZsT+Dv2Oy51t6ubiipgBR5thIYw3lrs55N8eKEfqoHMIPwwCX0ooyPar5YpavqJ9RivfX0RCLMSKhWU= 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 SG2PR0601MB1885.apcprd06.prod.outlook.com (10.170.132.146) 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:04:57 +0000 Message-ID: <87pof9w7sj.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Simon , Geert Uytterhoeven CC: Magnus , Linux-Renesas Subject: [PATCH] pinctrl: sh-pfc: r8a7796: 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:04:57 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: HKXPR03CA0075.apcprd03.prod.outlook.com (10.163.104.33) To SG2PR0601MB1885.apcprd06.prod.outlook.com (10.170.132.146) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de183562-1834-48e8-bea9-08d49c323ebf X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:SG2PR0601MB1885; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 3:L/VIOHGLkaKOhCK2ZOxfdlVZfI9BgLopp7c9mv1he3vZGqAq0JHuoufZ0jG5WZi6KzRy5qCkxPgUkVOOlyGwW8B7nJbPDG4+ejWiNyW4Nrb+Sen+uI/Cx9vZOkX74/ExGB0VlnFIl2+B8wCRTMOC21h0LVCziUZ4/nKAupxLbzxSOZCEVZBsT60UP4EJUbVisKoNUmgW3836ohauL0DBL+Sm8fzHKCnW2397BLGa8GLinIpLfmpoHP8JCekc8B7c4Z0H/SKXacCJnkVxO/8OwLxerhKU8O/WuAF2j1c19B/zpMjSmBmNEnasG9SpeLPMCH6ggV/OiklJF6F7w1jHWPwT/mfOrNf17GRuk7VZ/NU=; 25:kv4chz8yGhbfjXohvarp2aaoK9TL1Lq4uCZVzMpyoffYlWA+s5zhKtavbfJ+24KmUudVogjwwdZLHka6N9clUw+ZwjIFGLDIXpkJu4Hbe7RIade/oKc1EMKzEfWsMyMiavzA0Q4aNoNOqsh28MqTleV4kd6FsiJAYm52/1hGtdPDUCfYuzBzEkX6rVmjmBDtgmnPRJBJx7ZoxweX/fH8IzyqDTCp7Z7EgyuSklNZeKD9F/rVoKWYHUPem+J7tPehwLQwrExzBGaicRAMW+qIDsnbDndYTojlM5viuyYvpRUQiuZgQqvR7BdblSXm02a+3iSnBtP3XZgjp19g/27Cj9mGz4yt6omgJqm9aV/01J69h4tg7Lm0T219ieuo6vFXSfqN96h2bVH4j4LmUt/SoRQ+dqsB2CPwpnTGjyj71KL6p/SUkksh3ww/cVrMJlDUHtE2GlAKW9xnus3eGDXOw/FjZs9WgkSWSHIahELwXyU= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 31:iDRQZkK+iqAKNWnTzAiswKtTbpV+r1TjtJyJN80j7xyo2kpVxiFJkTcfXrEGSx5Zj8ZW3xA+4p/KoCNJhx+H6by0QnT7FkIiy1sBSQaEIej+ADreg+McGQ6tWFo4sioD9I5s9hJOcEgppvCStw2OkWmVlQ1NRM3th+FHJlws5X+nQxGZkGQaSX916kXbFLgsVEKsV0UF7kgZLj2rxnSSXALEoa0UOPsPQApoUpdydHrVWv0rosFZP7UhuxNDQU3ZeuWW3ph+/1tmS/8VAGUlwWv1WBZ/BlbQneWuLuJTnHk=; 20:ShUIFMiJhvAGbEKtFQdZt8KI4TfzV3bH35twfJs1PHhZK/GKnpzziTck/yBC8U5Z2530bsBCCXiI/mykSuxtM0f0safkXglx1Td0Enh2HcTUDelFufAfFMzYtfJL17wmKKTazS4CIOF7bHBmSpI8NCtm93sMFXvhuAYM+g9yixRSpA840bzodTolZDhS0F1XBm4NfebOTbcLonIzVHzCKZrkVtp5FXR3mKneRbJVVkLF+uA+lyqR2By4zcBaHlMHNjWTZaJXdV0vM16eXfbWFN4KA2nO4wjTPGfinep8z8nw2N+O8pLr1XviYKsJbJKSc2nbO7ShK0/DJOhokWCHvOJYDFFQUqmfNHREFXx4mYmB3hSRCLyeBhCr6pv9h09RmOzah75zJdqHCm+ByrmzbVJD0j5j2+b66TXzM7hd90zlLkEIArM93gQPN5t/8Md7bOlwgX8+grLXQp0uaYkfSB9mGdqRxEMd64umFg3FEP3bYrRKnDm+49y4/xEtQKhE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123555025)(6072148); SRVR:SG2PR0601MB1885; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1885; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 4:2XtjmXagkR0zVmnW9QEjHQBk6kV0EiTwZowzLHK0AFj9hTdqt0cEzdhV4sgaAAyl/tUNFBIaLbYjDN2xkxp7qGypIE6NYrD0dX2lFFr4/4HFUT0QsGxSGCk83jL1waet4qoYS5q8P7D3P2dziXxt0bqe2GoHjxP9sdO5EMdgzBM87Un2XDZrZSGDGZD2HUATZae84OM8bCilFrY9i6RpLr594cLmvHfzL46hQB8UQTdG9Iv1c5+LJP7WnQLDB8Ag5WXEyIA/MJfSi3oF5DHnT7TyRf9vCv6EL29zWYhWso2rLhdS0Tzwb3uFccYihnBnBwAWYCUlSJSAWfPcdsuROvcSwYsZX2Sq2cjygJvS0DTJcW9o9IxLcBfjvEimqhxz0Y4TDgVyDS/0Ghde2c9hNuUqzifC+rzm9K2Qe7ViG683S0v994NETo4ynypVmqJB1X5c4eNd78ifcTivrv9e18ootqro2QueoB27XE6Tgq3BdxrlFy6r2FSolaG0ser69N8irBHjS5iahSTef5g1CuKvx/ImXTaj9ARXYhGXYyw2lUE+5KUVc7G+SFfxDHMYOKTEPDLrApkfDiStc2TU8rSVKd85MbZYO/m5WtHO6Dvb2fJteqH1IDfdiJaPWP/7v1Roah5wW1N2KsNT1SNWqPVna0Nqr7wV00KjaBQdF9sIsn3g5TDJLaZi03F/So31qLdbwVkB3DBtMYlabVQAZjvqct/u3bws5aP/OhVdTrgO70k0pnFE6KtalutY/4pESftOWbReplM3oZJPZyQZqbGRoACX34gKcyYHKGyupb0= X-Forefront-PRVS: 03094A4065 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39410400002)(39850400002)(39450400003)(39400400002)(39860400002)(305945005)(478600001)(38730400002)(86362001)(83506001)(25786009)(6116002)(46406003)(3846002)(50466002)(23726003)(53936002)(7736002)(54906002)(6486002)(50986999)(2906002)(47776003)(66066001)(42186005)(53416004)(4326008)(4001350100001)(33646002)(81166006)(8676002)(189998001)(36756003)(5660300001)(54356999)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1885; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1885; 23:8WvYK93e6RYm299iqmsgt3IsNku7jTiD15usRzH?= =?us-ascii?Q?SuImYd/829t2YLDf71j/OHAOono+8jdMq/2l7b4OyS4m+98rhvCQcMWxZnAO?= =?us-ascii?Q?o3xKFMkMkn7PK7PZBmzRP4a6BqhEU50T+Bi0tlMi+TAM2zz6BYeiKgRwWNZt?= =?us-ascii?Q?YjD6T762mVChqakFqYPABt8K3h/N0PhrcPW8nbb6mDua0feg2QN6etk9+GfN?= =?us-ascii?Q?3NQlb4+ACHW8Ej0Fes8THm7JKJjU0BTFg6ERti8NiREsPzfqO1YPAl1oOhPn?= =?us-ascii?Q?mKm+JXv+oTzCHZx/Xtow1neaVLM87wI5b9848Mdxo/Ngi+34oVj5pn/LDiVe?= =?us-ascii?Q?43w8/MZNH168SafU8JxU/9Bx4gE9aUeygshtEiXSOu5wgq6/RnPpuXL4XD44?= =?us-ascii?Q?qVGRCgDAfhUtGG8KswpVb3ROcIf0BCh0pF/3AnnH4ldwpvNkWgBuhewaiA7P?= =?us-ascii?Q?jvRPBWKd8bkhelBoh6tmG5EppAFCG6hZ62SKJxm0tCILzaxJK/CTfwoLtm2a?= =?us-ascii?Q?FWDwTj3vhV/tH97pPsEr22kay3Zlb3Fu3ALzMC/QoD/iGEGEWaEYlme01xGy?= =?us-ascii?Q?Iel9XMP2k38iRXEnu4tNWUOShPIjqw086srMJ54PRYs7gHnU7Ml8myn/D4/X?= =?us-ascii?Q?/ackNT6WFihFRijCzJVvw0aOtv+xXpmcimu01fGoYtTrgSoaeTBQFF7hwzLD?= =?us-ascii?Q?w8jV4I7nKXXOlsQNjcgn9usSTCzD04f+csj3N8DnUS9r2Om3HivrTPcTJzVW?= =?us-ascii?Q?tcHG/K4WE+u2hq9zbPfF7mGSDsdGjaPAT5WRE9QMMd4OQB4+l9hjcccUHIP3?= =?us-ascii?Q?EJn3xqiSE+QCIT+KIK0xhs5ZKVGepXuyvaHSfB7FmNWJC/ldtllnJsiPzhbR?= =?us-ascii?Q?qbhImx1TTqtnSX1ZeLaF2M/o61VNHGszA0qFJXH1zkkZ/QBDYY4JbS79MKLh?= =?us-ascii?Q?wp+/XWPyGKMCjHfkJcrfKfKz17d1hpzX60I9Bk917DnVLm3m/kp4O9UdT3E4?= =?us-ascii?Q?sXeg=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 6:YM98zbiSZXcm8X+A29sJEu3tEWmRTOBWdBGd0MRbe4YxA0Hq9F2ZLVSLV+zE2djop6NkUcuXmBPtxpUxXgyet4I8MCwpJI/QG+zv3RD+onjTv1ECM0iqug1RdX7IcW9jmt6gZ5j+Ptm0xaPBw9GtR5TcYfoD2MRDvIjE64Jc+TXKtv1T2vWwgFtO+Jhd1SNgFxCGJcKfXz8lRe6H52R4DsCddSzr8smkNJN5tk1qh5fMYi8AsD7XQNwDxc5IDCZGw4QSXv+sqchRbktHTqSa7zS3jxz4Mvkb6LgKwBjBUf9eSTEmZb+w/Gu4YEMyuxB9bUdVW3vSLxDVP9p4b7s0aoMhKNEzkqEQVa+MK5uIDJVZi2+RQ0uO4flxSVuIiunC2dNWtH1ppibdzG2u4u+GPXQy4Bpu5tSaAA2SeAkGIUPY7nD6Pa5OUqlFXLRplkVoyEOeNZ49VzCudtlwhYecZAjtv8vjVYVAhr3Nvd1xvqzlEUxslXuK/yBt9yaW0q9bpatdzrlpZL33tccKLyYlOpX+IokpbzkqIJInRNCDliM=; 5:vsAHCqapLAksPNjYLMR5a/L4ZG800sVtvBtlYl/GNbiZJrbGTav/e6ZzgMxpf7adfJncLVsk+drnGxbDK7bAQG2DZn4rOWL6hIV1OSJmK32gQUK118xViMX0zaXV/yTv1ysnfHmfKg0r3FBIUTXg+Q==; 24:15bJAE9zpFUTP2o4+9nIx7eEuD64iaXD5GHxOV47bE9B/IL19otVNEU5zV/CABuBLUYwmo+8DjoLGZCN5XGOPO5ExJRM/RE0r4wIl7Gt1PI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 7:tUl57Om9j2XikcoC9zxr2NHxvKPXoUFx7jPaPSCLBYkghYSJBsX9wUseIhQ3p/LFKeQq+wXD1ooTg2XnTc4cEG2VK0PGcF/Uxh8MUQI2Ibh53ON20v4u8L+n1Mw93nEVBje21C0at2eIPewOyFK/U7qsA7gGriqJT01Iub8wGEJGPwjOZJ4XQ9K2DrLBS54s8GTxDCSKYyPIPP8oBHnZjwud6B62dLutQ30nClVSMz/5Qc7FY81VqfJDK4BsmGA1XRl8w4xRyiwcExoPg1PrX9qaSln2sJDDHQlRsR5evWMk7pjCA/rErg1kbYNajYRj2u5Jg9Qr1AO6sAR9Eny/kQ==; 20:61cPVR8h1duHwM9epwpU5n8s8gFpUy9oki6f8PA4v8Qq12ZZppV9n0OSE6EriitbiW82jvePjzPgA+gHsnVQYhwawAzrO3GOHW6fHzbWRakMCZ4UVmLsoBZxhDfYX+lpLPlihR+rYgXti7+3vAyk/ZOGu2eeASb9Fez7uqELTh0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2017 08:04:57.4388 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1885 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-r8a7796.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c index 51f9e6e..5ae752f 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c @@ -199,8 +199,8 @@ #define GPSR6_9 F_(SSI_WS4, IP15_27_24) #define GPSR6_8 F_(SSI_SCK4, IP15_23_20) #define GPSR6_7 F_(SSI_SDATA3, IP15_19_16) -#define GPSR6_6 F_(SSI_WS34, IP15_15_12) -#define GPSR6_5 F_(SSI_SCK34, IP15_11_8) +#define GPSR6_6 F_(SSI_WS349, IP15_15_12) +#define GPSR6_5 F_(SSI_SCK349, IP15_11_8) #define GPSR6_4 F_(SSI_SDATA2_A, IP15_7_4) #define GPSR6_3 F_(SSI_SDATA1_A, IP15_3_0) #define GPSR6_2 F_(SSI_SDATA0, IP14_31_28) @@ -345,8 +345,8 @@ #define IP14_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 IP15_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 IP15_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 IP15_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 IP15_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 IP15_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 IP15_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 IP15_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 IP15_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 IP15_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) @@ -1319,11 +1319,11 @@ enum { PINMUX_IPSR_MSEL(IP15_7_4, SSI_SDATA2_A, SEL_SSI_0), PINMUX_IPSR_MSEL(IP15_7_4, SSI_SCK1_B, SEL_SSI_1), - PINMUX_IPSR_GPSR(IP15_11_8, SSI_SCK34), + PINMUX_IPSR_GPSR(IP15_11_8, SSI_SCK349), PINMUX_IPSR_MSEL(IP15_11_8, MSIOF1_SS1_A, SEL_MSIOF1_0), PINMUX_IPSR_MSEL(IP15_11_8, STP_OPWM_0_A, SEL_SSP1_0_0), - PINMUX_IPSR_GPSR(IP15_15_12, SSI_WS34), + PINMUX_IPSR_GPSR(IP15_15_12, SSI_WS349), PINMUX_IPSR_MSEL(IP15_15_12, HCTS2_N_A, SEL_HSCIF2_0), PINMUX_IPSR_MSEL(IP15_15_12, MSIOF1_SS2_A, SEL_MSIOF1_0), PINMUX_IPSR_MSEL(IP15_15_12, STP_IVCXO27_0_A, SEL_SSP1_0_0), @@ -3697,12 +3697,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 */ @@ -4082,7 +4082,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), @@ -5343,8 +5343,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 */ } }, @@ -5590,8 +5590,8 @@ static int r8a7796_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin, u32 *poc { 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 */