Commit e6332374 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

MIPS: RBTX4938: Add TOSHIBA_RBTX4938_MPLEX_KEEP 



Add TOSHIBA_RBTX4938_MPLEX_KEEP to keep MPLEX settings by firmware.
Also replace some printk with pr_info.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 74894363

arch/mips/txx9/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ config TOSHIBA_RBTX4938_MPLEX_NAND 
	bool "NAND"

config TOSHIBA_RBTX4938_MPLEX_ATA

	bool "ATA"

config TOSHIBA_RBTX4938_MPLEX_KEEP

	bool "Keep firmware settings"



endchoice

arch/mips/txx9/rbtx4938/setup.c

+10 −3
Original line number Diff line number Diff line
@@ -174,23 +174,30 @@ static void __init rbtx4938_mem_setup(void) 
#endif



#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61

	printk(KERN_INFO "PIOSEL: disabling both ata and nand selection\n");

	pr_info("PIOSEL: disabling both ATA and NAND selection\n");

	txx9_clear64(&tx4938_ccfgptr->pcfg,

		     TX4938_PCFG_NDF_SEL | TX4938_PCFG_ATA_SEL);

#endif



#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND

	printk(KERN_INFO "PIOSEL: enabling nand selection\n");

	pr_info("PIOSEL: enabling NAND selection\n");

	txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_NDF_SEL);

	txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_ATA_SEL);

#endif



#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA

	printk(KERN_INFO "PIOSEL: enabling ata selection\n");

	pr_info("PIOSEL: enabling ATA selection\n");

	txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_ATA_SEL);

	txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_NDF_SEL);

#endif



#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_KEEP

	pcfg = ____raw_readq(&tx4938_ccfgptr->pcfg);

	pr_info("PIOSEL: NAND %s, ATA %s\n",

		(pcfg & TX4938_PCFG_NDF_SEL) ? "enabled" : "disabled",

		(pcfg & TX4938_PCFG_ATA_SEL) ? "enabled" : "disabled");

#endif



	rbtx4938_spi_setup();

	pcfg = ____raw_readq(&tx4938_ccfgptr->pcfg);	/* updated */

	/* fixup piosel */