From mboxrd@z Thu Jan  1 00:00:00 1970
From: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: [PATCH v2 4/7] spi/imx: merge type SPI_IMX_VER_0_7 into
	SPI_IMX_VER_0_4
Date: Sun, 10 Jul 2011 01:16:38 +0800
Message-ID: <1310231801-18761-5-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?= <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
	Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
To: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Return-path: <devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org>
In-Reply-To: <1310231801-18761-1-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
List-Unsubscribe: <https://lists.ozlabs.org/options/devicetree-discuss>,
	<mailto:devicetree-discuss-request-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org?subject=unsubscribe>
List-Archive: <http://lists.ozlabs.org/pipermail/devicetree-discuss>
List-Post: <mailto:devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org>
List-Help: <mailto:devicetree-discuss-request-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org?subject=help>
List-Subscribe: <https://lists.ozlabs.org/listinfo/devicetree-discuss>,
	<mailto:devicetree-discuss-request-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org?subject=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

VGhlIG9ubHkgZGlmZmVyZW5jZSBiZXR3ZWVuIFNQSV9JTVhfVkVSXzBfNyBhbmQgU1BJX0lNWF9W
RVJfMF80IGlzCi5jb25maWcgZnVuY3Rpb24uICBUaGUgcGF0Y2ggdXNlcyBjcHVfaXNfbXgzNSAo
dG8gYmUgcmVtb3ZlZCkgYXMgdGhlCnRlbXBvcmFyeSBzb2x1dGlvbiB0byBjb25zb2xpZGF0ZSBm
dW5jdGlvbnMgc3BpX2lteDBfNF9jb25maWcgYW5kCnNwaV9pbXgwXzdfY29uZmlnIGludG8gbXgz
MV9jb25maWcuICBBcyBhIHJlc3VsdCwgdHlwZSBTUElfSU1YX1ZFUl8wXzcKY2FuIGJlIG1lcmdl
ZCBpbnRvIFNQSV9JTVhfVkVSXzBfNC4KCkl0IGFsc28gcmVuYW1lcyBmdW5jdGlvbiBzcGlfaW14
MF80X3Jlc2V0IHRvIG14MzFfcmVzZXQgdG8ga2VlcApjb25zaXN0ZW5jeSB3aXRoIG90aGVyIGZ1
bmN0aW9uIG5hbWluZy4KCkEgY291cGxlIG9mIHJlZHVuZGFudCBtYWNyb3MsIE1YM19DU1BJU1RB
VCBhbmQgTVgzX0NTUElTVEFUX1JSLAp0b2dldGhlciB3aXRoIHRoZSB1c2VsZXNzIHR5cGUgU1BJ
X0lNWF9WRVJfMF81IGFsc28gZ2V0IGNsZWFuZWQgdXAuCgpTaWduZWQtb2ZmLWJ5OiBTaGF3biBH
dW8gPHNoYXduLmd1b0BsaW5hcm8ub3JnPgpDYzogVXdlIEtsZWluZS1Lw7ZuaWcgPHUua2xlaW5l
LWtvZW5pZ0BwZW5ndXRyb25peC5kZT4KQ2M6IFNhc2NoYSBIYXVlciA8cy5oYXVlckBwZW5ndXRy
b25peC5kZT4KQ2M6IEdyYW50IExpa2VseSA8Z3JhbnQubGlrZWx5QHNlY3JldGxhYi5jYT4KLS0t
CiBkcml2ZXJzL3NwaS9LY29uZmlnICAgfCAgICA1ICstLS0KIGRyaXZlcnMvc3BpL3NwaS1pbXgu
YyB8ICAgNzAgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
CiAyIGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDU2IGRlbGV0aW9ucygtKQoKZGlm
ZiAtLWdpdCBhL2RyaXZlcnMvc3BpL0tjb25maWcgYi9kcml2ZXJzL3NwaS9LY29uZmlnCmluZGV4
IDlhYWZhOTguLmMzMjdjZjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3BpL0tjb25maWcKKysrIGIv
ZHJpdmVycy9zcGkvS2NvbmZpZwpAQCAtMTYxLDEwICsxNjEsNyBAQCBjb25maWcgU1BJX0lNWF9W
RVJfMF8wCiAJZGVmX2Jvb2wgeSBpZiBTT0NfSU1YMjEgfHwgU09DX0lNWDI3CiAKIGNvbmZpZyBT
UElfSU1YX1ZFUl8wXzQKLQlkZWZfYm9vbCB5IGlmIFNPQ19JTVgzMQotCi1jb25maWcgU1BJX0lN
WF9WRVJfMF83Ci0JZGVmX2Jvb2wgeSBpZiBBUkNIX01YMjUgfHwgU09DX0lNWDM1IHx8IFNPQ19J
TVg1MSB8fCBTT0NfSU1YNTMKKwlkZWZfYm9vbCB5IGlmIEFSQ0hfTVgyNSB8fCBTT0NfSU1YMzEg
fHwgU09DX0lNWDM1IHx8IFNPQ19JTVg1MSB8fCBTT0NfSU1YNTMKIAogY29uZmlnIFNQSV9JTVhf
VkVSXzJfMwogCWRlZl9ib29sIHkgaWYgU09DX0lNWDUxIHx8IFNPQ19JTVg1MwpkaWZmIC0tZ2l0
IGEvZHJpdmVycy9zcGkvc3BpLWlteC5jIGIvZHJpdmVycy9zcGkvc3BpLWlteC5jCmluZGV4IDA1
Mjk1OWRmLi5iMjgyMzUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL3NwaS9zcGktaW14LmMKKysrIGIv
ZHJpdmVycy9zcGkvc3BpLWlteC5jCkBAIC00NSw5ICs0NSw2IEBACiAjZGVmaW5lIE1YQ19DU1BJ
SU5UCQkweDBjCiAjZGVmaW5lIE1YQ19SRVNFVAkJMHgxYwogCi0jZGVmaW5lIE1YM19DU1BJU1RB
VAkJMHgxNAotI2RlZmluZSBNWDNfQ1NQSVNUQVRfUlIJCSgxIDw8IDMpCi0KIC8qIGdlbmVyaWMg
ZGVmaW5lcyB0byBhYnN0cmFjdCBmcm9tIHRoZSBkaWZmZXJlbnQgcmVnaXN0ZXIgbGF5b3V0cyAq
LwogI2RlZmluZSBNWENfSU5UX1JSCSgxIDw8IDApIC8qIFJlY2VpdmUgZGF0YSByZWFkeSBpbnRl
cnJ1cHQgKi8KICNkZWZpbmUgTVhDX0lOVF9URQkoMSA8PCAxKSAvKiBUcmFuc21pdCBGSUZPIGVt
cHR5IGludGVycnVwdCAqLwpAQCAtNjMsOCArNjAsNiBAQCBlbnVtIHNwaV9pbXhfZGV2dHlwZSB7
CiAJU1BJX0lNWF9WRVJfSU1YMSwKIAlTUElfSU1YX1ZFUl8wXzAsCiAJU1BJX0lNWF9WRVJfMF80
LAotCVNQSV9JTVhfVkVSXzBfNSwKLQlTUElfSU1YX1ZFUl8wXzcsCiAJU1BJX0lNWF9WRVJfMl8z
LAogfTsKIApAQCAtMzQ0LDMyICszMzksNyBAQCBzdGF0aWMgdm9pZCBfX21heWJlX3VudXNlZCBt
eDMxX3RyaWdnZXIoc3RydWN0IHNwaV9pbXhfZGF0YSAqc3BpX2lteCkKIAl3cml0ZWwocmVnLCBz
cGlfaW14LT5iYXNlICsgTVhDX0NTUElDVFJMKTsKIH0KIAotc3RhdGljIGludCBfX21heWJlX3Vu
dXNlZCBzcGlfaW14MF80X2NvbmZpZyhzdHJ1Y3Qgc3BpX2lteF9kYXRhICpzcGlfaW14LAotCQlz
dHJ1Y3Qgc3BpX2lteF9jb25maWcgKmNvbmZpZykKLXsKLQl1bnNpZ25lZCBpbnQgcmVnID0gTVgz
MV9DU1BJQ1RSTF9FTkFCTEUgfCBNWDMxX0NTUElDVFJMX01BU1RFUjsKLQlpbnQgY3MgPSBzcGlf
aW14LT5jaGlwc2VsZWN0W2NvbmZpZy0+Y3NdOwotCi0JcmVnIHw9IHNwaV9pbXhfY2xrZGl2XzIo
c3BpX2lteC0+c3BpX2NsaywgY29uZmlnLT5zcGVlZF9oeikgPDwKLQkJTVgzMV9DU1BJQ1RSTF9E
Ul9TSElGVDsKLQotCXJlZyB8PSAoY29uZmlnLT5icHcgLSAxKSA8PCBNWDMxX0NTUElDVFJMX0JD
X1NISUZUOwotCi0JaWYgKGNvbmZpZy0+bW9kZSAmIFNQSV9DUEhBKQotCQlyZWcgfD0gTVgzMV9D
U1BJQ1RSTF9QSEE7Ci0JaWYgKGNvbmZpZy0+bW9kZSAmIFNQSV9DUE9MKQotCQlyZWcgfD0gTVgz
MV9DU1BJQ1RSTF9QT0w7Ci0JaWYgKGNvbmZpZy0+bW9kZSAmIFNQSV9DU19ISUdIKQotCQlyZWcg
fD0gTVgzMV9DU1BJQ1RSTF9TU1BPTDsKLQlpZiAoY3MgPCAwKQotCQlyZWcgfD0gKGNzICsgMzIp
IDw8IE1YMzFfQ1NQSUNUUkxfQ1NfU0hJRlQ7Ci0KLQl3cml0ZWwocmVnLCBzcGlfaW14LT5iYXNl
ICsgTVhDX0NTUElDVFJMKTsKLQotCXJldHVybiAwOwotfQotCi1zdGF0aWMgaW50IF9fbWF5YmVf
dW51c2VkIHNwaV9pbXgwXzdfY29uZmlnKHN0cnVjdCBzcGlfaW14X2RhdGEgKnNwaV9pbXgsCitz
dGF0aWMgaW50IF9fbWF5YmVfdW51c2VkIG14MzFfY29uZmlnKHN0cnVjdCBzcGlfaW14X2RhdGEg
KnNwaV9pbXgsCiAJCXN0cnVjdCBzcGlfaW14X2NvbmZpZyAqY29uZmlnKQogewogCXVuc2lnbmVk
IGludCByZWcgPSBNWDMxX0NTUElDVFJMX0VOQUJMRSB8IE1YMzFfQ1NQSUNUUkxfTUFTVEVSOwpA
QCAtMzc4LDggKzM0OCwxMiBAQCBzdGF0aWMgaW50IF9fbWF5YmVfdW51c2VkIHNwaV9pbXgwXzdf
Y29uZmlnKHN0cnVjdCBzcGlfaW14X2RhdGEgKnNwaV9pbXgsCiAJcmVnIHw9IHNwaV9pbXhfY2xr
ZGl2XzIoc3BpX2lteC0+c3BpX2NsaywgY29uZmlnLT5zcGVlZF9oeikgPDwKIAkJTVgzMV9DU1BJ
Q1RSTF9EUl9TSElGVDsKIAotCXJlZyB8PSAoY29uZmlnLT5icHcgLSAxKSA8PCBNWDM1X0NTUElD
VFJMX0JMX1NISUZUOwotCXJlZyB8PSBNWDMxX0NTUElDVFJMX1NTQ1RMOworCWlmIChjcHVfaXNf
bXgzNSgpKSB7CisJCXJlZyB8PSAoY29uZmlnLT5icHcgLSAxKSA8PCBNWDM1X0NTUElDVFJMX0JM
X1NISUZUOworCQlyZWcgfD0gTVgzMV9DU1BJQ1RSTF9TU0NUTDsKKwl9IGVsc2UgeworCQlyZWcg
fD0gKGNvbmZpZy0+YnB3IC0gMSkgPDwgTVgzMV9DU1BJQ1RSTF9CQ19TSElGVDsKKwl9CiAKIAlp
ZiAoY29uZmlnLT5tb2RlICYgU1BJX0NQSEEpCiAJCXJlZyB8PSBNWDMxX0NTUElDVFJMX1BIQTsK
QEAgLTM4OCw3ICszNjIsOSBAQCBzdGF0aWMgaW50IF9fbWF5YmVfdW51c2VkIHNwaV9pbXgwXzdf
Y29uZmlnKHN0cnVjdCBzcGlfaW14X2RhdGEgKnNwaV9pbXgsCiAJaWYgKGNvbmZpZy0+bW9kZSAm
IFNQSV9DU19ISUdIKQogCQlyZWcgfD0gTVgzMV9DU1BJQ1RSTF9TU1BPTDsKIAlpZiAoY3MgPCAw
KQotCQlyZWcgfD0gKGNzICsgMzIpIDw8IE1YMzVfQ1NQSUNUUkxfQ1NfU0hJRlQ7CisJCXJlZyB8
PSAoY3MgKyAzMikgPDwKKwkJCShjcHVfaXNfbXgzNSgpID8gTVgzNV9DU1BJQ1RSTF9DU19TSElG
VCA6CisJCQkJCSBNWDMxX0NTUElDVFJMX0NTX1NISUZUKTsKIAogCXdyaXRlbChyZWcsIHNwaV9p
bXgtPmJhc2UgKyBNWENfQ1NQSUNUUkwpOwogCkBAIC00MDAsMTAgKzM3NiwxMCBAQCBzdGF0aWMg
aW50IF9fbWF5YmVfdW51c2VkIG14MzFfcnhfYXZhaWxhYmxlKHN0cnVjdCBzcGlfaW14X2RhdGEg
KnNwaV9pbXgpCiAJcmV0dXJuIHJlYWRsKHNwaV9pbXgtPmJhc2UgKyBNWDMxX0NTUElTVEFUVVMp
ICYgTVgzMV9TVEFUVVNfUlI7CiB9CiAKLXN0YXRpYyB2b2lkIF9fbWF5YmVfdW51c2VkIHNwaV9p
bXgwXzRfcmVzZXQoc3RydWN0IHNwaV9pbXhfZGF0YSAqc3BpX2lteCkKK3N0YXRpYyB2b2lkIF9f
bWF5YmVfdW51c2VkIG14MzFfcmVzZXQoc3RydWN0IHNwaV9pbXhfZGF0YSAqc3BpX2lteCkKIHsK
IAkvKiBkcmFpbiByZWNlaXZlIGJ1ZmZlciAqLwotCXdoaWxlIChyZWFkbChzcGlfaW14LT5iYXNl
ICsgTVgzX0NTUElTVEFUKSAmIE1YM19DU1BJU1RBVF9SUikKKwl3aGlsZSAocmVhZGwoc3BpX2lt
eC0+YmFzZSArIE1YMzFfQ1NQSVNUQVRVUykgJiBNWDMxX1NUQVRVU19SUikKIAkJcmVhZGwoc3Bp
X2lteC0+YmFzZSArIE1YQ19DU1BJUlhEQVRBKTsKIH0KIApAQCAtNTY1LDIwICs1NDEsMTAgQEAg
c3RhdGljIHN0cnVjdCBzcGlfaW14X2RldnR5cGVfZGF0YSBzcGlfaW14X2RldnR5cGVfZGF0YVtd
ID0gewogI2lmZGVmIENPTkZJR19TUElfSU1YX1ZFUl8wXzQKIAlbU1BJX0lNWF9WRVJfMF80XSA9
IHsKIAkJLmludGN0cmwgPSBteDMxX2ludGN0cmwsCi0JCS5jb25maWcgPSBzcGlfaW14MF80X2Nv
bmZpZywKKwkJLmNvbmZpZyA9IG14MzFfY29uZmlnLAogCQkudHJpZ2dlciA9IG14MzFfdHJpZ2dl
ciwKIAkJLnJ4X2F2YWlsYWJsZSA9IG14MzFfcnhfYXZhaWxhYmxlLAotCQkucmVzZXQgPSBzcGlf
aW14MF80X3Jlc2V0LAotCQkuZmlmb3NpemUgPSA4LAotCX0sCi0jZW5kaWYKLSNpZmRlZiBDT05G
SUdfU1BJX0lNWF9WRVJfMF83Ci0JW1NQSV9JTVhfVkVSXzBfN10gPSB7Ci0JCS5pbnRjdHJsID0g
bXgzMV9pbnRjdHJsLAotCQkuY29uZmlnID0gc3BpX2lteDBfN19jb25maWcsCi0JCS50cmlnZ2Vy
ID0gbXgzMV90cmlnZ2VyLAotCQkucnhfYXZhaWxhYmxlID0gbXgzMV9yeF9hdmFpbGFibGUsCi0J
CS5yZXNldCA9IHNwaV9pbXgwXzRfcmVzZXQsCisJCS5yZXNldCA9IG14MzFfcmVzZXQsCiAJCS5m
aWZvc2l6ZSA9IDgsCiAJfSwKICNlbmRpZgpAQCAtNzM0LDcgKzcwMCw3IEBAIHN0YXRpYyBzdHJ1
Y3QgcGxhdGZvcm1fZGV2aWNlX2lkIHNwaV9pbXhfZGV2dHlwZVtdID0gewogCQkuZHJpdmVyX2Rh
dGEgPSBTUElfSU1YX1ZFUl8wXzAsCiAJfSwgewogCQkubmFtZSA9ICJpbXgyNS1jc3BpIiwKLQkJ
LmRyaXZlcl9kYXRhID0gU1BJX0lNWF9WRVJfMF83LAorCQkuZHJpdmVyX2RhdGEgPSBTUElfSU1Y
X1ZFUl8wXzQsCiAJfSwgewogCQkubmFtZSA9ICJpbXgyNy1jc3BpIiwKIAkJLmRyaXZlcl9kYXRh
ID0gU1BJX0lNWF9WRVJfMF8wLApAQCAtNzQzLDE2ICs3MDksMTYgQEAgc3RhdGljIHN0cnVjdCBw
bGF0Zm9ybV9kZXZpY2VfaWQgc3BpX2lteF9kZXZ0eXBlW10gPSB7CiAJCS5kcml2ZXJfZGF0YSA9
IFNQSV9JTVhfVkVSXzBfNCwKIAl9LCB7CiAJCS5uYW1lID0gImlteDM1LWNzcGkiLAotCQkuZHJp
dmVyX2RhdGEgPSBTUElfSU1YX1ZFUl8wXzcsCisJCS5kcml2ZXJfZGF0YSA9IFNQSV9JTVhfVkVS
XzBfNCwKIAl9LCB7CiAJCS5uYW1lID0gImlteDUxLWNzcGkiLAotCQkuZHJpdmVyX2RhdGEgPSBT
UElfSU1YX1ZFUl8wXzcsCisJCS5kcml2ZXJfZGF0YSA9IFNQSV9JTVhfVkVSXzBfNCwKIAl9LCB7
CiAJCS5uYW1lID0gImlteDUxLWVjc3BpIiwKIAkJLmRyaXZlcl9kYXRhID0gU1BJX0lNWF9WRVJf
Ml8zLAogCX0sIHsKIAkJLm5hbWUgPSAiaW14NTMtY3NwaSIsCi0JCS5kcml2ZXJfZGF0YSA9IFNQ
SV9JTVhfVkVSXzBfNywKKwkJLmRyaXZlcl9kYXRhID0gU1BJX0lNWF9WRVJfMF80LAogCX0sIHsK
IAkJLm5hbWUgPSAiaW14NTMtZWNzcGkiLAogCQkuZHJpdmVyX2RhdGEgPSBTUElfSU1YX1ZFUl8y
XzMsCi0tIAoxLjcuNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fXwpkZXZpY2V0cmVlLWRpc2N1c3MgbWFpbGluZyBsaXN0CmRldmljZXRyZWUtZGlzY3Vz
c0BsaXN0cy5vemxhYnMub3JnCmh0dHBzOi8vbGlzdHMub3psYWJzLm9yZy9saXN0aW5mby9kZXZp
Y2V0cmVlLWRpc2N1c3MK