From patchwork Tue May 16 08:01:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9728501 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 2B250602B4 for ; Tue, 16 May 2017 08:01:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C05A284ED for ; Tue, 16 May 2017 08:01:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10E1D2875D; Tue, 16 May 2017 08:01:41 +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 08697284ED for ; Tue, 16 May 2017 08:01:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751644AbdEPIBe (ORCPT ); Tue, 16 May 2017 04:01:34 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:56265 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751769AbdEPIBd (ORCPT ); Tue, 16 May 2017 04:01:33 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 16 May 2017 17:01:20 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id EC7F760791; Tue, 16 May 2017 17:01:20 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.38,348,1491231600"; d="scan'208";a="243970103" Received: from mail-pu1apc01lp0020.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.20]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 16 May 2017 17:01:20 +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=6lHEIG+qwakxeFC+POGK7HsrcQcuNZplSXLkeZrbU+U=; b=TwFyJJlGIZ8bSAbgHFSolcTQ1e6nr6RrGVma7FAGjp2B17is70dYwVjBnwzK2dUr7hI9zRlhie5xi6huDkGTdfB/hDC1Lp1e1VfEJQvsUA2UlVuQuGXkC4iFzmLBVB3pQuLGL8nwUItQORdSUBkXwCa+vBwXlJS1lBDKB64GML8= 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 PS1PR0601MB1883.apcprd06.prod.outlook.com (2603:1096:803:8::21) 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:17 +0000 Message-ID: <87shk5w7yp.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Simon , Geert Uytterhoeven CC: Magnus , Linux-Renesas Subject: [PATCH] pinctrl: sh-pfc: r8a7795: 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:17 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: HKXPR03CA0082.apcprd03.prod.outlook.com (2a01:111:e400:a428::40) To PS1PR0601MB1883.apcprd06.prod.outlook.com (2603:1096:803:8::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ace7d89d-a82a-4fa0-08f0-08d49c31bbe7 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:PS1PR0601MB1883; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1883; 3:ZLn7j2xpWpjmFvNFL+k5aTXXsOuBvZ+uFJuddYyJ8wMmUIoTc2ohg0jpnwM2rzEaoBm352bgjO4VjJrqFKhNfrS3SiYCSQszTqEuZ9c60jpYidnkciTNcpwZUoVgYt2fojviEPWA27x1lxFmC6hwPNxdbjKxcIqef9ms0haoRni79ICbU7LBl3EIPXHA1uRBEcjMm2JVMGjtGDjb145hLvv9ei7RiQl2HLpmontl1dTcfog12NlLpZA01zIGwtc1JNUi2WCfWFft6+Px93aVSUVNbawFgxFWuhUK0Ff3KhZk0s+kWDIpf+/6dS4l6kjXRYB6lo36vpS5YuzvLqukGUyAr1VD9ofq0A/vN6QtTD8=; 25:EXhl3CgFzIO2VWGzEJYIQIhks3Z8anDh7R5PVsDnIzBSebweeFc6Ip5ZFgGpInTUnaoP7izSftm2htOCGixJVR9D/ihe12ZXllNF/0BVwFS0ddDyoW6We7A3wBLhlSKXXoR5rwj83aR3oHqi3k4POryxpNpk5hpfEDKbKv40a6vAK+I4tgSEnBqpxJShuZ4M9rrBPtHJkfbN2v3LU8uE2Gto0BobnXM6olFgdkDKpUPEZRQM6Z49Rom6gRd6TpkNhExtnZVenvSMxg4kZojl5V5suwAzP7Bv+DnMAollvTOMfjP2f57O6fEPL88luNUnVGqeXc9Qc1G8D4k6xkoGdgLg7kcTWDHaV6aMn0ArIzUVfGKFOHaGgIpvZZRYaKtJXutf4fCqvgC4ufbhluOSqJvM5jHVFR64fFbDClxxeX3gEwO2fP4PVagm48S/JBskvmtCYJb7g9a6aN+usKAFXL0NBt2UlSLHyA/6/PyCUh0= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1883; 31:7s/z0Jh2P3bPyH4Zmo4S7uNkJU7QVpFDHVPSXCIYrHqpyvEa9sz/EBYCSmDdQEFd8gu3G0QEGOO5bN/PRns+s3vhTTSJGiba/9yS3QRMHCwK7TTzNOiJ7vbn0UdnmtLuA6/IQvHMiGvRED8UbfIgSVPXXC45g3IZQ6GtZnyG4XBFSVcL6S8AcYVyP1Tex2yIsNkAbQef/ZVlFBCu0STzJjryWEjnYIpKwVi5s3rUBBzdIDkit7+3DYQ42tpQ3PHa/y2KZa/GacAaPg7miy6cpQ==; 20:3NusVwR3vO8LB2zKMRNc1a1Oqe2iAjZkZXzEWJjEVmwfYEKmGNjLm4wB6ySL8+G4T/s4gjdC6x/V7QILuFNw3UXxQlry+MgowxbVYNbYA/nJCMmbgc2pQx/N+OZYgpPz+9xvcxJngCdCjhhuSeOsbGuIj3wHJ6LZrkWZCT4RK3p2L9bQuRRS/RYg7lUa1bmXOiKjHsH4b4AQnz6DAVkRboX9GS4gTjia16DvNrkB4BtbXUu7kstRWQIw+9g1rModcoB9lnUCPjgFYtqUknecxd+4d6pVD8bv7zVBhXC04jfImIxICKimPAe6OVVBclxsUDuy/bR4RidravL4qs3gC3901o/dIJEQBD1RPu09J035cPhFC0uiMg6nkfB3VMJl/8A3OxTHfisa9NElFq92PCiY815Fd4G70a4KcVjJdORhNa1cXSPeZ0Qe5/vn0O/s/pwFi7Ed+TQpc4wncHn97EhMmsnjeVISMtnpoaVp0Vfq3u1NYMk84o8VMToB3zDC 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:PS1PR0601MB1883; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1883; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1883; 4:3GsAWwhxTk99D3u5aSNytaY+ysK9ZmkzZtFlAGwcZuNKElpG68Y4nfYLGmzULR/gmy2O+QjGci2rM/6qRamAgsMz5Rb+mz7rVL2NeJm4Z8PBpxujNBIyAzYK4Aas3Olu+UfmYhL26QWbg/IUYFhupE6FNZxJLrbNfXlhsEZt94zlRPvwLkp5bViAekDXKapBICAezeQY2MRZ/dwB+r0gDzr3Uz+VksXkNSyZ3XFQBud9kqwY/J1iMOUl75/H3EVY9wbNt2BNA6K+yLicHA2XxlTFUVjrJvZmeLaHoQalJ//cCbbiBi5E02RnhqV3Ljpow8d98FjtTWLiJKIrxUBxnPHmIo7gF/Yto4DLeuYqF3JEsBem+rGOxW1X1t5stj8ysujLoDcTHsTjMkmlDjsrlFLo4iBQ6JnZ/5cbYmgOXwPwzFnOTqAgNWZKoHbhJB/UXK6jcqmIpWhNddP0lq3XyG+DUApAwVvZIe0vL7xdr5pxM6sJGgAh3yUDEQoqHrdlcgzv5JB9d31peFKRaPjoU0lJhXwuWxc6lRbJIOo6hvBiOyCmK2dLmuPW4mWdlm+CiFr3TP9Mdj1FH2WBi3x7QNWvqCfbOWpN8Qz5WfhDorHh7lq5Jy7pEwnEHvqvpBol8kX01Hgaryjr5lxFtbqAxFTFJLc3wE9AehdkwGNjLsxn8nsCfYCIIcIphDOx4nSxdmbq6J0qedwQmPEIYySt22VCcqFE7fwviRaYj5gqKD7mPZXYRvYfZL/Trg4e4jnXDOSYdMyW018H6YmHJ7CRxE8hLMb0n8CMjXbqnmnKFviUaEntU4wV3K9gObOEHTv4 X-Forefront-PRVS: 03094A4065 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39860400002)(39450400003)(39850400002)(39400400002)(39410400002)(38730400002)(8676002)(81166006)(53936002)(3846002)(6116002)(4001350100001)(6486002)(189998001)(54906002)(23726003)(2906002)(46406003)(478600001)(305945005)(5660300001)(7736002)(86362001)(42186005)(4326008)(33646002)(53416004)(83506001)(25786009)(50466002)(50986999)(54356999)(66066001)(36756003)(47776003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1883; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1883; 23:TBWCObwnLwdHczkprAVlbJYDHcj5tRuQx/7sGZb?= =?us-ascii?Q?SsZODkTmSp7emQtZRgL2loC82lfgv1FfxEexQZX08yRe0FPePb/W11W0BhYo?= =?us-ascii?Q?MEmi/NYbeZ/Uqdt8EyzM+dVZNXbfhZlPBRamJrjru8ytGobZI2+vrZDNh9jK?= =?us-ascii?Q?41dXoNAsVj69hhUvNyMfhRbkEjpVqf3RvHW/RubHM3O0HpymBeCMvknmk669?= =?us-ascii?Q?Br+6/e+fUcow0r89YVnfGBKomx19D6HjxxFMDrUR2bzoBW6h9h3X/ObDDu7l?= =?us-ascii?Q?DZSHARGhiZZu036msNONh0/P0OcszquQjyvOFIzVhK3brP3Ag3VgXW6lEl5p?= =?us-ascii?Q?XKP+2nROwOZ2ho9sXrmYOMeAPc8DI+VecM4mQDbx+8+p0MxZprXQWDoY1gVs?= =?us-ascii?Q?HBbbvzjxItHdI9zSsFUlf2f8fcP/oBVtoQ8JfTTRDJnl4NzDdaAYsXUS5cS9?= =?us-ascii?Q?2AKeZv5oc3+bh4/quFGCvOF6a/+m57tKkaNP1zcZfdXs+hLrSbjkXr1ReQ6b?= =?us-ascii?Q?zylNisnRjMlEaLIMhnl50kCKR0QqTYfnxhU/1BLBB+VZ0ziHpvK/NzEYB1cf?= =?us-ascii?Q?MZhES0EvGl1ZrImTCCXn/JopQGbTBbvaf8V7D/aWCxbXrIkb/vLxKXUOqpwm?= =?us-ascii?Q?wO5xZsZRLjs4mlUvFga/nNaJDgWEWA03ZPzXv5vZOAVQE7xE9Ip4l31eMAVu?= =?us-ascii?Q?w9R8aekiQBDH0csOtKZ7f5Yf5vRIpfVfZYOfy/L6KT6/BzGOBKnr9ZpovN76?= =?us-ascii?Q?m5Vt5emEOpajQz0sx9k4WdVjZFO4gGN0MuFC0PUwO6SFlresRjSpBlMZC3Ei?= =?us-ascii?Q?98MY4o3llw286kyEE6rSWg9wFBzePKxyDpUMNtxbXH6dLmThx5S/+g6XfL1q?= =?us-ascii?Q?h62wFEnu1ZPOKLzbweFVDoRjULZrrUAZkjAjJxZPBZY/I5BRemOvpnTSYH5b?= =?us-ascii?Q?6KcF9523mR0ZoAKitCxkWc1fYcz6cCGAj0FY9pXCPmBhSdRPpBZs0TLzMQYx?= =?us-ascii?Q?hLHk=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1883; 6:brgIg5cEIt8ed2yPL2tGRY0QmgI2UoZGky6G7QXyTrSa9fZNO+f0zmXsbhHBuaHt1wvAa9eKw7OpZF72kKczmmI6JHfQTLUxA6du5hXBeZkQY2xdncQz+ksxMdgoR2PACVXtAHboAB+ltJPAW3nruJsJMuvZV2gKiPS0dxXwErUyzdeumfFDy9u7RyZvoyKSUGwvh975jVLEOYiWeK2o9AOyAOxtjpgje9dhCjdK39cfrjhw8IWJFTemuiJikpFA2rv5FLVGv/zOrSPRzj/7Z2uIOfcZv+a916P44G3HJEGWUj+DJ4BxJJ8Tbe8n6aRO3HfKoSJRe/BTC/bb2cY0pE+jpkbZ/2B3ywRyz+/0YOzOV8nmo0TROP7GZSSVyenYOI4667WTHcgjovy7aXK9gj+ai2Ve+jDk5pw4kuHl7DOP/KcFQQhPMvdUqhqDe7HpkY7pbhQkfI7u5SYdkH6XkE6q+Z8m4UqQ1e6m7bP/+YwTo+fd3aqDFhNz4uXKBCGjn7yIA+FQZphH6MqxuEEJJSzkHRANvGWIERf9hlNNI6A=; 5:j+tHTFsdF57c+LoXEpXs9CwNtk6FSErh0olIR9J7/V6eOLMAqA0i7Fhvu3JMWisBVH0CNfOdcZ0l47wgCAzjAq3trcq79BO+FsMe4R+GOgg9xSO6TUa9bAEsx8BlDhoQ3FRM+0tEeCqxh4SgmvraVQ==; 24:8HJlzMMuXlEApU4enIccV4o/TazJUYmA9+K1Q+y2Fq6gPMuX/g8lkMuzc8hBlHrVgUtygY8qrSMNlgbVC4psoRR3TQYn7PB4EF3REIJ1Pa0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1883; 7:MTMbm4zTOeJsWzNZenpgD/ynYfmaCbpv+YVJCZHub3kr4IQzAQjYNsvD6GytvAL+WtZ71J3eL91zogrNtGnv1kU7OaaWYO6Bsno8+oT4s01sU0O3ZlnsenxCWgiFP9+bifhca/jPcZl1VtMWUxTxchOVGknD9nVQp+svemlyWMsD/89gv1f5QgCrwGkSxd//+KMTAnERLXohdBuGnOtKxuPoQWHXk6CuqMQmegrRXjhJAQlEGBmZ5e/pGv5XdmQYUXzuUWw62RCLW5t5uo6Ejt7YMgUMTpGo66J9Y19hx/Pj2KuSevMLi+u0Jc9c0Cy6+E+sdK9kWkYrKg47cfw9Sw==; 20:Bjxo8gWb39XLU3pWXifCg8g6K6tBzPrKbNtUGvz3AN7ybRSL9Pv3BMQZexALufP+nCsn63u4x4tX8Fz1PYf8Crqlg2oXBv6weTP9JmaRYTPHNbjYDOb8xO6G4U9cPvdoCIuRxR/SIk3HpZ8PUr1QF29d07yjE+RSIFU73GDpCTs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2017 08:01:17.6525 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1883 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 Reviewed-by: Geert Uytterhoeven --- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index 0454f31..c31881b 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c @@ -193,8 +193,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) @@ -339,8 +339,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) @@ -1315,11 +1315,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), @@ -2653,8 +2653,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 */ } }, @@ -2900,8 +2900,8 @@ static int r8a7795_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 */