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

Commit 47f3f4eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_fixes_4.21_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Paul Burton:
 "A few early MIPS fixes for 4.21:

   - The Broadcom BCM63xx platform sees a fix for resetting the BCM6368
     ethernet switch, and the removal of a platform device we've never
     had a driver for.

   - The Alchemy platform sees a few fixes for bitrot that occurred
     within the past few cycles.

   - We now enable vectored interrupt support for the MediaTek MT7620
     SoC, which makes sense since they're supported by the SoC but in
     this case also works around a bug relating to the location of
     exception vectors when using a recent version of U-Boot.

   - The atomic64_fetch_*_relaxed() family of functions see a fix for a
     regression in MIPS64 kernels since v4.19.

   - Cavium Octeon III CN7xxx systems will now disable their RGMII
     interfaces rather than attempt to enable them & warn about the lack
     of support for doing so, as they did since initial CN7xxx ethernet
     support was added in v4.7.

   - The Microsemi/Microchip MSCC SoCs gain a MAINTAINERS entry.

   - .mailmap now provides consistency for Dengcheng Zhu's name &
     current email address"

* tag 'mips_fixes_4.21_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: OCTEON: mark RGMII interface disabled on OCTEON III
  MIPS: Fix a R10000_LLSC_WAR logic in atomic.h
  MIPS: BCM63XX: drop unused and broken DSP platform device
  mailmap: Update name spelling and email for Dengcheng Zhu
  MIPS: ralink: Select CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8
  MAINTAINERS: Add a maintainer for MSCC MIPS SoCs
  MIPS: Alchemy: update dma masks for devboard devices
  MIPS: Alchemy: update cpu-feature-overrides
  MIPS: Alchemy: drop DB1000 IrDA support bits
  MIPS: alchemy: cpu_all_mask is forbidden for clock event devices
  MIPS: BCM63XX: fix switch core reset on BCM6368
parents f1c2f885 edefae94

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -48,7 +48,10 @@ Corey Minyard <minyard@acm.org> 
Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>

David Woodhouse <dwmw2@shinybook.infradead.org>

Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -10016,8 +10016,9 @@ F: drivers/dma/at_xdmac.c 


MICROSEMI MIPS SOCS

M:	Alexandre Belloni <alexandre.belloni@bootlin.com>

M:	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>

L:	linux-mips@vger.kernel.org

S:	Maintained

S:	Supported

F:	arch/mips/generic/board-ocelot.c

F:	arch/mips/configs/generic/board-ocelot.config

F:	arch/mips/boot/dts/mscc/

arch/mips/alchemy/common/time.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static struct clock_event_device au1x_rtcmatch2_clockdev = { 
	.features	= CLOCK_EVT_FEAT_ONESHOT,

	.rating		= 1500,

	.set_next_event = au1x_rtcmatch2_set_next_event,

	.cpumask	= cpu_all_mask,

	.cpumask	= cpu_possible_mask,

};



static struct irqaction au1x_rtcmatch2_irqaction = {

arch/mips/alchemy/devboards/db1000.c

+11 −65
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ static int db1500_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin) 
	return -1;

}



static u64 au1xxx_all_dmamask = DMA_BIT_MASK(32);



static struct resource alchemy_pci_host_res[] = {

	[0] = {

		.start	= AU1500_PCI_PHYS_ADDR,
@@ -120,13 +122,11 @@ static struct resource au1100_lcd_resources[] = { 
	}

};



static u64 au1100_lcd_dmamask = DMA_BIT_MASK(32);



static struct platform_device au1100_lcd_device = {

	.name		= "au1100-lcd",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1100_lcd_dmamask,

		.dma_mask		= &au1xxx_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

