Commit 83afdf24 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  arch/sh/drivers/dma/dma-sh.c: Correct use of ! and &
  serial: Move asm-sh/sci.h to linux/serial_sci.h.
  sh: Fix up HAS_SR_RB typo in entry-macros.
  
  maple: fix device detection
  sh: fix rtc_resources setup for sh770x
  sh: heartbeat: ioremap is expected to succeed
  sh: Storage class should be before const qualifier
  maple: remove unused variable
  sh: SH5-103 needs to select CPU_SH5.
  sh: Rename SH-3 CCR3 reg to avoid synclink_cs clash.
parents 219ff3ad b2d7c7f7

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ config CPU_SUBTYPE_SH5_101 


config CPU_SUBTYPE_SH5_103

	bool "Support SH5-103 processor"

	select CPU_SH5



endchoice

arch/sh/drivers/dma/dma-sh.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static irqreturn_t dma_tei(int irq, void *dev_id) 


static int sh_dmac_request_dma(struct dma_channel *chan)

{

	if (unlikely(!chan->flags & DMA_TEI_CAPABLE))

	if (unlikely(!(chan->flags & DMA_TEI_CAPABLE)))

		return 0;



	return request_irq(get_dmte_irq(chan->chan), dma_tei,

arch/sh/drivers/heartbeat.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int heartbeat_drv_probe(struct platform_device *pdev) 
	}



	hd->base = ioremap_nocache(res->start, res->end - res->start + 1);

	if (!unlikely(hd->base)) {

	if (unlikely(!hd->base)) {

		dev_err(&pdev->dev, "ioremap failed\n");



		if (!pdev->dev.platform_data)

arch/sh/drivers/pci/ops-dreamcast.c

+22 −22
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ static int gapspci_read(struct pci_bus *bus, unsigned int devfn, int where, int 
		return PCIBIOS_DEVICE_NOT_FOUND;



	switch (size) {

		case 1: *val = ctrl_inb(GAPSPCI_BBA_CONFIG+where); break;

		case 2: *val = ctrl_inw(GAPSPCI_BBA_CONFIG+where); break;

		case 4: *val = ctrl_inl(GAPSPCI_BBA_CONFIG+where); break;

		case 1: *val = inb(GAPSPCI_BBA_CONFIG+where); break;

		case 2: *val = inw(GAPSPCI_BBA_CONFIG+where); break;

		case 4: *val = inl(GAPSPCI_BBA_CONFIG+where); break;

	}	



        return PCIBIOS_SUCCESSFUL;
@@ -97,9 +97,9 @@ static int gapspci_write(struct pci_bus *bus, unsigned int devfn, int where, int 
		return PCIBIOS_DEVICE_NOT_FOUND;



	switch (size) {

		case 1: ctrl_outb(( u8)val, GAPSPCI_BBA_CONFIG+where); break;

		case 2: ctrl_outw((u16)val, GAPSPCI_BBA_CONFIG+where); break;

		case 4: ctrl_outl((u32)val, GAPSPCI_BBA_CONFIG+where); break;

		case 1: outb(( u8)val, GAPSPCI_BBA_CONFIG+where); break;

		case 2: outw((u16)val, GAPSPCI_BBA_CONFIG+where); break;

		case 4: outl((u32)val, GAPSPCI_BBA_CONFIG+where); break;

	}



        return PCIBIOS_SUCCESSFUL;
@@ -127,36 +127,36 @@ int __init gapspci_init(void) 
	 */



	for (i=0; i<16; i++)

		idbuf[i] = ctrl_inb(GAPSPCI_REGS+i);

		idbuf[i] = inb(GAPSPCI_REGS+i);



	if (strncmp(idbuf, "GAPSPCI_BRIDGE_2", 16))

		return -ENODEV;



	ctrl_outl(0x5a14a501, GAPSPCI_REGS+0x18);

	outl(0x5a14a501, GAPSPCI_REGS+0x18);



	for (i=0; i<1000000; i++)

		;



	if (ctrl_inl(GAPSPCI_REGS+0x18) != 1)

	if (inl(GAPSPCI_REGS+0x18) != 1)

		return -EINVAL;



	ctrl_outl(0x01000000, GAPSPCI_REGS+0x20);

	ctrl_outl(0x01000000, GAPSPCI_REGS+0x24);

	outl(0x01000000, GAPSPCI_REGS+0x20);

	outl(0x01000000, GAPSPCI_REGS+0x24);



	ctrl_outl(GAPSPCI_DMA_BASE, GAPSPCI_REGS+0x28);

	ctrl_outl(GAPSPCI_DMA_BASE+GAPSPCI_DMA_SIZE, GAPSPCI_REGS+0x2c);

	outl(GAPSPCI_DMA_BASE, GAPSPCI_REGS+0x28);

	outl(GAPSPCI_DMA_BASE+GAPSPCI_DMA_SIZE, GAPSPCI_REGS+0x2c);



	ctrl_outl(1, GAPSPCI_REGS+0x14);

	ctrl_outl(1, GAPSPCI_REGS+0x34);

	outl(1, GAPSPCI_REGS+0x14);

	outl(1, GAPSPCI_REGS+0x34);



	/* Setting Broadband Adapter */

	ctrl_outw(0xf900, GAPSPCI_BBA_CONFIG+0x06);

	ctrl_outl(0x00000000, GAPSPCI_BBA_CONFIG+0x30);

	ctrl_outb(0x00, GAPSPCI_BBA_CONFIG+0x3c);

	ctrl_outb(0xf0, GAPSPCI_BBA_CONFIG+0x0d);

	ctrl_outw(0x0006, GAPSPCI_BBA_CONFIG+0x04);

	ctrl_outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10);

	ctrl_outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14);

	outw(0xf900, GAPSPCI_BBA_CONFIG+0x06);

	outl(0x00000000, GAPSPCI_BBA_CONFIG+0x30);

	outb(0x00, GAPSPCI_BBA_CONFIG+0x3c);

	outb(0xf0, GAPSPCI_BBA_CONFIG+0x0d);

	outw(0x0006, GAPSPCI_BBA_CONFIG+0x04);

	outl(0x00002001, GAPSPCI_BBA_CONFIG+0x10);

	outl(0x01000000, GAPSPCI_BBA_CONFIG+0x14);



	return 0;

}

arch/sh/kernel/cpu/sh2/setup-sh7619.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/platform_device.h>

#include <linux/init.h>

#include <linux/serial.h>

#include <asm/sci.h>

#include <linux/serial_sci.h>



enum {

	UNUSED = 0,

CRA Git | Maintained and supported by SUSTech CRA and CCSE