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

Commit 82d0266c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 1d28224d ("selftests/ftrace: Correctly enable event in... 


Merge 1d28224d ("selftests/ftrace: Correctly enable event in instance-event.tc") into android11-5.4-lts

Steps on the way to 5.4.258

Change-Id: I30650e7c379c3504cf10665b7f396d2620627b38
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents c5c964fd 1d28224d

arch/arm/boot/dts/omap4-droid4-xt894.dts

+2 −2
Original line number Diff line number Diff line
@@ -656,12 +656,12 @@ 
/* Configure pwm clock source for timers 8 & 9 */

&timer8 {

	assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;

	assigned-clock-parents = <&sys_clkin_ck>;

	assigned-clock-parents = <&sys_32k_ck>;

};



&timer9 {

	assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;

	assigned-clock-parents = <&sys_clkin_ck>;

	assigned-clock-parents = <&sys_32k_ck>;

};



/*

arch/mips/alchemy/devboards/db1000.c

+4 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ static struct platform_device db1x00_audio_dev = { 


/******************************************************************************/



#ifdef CONFIG_MMC_AU1X

static irqreturn_t db1100_mmc_cd(int irq, void *ptr)

{

	mmc_detect_change(ptr, msecs_to_jiffies(500));
@@ -369,6 +370,7 @@ static struct platform_device db1100_mmc1_dev = { 
	.num_resources	= ARRAY_SIZE(au1100_mmc1_res),

	.resource	= au1100_mmc1_res,

};

#endif /* CONFIG_MMC_AU1X */



/******************************************************************************/
@@ -432,8 +434,10 @@ static struct platform_device *db1x00_devs[] = { 


static struct platform_device *db1100_devs[] = {

	&au1100_lcd_device,

#ifdef CONFIG_MMC_AU1X

	&db1100_mmc0_dev,

	&db1100_mmc1_dev,

#endif

};



int __init db1000_dev_setup(void)

arch/mips/alchemy/devboards/db1200.c

+6 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ static struct platform_device db1200_ide_dev = { 


/**********************************************************************/



#ifdef CONFIG_MMC_AU1X

/* SD carddetects:  they're supposed to be edge-triggered, but ack

 * doesn't seem to work (CPLD Rev 2).  Instead, the screaming one

 * is disabled and its counterpart enabled.  The 200ms timeout is
@@ -584,6 +585,7 @@ static struct platform_device pb1200_mmc1_dev = { 
	.num_resources	= ARRAY_SIZE(au1200_mmc1_res),

	.resource	= au1200_mmc1_res,

};

#endif /* CONFIG_MMC_AU1X */



/**********************************************************************/
@@ -751,7 +753,9 @@ static struct platform_device db1200_audiodma_dev = { 
static struct platform_device *db1200_devs[] __initdata = {

	NULL,		/* PSC0, selected by S6.8 */

	&db1200_ide_dev,

#ifdef CONFIG_MMC_AU1X

	&db1200_mmc0_dev,

#endif

	&au1200_lcd_dev,

	&db1200_eth_dev,

	&db1200_nand_dev,
@@ -762,7 +766,9 @@ static struct platform_device *db1200_devs[] __initdata = { 
};



static struct platform_device *pb1200_devs[] __initdata = {

#ifdef CONFIG_MMC_AU1X

	&pb1200_mmc1_dev,

#endif

};



/* Some peripheral base addresses differ on the PB1200 */

arch/mips/alchemy/devboards/db1300.c

+4 −0
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ static struct platform_device db1300_ide_dev = { 


/**********************************************************************/



#ifdef CONFIG_MMC_AU1X

static irqreturn_t db1300_mmc_cd(int irq, void *ptr)

{

	disable_irq_nosync(irq);
@@ -632,6 +633,7 @@ static struct platform_device db1300_sd0_dev = { 
	.resource	= au1300_sd0_res,

	.num_resources	= ARRAY_SIZE(au1300_sd0_res),

};

#endif /* CONFIG_MMC_AU1X */



/**********************************************************************/
@@ -769,8 +771,10 @@ static struct platform_device *db1300_dev[] __initdata = { 
	&db1300_5waysw_dev,

	&db1300_nand_dev,

	&db1300_ide_dev,

#ifdef CONFIG_MMC_AU1X

	&db1300_sd0_dev,

	&db1300_sd1_dev,

#endif

	&db1300_lcd_dev,

	&db1300_ac97_dev,

	&db1300_i2s_dev,

arch/parisc/include/asm/ropes.h

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ struct sba_device { 
	struct ioc		ioc[MAX_IOC];

};



/* list of SBA's in system, see drivers/parisc/sba_iommu.c */

extern struct sba_device *sba_list;



#define ASTRO_RUNWAY_PORT	0x582

#define IKE_MERCED_PORT		0x803

#define REO_MERCED_PORT		0x804