Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c21ac50 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b10b885

arch/sh/kernel/cpu/sh2/setup-sh7619.c

+0 −3
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, 
			 NULL, prio_registers, NULL);



static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -82,7 +81,6 @@ static struct platform_device scif0_device = { 
};



static struct plat_sci_port scif1_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -103,7 +101,6 @@ static struct platform_device scif1_device = { 
};



static struct plat_sci_port scif2_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};

arch/sh/kernel/cpu/sh2a/setup-mxg.c

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static struct platform_device mtu2_device = { 
};



static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};

arch/sh/kernel/cpu/sh2a/setup-sh7201.c

+0 −8
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ static DECLARE_INTC_DESC(intc_desc, "sh7201", vectors, groups, 
			 mask_registers, prio_registers, NULL);



static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -199,7 +198,6 @@ static struct platform_device scif0_device = { 
};



static struct plat_sci_port scif1_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -220,7 +218,6 @@ static struct platform_device scif1_device = { 
};



static struct plat_sci_port scif2_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -241,7 +238,6 @@ static struct platform_device scif2_device = { 
};



static struct plat_sci_port scif3_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -262,7 +258,6 @@ static struct platform_device scif3_device = { 
};



static struct plat_sci_port scif4_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -283,7 +278,6 @@ static struct platform_device scif4_device = { 
};



static struct plat_sci_port scif5_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -304,7 +298,6 @@ static struct platform_device scif5_device = { 
};



static struct plat_sci_port scif6_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -325,7 +318,6 @@ static struct platform_device scif6_device = { 
};



static struct plat_sci_port scif7_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};

arch/sh/kernel/cpu/sh2a/setup-sh7203.c

+0 −4
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups, 
			 mask_registers, prio_registers, NULL);



static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,
@@ -196,7 +195,6 @@ static struct platform_device scif0_device = { 
};



static struct plat_sci_port scif1_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,
@@ -218,7 +216,6 @@ static struct platform_device scif1_device = { 
};



static struct plat_sci_port scif2_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,
@@ -240,7 +237,6 @@ static struct platform_device scif2_device = { 
};



static struct plat_sci_port scif3_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

	.regtype	= SCIx_SH2_SCIF_FIFODATA_REGTYPE,

arch/sh/kernel/cpu/sh2a/setup-sh7206.c

+0 −4
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ static DECLARE_INTC_DESC(intc_desc, "sh7206", vectors, groups, 
			 mask_registers, prio_registers, NULL);



static struct plat_sci_port scif0_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -155,7 +154,6 @@ static struct platform_device scif0_device = { 
};



static struct plat_sci_port scif1_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -176,7 +174,6 @@ static struct platform_device scif1_device = { 
};



static struct plat_sci_port scif2_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};
@@ -197,7 +194,6 @@ static struct platform_device scif2_device = { 
};



static struct plat_sci_port scif3_platform_data = {

	.flags		= UPF_BOOT_AUTOCONF,

	.scscr		= SCSCR_REIE,

	.type		= PORT_SCIF,

};