mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
2cec11d871
- Convert from printk() to pr_*(),
- Add missing continuations, to fix user-visible breakage,
- Drop superfluous casts (u64 has been unsigned long long on all
architectures for many years).
On rbtx4927, this restores the kernel output like:
-TX4927 SDRAMC --
- CR0:0000007e00000544
- TR:32800030e
+TX4927 SDRAMC -- CR0:0000007e00000544 TR:32800030e
and:
-PCIC -- PCICLK:
-Internal(33.3MHz)
-
+PCIC -- PCICLK:Internal(33.3MHz)
Fixes: 4bcc595ccd
("printk: reinstate KERN_CONT for printing continuation lines")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14646/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
372 lines
10 KiB
C
372 lines
10 KiB
C
/*
|
|
* Setup pointers to hardware-dependent routines.
|
|
* Copyright (C) 2000-2001 Toshiba Corporation
|
|
*
|
|
* 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
|
|
* terms of the GNU General Public License version 2. This program is
|
|
* licensed "as is" without any warranty of any kind, whether express
|
|
* or implied.
|
|
*
|
|
* Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <linux/types.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/gpio/driver.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/mtd/physmap.h>
|
|
|
|
#include <asm/reboot.h>
|
|
#include <asm/io.h>
|
|
#include <asm/txx9/generic.h>
|
|
#include <asm/txx9/pci.h>
|
|
#include <asm/txx9/rbtx4938.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <asm/txx9/spi.h>
|
|
#include <asm/txx9pio.h>
|
|
|
|
static void rbtx4938_machine_restart(char *command)
|
|
{
|
|
local_irq_disable();
|
|
writeb(1, rbtx4938_softresetlock_addr);
|
|
writeb(1, rbtx4938_sfvol_addr);
|
|
writeb(1, rbtx4938_softreset_addr);
|
|
/* fallback */
|
|
(*_machine_halt)();
|
|
}
|
|
|
|
static void __init rbtx4938_pci_setup(void)
|
|
{
|
|
#ifdef CONFIG_PCI
|
|
int extarb = !(__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCIARB);
|
|
struct pci_controller *c = &txx9_primary_pcic;
|
|
|
|
register_pci_controller(c);
|
|
|
|
if (__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCI66)
|
|
txx9_pci_option =
|
|
(txx9_pci_option & ~TXX9_PCI_OPT_CLK_MASK) |
|
|
TXX9_PCI_OPT_CLK_66; /* already configured */
|
|
|
|
/* Reset PCI Bus */
|
|
writeb(0, rbtx4938_pcireset_addr);
|
|
/* Reset PCIC */
|
|
txx9_set64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
|
|
if ((txx9_pci_option & TXX9_PCI_OPT_CLK_MASK) ==
|
|
TXX9_PCI_OPT_CLK_66)
|
|
tx4938_pciclk66_setup();
|
|
mdelay(10);
|
|
/* clear PCIC reset */
|
|
txx9_clear64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
|
|
writeb(1, rbtx4938_pcireset_addr);
|
|
iob();
|
|
|
|
tx4938_report_pciclk();
|
|
tx4927_pcic_setup(tx4938_pcicptr, c, extarb);
|
|
if ((txx9_pci_option & TXX9_PCI_OPT_CLK_MASK) ==
|
|
TXX9_PCI_OPT_CLK_AUTO &&
|
|
txx9_pci66_check(c, 0, 0)) {
|
|
/* Reset PCI Bus */
|
|
writeb(0, rbtx4938_pcireset_addr);
|
|
/* Reset PCIC */
|
|
txx9_set64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
|
|
tx4938_pciclk66_setup();
|
|
mdelay(10);
|
|
/* clear PCIC reset */
|
|
txx9_clear64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIRST);
|
|
writeb(1, rbtx4938_pcireset_addr);
|
|
iob();
|
|
/* Reinitialize PCIC */
|
|
tx4938_report_pciclk();
|
|
tx4927_pcic_setup(tx4938_pcicptr, c, extarb);
|
|
}
|
|
|
|
if (__raw_readq(&tx4938_ccfgptr->pcfg) &
|
|
(TX4938_PCFG_ETH0_SEL|TX4938_PCFG_ETH1_SEL)) {
|
|
/* Reset PCIC1 */
|
|
txx9_set64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIC1RST);
|
|
/* PCI1DMD==0 => PCI1CLK==GBUSCLK/2 => PCI66 */
|
|
if (!(__raw_readq(&tx4938_ccfgptr->ccfg)
|
|
& TX4938_CCFG_PCI1DMD))
|
|
tx4938_ccfg_set(TX4938_CCFG_PCI1_66);
|
|
mdelay(10);
|
|
/* clear PCIC1 reset */
|
|
txx9_clear64(&tx4938_ccfgptr->clkctr, TX4938_CLKCTR_PCIC1RST);
|
|
tx4938_report_pci1clk();
|
|
|
|
/* mem:64K(max), io:64K(max) (enough for ETH0,ETH1) */
|
|
c = txx9_alloc_pci_controller(NULL, 0, 0x10000, 0, 0x10000);
|
|
register_pci_controller(c);
|
|
tx4927_pcic_setup(tx4938_pcic1ptr, c, 0);
|
|
}
|
|
tx4938_setup_pcierr_irq();
|
|
#endif /* CONFIG_PCI */
|
|
}
|
|
|
|
/* SPI support */
|
|
|
|
/* chip select for SPI devices */
|
|
#define SEEPROM1_CS 7 /* PIO7 */
|
|
#define SEEPROM2_CS 0 /* IOC */
|
|
#define SEEPROM3_CS 1 /* IOC */
|
|
#define SRTC_CS 2 /* IOC */
|
|
#define SPI_BUSNO 0
|
|
|
|
static int __init rbtx4938_ethaddr_init(void)
|
|
{
|
|
#ifdef CONFIG_PCI
|
|
unsigned char dat[17];
|
|
unsigned char sum;
|
|
int i;
|
|
|
|
/* 0-3: "MAC\0", 4-9:eth0, 10-15:eth1, 16:sum */
|
|
if (spi_eeprom_read(SPI_BUSNO, SEEPROM1_CS, 0, dat, sizeof(dat))) {
|
|
pr_err("seeprom: read error.\n");
|
|
return -ENODEV;
|
|
} else {
|
|
if (strcmp(dat, "MAC") != 0)
|
|
pr_warn("seeprom: bad signature.\n");
|
|
for (i = 0, sum = 0; i < sizeof(dat); i++)
|
|
sum += dat[i];
|
|
if (sum)
|
|
pr_warn("seeprom: bad checksum.\n");
|
|
}
|
|
tx4938_ethaddr_init(&dat[4], &dat[4 + 6]);
|
|
#endif /* CONFIG_PCI */
|
|
return 0;
|
|
}
|
|
|
|
static void __init rbtx4938_spi_setup(void)
|
|
{
|
|
/* set SPI_SEL */
|
|
txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_SPI_SEL);
|
|
}
|
|
|
|
static struct resource rbtx4938_fpga_resource;
|
|
|
|
static void __init rbtx4938_time_init(void)
|
|
{
|
|
tx4938_time_init(0);
|
|
}
|
|
|
|
static void __init rbtx4938_mem_setup(void)
|
|
{
|
|
unsigned long long pcfg;
|
|
|
|
if (txx9_master_clock == 0)
|
|
txx9_master_clock = 25000000; /* 25MHz */
|
|
|
|
tx4938_setup();
|
|
|
|
#ifdef CONFIG_PCI
|
|
txx9_alloc_pci_controller(&txx9_primary_pcic, 0, 0, 0, 0);
|
|
txx9_board_pcibios_setup = tx4927_pcibios_setup;
|
|
#else
|
|
set_io_port_base(RBTX4938_ETHER_BASE);
|
|
#endif
|
|
|
|
tx4938_sio_init(7372800, 0);
|
|
|
|
#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61
|
|
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
|
|
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
|
|
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 */
|
|
if ((pcfg & (TX4938_PCFG_ATA_SEL | TX4938_PCFG_NDF_SEL)) ==
|
|
TX4938_PCFG_ATA_SEL)
|
|
writeb((readb(rbtx4938_piosel_addr) & 0x03) | 0x04,
|
|
rbtx4938_piosel_addr);
|
|
else if ((pcfg & (TX4938_PCFG_ATA_SEL | TX4938_PCFG_NDF_SEL)) ==
|
|
TX4938_PCFG_NDF_SEL)
|
|
writeb((readb(rbtx4938_piosel_addr) & 0x03) | 0x08,
|
|
rbtx4938_piosel_addr);
|
|
else
|
|
writeb(readb(rbtx4938_piosel_addr) & ~(0x08 | 0x04),
|
|
rbtx4938_piosel_addr);
|
|
|
|
rbtx4938_fpga_resource.name = "FPGA Registers";
|
|
rbtx4938_fpga_resource.start = CPHYSADDR(RBTX4938_FPGA_REG_ADDR);
|
|
rbtx4938_fpga_resource.end = CPHYSADDR(RBTX4938_FPGA_REG_ADDR) + 0xffff;
|
|
rbtx4938_fpga_resource.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
|
|
if (request_resource(&txx9_ce_res[2], &rbtx4938_fpga_resource))
|
|
pr_err("request resource for fpga failed\n");
|
|
|
|
_machine_restart = rbtx4938_machine_restart;
|
|
|
|
writeb(0xff, rbtx4938_led_addr);
|
|
pr_info("RBTX4938 --- FPGA(Rev %02x) DIPSW:%02x,%02x\n",
|
|
readb(rbtx4938_fpga_rev_addr),
|
|
readb(rbtx4938_dipsw_addr), readb(rbtx4938_bdipsw_addr));
|
|
}
|
|
|
|
static void __init rbtx4938_ne_init(void)
|
|
{
|
|
struct resource res[] = {
|
|
{
|
|
.start = RBTX4938_RTL_8019_BASE,
|
|
.end = RBTX4938_RTL_8019_BASE + 0x20 - 1,
|
|
.flags = IORESOURCE_IO,
|
|
}, {
|
|
.start = RBTX4938_RTL_8019_IRQ,
|
|
.flags = IORESOURCE_IRQ,
|
|
}
|
|
};
|
|
platform_device_register_simple("ne", -1, res, ARRAY_SIZE(res));
|
|
}
|
|
|
|
static DEFINE_SPINLOCK(rbtx4938_spi_gpio_lock);
|
|
|
|
static void rbtx4938_spi_gpio_set(struct gpio_chip *chip, unsigned int offset,
|
|
int value)
|
|
{
|
|
u8 val;
|
|
unsigned long flags;
|
|
spin_lock_irqsave(&rbtx4938_spi_gpio_lock, flags);
|
|
val = readb(rbtx4938_spics_addr);
|
|
if (value)
|
|
val |= 1 << offset;
|
|
else
|
|
val &= ~(1 << offset);
|
|
writeb(val, rbtx4938_spics_addr);
|
|
mmiowb();
|
|
spin_unlock_irqrestore(&rbtx4938_spi_gpio_lock, flags);
|
|
}
|
|
|
|
static int rbtx4938_spi_gpio_dir_out(struct gpio_chip *chip,
|
|
unsigned int offset, int value)
|
|
{
|
|
rbtx4938_spi_gpio_set(chip, offset, value);
|
|
return 0;
|
|
}
|
|
|
|
static struct gpio_chip rbtx4938_spi_gpio_chip = {
|
|
.set = rbtx4938_spi_gpio_set,
|
|
.direction_output = rbtx4938_spi_gpio_dir_out,
|
|
.label = "RBTX4938-SPICS",
|
|
.base = 16,
|
|
.ngpio = 3,
|
|
};
|
|
|
|
static int __init rbtx4938_spi_init(void)
|
|
{
|
|
struct spi_board_info srtc_info = {
|
|
.modalias = "rtc-rs5c348",
|
|
.max_speed_hz = 1000000, /* 1.0Mbps @ Vdd 2.0V */
|
|
.bus_num = 0,
|
|
.chip_select = 16 + SRTC_CS,
|
|
/* Mode 1 (High-Active, Shift-Then-Sample), High Avtive CS */
|
|
.mode = SPI_MODE_1 | SPI_CS_HIGH,
|
|
};
|
|
spi_register_board_info(&srtc_info, 1);
|
|
spi_eeprom_register(SPI_BUSNO, SEEPROM1_CS, 128);
|
|
spi_eeprom_register(SPI_BUSNO, 16 + SEEPROM2_CS, 128);
|
|
spi_eeprom_register(SPI_BUSNO, 16 + SEEPROM3_CS, 128);
|
|
gpio_request(16 + SRTC_CS, "rtc-rs5c348");
|
|
gpio_direction_output(16 + SRTC_CS, 0);
|
|
gpio_request(SEEPROM1_CS, "seeprom1");
|
|
gpio_direction_output(SEEPROM1_CS, 1);
|
|
gpio_request(16 + SEEPROM2_CS, "seeprom2");
|
|
gpio_direction_output(16 + SEEPROM2_CS, 1);
|
|
gpio_request(16 + SEEPROM3_CS, "seeprom3");
|
|
gpio_direction_output(16 + SEEPROM3_CS, 1);
|
|
tx4938_spi_init(SPI_BUSNO);
|
|
return 0;
|
|
}
|
|
|
|
static void __init rbtx4938_mtd_init(void)
|
|
{
|
|
struct physmap_flash_data pdata = {
|
|
.width = 4,
|
|
};
|
|
|
|
switch (readb(rbtx4938_bdipsw_addr) & 7) {
|
|
case 0:
|
|
/* Boot */
|
|
txx9_physmap_flash_init(0, 0x1fc00000, 0x400000, &pdata);
|
|
/* System */
|
|
txx9_physmap_flash_init(1, 0x1e000000, 0x1000000, &pdata);
|
|
break;
|
|
case 1:
|
|
/* System */
|
|
txx9_physmap_flash_init(0, 0x1f000000, 0x1000000, &pdata);
|
|
/* Boot */
|
|
txx9_physmap_flash_init(1, 0x1ec00000, 0x400000, &pdata);
|
|
break;
|
|
case 2:
|
|
/* Ext */
|
|
txx9_physmap_flash_init(0, 0x1f000000, 0x1000000, &pdata);
|
|
/* System */
|
|
txx9_physmap_flash_init(1, 0x1e000000, 0x1000000, &pdata);
|
|
/* Boot */
|
|
txx9_physmap_flash_init(2, 0x1dc00000, 0x400000, &pdata);
|
|
break;
|
|
case 3:
|
|
/* Boot */
|
|
txx9_physmap_flash_init(1, 0x1bc00000, 0x400000, &pdata);
|
|
/* System */
|
|
txx9_physmap_flash_init(2, 0x1a000000, 0x1000000, &pdata);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void __init rbtx4938_arch_init(void)
|
|
{
|
|
txx9_gpio_init(TX4938_PIO_REG & 0xfffffffffULL, 0, TX4938_NUM_PIO);
|
|
gpiochip_add_data(&rbtx4938_spi_gpio_chip, NULL);
|
|
rbtx4938_pci_setup();
|
|
rbtx4938_spi_init();
|
|
}
|
|
|
|
static void __init rbtx4938_device_init(void)
|
|
{
|
|
rbtx4938_ethaddr_init();
|
|
rbtx4938_ne_init();
|
|
tx4938_wdt_init();
|
|
rbtx4938_mtd_init();
|
|
/* TC58DVM82A1FT: tDH=10ns, tWP=tRP=tREADID=35ns */
|
|
tx4938_ndfmc_init(10, 35);
|
|
tx4938_ata_init(RBTX4938_IRQ_IOC_ATA, 0, 1);
|
|
tx4938_dmac_init(0, 2);
|
|
tx4938_aclc_init();
|
|
platform_device_register_simple("txx9aclc-generic", -1, NULL, 0);
|
|
tx4938_sramc_init();
|
|
txx9_iocled_init(RBTX4938_LED_ADDR - IO_BASE, -1, 8, 1, "green", NULL);
|
|
}
|
|
|
|
struct txx9_board_vec rbtx4938_vec __initdata = {
|
|
.system = "Toshiba RBTX4938",
|
|
.prom_init = rbtx4938_prom_init,
|
|
.mem_setup = rbtx4938_mem_setup,
|
|
.irq_setup = rbtx4938_irq_setup,
|
|
.time_init = rbtx4938_time_init,
|
|
.device_init = rbtx4938_device_init,
|
|
.arch_init = rbtx4938_arch_init,
|
|
#ifdef CONFIG_PCI
|
|
.pci_map_irq = rbtx4938_pci_map_irq,
|
|
#endif
|
|
};
|