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

Commit 08a41d12 authored by Jonas Gorski's avatar Jonas Gorski Committed by Ralf Baechle
Browse files

MIPS: BCM63XX: enable SPI controller for BCM6362 



The SPI controller shares the same register layout as the 6358 one.

Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5010/


Acked-by: default avatarJohn Crispin <blogic@openwrt.org>
parent 2c8aaf71

arch/mips/bcm63xx/clk.c

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,8 @@ static void spi_set(struct clk *clk, int enable) 
		mask = CKCTL_6348_SPI_EN;

	else if (BCMCPU_IS_6358())

		mask = CKCTL_6358_SPI_EN;

	else if (BCMCPU_IS_6362())

		mask = CKCTL_6362_SPI_EN;

	else

		/* BCMCPU_IS_6368 */

		mask = CKCTL_6368_SPI_EN;

arch/mips/bcm63xx/dev-spi.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static __init void bcm63xx_spi_regs_init(void) 
{

	if (BCMCPU_IS_6338() || BCMCPU_IS_6348())

		bcm63xx_regs_spi = bcm6348_regs_spi;

	if (BCMCPU_IS_6358() || BCMCPU_IS_6368())

	if (BCMCPU_IS_6358() || BCMCPU_IS_6362() || BCMCPU_IS_6368())

		bcm63xx_regs_spi = bcm6358_regs_spi;

}

#else
@@ -98,7 +98,7 @@ int __init bcm63xx_spi_register(void) 
		spi_pdata.msg_ctl_width = SPI_6348_MSG_CTL_WIDTH;

	}



	if (BCMCPU_IS_6358() || BCMCPU_IS_6368()) {

	if (BCMCPU_IS_6358() || BCMCPU_IS_6362() || BCMCPU_IS_6368()) {

		spi_resources[0].end += BCM_6358_RSET_SPI_SIZE - 1;

		spi_pdata.fifo_size = SPI_6358_MSG_DATA_SIZE;

		spi_pdata.msg_type_shift = SPI_6358_MSG_TYPE_SHIFT;

arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ static inline unsigned long bcm63xx_spireg(enum bcm63xx_regs_spi reg) 
#if defined(CONFIG_BCM63XX_CPU_6338) || defined(CONFIG_BCM63XX_CPU_6348)

	__GEN_SPI_RSET(6348)

#endif

#if defined(CONFIG_BCM63XX_CPU_6358) || defined(CONFIG_BCM63XX_CPU_6368)

#if defined(CONFIG_BCM63XX_CPU_6358) || defined(CONFIG_BCM63XX_CPU_6362) || \

	defined(CONFIG_BCM63XX_CPU_6368)

	__GEN_SPI_RSET(6358)

#endif

#endif