usb: musb: debugfs: allow forcing host mode together with speed in testmode

Based on the musb ug, force_host bit is allowed to be set along with
force_hs or force_fs bit.

It could help to implement forced host mode via testmode on Nokia N900.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Pali Rohár 2017-02-01 21:30:22 -06:00 коммит произвёл Greg Kroah-Hartman
Родитель bb1d1ce8c7
Коммит 7eebe4ec41
1 изменённых файлов: 29 добавлений и 17 удалений

Просмотреть файл

@ -153,28 +153,34 @@ static int musb_test_mode_show(struct seq_file *s, void *unused)
pm_runtime_mark_last_busy(musb->controller); pm_runtime_mark_last_busy(musb->controller);
pm_runtime_put_autosuspend(musb->controller); pm_runtime_put_autosuspend(musb->controller);
if (test & MUSB_TEST_FORCE_HOST) if (test == (MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_FS))
seq_printf(s, "force host full-speed\n");
else if (test == (MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_HS))
seq_printf(s, "force host high-speed\n");
else if (test == MUSB_TEST_FORCE_HOST)
seq_printf(s, "force host\n"); seq_printf(s, "force host\n");
if (test & MUSB_TEST_FIFO_ACCESS) else if (test == MUSB_TEST_FIFO_ACCESS)
seq_printf(s, "fifo access\n"); seq_printf(s, "fifo access\n");
if (test & MUSB_TEST_FORCE_FS) else if (test == MUSB_TEST_FORCE_FS)
seq_printf(s, "force full-speed\n"); seq_printf(s, "force full-speed\n");
if (test & MUSB_TEST_FORCE_HS) else if (test == MUSB_TEST_FORCE_HS)
seq_printf(s, "force high-speed\n"); seq_printf(s, "force high-speed\n");
if (test & MUSB_TEST_PACKET) else if (test == MUSB_TEST_PACKET)
seq_printf(s, "test packet\n"); seq_printf(s, "test packet\n");
if (test & MUSB_TEST_K) else if (test == MUSB_TEST_K)
seq_printf(s, "test K\n"); seq_printf(s, "test K\n");
if (test & MUSB_TEST_J) else if (test == MUSB_TEST_J)
seq_printf(s, "test J\n"); seq_printf(s, "test J\n");
if (test & MUSB_TEST_SE0_NAK) else if (test == MUSB_TEST_SE0_NAK)
seq_printf(s, "test SE0 NAK\n"); seq_printf(s, "test SE0 NAK\n");
return 0; return 0;
@ -198,7 +204,7 @@ static ssize_t musb_test_mode_write(struct file *file,
struct seq_file *s = file->private_data; struct seq_file *s = file->private_data;
struct musb *musb = s->private; struct musb *musb = s->private;
u8 test; u8 test;
char buf[18]; char buf[24];
pm_runtime_get_sync(musb->controller); pm_runtime_get_sync(musb->controller);
test = musb_readb(musb->mregs, MUSB_TESTMODE); test = musb_readb(musb->mregs, MUSB_TESTMODE);
@ -213,30 +219,36 @@ static ssize_t musb_test_mode_write(struct file *file,
if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
return -EFAULT; return -EFAULT;
if (strstarts(buf, "force host")) if (strstarts(buf, "force host full-speed"))
test = MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_FS;
else if (strstarts(buf, "force host high-speed"))
test = MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_HS;
else if (strstarts(buf, "force host"))
test = MUSB_TEST_FORCE_HOST; test = MUSB_TEST_FORCE_HOST;
if (strstarts(buf, "fifo access")) else if (strstarts(buf, "fifo access"))
test = MUSB_TEST_FIFO_ACCESS; test = MUSB_TEST_FIFO_ACCESS;
if (strstarts(buf, "force full-speed")) else if (strstarts(buf, "force full-speed"))
test = MUSB_TEST_FORCE_FS; test = MUSB_TEST_FORCE_FS;
if (strstarts(buf, "force high-speed")) else if (strstarts(buf, "force high-speed"))
test = MUSB_TEST_FORCE_HS; test = MUSB_TEST_FORCE_HS;
if (strstarts(buf, "test packet")) { else if (strstarts(buf, "test packet")) {
test = MUSB_TEST_PACKET; test = MUSB_TEST_PACKET;
musb_load_testpacket(musb); musb_load_testpacket(musb);
} }
if (strstarts(buf, "test K")) else if (strstarts(buf, "test K"))
test = MUSB_TEST_K; test = MUSB_TEST_K;
if (strstarts(buf, "test J")) else if (strstarts(buf, "test J"))
test = MUSB_TEST_J; test = MUSB_TEST_J;
if (strstarts(buf, "test SE0 NAK")) else if (strstarts(buf, "test SE0 NAK"))
test = MUSB_TEST_SE0_NAK; test = MUSB_TEST_SE0_NAK;
musb_writeb(musb->mregs, MUSB_TESTMODE, test); musb_writeb(musb->mregs, MUSB_TESTMODE, test);