Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932206AbbG1Npc (ORCPT ); Tue, 28 Jul 2015 09:45:32 -0400 Received: from mail-bn1on0058.outbound.protection.outlook.com ([157.56.110.58]:43473 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752538AbbG1Np2 (ORCPT ); Tue, 28 Jul 2015 09:45:28 -0400 Authentication-Results: spf=fail (sender IP is 66.35.236.227) smtp.mailfrom=opensource.altera.com; hellion.org.uk; dkim=none (message not signed) header.d=none; Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; Message-ID: <55B787D3.5060509@opensource.altera.com> Date: Tue, 28 Jul 2015 08:46:59 -0500 From: Dinh Nguyen User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Philipp Zabel CC: , , , , , , , , Subject: Re: [PATCH 3/4] reset: socfpga: Update reset-socfpga to read the altr,modrst-offset property References: <1438023444-11881-1-git-send-email-dinguyen@opensource.altera.com> <1438023444-11881-4-git-send-email-dinguyen@opensource.altera.com> <1438073190.3193.28.camel@pengutronix.de> In-Reply-To: <1438073190.3193.28.camel@pengutronix.de> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [99.103.66.154] X-ClientProxiedBy: SN1PR0501CA0005.namprd05.prod.outlook.com (25.163.126.143) To CY1PR03MB1374.namprd03.prod.outlook.com (25.163.16.28) X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1374;2:cAZnuPUd5sp8rJ3hAQ3a3hl3GCILrwlzBuW3vaT7DCBfD1X9YMEzbdSj0hWeCKPKhFZWg93H1NSa9+zscq0l+XzTypEkLbjYGlNS1PjKuLC7aywFqGkEFluQm3nbovXAMiZQA4wA2UVYWzJ7dilj0fVSVuaBPjAlG1uqOkiJGzE=;3:AYM+m5W1EX8ugv7bOH7Hj0NQjYQBzzN3VDxalPYlnHUqbGkGjd/O+tORO/+fCJLle6S/Xtxt+TNX7VG0JPsiKXfC12V3uBlkrfDxKtQtpNFXu2r1LcbFFZusHqtH2j2DzjURkSjwGBzne2S0jKv3QA==;25:CY4GCNwqJzsU0rDeOIg+l7g4VSn2JHXRm0O9edluD3x5XcUd5E6yy1oHuTUFyG8OLIfwNu1TAtYg5zhkmv6ke2szHxHbLkELUP/5Hk7vL25aCFsQyX5Y9axdUtarmj8ZwWw5pCLbjKaHkUQq/CrnSf5vEjJNZl0gewWQORMd4CRMuyeROGxlRfGfMQpxJLGK1/ViSAJwEWEhw2Cs+aiZ1hGpkwqS1/CqvBkki69UJ4BqGMMfmBcVrjfeDX0efFw7iU0HH8IlJZFHt0XLx45buA==;20:LAzzkrizn4gdiz9ZyUQGOXDXaiXvDbiJGn6mGpR38PsSQhl9jZNFiTgbO0luEaedbsaKH9F3apu4ALDbKdQdlQn5QRaxUN/CdaE9M6OJTKzcYg1FoHftVn7PvTBsLFwtZixwZCrfpZF7vahKvyAQ/o/s35taKzgESw8huQxQIAk= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1374;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1492; CY1PR03MB1374: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:;UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:CY1PR03MB1374;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1374;BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:BLUPR03MB1492;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1492; X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1374;4:63LaIHX64XXs8dPBkB31qm6lzCQxD2kCusI97LJE8U8B6Azmz4XfJBzv0nfeXeg/8RrqAyshceX3uZr6M7nIvoDtwYxdG7tWIz3czRySC+f9pgX6OVxpO3g7uGFr+J2vI1jDTlbZglwFOgkFSxFJ1kxcC2CUrW9v3l+GF6eYjRPEB42DRanaRv69NpeSk/YBqVRr+pdf/OdUq442UtlM7gfj8JvgwCSbPLy7PZB0HXnhcDvciJFruaAyQMHtXop+aWrGodNugkKIVellN5PNLLMmtnZXARd7BsC3g+AuugU= X-Forefront-PRVS: 06515DA04B X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(6009001)(377454003)(52604005)(479174004)(65806001)(86362001)(77156002)(66066001)(23676002)(122386002)(64126003)(65956001)(62966003)(59896002)(4001350100001)(40100003)(46102003)(87976001)(92566002)(2950100001)(47776003)(5001960100002)(19580405001)(50466002)(50986999)(19580395003)(110136002)(33656002)(83506001)(189998001)(65816999)(76176999)(77096005)(42186005)(54356999)(142933001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR03MB1374;H:Dinhs-MacBook-Pro.local;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: =?utf-8?B?MTtDWTFQUjAzTUIxMzc0OzIzOktGWjRvZUwxcFRja212c3RNRnpqb1hVclRK?= =?utf-8?B?ZDFudDhodzR4aUU4OU80OFZNQ25QY3JrbTJCSEJPUWNLbG1mTHd1OFVVQ2VQ?= =?utf-8?B?aFZDdDBXN0lINkhXNG9CRjlta0FteHFXbWZHOXRjWXdpa0JCRmxteUd2N2xp?= =?utf-8?B?MGN5UXArMkpiOEhkTWhDa0UvNnpFQzIxMEFNdnJ4R3FSL3BFc0RFOEJZR1kx?= =?utf-8?B?NngwWTdPZGxYSGRuZWdrSDY5RVZPeDYxV2FKRDkraUd3aGtFVmJDYTVtc05J?= =?utf-8?B?OU9RVCttaS8wU2lUakJQQ0ZXUFRIcGpZLzdKVWhPOHU4MVJFVThYYXAvbXB6?= =?utf-8?B?MXNrRW9NR2Q0VjRqOG5zYVRCSVc3VTJLQkpMWjFVN1hCV2V4VVlITkJDYVpG?= =?utf-8?B?OE02KzRoTVlSVGxyb3BrM1NHKy8vR3NWSTU1cVplL1JoQnBFVEU5Zkx2QWZD?= =?utf-8?B?c0FNa2t3NlI1N2dIUWFvVkZuV0hMemJ6M0d2N1ptSWNBU3Z3WmJWeVRpa2Rv?= =?utf-8?B?TnJwUkNoakYvVnQvdEZKRU5HaHhLQ0VLeUZEUkwrZlJnakpCK3VId1o5aXll?= =?utf-8?B?M3YvbTBmQjJlcXl6Y25tMjJVRmlCeUVZZlQ1ZCs5S1hpYWNRY1MrODBhOWNE?= =?utf-8?B?Ky9US2VTNk11QnNoL0tYWmk5UE1RTitnTEtDRXhrU1ZqaDF3OG9MUkp4am51?= =?utf-8?B?NFNZUkVKREpkTk9ZN0w3MUE0enkyTVFqNHNzbkhubXVMRUNJOXJEc1d0dmlp?= =?utf-8?B?ZG1MY2dRdUlwb3FkT3FGUXo5dlJwTkZTSWwyMkNWL2pXcldzYUo1bGJuMjEx?= =?utf-8?B?VXc4Q1J6M3g4N21OaUxiWjNWcDVhWUg0dTNXbndQcmNJVnFOUDQ5cTJuNU1n?= =?utf-8?B?cXNubUkzNnQ4QUNtajViLzd6UlpaYlp4VERRQ0YxNEdmWlUvbUtZQ3Bhbzdn?= =?utf-8?B?THNDRm5RcnBycFRDOXJJMXVPUURSUkFiVjFzRFBubTNJY1p1d2xPZ3Z0bFlK?= =?utf-8?B?Z0t5OEsvWlF5ZngvZ1BpVnNTaVB0TmRuZWNrRHRaK3lCamNNRlF0K0Y0NFEr?= =?utf-8?B?WkdyVW5kZ1R6dStSaG9UL2RNa1RVNmJsZS9hSEVweXRLQlAwa0dLazdmajRl?= =?utf-8?B?eUZpN0xzWVdQb2RnK1JRM21YM0JOL244SmVDRnp1bE41Sm8zcUcwSWlTc3Iv?= =?utf-8?B?MDlTZEZGYkRHRVRJV0NPbWExM2pvaGc4cHR3NHB2cEV5WndBR1VOMEtMRVYw?= =?utf-8?B?cUN4S0x6b1FWTVRwSWs0OTRyenA1ZGljcTBia1IyLzlJYVZjblNZUHVpcHEr?= =?utf-8?B?WDFKTGZhT3owR0E9PQ==?= X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1374;5:qpBJwlhq8vtAbq+FvZZr/g4/A01WFyzRnoQPyw3NGCLEKkSjHCsIeIL1uOFI57+r2VjA5YSTpY9lbQPkAlvEHQ2J+SGxY3pYT1vE3ZMATHctI4es50FJE8HsBSFNRCGyQZH38RYgCIHwy5ZWSZlFCA==;24:Mkn7N9gMzVUpMgloYjSjsP4WjdwOVMwmINXP7EPWsiJaN/3DCo5pg9PuDF4D1DOjkC9L3Je3uZvNIB/giNSexrPvO8M7+/uo0wuQSw9KX2Q=;20:tp2svwPBaydKOu6zh7vrdswPFPfNx+WI1VlFTSUUQ/GLvqAPX6d5yPdJzvBYt2z15SmIj3WmZEfuuLEEKCkpzSxUfSeHB1YkXTNd9LINz5MoltMiMZ2Sb9pFBJ6+uoLndcfHaGBCfy+YA9n3RoNHmeWgXt2Mp7ZYZfZ4pE9W9zg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1374 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BN1AFFO11FD054.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD054;1:rAQWjMVfMOgZcn8H5NbqLw0soV7220Gdw/4pd759LuVBbVDAH19RooA4k8ElunxBuV8LPuAVKecWp/G6HZuK6Ryy6iJvpyFcuUtI3DY3D0wIELys1QCWi9A5YkfcgERkoiNoG5GFrHxL0pYAC40HXcFDsRVZ946q+A609oP6lh3hbFF5Ye2fOE5mJWYphfiSOk8t3Z7bR7uBHWM0cafCtQo5YOW8ilXan/MIYDZIy/TOSkUrPEVslr7iegWwEoK1OOZaNAqM/P188bc0VUzoSXGDSFHxnwOUaNr8j9LYet0UntUqO35EO2DWCScQDtW6 X-Forefront-Antispam-Report: CIP:66.35.236.227;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(339900001)(199003)(377454003)(479174004)(52604005)(189002)(110136002)(65806001)(77096005)(189998001)(40100003)(77156002)(19580405001)(46102003)(106466001)(5001960100002)(23676002)(19580395003)(86362001)(62966003)(87936001)(65956001)(83506001)(66066001)(50986999)(54356999)(85426001)(47776003)(33656002)(92566002)(2950100001)(76176999)(6806004)(64126003)(4001350100001)(59896002)(65816999)(122386002)(16796002)(50466002)(7099028)(142933001);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR03MB1492;H:sj-itexedge03.altera.priv.altera.com;FPR:;SPF:Fail;MLV:sfv;A:0;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1492;2:YGfqUHDSv1ziocx8ywMwMstZMygTNAA0KmOIX/lmr70SNwp39+LnQZllnrEQB2mq;3:z6j6jf1rh57AmyhLAiiEwfd8qBtgor9pwlhxQZmGztUe+x7LwF4oRftehvudauSrJ8wBmQjVzZF63B0oxsqDM4dL9rA9QlOj3TLrsCGMJJfr2+7msNZikW7knmdeE1GIVO2lu4maoUDcbq4INEWntG8l+k9DWPKlRdAGwZZ+e3yuIRZY36wfBF1lSFTF8k8Muljx6WFcCPS60G4hqMz4+eokYU0781+zN9kOiy4T2ww=;25:EwhIysKjTBiRBGX9DfLATEV6VOaQBisJEjH9lbher8KXqOmdGPbrNpWrb5pvxjd3bcfcPxR90ajKvidgobtqz3Ub/m0glic/dsLEMDiMLBHyspnRtgyMqyoKySKNlSZiyE+bPbccAarzkrk9rjzHGpeu1h3zSqtt3+40OTJZ1FRlKASoZU4b1MPKk6U5DKyoTPnWl+OWJ3x3b048klhS6fmTGbKqdFOYzt40WZxzcR2KFiCFUVdZhMio5ygQ2lXBjp5lI2EylDZ9cLcVS+h+Yg==;20:SAldoyguHnVLoRTik3yRFYt0iLN+5L0hsj4s19+M69+RX+AbpKOFjsJd5UnNvywjKkxbfMS3fAxQPGsb+aigjLgoJjJFG3kVTzyDo5yW4MQqx/QJXAeCH3nUsmP46JINqPUE6oPxmeb+AbOerpEP0sReE0PhUk8Soh8pqYBAQM4= BLUPR03MB1492: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1492;4:uSgWuw79L47gyzfVUzHHUMS4xma097Pm5kxUMMY3Lk+8cB/FZ4+hBpPDB9Fl1cdNOPFwxvLgV7/0sAayD7HbGcmg/xNwVoaaYUQqVQAPYJDfoQBDGguXgJdMzZBJ2timJXxxaadItM/53LQHFBU4/M5TwUVvuvg060dbClAMwkrxF6s6fNetWIC1LYHQll7nIMp2nlp8znk4UGZtWPp7wL3JB8LTQEgIqxpbPrYTUSObIYS+3p6HSM+74a44xlFuy6XhGO6drM9SAmIXeUr+q1Yqgv1LUIIoaBOA/64zuqI= X-Forefront-PRVS: 06515DA04B X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTFVQUjAzTUIxNDkyOzIzOmpVZDZ5NW5heXYxTzJITkE3K09nVEVRaVI2?= =?utf-8?B?dU82QXF0aWkxTEtkNzRYRGlQNU9GN1RZZWhwV0NCR0JCSGlKNXlBdkVlQUhR?= =?utf-8?B?cElZb2dYNFFTM2xQR1FHczZrRTdFcjhmN0hwdnVnYk5lWUtwMkFNVmZkUFpy?= =?utf-8?B?ampxRTFiSmpYc1JJcjFxWmo4N0h6TmZMc1hveGVEeWJPUDUxSUFieURQYlVH?= =?utf-8?B?ZkJGeFI0bmhrUStQeTIvTkw5UjFkdnZqdXJFNE1HR2lLSlFBNlRQUTFQamRn?= =?utf-8?B?SXVSQ2hTUDVkSExkYmJiRTJCKytDbEp2Z0tVK1ZGMzAvTEpkTlY1NUxIcTFC?= =?utf-8?B?Zlp0NmF3RVhPRFA1WUswR2t3aTBkOS8xTDJONno3Y2J1cUNIMitraGkrM3R1?= =?utf-8?B?T3h4dWI3TmpIaW9lMUNPZ1RIYmptY0NHVW1FNW55UUFNT2NTcjZqMUdmS0tY?= =?utf-8?B?b21WZEY0RmFGTVprWDNEWFNUUFZIdjZxWHNraFhzcmw3cFZaOGR2RTF5aGli?= =?utf-8?B?dzlid0lwQU9KWWhneUpJMVRaVU02a1Jta3N4L0JoclEzQ0lPU004dHV2ckJH?= =?utf-8?B?N1lBYytZaU41dFVKNWdTc2lPT3A3OEFxQ0UxTG9jc1JvSjZSMHEwdDFmK3lo?= =?utf-8?B?VEp3WGxnUVpOZ3NHMXpnQk1QZk0yMjU1N2laTDhrSVhEeVZJb2NEeWc5VGs5?= =?utf-8?B?a3ZEdHkzZ0lUblRRSkJOWXd2UWtoek8waFBpQ3JvaEFGRlRTRWlNdVBmMVgz?= =?utf-8?B?Tm5hQnV0TFVKbDJrQnJYRnc5NW9USU5KTzRvSGVQQWVuNUFNTi9sNC95Vk4r?= =?utf-8?B?d1FmTkNYSEdZWnVVdkVLeURqUDhnaXZuRXBPdy9jaTFpalJxTTJjc1hNYnBy?= =?utf-8?B?eUZsWUhNcmFKdUVVVWtJSGNsbWhTblJOQW53MWhiL1ZUMlRVR282ZjhVQ0xo?= =?utf-8?B?M2dJUUhmSFkrQ1FSQ0lwQzU2YlVBSFNQd056T0l0NElMbC8vYjN5d1RpQ2Z0?= =?utf-8?B?Z25yNjZsdnFOLzQwUlVTRGpOQ2VGT2V4RTJNZ0dkNVRRRjNBTmxBVHhVSGRn?= =?utf-8?B?SE9icFhSek9XNXF2c3NwWUJtRGNTRFphQ29QaVR5elV1SXU1TFRaZXBPQnVN?= =?utf-8?B?Y0d6azZIMlplOGVHaG9la3czZy9TbHc3azBoSVJ2RkdQK0o2OGx0ZVhVaENo?= =?utf-8?B?eXFMZ1ZZVUd6b0R5VGZMSWpzYmVBdmVTQ0hsdnFCSWdHUmNERzBRU2Q5UDhG?= =?utf-8?B?QTV2Z01Eekh2NDZuTy9MZERIWkFPYXlhaVhqcDNWU3F4cnpGZVhDU2cyTWZU?= =?utf-8?B?bDNHeFFNdTRUcTFuUnB0TGljMklIbkdTMFA5anlXTVFyVnpNTzUvZ0o0SEdU?= =?utf-8?B?dlIxWlkrSW1oRlVMTXFFeG41WFJEeTJTd0dYQUNNd2pHQXRHa2owS05kR0gw?= =?utf-8?B?T2hJbTMvcS9wVzY3RUZ3cCt5SUlWTjZLWUJ5b3pJWTJibWcyVG5NYTgyVHpp?= =?utf-8?Q?5ZEOFFHkW9Ds5ZzhaMcRb7PBZ788/bceMpPcb/O8p1cCJ+?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1492;5:9xOFlxymwvIv9YZfd098dMAfM7zWPbt/ppf8IsAYEAiHUQvogD9X/4Sg3mxByh5eaC4njdyM2YU+CjsqbZUDxrpBErZsLRPQstPHIHb0dQVxb84DwnuAkTP+fGM3cL/KLMcSS7nXYUP0e8f2+6qXag==;24:7Tu240IqEAusoqkKflAXpNqrhjOuQL7Yle70DisHY3fv+4zBILfszW5cAAxEOMroRhOsMyhi+9/p+oKl7LcodDl+XU3GAmAut3/KKTNtows=;20:h5WAhBnYTUmr2VuzUJk+4SvunjW5IrOK/0faJrt0BiI92Y+8CoTOIalFadZOhzZa+aC5rU+g9I/tokFQm5Vj7TNmhjuzhD00d3ZhWWx8yCzw8v46IJw8QC9wWmFS0eFazca7M3foCY6lOho36gzFJqS5L5KaVYPPMr4X+UAE/No= X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2015 13:45:25.0646 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a;Ip=[66.35.236.227];Helo=[sj-itexedge03.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB1492 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3636 Lines: 97 On 7/28/15 3:46 AM, Philipp Zabel wrote: > Am Montag, den 27.07.2015, 13:57 -0500 schrieb > dinguyen@opensource.altera.com: >> From: Dinh Nguyen >> >> In order for the Arria10 to be able to re-use the reset driver for SoCFPGA >> Cyclone5/Arria5, we need to read the 'altr,modrst-offset' property from the >> device tree entry. The 'altr,modrst-offset' property is the first register >> into the reset manager that is used for bringing peripherals out of reset. >> >> Signed-off-by: Dinh Nguyen >> --- >> drivers/reset/reset-socfpga.c | 19 +++++++++++++------ >> 1 file changed, 13 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c >> index 0a8def3..9074d41 100644 >> --- a/drivers/reset/reset-socfpga.c >> +++ b/drivers/reset/reset-socfpga.c >> @@ -24,11 +24,11 @@ >> #include >> >> #define NR_BANKS 4 >> -#define OFFSET_MODRST 0x10 >> >> struct socfpga_reset_data { >> spinlock_t lock; >> void __iomem *membase; >> + u32 modrst_offset; >> struct reset_controller_dev rcdev; >> }; >> >> @@ -45,8 +45,8 @@ static int socfpga_reset_assert(struct reset_controller_dev *rcdev, >> >> spin_lock_irqsave(&data->lock, flags); >> >> - reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS)); >> - writel(reg | BIT(offset), data->membase + OFFSET_MODRST + >> + reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS)); >> + writel(reg | BIT(offset), data->membase + data->modrst_offset + >> (bank * NR_BANKS)); >> spin_unlock_irqrestore(&data->lock, flags); >> >> @@ -67,8 +67,8 @@ static int socfpga_reset_deassert(struct reset_controller_dev *rcdev, >> >> spin_lock_irqsave(&data->lock, flags); >> >> - reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS)); >> - writel(reg & ~BIT(offset), data->membase + OFFSET_MODRST + >> + reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS)); >> + writel(reg & ~BIT(offset), data->membase + data->modrst_offset + >> (bank * NR_BANKS)); >> >> spin_unlock_irqrestore(&data->lock, flags); >> @@ -85,7 +85,7 @@ static int socfpga_reset_status(struct reset_controller_dev *rcdev, >> int offset = id % BITS_PER_LONG; >> u32 reg; >> >> - reg = readl(data->membase + OFFSET_MODRST + (bank * NR_BANKS)); >> + reg = readl(data->membase + data->modrst_offset + (bank * NR_BANKS)); >> >> return !(reg & BIT(offset)); >> } >> @@ -100,6 +100,8 @@ static int socfpga_reset_probe(struct platform_device *pdev) >> { >> struct socfpga_reset_data *data; >> struct resource *res; >> + struct device *dev = &pdev->dev; >> + struct device_node *np = dev->of_node; >> >> /* >> * The binding was mainlined without the required property. >> @@ -120,6 +122,11 @@ static int socfpga_reset_probe(struct platform_device *pdev) >> if (IS_ERR(data->membase)) >> return PTR_ERR(data->membase); >> >> + if (of_property_read_u32(np, "altr,modrst-offset", &data->modrst_offset)) { >> + dev_err(dev, "no altr,modrst-offset specified in device tree\n"); >> + return -ENODEV; >> + } >> + > > This should fall back to the old value of 0x10 in case the device tree > property doesn't exist. Otherwise you are breaking Cyclone5/Arria5 with > older device trees. > Ah yes, you're right. Thanks for catching this! Dinh -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/