	.num_resources	= ARRAY_SIZE(au1100_lcd_resources),
@@ -170,6 +170,10 @@ static struct platform_device db1x00_codec_dev = { 


static struct platform_device db1x00_audio_dev = {

	.name		= "db1000-audio",

	.dev = {

		.dma_mask		= &au1xxx_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



/******************************************************************************/
@@ -338,13 +342,11 @@ static struct resource au1100_mmc0_resources[] = { 
	}

};



static u64 au1xxx_mmc_dmamask =	 DMA_BIT_MASK(32);



static struct platform_device db1100_mmc0_dev = {

	.name		= "au1xxx-mmc",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1xxx_mmc_dmamask,

		.dma_mask		= &au1xxx_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1100_mmc_platdata[0],

	},
@@ -379,7 +381,7 @@ static struct platform_device db1100_mmc1_dev = { 
	.name		= "au1xxx-mmc",

	.id		= 1,

	.dev = {

		.dma_mask		= &au1xxx_mmc_dmamask,

		.dma_mask		= &au1xxx_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1100_mmc_platdata[1],

	},
@@ -389,58 +391,6 @@ static struct platform_device db1100_mmc1_dev = { 


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



static void db1000_irda_set_phy_mode(int mode)

{

	unsigned short mask = BCSR_RESETS_IRDA_MODE_MASK | BCSR_RESETS_FIR_SEL;



	switch (mode) {

	case AU1000_IRDA_PHY_MODE_OFF:

		bcsr_mod(BCSR_RESETS, mask, BCSR_RESETS_IRDA_MODE_OFF);

		break;

	case AU1000_IRDA_PHY_MODE_SIR:

		bcsr_mod(BCSR_RESETS, mask, BCSR_RESETS_IRDA_MODE_FULL);

		break;

	case AU1000_IRDA_PHY_MODE_FIR:

		bcsr_mod(BCSR_RESETS, mask, BCSR_RESETS_IRDA_MODE_FULL |

					    BCSR_RESETS_FIR_SEL);

		break;

	}

}



static struct au1k_irda_platform_data db1000_irda_platdata = {

	.set_phy_mode	= db1000_irda_set_phy_mode,

};



static struct resource au1000_irda_res[] = {

	[0] = {

		.start	= AU1000_IRDA_PHYS_ADDR,

		.end	= AU1000_IRDA_PHYS_ADDR + 0x0fff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= AU1000_IRDA_TX_INT,

		.end	= AU1000_IRDA_TX_INT,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= AU1000_IRDA_RX_INT,

		.end	= AU1000_IRDA_RX_INT,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device db1000_irda_dev = {

	.name	= "au1000-irda",

	.id	= -1,

	.dev	= {

		.platform_data = &db1000_irda_platdata,

	},

	.resource	= au1000_irda_res,

	.num_resources	= ARRAY_SIZE(au1000_irda_res),

};



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



static struct ads7846_platform_data db1100_touch_pd = {

	.model		= 7846,

	.vref_mv	= 3300,
@@ -468,6 +418,8 @@ static struct platform_device db1100_spi_dev = { 
	.id		= 0,

	.dev		= {

		.platform_data	= &db1100_spictl_pd,

		.dma_mask		= &au1xxx_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};
@@ -497,15 +449,10 @@ static struct platform_device *db1x00_devs[] = { 
	&db1x00_audio_dev,

};



static struct platform_device *db1000_devs[] = {

	&db1000_irda_dev,

};



static struct platform_device *db1100_devs[] = {

	&au1100_lcd_device,

	&db1100_mmc0_dev,

	&db1100_mmc1_dev,

	&db1000_irda_dev,

};



int __init db1000_dev_setup(void)
@@ -565,7 +512,6 @@ int __init db1000_dev_setup(void) 
		d1 = 3; /* GPIO number, NOT irq! */

		s0 = AU1000_GPIO1_INT;

		s1 = AU1000_GPIO4_INT;

		platform_add_devices(db1000_devs, ARRAY_SIZE(db1000_devs));

	} else if ((board == BCSR_WHOAMI_PB1500) ||

		   (board == BCSR_WHOAMI_PB1500R2)) {

		c0 = AU1500_GPIO203_INT;

arch/mips/alchemy/devboards/db1200.c

+11 −13
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ int __init db1200_board_setup(void) 


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



static u64 au1200_all_dmamask = DMA_BIT_MASK(32);



static struct mtd_partition db1200_spiflash_parts[] = {

	{

		.name	= "spi_flash",
@@ -324,13 +326,11 @@ static struct resource db1200_ide_res[] = { 
	},

};



static u64 au1200_ide_dmamask = DMA_BIT_MASK(32);



static struct platform_device db1200_ide_dev = {

	.name		= "pata_platform",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1200_ide_dmamask,

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1200_ide_info,

	},
@@ -566,13 +566,11 @@ static struct resource au1200_mmc0_resources[] = { 
	}

};



static u64 au1xxx_mmc_dmamask =	 DMA_BIT_MASK(32);



static struct platform_device db1200_mmc0_dev = {

	.name		= "au1xxx-mmc",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1xxx_mmc_dmamask,

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1200_mmc_platdata[0],

	},
@@ -607,7 +605,7 @@ static struct platform_device pb1200_mmc1_dev = { 
	.name		= "au1xxx-mmc",

	.id		= 1,

	.dev = {

		.dma_mask		= &au1xxx_mmc_dmamask,

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1200_mmc_platdata[1],

	},
@@ -657,13 +655,11 @@ static struct resource au1200_lcd_res[] = { 
	}

};



static u64 au1200_lcd_dmamask = DMA_BIT_MASK(32);



static struct platform_device au1200_lcd_dev = {

	.name		= "au1200-lcd",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1200_lcd_dmamask,

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1200fb_pd,

	},
@@ -717,11 +713,9 @@ static struct au1550_spi_info db1200_spi_platdata = { 
	.activate_cs	= db1200_spi_cs_en,

};



static u64 spi_dmamask = DMA_BIT_MASK(32);



static struct platform_device db1200_spi_dev = {

	.dev	= {

		.dma_mask		= &spi_dmamask,

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1200_spi_platdata,

	},
@@ -766,6 +760,10 @@ static struct platform_device db1200_audio_dev = { 
static struct platform_device db1200_sound_dev = {

	/* name assigned later based on switch setting */

	.id		= 1,	/* PSC ID */

	.dev = {

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



static struct platform_device db1200_stac_dev = {