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

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

Merge tag 'renesas-boards-bockw-for-v3.10' of... 

Merge tag 'renesas-boards-bockw-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2

From Simon Horman <horms+renesas@verge.net.au>:

Renesas ARM-based SoC bockw board updates for v3.10

Add SMSC ethernet support to the bockw board.

This pull request is based on a merge of:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-r8a7778-for-v3.10
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards3-for-v3.10

The reason for merging with renesas-soc-r8a7778-for-v3.10 is
to provide pre-requisite SoC code to configure IRQ pins for the
SMSC ethernet.

* tag 'renesas-boards-bockw-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: bockw: enable network settings on bootargs
  ARM: shmobile: bockw: add SMSC ethernet support

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f12d9f9c 446ee9b2

arch/arm/boot/dts/r8a7778-bockw.dts

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
	compatible = "renesas,bockw", "renesas,r8a7778";



	chosen {

		bootargs = "console=ttySC0,115200 ignore_loglevel";

		bootargs = "console=ttySC0,115200 ignore_loglevel ip=dhcp root=/dev/nfs";

	};



	memory {

arch/arm/mach-shmobile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ config MACH_BOCKW 
	bool "BOCK-W platform"

	depends on ARCH_R8A7778

	select ARCH_REQUIRE_GPIOLIB

	select RENESAS_INTC_IRQPIN

	select USE_OF



config MACH_MARZEN

arch/arm/mach-shmobile/board-bockw.c

+38 −0
Original line number Diff line number Diff line
@@ -19,14 +19,52 @@ 
 */



#include <linux/platform_device.h>

#include <linux/smsc911x.h>

#include <mach/common.h>

#include <mach/irqs.h>

#include <mach/r8a7778.h>

#include <asm/mach/arch.h>



static struct smsc911x_platform_config smsc911x_data = {

	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,

	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,

	.flags		= SMSC911X_USE_32BIT,

	.phy_interface	= PHY_INTERFACE_MODE_MII,

};



static struct resource smsc911x_resources[] = {

	DEFINE_RES_MEM(0x18300000, 0x1000),

	DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */

};



#define IRQ0MR	0x30

static void __init bockw_init(void)

{

	void __iomem *fpga;



	r8a7778_clock_init();

	r8a7778_init_irq_extpin(1);

	r8a7778_add_standard_devices();



	fpga = ioremap_nocache(0x18200000, SZ_1M);

	if (fpga) {

		/*

		 * CAUTION

		 *

		 * IRQ0/1 is cascaded interrupt from FPGA.

		 * it should be cared in the future

		 * Now, it is assuming IRQ0 was used only from SMSC.

		 */

		u16 val = ioread16(fpga + IRQ0MR);

		val &= ~(1 << 4); /* enable SMSC911x */

		iowrite16(val, fpga + IRQ0MR);

		iounmap(fpga);



		platform_device_register_resndata(

			&platform_bus, "smsc911x", -1,

			smsc911x_resources, ARRAY_SIZE(smsc911x_resources),

			&smsc911x_data, sizeof(smsc911x_data));

	}

}



static const char *bockw_boards_compat_dt[] __initdata = {

arch/arm/mach-shmobile/clock-r8a7778.c

+3 −0
Original line number Diff line number Diff line
@@ -58,11 +58,13 @@ static struct clk *main_clks[] = { 
};



enum {

	MSTP114,

	MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,

	MSTP016, MSTP015,

	MSTP_NR };



static struct clk mstp_clks[MSTP_NR] = {

	[MSTP114] = SH_CLK_MSTP32(&clkp, MSTPCR1, 14, 0), /* Ether */

	[MSTP026] = SH_CLK_MSTP32(&clkp, MSTPCR0, 26, 0), /* SCIF0 */

	[MSTP025] = SH_CLK_MSTP32(&clkp, MSTPCR0, 25, 0), /* SCIF1 */

	[MSTP024] = SH_CLK_MSTP32(&clkp, MSTPCR0, 24, 0), /* SCIF2 */
@@ -75,6 +77,7 @@ static struct clk mstp_clks[MSTP_NR] = { 


static struct clk_lookup lookups[] = {

	/* MSTP32 clocks */

	CLKDEV_DEV_ID("sh-eth",	&mstp_clks[MSTP114]), /* Ether */

	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */

	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */

	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */

arch/arm/mach-shmobile/include/mach/r8a7778.h

+4 −0
Original line number Diff line number Diff line
@@ -18,11 +18,15 @@ 
#ifndef __ASM_R8A7778_H__

#define __ASM_R8A7778_H__



#include <linux/sh_eth.h>



extern void r8a7778_add_standard_devices(void);

extern void r8a7778_add_standard_devices_dt(void);

extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);

extern void r8a7778_init_delay(void);

extern void r8a7778_init_irq(void);

extern void r8a7778_init_irq_dt(void);

extern void r8a7778_clock_init(void);

extern void r8a7778_init_irq_extpin(int irlm);



#endif /* __ASM_R8A7778_H__ */