diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-12-13 00:26:19 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-12-13 00:26:19 +0100 |
| commit | f6704e49d6221fa650434e75faa5a3e2d7002f1b (patch) | |
| tree | ea8c82808cf1bb8397d41b0c293c318d90c3cf9e /drivers | |
| parent | 8e9c63b40059e81b870685b54d99589152c5b750 (diff) | |
| parent | d8bbc51c7ba9b737a20984333d19fe28a3526431 (diff) | |
| download | blackbird-obmc-uboot-f6704e49d6221fa650434e75faa5a3e2d7002f1b.tar.gz blackbird-obmc-uboot-f6704e49d6221fa650434e75faa5a3e2d7002f1b.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci_sh7751.c | 4 | ||||
| -rw-r--r-- | drivers/serial/serial_sh.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c index e3a0ea0047..df6d76f7f1 100644 --- a/drivers/pci/pci_sh7751.c +++ b/drivers/pci/pci_sh7751.c @@ -187,8 +187,8 @@ int pci_sh7751_init(struct pci_controller *hose) /* Copy BSC registers into PCI BSC */ p4_out(inl(SH7751_BCR1), SH7751_PCIBCR1); - p4_out(inl(SH7751_BCR2), SH7751_PCIBCR2); - p4_out(inl(SH7751_BCR3), SH7751_PCIBCR3); + p4_out(inw(SH7751_BCR2), SH7751_PCIBCR2); + p4_out(inw(SH7751_BCR3), SH7751_PCIBCR3); p4_out(inl(SH7751_WCR1), SH7751_PCIWCR1); p4_out(inl(SH7751_WCR2), SH7751_PCIWCR2); p4_out(inl(SH7751_WCR3), SH7751_PCIWCR3); diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index f30532b5ab..1d76a194a5 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -94,7 +94,7 @@ # define LSR_ORER 1 # define FIFOLEVEL_MASK 0x1F #elif defined(CONFIG_CPU_SH7720) -# define SCLSR (vu_short *)(SCIF_BASE + 0x24) +# define SCLSR SCFSR # define LSR_ORER 0x0200 # define FIFOLEVEL_MASK 0x1F #elif defined(CONFIG_CPU_SH7710) || \ |
