Commit ca1fa06b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-arm-5.7-1' of git://git.infradead.org/linux-mvebu into arm/soc 

mvebu arm for 5.6 (part 1)

Various cleanup:

On Orion5x:
- Drop unneeded select of PCI_DOMAINS_GENERIC
- Remove unneeded variable ret
- Replace setup_irq() by request_irq()

On Dove: Mark dove_io_desc as __maybe_unused

* tag 'mvebu-arm-5.7-1' of git://git.infradead.org/linux-mvebu:
  arm: mach-dove: Mark dove_io_desc as __maybe_unused
  ARM: orion: replace setup_irq() by request_irq()
  ARM: orion5x: ts78xx: Remove unneeded variable ret
  ARM: orion5x: Drop unneeded select of PCI_DOMAINS_GENERIC

Link: https://lore.kernel.org/r/87eetux7um.fsf@FE-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 10996b24 afb80cf1

arch/arm/mach-dove/common.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
/*****************************************************************************

 * I/O Address Mapping

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

static struct map_desc dove_io_desc[] __initdata = {

static struct map_desc __maybe_unused dove_io_desc[] __initdata = {

	{

		.virtual	= (unsigned long) DOVE_SB_REGS_VIRT_BASE,

		.pfn		= __phys_to_pfn(DOVE_SB_REGS_PHYS_BASE),

arch/arm/mach-orion5x/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ menuconfig ARCH_ORION5X 
	bool "Marvell Orion"

	depends on MMU && ARCH_MULTI_V5

	select CPU_FEROCEON

	select GENERIC_CLOCKEVENTS

	select GPIOLIB

	select MVEBU_MBUS

	select FORCE_PCI
@@ -18,7 +17,6 @@ if ARCH_ORION5X 


config ARCH_ORION5X_DT

	bool "Marvell Orion5x Flattened Device Tree"

	select USE_OF

	select ORION_CLK

	select ORION_IRQCHIP

	select ORION_TIMER

arch/arm/mach-orion5x/ts78xx-setup.c

+1 −2
Original line number Diff line number Diff line
@@ -398,7 +398,6 @@ static int ts78xx_fpga_load_devices(void) 


static int ts78xx_fpga_unload_devices(void)

{

	int ret = 0;



	if (ts78xx_fpga.supports.ts_rtc.present == 1)

		ts78xx_ts_rtc_unload();
@@ -407,7 +406,7 @@ static int ts78xx_fpga_unload_devices(void) 
	if (ts78xx_fpga.supports.ts_rng.present == 1)

		ts78xx_ts_rng_unload();



	return ret;

	return 0;

}



static int ts78xx_fpga_load(void)

arch/arm/plat-orion/time.c

+3 −7
Original line number Diff line number Diff line
@@ -177,12 +177,6 @@ static irqreturn_t orion_timer_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static struct irqaction orion_timer_irq = {

	.name		= "orion_tick",

	.flags		= IRQF_TIMER,

	.handler	= orion_timer_interrupt

};



void __init

orion_time_set_base(void __iomem *_timer_base)

{
@@ -236,7 +230,9 @@ orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask, 
	/*

	 * Setup clockevent timer (interrupt-driven).

	 */

	setup_irq(irq, &orion_timer_irq);

	if (request_irq(irq, orion_timer_interrupt, IRQF_TIMER, "orion_tick",

			NULL))

		pr_err("Failed to request irq %u (orion_tick)\n", irq);

	orion_clkevt.cpumask = cpumask_of(0);

	clockevents_config_and_register(&orion_clkevt, tclk, 1, 0xfffffffe);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE