Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4ae26f46c98f58ef19ad34f475617b40740d2faa

Authored by Paul Mundt
1 parent ef7fc9026f
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

serial: sh-sci: build fixes. 

This fixes up the port_rx_irq_mask() REIE flag definition as well as a
debug printk blowing up on the SCSCR_INIT having gone away.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/serial/sh-sci.c
Diff comments   View file @ 4ae26f4
... ... @@ -794,7 +794,7 @@
794 794 * it's unset, it's logically inferred that there's no point in
795 795 * testing for it.
796 796 */
797   - return SCSCR_RIE | (to_sci_port(port)->scscr & SCSR_REIE);
  797 + return SCSCR_RIE | (to_sci_port(port)->scscr & SCSCR_REIE);
798 798 }
799 799  
800 800 static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
... ... @@ -1540,7 +1540,7 @@
1540 1540 sci_out(port, SCSMR, smr_val);
1541 1541  
1542 1542 dev_dbg(port->dev, "%s: SMR %x, t %x, SCSCR %x\n", __func__, smr_val, t,
1543   - SCSCR_INIT(port));
  1543 + s->scscr);
1544 1544  
1545 1545 if (t > 0) {
1546 1546 if (t >= 256) {