xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sh: Don't set the sh-sci pdata UPF_BOOT_AUTOCONF flags

Browse Source 
The flag is set by the driver internally, don't set it in platform data.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Laurent Pinchart
2017-01-11 16:43:28 +02:00
committed by Greg Kroah-Hartman
parent 1b10b88531
commit 9c21ac508c
28 changed files with 1 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/kernel/cpu/sh3/setup-sh7705.c
View File

@@ -70,7 +70,6 @@ static DECLARE_INTC_DESC(intc_desc, "sh7705", vectors, NULL,
NULL, prio_registers, NULL);
static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_CKE1 | SCSCR_CKE0,
.type = PORT_SCIF,
.ops = &sh770x_sci_port_ops,
@@ -93,7 +92,6 @@ static struct platform_device scif0_device = {
};
static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
.type = PORT_SCIF,
.ops = &sh770x_sci_port_ops,
.regtype = SCIx_SH7705_SCIF_REGTYPE,

3
arch/sh/kernel/cpu/sh3/setup-sh770x.c
View File

@@ -110,7 +110,6 @@ static struct platform_device rtc_device = {
static struct plat_sci_port scif0_platform_data = {
.port_reg = 0xa4000136,
.flags = UPF_BOOT_AUTOCONF,
.type = PORT_SCI,
.ops = &sh770x_sci_port_ops,
.regshift = 1,
@@ -134,7 +133,6 @@ static struct platform_device scif0_device = {
defined(CONFIG_CPU_SUBTYPE_SH7707) || \
defined(CONFIG_CPU_SUBTYPE_SH7709)
static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
.type = PORT_SCIF,
.ops = &sh770x_sci_port_ops,
.regtype = SCIx_SH3_SCIF_REGTYPE,
@@ -159,7 +157,6 @@ static struct platform_device scif1_device = {
defined(CONFIG_CPU_SUBTYPE_SH7709)
static struct plat_sci_port scif2_platform_data = {
.port_reg = SCIx_NOT_SUPPORTED,
.flags = UPF_BOOT_AUTOCONF,
.type = PORT_IRDA,
.ops = &sh770x_sci_port_ops,
.regshift = 1,

2
arch/sh/kernel/cpu/sh3/setup-sh7710.c
View File

@@ -98,7 +98,6 @@ static struct platform_device rtc_device = {
};
static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_REIE | SCSCR_CKE1 | SCSCR_CKE0,
.type = PORT_SCIF,
};
@@ -119,7 +118,6 @@ static struct platform_device scif0_device = {
};
static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
.scscr = SCSCR_REIE | SCSCR_CKE1 | SCSCR_CKE0,
.type = PORT_SCIF,
};

2
arch/sh/kernel/cpu/sh3/setup-sh7720.c
View File

@@ -52,7 +52,6 @@ static struct platform_device rtc_device = {
};
static struct plat_sci_port scif0_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
.type = PORT_SCIF,
.ops = &sh7720_sci_port_ops,
.regtype = SCIx_SH7705_SCIF_REGTYPE,
@@ -74,7 +73,6 @@ static struct platform_device scif0_device = {
};
static struct plat_sci_port scif1_platform_data = {
.flags = UPF_BOOT_AUTOCONF,
.type = PORT_SCIF,
.ops = &sh7720_sci_port_ops,
.regtype = SCIx_SH7705_SCIF_REGTYPE,