From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753290AbZLAHWo (ORCPT ); Tue, 1 Dec 2009 02:22:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752764AbZLAHWn (ORCPT ); Tue, 1 Dec 2009 02:22:43 -0500 Received: from mail-bw0-f227.google.com ([209.85.218.227]:42053 "EHLO mail-bw0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752280AbZLAHWn (ORCPT ); Tue, 1 Dec 2009 02:22:43 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=xfhybRSf59L5hywteS4CW/WXG4jBQN7mZFsaVmWSBsAlg41+xut8DgdjmwMtXLxlV1 Rztlb+01iP9tExyH4sGxfvMhobxR4VE7DCPoV8I/hYz3UjJeSOohHk5NvlP5JzgfzVK2 OpUKmEM2AlYKNpmh3FeQxSpcRoCeA6JduuSdw= MIME-Version: 1.0 Date: Tue, 1 Dec 2009 08:22:48 +0100 Message-ID: Subject: [PATCH]: at91 slowclock: fix two bugs when disabling the PLLs From: Julien Langer To: linux-kernel@vger.kernel.org Content-Type: multipart/mixed; boundary=0015174beac605e7eb0479a5a062 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --0015174beac605e7eb0479a5a062 Content-Type: text/plain; charset=ISO-8859-1 Hi, attached are two patches which fix two problems with the at91 slowclock code: the first one fixes a problem during suspend: When turning off the PLLs, wait for the LOCKA/LOCKB flags to be unset instead of being set (which will never happen). The second patch fixes a problem of trying to turn on/off a PLL which was already disabled: ohci-at91 disables PLLB when going to suspend. The slowclock code however tries to do the same. In that case the slowclock code just stores and restores a 0 to the PLLB register which results in the wait_pllblock loop to hang until it reaches the timeout. This patches fixes the problem by only restoring the PLLA/PLLB registers when they were != 0. PS: please CC me, I'm not on the list. --0015174beac605e7eb0479a5a062 Content-Type: text/x-patch; charset=US-ASCII; name="at91_slowclock_pll_unlock.patch" Content-Disposition: attachment; filename="at91_slowclock_pll_unlock.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g2oca87s0 YXQ5MTogd2hlbiB0dXJuaW5nIG9mZiB0aGUgcGxscyBkdXJpbmcgc3VzcGVuZCwgZG9uJ3Qgd2Fp dCBmb3IgdGhlIGxvY2sKCmZsYWcgdG8gYmUgc2V0LCBpbnN0ZWFkIHdhaXQgZm9yIGl0IHRvIGJl IHVuc2V0LiBQcmV2aW91c2x5IHRoZSBjb2RlIHdvdWxkCmFsd2F5cyBydW4gaW50byB0aGUgbG9v cCBsaW1pdGF0aW9uIG9mIDEwMDAgaXRlcmF0aW9ucyBiZWNhdXNlIHRoZSBmbGFnIGlzCm5ldmVy IHNldCB3aGVuIHR1cm5pbmcgdGhlIHBsbHMgb2ZmLgoKU2lnbmVkLW9mZi1ieTogSnVsaWVuIExh bmdlciA8anVsaWVuLmxhbmdlckBnbWFpbC5jb20+Ci0tLQoKIGFyY2gvYXJtL21hY2gtYXQ5MS9w bV9zbG93Y2xvY2suUyB8ICAgMzUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0K IDEgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCgpkaWZm IC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1hdDkxL3BtX3Nsb3djbG9jay5TIGIvYXJjaC9hcm0vbWFj aC1hdDkxL3BtX3Nsb3djbG9jay5TCmluZGV4IDk4N2ZhYjMuLmRjNmQ3MzAgMTAwNjQ0Ci0tLSBh L2FyY2gvYXJtL21hY2gtYXQ5MS9wbV9zbG93Y2xvY2suUworKysgYi9hcmNoL2FybS9tYWNoLWF0 OTEvcG1fc2xvd2Nsb2NrLlMKQEAgLTQ1LDcgKzQ1LDkgQEAKICNkZWZpbmUgTUNLUkRZX1RJTUVP VVQJCTEwMDAKICNkZWZpbmUgTU9TQ1JEWV9USU1FT1VUIAkxMDAwCiAjZGVmaW5lIFBMTEFMT0NL X1RJTUVPVVQJMTAwMAorI2RlZmluZSBQTExBVU5MT0NLX1RJTUVPVVQJMTAwMAogI2RlZmluZSBQ TExCTE9DS19USU1FT1VUCTEwMDAKKyNkZWZpbmUgUExMQlVOTE9DS19USU1FT1VUCTEwMDAKIAog CiAvKgpAQCAtOTEsNiArOTMsMjAgQEAKIAkuZW5kbQogCiAvKgorICogV2FpdCB1bnRpbCBQTExB IGhhcyB1bmxvY2tlZC4KKyAqLworCS5tYWNybyB3YWl0X3BsbGF1bmxvY2sKKwltb3YJcjQsICNQ TExBVU5MT0NLX1RJTUVPVVQKKzE6CXN1YglyNCwgcjQsICMxCisJY21wCXI0LCAjMAorCWJlcQky ZgorCWxkcglyMywgW3IxLCAjKEFUOTFfUE1DX1NSIC0gQVQ5MV9QTUMpXQorCXRzdAlyMywgI0FU OTFfUE1DX0xPQ0tBCisJYm5lCTFiCisyOgorCS5lbmRtCisKKy8qCiAgKiBXYWl0IHVudGlsIFBM TEIgaGFzIGxvY2tlZC4KICAqLwogCS5tYWNybyB3YWl0X3BsbGJsb2NrCkBAIC0xMDQsNiArMTIw LDIwIEBACiAyOgogCS5lbmRtCiAKKy8qCisgKiBXYWl0IHVudGlsIFBMTEIgaGFzIHVubG9ja2Vk LgorICovCisJLm1hY3JvIHdhaXRfcGxsYnVubG9jaworCW1vdglyNCwgI1BMTEJVTkxPQ0tfVElN RU9VVAorMToJc3ViCXI0LCByNCwgIzEKKwljbXAJcjQsICMwCisJYmVxCTJmCisJbGRyCXIzLCBb cjEsICMoQVQ5MV9QTUNfU1IgLSBBVDkxX1BNQyldCisJdHN0CXIzLCAjQVQ5MV9QTUNfTE9DS0IK KwlibmUJMWIKKzI6CisJLmVuZG0KKwogCS50ZXh0CiAKIEVOVFJZKGF0OTFfc2xvd19jbG9jaykK QEAgLTE3NSw3ICsyMDUsNyBAQCBFTlRSWShhdDkxX3Nsb3dfY2xvY2spCiAJb3JyCXIzLCByMywg IygxIDw8IDI5KQkJLyogYml0IDI5IGFsd2F5cyBzZXQgKi8KIAlzdHIJcjMsIFtyMSwgIyhBVDkx X0NLR1JfUExMQVIgLSBBVDkxX1BNQyldCiAKLQl3YWl0X3BsbGFsb2NrCisJd2FpdF9wbGxhdW5s b2NrCiAKIAkvKiBTYXZlIFBMTEIgc2V0dGluZyBhbmQgZGlzYWJsZSBpdCAqLwogCWxkcglyMywg W3IxLCAjKEFUOTFfQ0tHUl9QTExCUiAtIEFUOTFfUE1DKV0KQEAgLTE4Myw4ICsyMTMsNyBAQCBF TlRSWShhdDkxX3Nsb3dfY2xvY2spCiAKIAltb3YJcjMsICNBVDkxX1BNQ19QTExDT1VOVAogCXN0 cglyMywgW3IxLCAjKEFUOTFfQ0tHUl9QTExCUiAtIEFUOTFfUE1DKV0KLQotCXdhaXRfcGxsYmxv Y2sKKwl3YWl0X3BsbGJ1bmxvY2sKIAogCS8qIFR1cm4gb2ZmIHRoZSBtYWluIG9zY2lsbGF0b3Ig Ki8KIAlsZHIJcjMsIFtyMSwgIyhBVDkxX0NLR1JfTU9SIC0gQVQ5MV9QTUMpXQo= --0015174beac605e7eb0479a5a062 Content-Type: text/x-patch; charset=US-ASCII; name="at91_slowclock_pll_fix.patch" Content-Disposition: attachment; filename="at91_slowclock_pll_fix.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g2ocaay01 YXQ5MTogRG9uJ3QgdHJ5IHRvIHJlc3RvcmUgdGhlIFBMTCBzZXR0aW5ncyB3aGVuIHRoZSBQTExz IHdlcmUgdHVybmVkIG9mZgoKcHJldmlvdXNseS4KCldlIHJ1biBpbnRvIHRoaXMgcHJvYmxlbSB3 aXRoIHRoZSBQTExCIG9uIHRoZSBhdDkxOiBvaGNpLWF0OTEgZGlzYWJsZXMgdGhlIFBMTEIKd2hl biBnb2luZyB0byBzdXNwZW5kLiBUaGUgc2xvd2Nsb2NrIGNvZGUgaG93ZXZlciB0cmllcyB0byBk byB0aGUgc2FtZTogSXQKc2F2ZXMgdGhlIFBMTEIgcmVnaXN0ZXIgdmFsdWUgYW5kIHdoZW4gcmVz dG9yaW5nIHRoZSB2YWx1ZSBkdXJpbmcgcmVzdW1lLCBpdAp3YWl0J3MgZm9yIHRoZSBQTExCIHRv IGxvY2sgYWdhaW4uIEhvd2V2ZXIgdGhlIFBMTCB3aWxsIG5ldmVyIGxvY2sgYW5kIHRoZSBsb29w CndvdWxkIHJ1biBpbnRvIGl0J3MgdGltZW91dCBiZWNhdXNlIHRoZSBzbG93Y2xvY2sgY29kZSBq dXN0IHN0b3JlZCBhbmQgcmVzdG9yZWQKYW4gZW1wdHkgcmVnaXN0ZXIuClRoaXMgZml4ZXMgdGhl IHByb2JsZW0gYnkgb25seSByZXN0b3JpbmcgUExMQS9QTExCIHdoZW4gdGhlIHJlZ2lzdGVycyB3 ZXJlICE9IDAuCgpTaWduZWQtb2ZmLWJ5OiBKdWxpZW4gTGFuZ2VyIDxqdWxpZW4ubGFuZ2VyQGdt YWlsLmNvbT4KLS0tCgogYXJjaC9hcm0vbWFjaC1hdDkxL3BtX3Nsb3djbG9jay5TIHwgICAxNCAr KysrKysrKysrKysrKwogMSBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAwIGRlbGV0 aW9ucygtKQoKCmRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNoLWF0OTEvcG1fc2xvd2Nsb2NrLlMg Yi9hcmNoL2FybS9tYWNoLWF0OTEvcG1fc2xvd2Nsb2NrLlMKaW5kZXggZGM2ZDczMC4uZGJjOGYw YSAxMDA2NDQKLS0tIGEvYXJjaC9hcm0vbWFjaC1hdDkxL3BtX3Nsb3djbG9jay5TCisrKyBiL2Fy Y2gvYXJtL21hY2gtYXQ5MS9wbV9zbG93Y2xvY2suUwpAQCAtMjAxLDIwICsyMDEsMjggQEAgRU5U UlkoYXQ5MV9zbG93X2Nsb2NrKQogCWxkcglyMywgW3IxLCAjKEFUOTFfQ0tHUl9QTExBUiAtIEFU OTFfUE1DKV0KIAlzdHIJcjMsIC5zYXZlZF9wbGxhcgogCisJY21wIHIzLCAjMAorCWJlcSAzZgor CiAJbW92CXIzLCAjQVQ5MV9QTUNfUExMQ09VTlQKIAlvcnIJcjMsIHIzLCAjKDEgPDwgMjkpCQkv KiBiaXQgMjkgYWx3YXlzIHNldCAqLwogCXN0cglyMywgW3IxLCAjKEFUOTFfQ0tHUl9QTExBUiAt IEFUOTFfUE1DKV0KIAogCXdhaXRfcGxsYXVubG9jawogCiszOgogCS8qIFNhdmUgUExMQiBzZXR0 aW5nIGFuZCBkaXNhYmxlIGl0ICovCiAJbGRyCXIzLCBbcjEsICMoQVQ5MV9DS0dSX1BMTEJSIC0g QVQ5MV9QTUMpXQogCXN0cglyMywgLnNhdmVkX3BsbGJyCiAKKwljbXAgcjMsICMwCisJYmVxIDRm CisKIAltb3YJcjMsICNBVDkxX1BNQ19QTExDT1VOVAogCXN0cglyMywgW3IxLCAjKEFUOTFfQ0tH Ul9QTExCUiAtIEFUOTFfUE1DKV0KIAl3YWl0X3BsbGJ1bmxvY2sKIAorNDoKIAkvKiBUdXJuIG9m ZiB0aGUgbWFpbiBvc2NpbGxhdG9yICovCiAJbGRyCXIzLCBbcjEsICMoQVQ5MV9DS0dSX01PUiAt IEFUOTFfUE1DKV0KIAliaWMJcjMsIHIzLCAjQVQ5MV9QTUNfTU9TQ0VOCkBAIC0yMzIsMTYgKzI0 MCwyMiBAQCBFTlRSWShhdDkxX3Nsb3dfY2xvY2spCiAKIAkvKiBSZXN0b3JlIFBMTEIgc2V0dGlu ZyAqLwogCWxkcglyMywgLnNhdmVkX3BsbGJyCisJY21wIHIzLCAjMAorCWJlcSA1ZgogCXN0cgly MywgW3IxLCAjKEFUOTFfQ0tHUl9QTExCUiAtIEFUOTFfUE1DKV0KIAogCXdhaXRfcGxsYmxvY2sK IAorNToKIAkvKiBSZXN0b3JlIFBMTEEgc2V0dGluZyAqLwogCWxkcglyMywgLnNhdmVkX3BsbGFy CisJY21wIHIzLCAjMAorCWJlcSA2ZgogCXN0cglyMywgW3IxLCAjKEFUOTFfQ0tHUl9QTExBUiAt IEFUOTFfUE1DKV0KIAogCXdhaXRfcGxsYWxvY2sKIAorNjoKICNpZmRlZiBTTE9XRE9XTl9NQVNU RVJfQ0xPQ0sKIAkvKgogCSAqIEZpcnN0IHNldCBQUkVTIGlmIGl0IHdhcyBub3QgMCwK --0015174beac605e7eb0479a5a062--