From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russ Dill Subject: Re: [PATCH 1/2] OMAP2+: UART: Fix incorrect population of default uart pads Date: Wed, 11 Apr 2012 13:14:36 -0700 Message-ID: References: <1334065246-21294-1-git-send-email-govindraj.raja@ti.com> <1334065246-21294-2-git-send-email-govindraj.raja@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: base64 Return-path: Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]:37025 "EHLO mail-lpp01m010-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756977Ab2DKUOi (ORCPT ); Wed, 11 Apr 2012 16:14:38 -0400 Received: by lahj13 with SMTP id j13so1014868lah.19 for ; Wed, 11 Apr 2012 13:14:36 -0700 (PDT) In-Reply-To: <1334065246-21294-2-git-send-email-govindraj.raja@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "Govindraj.R" Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Felipe Balbi , Kevin Hilman , Tony Lindgren T24gVHVlLCBBcHIgMTAsIDIwMTIgYXQgNjo0MCBBTSwgR292aW5kcmFqLlIgPGdvdmluZHJhai5y YWphQHRpLmNvbT4gd3JvdGU6Cj4gRnJvbTogIkdvdmluZHJhai5SIiA8Z292aW5kcmFqLnJhamFA dGkuY29tPgo+Cj4gVGhlIGZvbGxvd2luZyBjb21taXQ6Cj4gKDc0OTZiYTMgwqBBUk06IE9NQVAy KzogVUFSVDogQWRkIGRlZmF1bHQgbXV4IGZvciBhbGwgdWFydHMpCj4gYWRkZWQgZGVmYXVsdCBw YWRzIGZvciBhbGwgdWFydHMuIEJ1dCBub3QgYWxsIGJvYXJkcyB0ZW5kIHRvCj4gdXNlIGFsbCB1 YXJ0cyBhbmQgbW9zdCBvZiB1bnVzZWQgdWFydCBwaW5zIGFyZSBtdXhlZCBmb3IKPiBvdGhlciBw dXJwb3NlLiBUaGlzIGNvbW1pdCBicmVha3MgdGhlIG1vZHVsZXMgd2hpY2ggd2hlcmUgdHJ5aW5n Cj4gdG8gdXNlIHVudXNlZCB1YXJ0IHBpbnMgb24gdGhlaXIgYm9hcmRzLgo+Cj4gU28gcmVtb3Zl IHRoZSBkZWZhdWx0IHBhZHMgYWRkaW5nLgo+Cj4gQ2M6IEZlbGlwZSBCYWxiaSA8YmFsYmlAdGku Y29tPgo+IENjOiBLZXZpbiBIaWxtYW4gPGtoaWxtYW5AdGkuY29tPgo+IENjOiBSdXNzIERpbGwg PHJ1c3MuZGlsbEBnbWFpbC5jb20+Cj4gUmVwb3J0ZWQtYnk6IFRvbnkgTGluZGdyZW4gPHRvbnlA YXRvbWlkZS5jb20+Cj4gU2lnbmVkLW9mZi1ieTogR292aW5kcmFqLlIgPGdvdmluZHJhai5yYWph QHRpLmNvbT4KClNpZ25lZC1vZmYtYnk6IFJ1c3MuRGlsbEB0aS5jb20KCj4gLS0tCj4gwqBhcmNo L2FybS9tYWNoLW9tYXAyL3NlcmlhbC5jIHwgwqAxMTYgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCj4gwqAxIGZpbGVzIGNoYW5nZWQsIDAgaW5zZXJ0aW9ucygrKSwg MTE2IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtb21hcDIvc2Vy aWFsLmMgYi9hcmNoL2FybS9tYWNoLW9tYXAyL3NlcmlhbC5jCj4gaW5kZXggYzk1MDNhNy4uMTU1 NDIzMyAxMDA2NDQKPiAtLS0gYS9hcmNoL2FybS9tYWNoLW9tYXAyL3NlcmlhbC5jCj4gKysrIGIv YXJjaC9hcm0vbWFjaC1vbWFwMi9zZXJpYWwuYwo+IEBAIC0xMjAsMTI0ICsxMjAsOCBAQCBzdGF0 aWMgdm9pZCBvbWFwX3VhcnRfc2V0X3NtYXJ0aWRsZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw ZGV2KSB7fQo+IMKgI2VuZGlmIC8qIENPTkZJR19QTSAqLwo+Cj4gwqAjaWZkZWYgQ09ORklHX09N QVBfTVVYCj4gLXN0YXRpYyBzdHJ1Y3Qgb21hcF9kZXZpY2VfcGFkIGRlZmF1bHRfdWFydDFfcGFk c1tdIF9faW5pdGRhdGEgPSB7Cj4gLSDCoCDCoCDCoCB7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDC oCAubmFtZSDCoCA9ICJ1YXJ0MV9jdHMudWFydDFfY3RzIiwKPiAtIMKgIMKgIMKgIMKgIMKgIMKg IMKgIC5lbmFibGUgPSBPTUFQX1BJTl9JTlBVVF9QVUxMVVAgfCBPTUFQX01VWF9NT0RFMCwKPiAt IMKgIMKgIMKgIH0sCj4gLSDCoCDCoCDCoCB7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCAubmFt ZSDCoCA9ICJ1YXJ0MV9ydHMudWFydDFfcnRzIiwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC5l bmFibGUgPSBPTUFQX1BJTl9PVVRQVVQgfCBPTUFQX01VWF9NT0RFMCwKPiAtIMKgIMKgIMKgIH0s Cj4gLSDCoCDCoCDCoCB7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCAubmFtZSDCoCA9ICJ1YXJ0 MV90eC51YXJ0MV90eCIsCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCAuZW5hYmxlID0gT01BUF9Q SU5fT1VUUFVUIHwgT01BUF9NVVhfTU9ERTAsCj4gLSDCoCDCoCDCoCB9LAo+IC0gwqAgwqAgwqAg ewo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgLm5hbWUgwqAgPSAidWFydDFfcngudWFydDFfcngi LAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgLmZsYWdzIMKgPSBPTUFQX0RFVklDRV9QQURfUkVN VVggfCBPTUFQX0RFVklDRV9QQURfV0FLRVVQLAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgLmVu YWJsZSA9IE9NQVBfUElOX0lOUFVUX1BVTExVUCB8IE9NQVBfTVVYX01PREUwLAo+IC0gwqAgwqAg wqAgwqAgwqAgwqAgwqAgLmlkbGUgwqAgPSBPTUFQX1BJTl9JTlBVVF9QVUxMVVAgfCBPTUFQX01V WF9NT0RFMCwKPiAtIMKgIMKgIMKgIH0sCj4gLX07Cj4gLQo+IC1zdGF0aWMgc3RydWN0IG9tYXBf ZGV2aWNlX3BhZCBkZWZhdWx0X3VhcnQyX3BhZHNbXSBfX2luaXRkYXRhID0gewo+IC0gwqAgwqAg wqAgewo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgLm5hbWUgwqAgPSAidWFydDJfY3RzLnVhcnQy X2N0cyIsCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCAuZW5hYmxlID0gT01BUF9QSU5fSU5QVVRf UFVMTFVQIHwgT01BUF9NVVhfTU9ERTAsCj4gLSDCoCDCoCDCoCB9LAo+IC0gwqAgwqAgwqAgewo+ IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgLm5hbWUgwqAgPSAidWFydDJfcnRzLnVhcnQyX3J0cyIs Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCAuZW5hYmxlID0gT01BUF9QSU5fT1VUUFVUIHwgT01B UF9NVVhfTU9ERTAsCj4gLSDCoCDCoCDCoCB9LAo+IC0gwqAgwqAgwqAgewo+IC0gwqAgwqAgwqAg wqAgwqAgwqAgwqAgLm5hbWUgwqAgPSAidWFydDJfdHgudWFydDJfdHgiLAo+IC0gwqAgwqAgwqAg wqAgwqAgwqAgwqAgLmVuYWJsZSA9IE9NQVBfUElOX09VVFBVVCB8IE9NQVBfTVVYX01PREUwLAo+ IC0gwqAgwqAgwqAgfSwKPiAtIMKgIMKgIMKgIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC5u YW1lIMKgID0gInVhcnQyX3J4LnVhcnQyX3J4IiwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC5m bGFncyDCoD0gT01BUF9ERVZJQ0VfUEFEX1JFTVVYIHwgT01BUF9ERVZJQ0VfUEFEX1dBS0VVUCwK PiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC5lbmFibGUgPSBPTUFQX1BJTl9JTlBVVF9QVUxMVVAg fCBPTUFQX01VWF9NT0RFMCwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC5pZGxlIMKgID0gT01B UF9QSU5fSU5QVVRfUFVMTFVQIHwgT01BUF9NVVhfTU9ERTAsCj4gLSDCoCDCoCDCoCB9LAo+IC19 Owo+IC0KPiAtc3RhdGljIHN0cnVjdCBvbWFwX2RldmljZV9wYWQgZGVmYXVsdF91YXJ0M19wYWRz W10gX19pbml0ZGF0YSA9IHsKPiAtIMKgIMKgIMKgIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKg IC5uYW1lIMKgID0gInVhcnQzX2N0c19yY3R4LnVhcnQzX2N0c19yY3R4IiwKPiAtIMKgIMKgIMKg IMKgIMKgIMKgIMKgIC5lbmFibGUgPSBPTUFQX1BJTl9JTlBVVF9QVUxMVVAgfCBPTUFQX01VWF9N T0RFMCwKPiAtIMKgIMKgIMKgIH0sCj4gLSDCoCDCoCDCoCB7Cj4gLSDCoCDCoCDCoCDCoCDCoCDC oCDCoCAubmFtZSDCoCA9ICJ1YXJ0M19ydHNfc2QudWFydDNfcnRzX3NkIiwKPiAtIMKgIMKgIMKg IMKgIMKgIMKgIMKgIC5lbmFibGUgPSBPTUFQX1BJTl9PVVRQVVQgfCBPTUFQX01VWF9NT0RFMCwK PiAtIMKgIMKgIMKgIH0sCj4gLSDCoCDCoCDCoCB7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCAu bmFtZSDCoCA9ICJ1YXJ0M190eF9pcnR4LnVhcnQzX3R4X2lydHgiLAo+IC0gwqAgwqAgwqAgwqAg wqAgwqAgwqAgLmVuYWJsZSA9IE9NQVBfUElOX09VVFBVVCB8IE9NQVBfTVVYX01PREUwLAo+IC0g wqAgwqAgwqAgfSwKPiAtIMKgIMKgIMKgIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC5uYW1l IMKgID0gInVhcnQzX3J4X2lycngudWFydDNfcnhfaXJyeCIsCj4gLSDCoCDCoCDCoCDCoCDCoCDC oCDCoCAuZmxhZ3MgwqA9IE9NQVBfREVWSUNFX1BBRF9SRU1VWCB8IE9NQVBfREVWSUNFX1BBRF9X QUtFVVAsCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCAuZW5hYmxlID0gT01BUF9QSU5fSU5QVVQg fCBPTUFQX01VWF9NT0RFMCwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC5pZGxlIMKgID0gT01B UF9QSU5fSU5QVVQgfCBPTUFQX01VWF9NT0RFMCwKPiAtIMKgIMKgIMKgIH0sCj4gLX07Cj4gLQo+ IC1zdGF0aWMgc3RydWN0IG9tYXBfZGV2aWNlX3BhZCBkZWZhdWx0X29tYXAzNnh4X3VhcnQ0X3Bh ZHNbXSBfX2luaXRkYXRhID0gewo+IC0gwqAgwqAgwqAgewo+IC0gwqAgwqAgwqAgwqAgwqAgwqAg wqAgLm5hbWUgwqAgPSAiZ3BtY193YWl0Mi51YXJ0NF90eCIsCj4gLSDCoCDCoCDCoCDCoCDCoCDC oCDCoCAuZW5hYmxlID0gT01BUF9QSU5fT1VUUFVUIHwgT01BUF9NVVhfTU9ERTAsCj4gLSDCoCDC oCDCoCB9LAo+IC0gwqAgwqAgwqAgewo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgLm5hbWUgwqAg PSAiZ3BtY193YWl0My51YXJ0NF9yeCIsCj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCAuZmxhZ3Mg wqA9IE9NQVBfREVWSUNFX1BBRF9SRU1VWCB8IE9NQVBfREVWSUNFX1BBRF9XQUtFVVAsCj4gLSDC oCDCoCDCoCDCoCDCoCDCoCDCoCAuZW5hYmxlID0gT01BUF9QSU5fSU5QVVQgfCBPTUFQX01VWF9N T0RFMiwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC5pZGxlIMKgID0gT01BUF9QSU5fSU5QVVQg fCBPTUFQX01VWF9NT0RFMiwKPiAtIMKgIMKgIMKgIH0sCj4gLX07Cj4gLQo+IC1zdGF0aWMgc3Ry dWN0IG9tYXBfZGV2aWNlX3BhZCBkZWZhdWx0X29tYXA0X3VhcnQ0X3BhZHNbXSBfX2luaXRkYXRh ID0gewo+IC0gwqAgwqAgwqAgewo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgLm5hbWUgwqAgPSAi dWFydDRfdHgudWFydDRfdHgiLAo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgLmVuYWJsZSA9IE9N QVBfUElOX09VVFBVVCB8IE9NQVBfTVVYX01PREUwLAo+IC0gwqAgwqAgwqAgfSwKPiAtIMKgIMKg IMKgIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC5uYW1lIMKgID0gInVhcnQ0X3J4LnVhcnQ0 X3J4IiwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIC5mbGFncyDCoD0gT01BUF9ERVZJQ0VfUEFE X1JFTVVYIHwgT01BUF9ERVZJQ0VfUEFEX1dBS0VVUCwKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKg IC5lbmFibGUgPSBPTUFQX1BJTl9JTlBVVCB8IE9NQVBfTVVYX01PREUwLAo+IC0gwqAgwqAgwqAg wqAgwqAgwqAgwqAgLmlkbGUgwqAgPSBPTUFQX1BJTl9JTlBVVCB8IE9NQVBfTVVYX01PREUwLAo+ IC0gwqAgwqAgwqAgfSwKPiAtfTsKPiAtCj4gwqBzdGF0aWMgdm9pZCBvbWFwX3NlcmlhbF9maWxs X2RlZmF1bHRfcGFkcyhzdHJ1Y3Qgb21hcF9ib2FyZF9kYXRhICpiZGF0YSkKPiDCoHsKPiAtIMKg IMKgIMKgIHN3aXRjaCAoYmRhdGEtPmlkKSB7Cj4gLSDCoCDCoCDCoCBjYXNlIDA6Cj4gLSDCoCDC oCDCoCDCoCDCoCDCoCDCoCBiZGF0YS0+cGFkcyA9IGRlZmF1bHRfdWFydDFfcGFkczsKPiAtIMKg IMKgIMKgIMKgIMKgIMKgIMKgIGJkYXRhLT5wYWRzX2NudCA9IEFSUkFZX1NJWkUoZGVmYXVsdF91 YXJ0MV9wYWRzKTsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGJyZWFrOwo+IC0gwqAgwqAgwqAg Y2FzZSAxOgo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgYmRhdGEtPnBhZHMgPSBkZWZhdWx0X3Vh cnQyX3BhZHM7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCBiZGF0YS0+cGFkc19jbnQgPSBBUlJB WV9TSVpFKGRlZmF1bHRfdWFydDJfcGFkcyk7Cj4gLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCBicmVh azsKPiAtIMKgIMKgIMKgIGNhc2UgMjoKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIGJkYXRhLT5w YWRzID0gZGVmYXVsdF91YXJ0M19wYWRzOwo+IC0gwqAgwqAgwqAgwqAgwqAgwqAgwqAgYmRhdGEt PnBhZHNfY250ID0gQVJSQVlfU0laRShkZWZhdWx0X3VhcnQzX3BhZHMpOwo+IC0gwqAgwqAgwqAg wqAgwqAgwqAgwqAgYnJlYWs7Cj4gLSDCoCDCoCDCoCBjYXNlIDM6Cj4gLSDCoCDCoCDCoCDCoCDC oCDCoCDCoCBpZiAoY3B1X2lzX29tYXA0NHh4KCkpIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIGJkYXRhLT5wYWRzID0gZGVmYXVsdF9vbWFwNF91YXJ0NF9wYWRzOwo+IC0g wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgYmRhdGEtPnBhZHNfY250ID0KPiAtIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIEFSUkFZX1NJWkUoZGVm YXVsdF9vbWFwNF91YXJ0NF9wYWRzKTsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIH0gZWxzZSBp ZiAoY3B1X2lzX29tYXAzNjMwKCkpIHsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg IMKgIGJkYXRhLT5wYWRzID0gZGVmYXVsdF9vbWFwMzZ4eF91YXJ0NF9wYWRzOwo+IC0gwqAgwqAg wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgYmRhdGEtPnBhZHNfY250ID0KPiAtIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIEFSUkFZX1NJWkUoZGVmYXVsdF9v bWFwMzZ4eF91YXJ0NF9wYWRzKTsKPiAtIMKgIMKgIMKgIMKgIMKgIMKgIMKgIH0KPiAtIMKgIMKg IMKgIMKgIMKgIMKgIMKgIGJyZWFrOwo+IC0gwqAgwqAgwqAgZGVmYXVsdDoKPiAtIMKgIMKgIMKg IMKgIMKgIMKgIMKgIGJyZWFrOwo+IC0gwqAgwqAgwqAgfQo+IMKgfQo+IMKgI2Vsc2UKPiDCoHN0 YXRpYyB2b2lkIG9tYXBfc2VyaWFsX2ZpbGxfZGVmYXVsdF9wYWRzKHN0cnVjdCBvbWFwX2JvYXJk X2RhdGEgKmJkYXRhKSB7fQo+IC0tCj4gMS43LjkKPgo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russ.Dill@ti.com (Russ Dill) Date: Wed, 11 Apr 2012 13:14:36 -0700 Subject: [PATCH 1/2] OMAP2+: UART: Fix incorrect population of default uart pads In-Reply-To: <1334065246-21294-2-git-send-email-govindraj.raja@ti.com> References: <1334065246-21294-1-git-send-email-govindraj.raja@ti.com> <1334065246-21294-2-git-send-email-govindraj.raja@ti.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Apr 10, 2012 at 6:40 AM, Govindraj.R wrote: > From: "Govindraj.R" > > The following commit: > (7496ba3 ?ARM: OMAP2+: UART: Add default mux for all uarts) > added default pads for all uarts. But not all boards tend to > use all uarts and most of unused uart pins are muxed for > other purpose. This commit breaks the modules which where trying > to use unused uart pins on their boards. > > So remove the default pads adding. > > Cc: Felipe Balbi > Cc: Kevin Hilman > Cc: Russ Dill > Reported-by: Tony Lindgren > Signed-off-by: Govindraj.R Signed-off-by: Russ.Dill at ti.com > --- > ?arch/arm/mach-omap2/serial.c | ?116 ------------------------------------------ > ?1 files changed, 0 insertions(+), 116 deletions(-) > > diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c > index c9503a7..1554233 100644 > --- a/arch/arm/mach-omap2/serial.c > +++ b/arch/arm/mach-omap2/serial.c > @@ -120,124 +120,8 @@ static void omap_uart_set_smartidle(struct platform_device *pdev) {} > ?#endif /* CONFIG_PM */ > > ?#ifdef CONFIG_OMAP_MUX > -static struct omap_device_pad default_uart1_pads[] __initdata = { > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart1_cts.uart1_cts", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart1_rts.uart1_rts", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart1_tx.uart1_tx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart1_rx.uart1_rx", > - ? ? ? ? ? ? ? .flags ?= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? ? ? ? ? .idle ? = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? }, > -}; > - > -static struct omap_device_pad default_uart2_pads[] __initdata = { > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart2_cts.uart2_cts", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart2_rts.uart2_rts", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart2_tx.uart2_tx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart2_rx.uart2_rx", > - ? ? ? ? ? ? ? .flags ?= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? ? ? ? ? .idle ? = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? }, > -}; > - > -static struct omap_device_pad default_uart3_pads[] __initdata = { > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart3_cts_rctx.uart3_cts_rctx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart3_rts_sd.uart3_rts_sd", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart3_tx_irtx.uart3_tx_irtx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart3_rx_irrx.uart3_rx_irrx", > - ? ? ? ? ? ? ? .flags ?= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - ? ? ? ? ? ? ? .idle ? = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - ? ? ? }, > -}; > - > -static struct omap_device_pad default_omap36xx_uart4_pads[] __initdata = { > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "gpmc_wait2.uart4_tx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "gpmc_wait3.uart4_rx", > - ? ? ? ? ? ? ? .flags ?= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE2, > - ? ? ? ? ? ? ? .idle ? = OMAP_PIN_INPUT | OMAP_MUX_MODE2, > - ? ? ? }, > -}; > - > -static struct omap_device_pad default_omap4_uart4_pads[] __initdata = { > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart4_tx.uart4_tx", > - ? ? ? ? ? ? ? .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0, > - ? ? ? }, > - ? ? ? { > - ? ? ? ? ? ? ? .name ? = "uart4_rx.uart4_rx", > - ? ? ? ? ? ? ? .flags ?= OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP, > - ? ? ? ? ? ? ? .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - ? ? ? ? ? ? ? .idle ? = OMAP_PIN_INPUT | OMAP_MUX_MODE0, > - ? ? ? }, > -}; > - > ?static void omap_serial_fill_default_pads(struct omap_board_data *bdata) > ?{ > - ? ? ? switch (bdata->id) { > - ? ? ? case 0: > - ? ? ? ? ? ? ? bdata->pads = default_uart1_pads; > - ? ? ? ? ? ? ? bdata->pads_cnt = ARRAY_SIZE(default_uart1_pads); > - ? ? ? ? ? ? ? break; > - ? ? ? case 1: > - ? ? ? ? ? ? ? bdata->pads = default_uart2_pads; > - ? ? ? ? ? ? ? bdata->pads_cnt = ARRAY_SIZE(default_uart2_pads); > - ? ? ? ? ? ? ? break; > - ? ? ? case 2: > - ? ? ? ? ? ? ? bdata->pads = default_uart3_pads; > - ? ? ? ? ? ? ? bdata->pads_cnt = ARRAY_SIZE(default_uart3_pads); > - ? ? ? ? ? ? ? break; > - ? ? ? case 3: > - ? ? ? ? ? ? ? if (cpu_is_omap44xx()) { > - ? ? ? ? ? ? ? ? ? ? ? bdata->pads = default_omap4_uart4_pads; > - ? ? ? ? ? ? ? ? ? ? ? bdata->pads_cnt = > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ARRAY_SIZE(default_omap4_uart4_pads); > - ? ? ? ? ? ? ? } else if (cpu_is_omap3630()) { > - ? ? ? ? ? ? ? ? ? ? ? bdata->pads = default_omap36xx_uart4_pads; > - ? ? ? ? ? ? ? ? ? ? ? bdata->pads_cnt = > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ARRAY_SIZE(default_omap36xx_uart4_pads); > - ? ? ? ? ? ? ? } > - ? ? ? ? ? ? ? break; > - ? ? ? default: > - ? ? ? ? ? ? ? break; > - ? ? ? } > ?} > ?#else > ?static void omap_serial_fill_default_pads(struct omap_board_data *bdata) {} > -- > 1.7.9 >