From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shawn Guo Subject: [PATCH v2 3/7] spi/imx: do not use spi_imx2_3 to name SPI_IMX_VER_2_3 function and macro Date: Sun, 10 Jul 2011 01:16:37 +0800 Message-ID: <1310231801-18761-4-git-send-email-shawn.guo@linaro.org> References: <1310231801-18761-1-git-send-email-shawn.guo@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: patches-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Sascha Hauer , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Return-path: In-Reply-To: <1310231801-18761-1-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org List-Id: linux-spi.vger.kernel.org SXQncyBjb25mdXNpbmcgdG8gdXNlIHNwaV9pbXgyXzMgdG8gbmFtZSBTUElfSU1YX1ZFUl8yXzMg ZnVuY3Rpb24KYW5kIG1hY3JvLCBhcyBpdCBlYXNpbHkgbWFrZSBwZW9wbGUgdGhpbmsgb2YgaW14 MiBhbmQgaW14My4gIEl0J3MKYmV0dGVyIHRvIHVzZSBzcGVjaWZpYyBzb2MgbmFtZSBqdXN0IGxp a2Ugd2hhdCBvdGhlciBTUElfSU1YX1ZFUgpkby4gIEZvciBTUElfSU1YX1ZFUl8yXzMgY2FzZSwg aXQgd2lsbCBiZSBteDUxLiAgVG8gZGlzdGluZ3Vpc2ggaXQKZnJvbSBDU1BJIG9uIG14NTEsIG14 NTFfZWNzcGkgbWlnaHQgYmUgYSBnb29kIGNob2ljZS4KClNpZ25lZC1vZmYtYnk6IFNoYXduIEd1 byA8c2hhd24uZ3VvQGxpbmFyby5vcmc+CkNjOiBVd2UgS2xlaW5lLUvDtm5pZyA8dS5rbGVpbmUt a29lbmlnQHBlbmd1dHJvbml4LmRlPgpDYzogU2FzY2hhIEhhdWVyIDxzLmhhdWVyQHBlbmd1dHJv bml4LmRlPgpDYzogR3JhbnQgTGlrZWx5IDxncmFudC5saWtlbHlAc2VjcmV0bGFiLmNhPgotLS0K IGRyaXZlcnMvc3BpL3NwaS1pbXguYyB8ICAxMDcgKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlcyBjaGFuZ2VkLCA1NCBpbnNlcnRpb25zKCsp LCA1MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3NwaS9zcGktaW14LmMgYi9k cml2ZXJzL3NwaS9zcGktaW14LmMKaW5kZXggYWQ5MjhiMS4uMDUyOTU5ZGYgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvc3BpL3NwaS1pbXguYworKysgYi9kcml2ZXJzL3NwaS9zcGktaW14LmMKQEAgLTE3 MSwzMCArMTcxLDMwIEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgc3BpX2lteF9jbGtkaXZfMih1bnNp Z25lZCBpbnQgZmluLAogCXJldHVybiA3OwogfQogCi0jZGVmaW5lIFNQSV9JTVgyXzNfQ1RSTAkJ MHgwOAotI2RlZmluZSBTUElfSU1YMl8zX0NUUkxfRU5BQkxFCQkoMSA8PCAgMCkKLSNkZWZpbmUg U1BJX0lNWDJfM19DVFJMX1hDSAkJKDEgPDwgIDIpCi0jZGVmaW5lIFNQSV9JTVgyXzNfQ1RSTF9N T0RFX01BU0sJKDB4ZiA8PCA0KQotI2RlZmluZSBTUElfSU1YMl8zX0NUUkxfUE9TVERJVl9PRkZT RVQJOAotI2RlZmluZSBTUElfSU1YMl8zX0NUUkxfUFJFRElWX09GRlNFVAkxMgotI2RlZmluZSBT UElfSU1YMl8zX0NUUkxfQ1MoY3MpCQkoKGNzKSA8PCAxOCkKLSNkZWZpbmUgU1BJX0lNWDJfM19D VFJMX0JMX09GRlNFVAkyMAotCi0jZGVmaW5lIFNQSV9JTVgyXzNfQ09ORklHCTB4MGMKLSNkZWZp bmUgU1BJX0lNWDJfM19DT05GSUdfU0NMS1BIQShjcykJKDEgPDwgKChjcykgKyAgMCkpCi0jZGVm aW5lIFNQSV9JTVgyXzNfQ09ORklHX1NDTEtQT0woY3MpCSgxIDw8ICgoY3MpICsgIDQpKQotI2Rl ZmluZSBTUElfSU1YMl8zX0NPTkZJR19TQkJDVFJMKGNzKQkoMSA8PCAoKGNzKSArICA4KSkKLSNk ZWZpbmUgU1BJX0lNWDJfM19DT05GSUdfU1NCUE9MKGNzKQkoMSA8PCAoKGNzKSArIDEyKSkKLQot I2RlZmluZSBTUElfSU1YMl8zX0lOVAkJMHgxMAotI2RlZmluZSBTUElfSU1YMl8zX0lOVF9URUVO CQkoMSA8PCAgMCkKLSNkZWZpbmUgU1BJX0lNWDJfM19JTlRfUlJFTgkJKDEgPDwgIDMpCi0KLSNk ZWZpbmUgU1BJX0lNWDJfM19TVEFUCQkweDE4Ci0jZGVmaW5lIFNQSV9JTVgyXzNfU1RBVF9SUgkJ KDEgPDwgIDMpCisjZGVmaW5lIE1YNTFfRUNTUElfQ1RSTAkJMHgwOAorI2RlZmluZSBNWDUxX0VD U1BJX0NUUkxfRU5BQkxFCQkoMSA8PCAgMCkKKyNkZWZpbmUgTVg1MV9FQ1NQSV9DVFJMX1hDSAkJ KDEgPDwgIDIpCisjZGVmaW5lIE1YNTFfRUNTUElfQ1RSTF9NT0RFX01BU0sJKDB4ZiA8PCA0KQor I2RlZmluZSBNWDUxX0VDU1BJX0NUUkxfUE9TVERJVl9PRkZTRVQJOAorI2RlZmluZSBNWDUxX0VD U1BJX0NUUkxfUFJFRElWX09GRlNFVAkxMgorI2RlZmluZSBNWDUxX0VDU1BJX0NUUkxfQ1MoY3Mp CQkoKGNzKSA8PCAxOCkKKyNkZWZpbmUgTVg1MV9FQ1NQSV9DVFJMX0JMX09GRlNFVAkyMAorCisj ZGVmaW5lIE1YNTFfRUNTUElfQ09ORklHCTB4MGMKKyNkZWZpbmUgTVg1MV9FQ1NQSV9DT05GSUdf U0NMS1BIQShjcykJKDEgPDwgKChjcykgKyAgMCkpCisjZGVmaW5lIE1YNTFfRUNTUElfQ09ORklH X1NDTEtQT0woY3MpCSgxIDw8ICgoY3MpICsgIDQpKQorI2RlZmluZSBNWDUxX0VDU1BJX0NPTkZJ R19TQkJDVFJMKGNzKQkoMSA8PCAoKGNzKSArICA4KSkKKyNkZWZpbmUgTVg1MV9FQ1NQSV9DT05G SUdfU1NCUE9MKGNzKQkoMSA8PCAoKGNzKSArIDEyKSkKKworI2RlZmluZSBNWDUxX0VDU1BJX0lO VAkJMHgxMAorI2RlZmluZSBNWDUxX0VDU1BJX0lOVF9URUVOCQkoMSA8PCAgMCkKKyNkZWZpbmUg TVg1MV9FQ1NQSV9JTlRfUlJFTgkJKDEgPDwgIDMpCisKKyNkZWZpbmUgTVg1MV9FQ1NQSV9TVEFU CQkweDE4CisjZGVmaW5lIE1YNTFfRUNTUElfU1RBVF9SUgkJKDEgPDwgIDMpCiAKIC8qIE1YNTEg ZUNTUEkgKi8KLXN0YXRpYyB1bnNpZ25lZCBpbnQgc3BpX2lteDJfM19jbGtkaXYodW5zaWduZWQg aW50IGZpbiwgdW5zaWduZWQgaW50IGZzcGkpCitzdGF0aWMgdW5zaWduZWQgaW50IG14NTFfZWNz cGlfY2xrZGl2KHVuc2lnbmVkIGludCBmaW4sIHVuc2lnbmVkIGludCBmc3BpKQogewogCS8qCiAJ ICogdGhlcmUgYXJlIHR3byA0LWJpdCBkaXZpZGVycywgdGhlIHByZS1kaXZpZGVyIGRpdmlkZXMg YnkKQEAgLTIyMiwzNiArMjIyLDM3IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgc3BpX2lteDJfM19j bGtkaXYodW5zaWduZWQgaW50IGZpbiwgdW5zaWduZWQgaW50IGZzcGkpCiAKIAlwcl9kZWJ1Zygi JXM6IGZpbjogJXUsIGZzcGk6ICV1LCBwb3N0OiAldSwgcHJlOiAldVxuIiwKIAkJCV9fZnVuY19f LCBmaW4sIGZzcGksIHBvc3QsIHByZSk7Ci0JcmV0dXJuIChwcmUgPDwgU1BJX0lNWDJfM19DVFJM X1BSRURJVl9PRkZTRVQpIHwKLQkJKHBvc3QgPDwgU1BJX0lNWDJfM19DVFJMX1BPU1RESVZfT0ZG U0VUKTsKKwlyZXR1cm4gKHByZSA8PCBNWDUxX0VDU1BJX0NUUkxfUFJFRElWX09GRlNFVCkgfAor CQkocG9zdCA8PCBNWDUxX0VDU1BJX0NUUkxfUE9TVERJVl9PRkZTRVQpOwogfQogCi1zdGF0aWMg dm9pZCBfX21heWJlX3VudXNlZCBzcGlfaW14Ml8zX2ludGN0cmwoc3RydWN0IHNwaV9pbXhfZGF0 YSAqc3BpX2lteCwgaW50IGVuYWJsZSkKK3N0YXRpYyB2b2lkIF9fbWF5YmVfdW51c2VkCitteDUx X2Vjc3BpX2ludGN0cmwoc3RydWN0IHNwaV9pbXhfZGF0YSAqc3BpX2lteCwgaW50IGVuYWJsZSkK IHsKIAl1bnNpZ25lZCB2YWwgPSAwOwogCiAJaWYgKGVuYWJsZSAmIE1YQ19JTlRfVEUpCi0JCXZh bCB8PSBTUElfSU1YMl8zX0lOVF9URUVOOworCQl2YWwgfD0gTVg1MV9FQ1NQSV9JTlRfVEVFTjsK IAogCWlmIChlbmFibGUgJiBNWENfSU5UX1JSKQotCQl2YWwgfD0gU1BJX0lNWDJfM19JTlRfUlJF TjsKKwkJdmFsIHw9IE1YNTFfRUNTUElfSU5UX1JSRU47CiAKLQl3cml0ZWwodmFsLCBzcGlfaW14 LT5iYXNlICsgU1BJX0lNWDJfM19JTlQpOworCXdyaXRlbCh2YWwsIHNwaV9pbXgtPmJhc2UgKyBN WDUxX0VDU1BJX0lOVCk7CiB9CiAKLXN0YXRpYyB2b2lkIF9fbWF5YmVfdW51c2VkIHNwaV9pbXgy XzNfdHJpZ2dlcihzdHJ1Y3Qgc3BpX2lteF9kYXRhICpzcGlfaW14KQorc3RhdGljIHZvaWQgX19t YXliZV91bnVzZWQgbXg1MV9lY3NwaV90cmlnZ2VyKHN0cnVjdCBzcGlfaW14X2RhdGEgKnNwaV9p bXgpCiB7CiAJdTMyIHJlZzsKIAotCXJlZyA9IHJlYWRsKHNwaV9pbXgtPmJhc2UgKyBTUElfSU1Y Ml8zX0NUUkwpOwotCXJlZyB8PSBTUElfSU1YMl8zX0NUUkxfWENIOwotCXdyaXRlbChyZWcsIHNw aV9pbXgtPmJhc2UgKyBTUElfSU1YMl8zX0NUUkwpOworCXJlZyA9IHJlYWRsKHNwaV9pbXgtPmJh c2UgKyBNWDUxX0VDU1BJX0NUUkwpOworCXJlZyB8PSBNWDUxX0VDU1BJX0NUUkxfWENIOworCXdy aXRlbChyZWcsIHNwaV9pbXgtPmJhc2UgKyBNWDUxX0VDU1BJX0NUUkwpOwogfQogCi1zdGF0aWMg aW50IF9fbWF5YmVfdW51c2VkIHNwaV9pbXgyXzNfY29uZmlnKHN0cnVjdCBzcGlfaW14X2RhdGEg KnNwaV9pbXgsCitzdGF0aWMgaW50IF9fbWF5YmVfdW51c2VkIG14NTFfZWNzcGlfY29uZmlnKHN0 cnVjdCBzcGlfaW14X2RhdGEgKnNwaV9pbXgsCiAJCXN0cnVjdCBzcGlfaW14X2NvbmZpZyAqY29u ZmlnKQogewotCXUzMiBjdHJsID0gU1BJX0lNWDJfM19DVFJMX0VOQUJMRSwgY2ZnID0gMDsKKwl1 MzIgY3RybCA9IE1YNTFfRUNTUElfQ1RSTF9FTkFCTEUsIGNmZyA9IDA7CiAKIAkvKgogCSAqIFRo ZSBoYXJkd2FyZSBzZWVtcyB0byBoYXZlIGEgcmFjZSBjb25kaXRpb24gd2hlbiBjaGFuZ2luZyBt b2Rlcy4gVGhlCkBAIC0yNjAsNDIgKzI2MSw0MiBAQCBzdGF0aWMgaW50IF9fbWF5YmVfdW51c2Vk IHNwaV9pbXgyXzNfY29uZmlnKHN0cnVjdCBzcGlfaW14X2RhdGEgKnNwaV9pbXgsCiAJICogdGhl IHNhbWUgdGltZS4KIAkgKiBTbyBzZXQgbWFzdGVyIG1vZGUgZm9yIGFsbCBjaGFubmVscyBhcyB3 ZSBkbyBub3Qgc3VwcG9ydCBzbGF2ZSBtb2RlLgogCSAqLwotCWN0cmwgfD0gU1BJX0lNWDJfM19D VFJMX01PREVfTUFTSzsKKwljdHJsIHw9IE1YNTFfRUNTUElfQ1RSTF9NT0RFX01BU0s7CiAKIAkv KiBzZXQgY2xvY2sgc3BlZWQgKi8KLQljdHJsIHw9IHNwaV9pbXgyXzNfY2xrZGl2KHNwaV9pbXgt PnNwaV9jbGssIGNvbmZpZy0+c3BlZWRfaHopOworCWN0cmwgfD0gbXg1MV9lY3NwaV9jbGtkaXYo c3BpX2lteC0+c3BpX2NsaywgY29uZmlnLT5zcGVlZF9oeik7CiAKIAkvKiBzZXQgY2hpcCBzZWxl Y3QgdG8gdXNlICovCi0JY3RybCB8PSBTUElfSU1YMl8zX0NUUkxfQ1MoY29uZmlnLT5jcyk7CisJ Y3RybCB8PSBNWDUxX0VDU1BJX0NUUkxfQ1MoY29uZmlnLT5jcyk7CiAKLQljdHJsIHw9IChjb25m aWctPmJwdyAtIDEpIDw8IFNQSV9JTVgyXzNfQ1RSTF9CTF9PRkZTRVQ7CisJY3RybCB8PSAoY29u ZmlnLT5icHcgLSAxKSA8PCBNWDUxX0VDU1BJX0NUUkxfQkxfT0ZGU0VUOwogCi0JY2ZnIHw9IFNQ SV9JTVgyXzNfQ09ORklHX1NCQkNUUkwoY29uZmlnLT5jcyk7CisJY2ZnIHw9IE1YNTFfRUNTUElf Q09ORklHX1NCQkNUUkwoY29uZmlnLT5jcyk7CiAKIAlpZiAoY29uZmlnLT5tb2RlICYgU1BJX0NQ SEEpCi0JCWNmZyB8PSBTUElfSU1YMl8zX0NPTkZJR19TQ0xLUEhBKGNvbmZpZy0+Y3MpOworCQlj ZmcgfD0gTVg1MV9FQ1NQSV9DT05GSUdfU0NMS1BIQShjb25maWctPmNzKTsKIAogCWlmIChjb25m aWctPm1vZGUgJiBTUElfQ1BPTCkKLQkJY2ZnIHw9IFNQSV9JTVgyXzNfQ09ORklHX1NDTEtQT0wo Y29uZmlnLT5jcyk7CisJCWNmZyB8PSBNWDUxX0VDU1BJX0NPTkZJR19TQ0xLUE9MKGNvbmZpZy0+ Y3MpOwogCiAJaWYgKGNvbmZpZy0+bW9kZSAmIFNQSV9DU19ISUdIKQotCQljZmcgfD0gU1BJX0lN WDJfM19DT05GSUdfU1NCUE9MKGNvbmZpZy0+Y3MpOworCQljZmcgfD0gTVg1MV9FQ1NQSV9DT05G SUdfU1NCUE9MKGNvbmZpZy0+Y3MpOwogCi0Jd3JpdGVsKGN0cmwsIHNwaV9pbXgtPmJhc2UgKyBT UElfSU1YMl8zX0NUUkwpOwotCXdyaXRlbChjZmcsIHNwaV9pbXgtPmJhc2UgKyBTUElfSU1YMl8z X0NPTkZJRyk7CisJd3JpdGVsKGN0cmwsIHNwaV9pbXgtPmJhc2UgKyBNWDUxX0VDU1BJX0NUUkwp OworCXdyaXRlbChjZmcsIHNwaV9pbXgtPmJhc2UgKyBNWDUxX0VDU1BJX0NPTkZJRyk7CiAKIAly ZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBfX21heWJlX3VudXNlZCBzcGlfaW14Ml8zX3J4X2F2 YWlsYWJsZShzdHJ1Y3Qgc3BpX2lteF9kYXRhICpzcGlfaW14KQorc3RhdGljIGludCBfX21heWJl X3VudXNlZCBteDUxX2Vjc3BpX3J4X2F2YWlsYWJsZShzdHJ1Y3Qgc3BpX2lteF9kYXRhICpzcGlf aW14KQogewotCXJldHVybiByZWFkbChzcGlfaW14LT5iYXNlICsgU1BJX0lNWDJfM19TVEFUKSAm IFNQSV9JTVgyXzNfU1RBVF9SUjsKKwlyZXR1cm4gcmVhZGwoc3BpX2lteC0+YmFzZSArIE1YNTFf RUNTUElfU1RBVCkgJiBNWDUxX0VDU1BJX1NUQVRfUlI7CiB9CiAKLXN0YXRpYyB2b2lkIF9fbWF5 YmVfdW51c2VkIHNwaV9pbXgyXzNfcmVzZXQoc3RydWN0IHNwaV9pbXhfZGF0YSAqc3BpX2lteCkK K3N0YXRpYyB2b2lkIF9fbWF5YmVfdW51c2VkIG14NTFfZWNzcGlfcmVzZXQoc3RydWN0IHNwaV9p bXhfZGF0YSAqc3BpX2lteCkKIHsKIAkvKiBkcmFpbiByZWNlaXZlIGJ1ZmZlciAqLwotCXdoaWxl IChzcGlfaW14Ml8zX3J4X2F2YWlsYWJsZShzcGlfaW14KSkKKwl3aGlsZSAobXg1MV9lY3NwaV9y eF9hdmFpbGFibGUoc3BpX2lteCkpCiAJCXJlYWRsKHNwaV9pbXgtPmJhc2UgKyBNWENfQ1NQSVJY REFUQSk7CiB9CiAKQEAgLTU4MywxMSArNTg0LDExIEBAIHN0YXRpYyBzdHJ1Y3Qgc3BpX2lteF9k ZXZ0eXBlX2RhdGEgc3BpX2lteF9kZXZ0eXBlX2RhdGFbXSA9IHsKICNlbmRpZgogI2lmZGVmIENP TkZJR19TUElfSU1YX1ZFUl8yXzMKIAlbU1BJX0lNWF9WRVJfMl8zXSA9IHsKLQkJLmludGN0cmwg PSBzcGlfaW14Ml8zX2ludGN0cmwsCi0JCS5jb25maWcgPSBzcGlfaW14Ml8zX2NvbmZpZywKLQkJ LnRyaWdnZXIgPSBzcGlfaW14Ml8zX3RyaWdnZXIsCi0JCS5yeF9hdmFpbGFibGUgPSBzcGlfaW14 Ml8zX3J4X2F2YWlsYWJsZSwKLQkJLnJlc2V0ID0gc3BpX2lteDJfM19yZXNldCwKKwkJLmludGN0 cmwgPSBteDUxX2Vjc3BpX2ludGN0cmwsCisJCS5jb25maWcgPSBteDUxX2Vjc3BpX2NvbmZpZywK KwkJLnRyaWdnZXIgPSBteDUxX2Vjc3BpX3RyaWdnZXIsCisJCS5yeF9hdmFpbGFibGUgPSBteDUx X2Vjc3BpX3J4X2F2YWlsYWJsZSwKKwkJLnJlc2V0ID0gbXg1MV9lY3NwaV9yZXNldCwKIAkJLmZp Zm9zaXplID0gNjQsCiAJfSwKICNlbmRpZgotLSAKMS43LjQuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZGV2aWNldHJlZS1kaXNjdXNzIG1haWxpbmcg bGlzdApkZXZpY2V0cmVlLWRpc2N1c3NAbGlzdHMub3psYWJzLm9yZwpodHRwczovL2xpc3RzLm96 bGFicy5vcmcvbGlzdGluZm8vZGV2aWNldHJlZS1kaXNjdXNzCg==