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

Commit 843284d0 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: Use sh7720 GPIO on magicpanelr2 board 



This patch hooks up the magicpanelr2 board with the sh7720 pinmux code.

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c9c3c1b7

arch/sh/boards/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ config SH_X3PROTO 
config SH_MAGIC_PANEL_R2

	bool "Magic Panel R2"

	depends on CPU_SUBTYPE_SH7720

	select GENERIC_GPIO

	help

	  Select Magic Panel R2 if configuring for Magic Panel R2.

arch/sh/boards/board-magicpanelr2.c

+10 −1
Original line number Diff line number Diff line
@@ -13,12 +13,14 @@ 
#include <linux/irq.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/map.h>

#include <asm/magicpanelr2.h>

#include <asm/heartbeat.h>

#include <asm/sh7720.h>



#define LAN9115_READY	(ctrl_inl(0xA8000084UL) & 0x00000001UL)
@@ -170,7 +172,14 @@ static void __init setup_port_multiplexing(void) 
	/* R7 A25;	     R6 A24;	     R5 A23;		  R4 A22;

	 * R3 A21;	     R2 A20;	     R1 A19;		  R0 A0;

	 */

	ctrl_outw(0x0000, PORT_PRCR);	/* 00 00 00 00 00 00 00 00 */

	gpio_request(GPIO_FN_A25, NULL);

	gpio_request(GPIO_FN_A24, NULL);

	gpio_request(GPIO_FN_A23, NULL);

	gpio_request(GPIO_FN_A22, NULL);

	gpio_request(GPIO_FN_A21, NULL);

	gpio_request(GPIO_FN_A20, NULL);

	gpio_request(GPIO_FN_A19, NULL);

	gpio_request(GPIO_FN_A0, NULL);



	/* S7 (x);		S6 (x);        S5 (x);	     S4 GPO(EEPROM_CS2);

	 * S3 GPO(EEPROM_CS1);  S2 SIOF0_TXD;  S1 SIOF0_RXD; S0 SIOF0_SCK;