mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 04:26:45 +00:00
bfaf245022
Pull MIPS updates from Ralf Baechle:
"This is the main pull request for MIPS for Linux 4.1. Most
noteworthy:
- Add more Octeon-optimized crypto functions
- Octeon crypto preemption and locking fixes
- Little endian support for Octeon
- Use correct CSR to soft reset Octeons
- Support LEDs on the Octeon-based DSR-1000N
- Fix PCI interrupt mapping for the Octeon-based DSR-1000N
- Mark prom_free_prom_memory() as __init for a number of systems
- Support for Imagination's Pistachio SOC. This includes arch and
CLK bits. I'd like to merge pinctrl bits later
- Improve parallelism of csum_partial for certain pipelines
- Organize DTB files in subdirs like other architectures
- Implement read_sched_clock for all MIPS platforms other than
Octeon
- Massive series of 38 fixes and cleanups for the FPU emulator /
kernel
- Further FPU remulator work to support new features. This sits on a
separate branch which also has been pulled into the 4.1 KVM branch
- Clean up and fixes for the SEAD3 eval board; remove unused file
- Various updates for Netlogic platforms
- A number of small updates for Loongson 3 platforms
- Increase the memory limit for ATH79 platforms to 256MB
- A fair number of fixes and updates for BCM47xx platforms
- Finish the implementation of XPA support
- MIPS FDC support. No, not floppy controller but Fast Debug Channel :)
- Detect the R16000 used in SGI legacy platforms
- Fix Kconfig dependencies for the SSB bus support"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (265 commits)
MIPS: Makefile: Fix MIPS ASE detection code
MIPS: asm: elf: Set O32 default FPU flags
MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G
MIPS: Kconfig: Disable SMP/CPS for 64-bit
MIPS: Hibernate: flush TLB entries earlier
MIPS: smp-cps: cpu_set FPU mask if FPU present
MIPS: lose_fpu(): Disable FPU when MSA enabled
MIPS: ralink: add missing symbol for RALINK_ILL_ACC
MIPS: ralink: Fix bad config symbol in PCI makefile.
SSB: fix Kconfig dependencies
MIPS: Malta: Detect and fix bad memsize values
Revert "MIPS: Avoid pipeline stalls on some MIPS32R2 cores."
MIPS: Octeon: Delete override of cpu_has_mips_r2_exec_hazard.
MIPS: Fix cpu_has_mips_r2_exec_hazard.
MIPS: kernel: entry.S: Set correct ISA level for mips_ihb
MIPS: asm: spinlock: Fix addiu instruction for R10000_LLSC_WAR case
MIPS: r4kcache: Use correct base register for MIPS R6 cache flushes
MIPS: Kconfig: Fix typo for the r2-to-r6 emulator kernel parameter
MIPS: unaligned: Fix regular load/store instruction emulation for EVA
MIPS: unaligned: Surround load/store macros in do {} while statements
...
138 lines
3 KiB
C
138 lines
3 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/serial_8250.h>
|
|
#include <linux/rtc/ds1685.h>
|
|
|
|
#include <asm/ip32/mace.h>
|
|
#include <asm/ip32/ip32_ints.h>
|
|
|
|
extern void ip32_prepare_poweroff(void);
|
|
|
|
#define MACEISA_SERIAL1_OFFS offsetof(struct sgi_mace, isa.serial1)
|
|
#define MACEISA_SERIAL2_OFFS offsetof(struct sgi_mace, isa.serial2)
|
|
|
|
#define MACE_PORT(offset,_irq) \
|
|
{ \
|
|
.mapbase = MACE_BASE + offset, \
|
|
.irq = _irq, \
|
|
.uartclk = 1843200, \
|
|
.iotype = UPIO_MEM, \
|
|
.flags = UPF_SKIP_TEST|UPF_IOREMAP, \
|
|
.regshift = 8, \
|
|
}
|
|
|
|
static struct plat_serial8250_port uart8250_data[] = {
|
|
MACE_PORT(MACEISA_SERIAL1_OFFS, MACEISA_SERIAL1_IRQ),
|
|
MACE_PORT(MACEISA_SERIAL2_OFFS, MACEISA_SERIAL2_IRQ),
|
|
{ },
|
|
};
|
|
|
|
static struct platform_device uart8250_device = {
|
|
.name = "serial8250",
|
|
.id = PLAT8250_DEV_PLATFORM,
|
|
.dev = {
|
|
.platform_data = uart8250_data,
|
|
},
|
|
};
|
|
|
|
static int __init uart8250_init(void)
|
|
{
|
|
return platform_device_register(&uart8250_device);
|
|
}
|
|
|
|
device_initcall(uart8250_init);
|
|
|
|
static __init int meth_devinit(void)
|
|
{
|
|
struct platform_device *pd;
|
|
int ret;
|
|
|
|
pd = platform_device_alloc("meth", -1);
|
|
if (!pd)
|
|
return -ENOMEM;
|
|
|
|
ret = platform_device_add(pd);
|
|
if (ret)
|
|
platform_device_put(pd);
|
|
|
|
return ret;
|
|
}
|
|
|
|
device_initcall(meth_devinit);
|
|
|
|
static __init int sgio2audio_devinit(void)
|
|
{
|
|
struct platform_device *pd;
|
|
int ret;
|
|
|
|
pd = platform_device_alloc("sgio2audio", -1);
|
|
if (!pd)
|
|
return -ENOMEM;
|
|
|
|
ret = platform_device_add(pd);
|
|
if (ret)
|
|
platform_device_put(pd);
|
|
|
|
return ret;
|
|
}
|
|
|
|
device_initcall(sgio2audio_devinit);
|
|
|
|
static __init int sgio2btns_devinit(void)
|
|
{
|
|
return IS_ERR(platform_device_register_simple("sgibtns", -1, NULL, 0));
|
|
}
|
|
|
|
device_initcall(sgio2btns_devinit);
|
|
|
|
#define MACE_RTC_RES_START (MACE_BASE + offsetof(struct sgi_mace, isa.rtc))
|
|
#define MACE_RTC_RES_END (MACE_RTC_RES_START + 32767)
|
|
|
|
static struct resource ip32_rtc_resources[] = {
|
|
{
|
|
.start = MACEISA_RTC_IRQ,
|
|
.end = MACEISA_RTC_IRQ,
|
|
.flags = IORESOURCE_IRQ
|
|
}, {
|
|
.start = MACE_RTC_RES_START,
|
|
.end = MACE_RTC_RES_END,
|
|
.flags = IORESOURCE_MEM,
|
|
}
|
|
};
|
|
|
|
/* RTC registers on IP32 are each padded by 256 bytes (0x100). */
|
|
static struct ds1685_rtc_platform_data
|
|
ip32_rtc_platform_data[] = {
|
|
{
|
|
.regstep = 0x100,
|
|
.bcd_mode = true,
|
|
.no_irq = false,
|
|
.uie_unsupported = false,
|
|
.alloc_io_resources = true,
|
|
.plat_prepare_poweroff = ip32_prepare_poweroff,
|
|
},
|
|
};
|
|
|
|
struct platform_device ip32_rtc_device = {
|
|
.name = "rtc-ds1685",
|
|
.id = -1,
|
|
.dev = {
|
|
.platform_data = ip32_rtc_platform_data,
|
|
},
|
|
.num_resources = ARRAY_SIZE(ip32_rtc_resources),
|
|
.resource = ip32_rtc_resources,
|
|
};
|
|
|
|
+static int __init sgio2_rtc_devinit(void)
|
|
{
|
|
return platform_device_register(&ip32_rtc_device);
|
|
}
|
|
|
|
device_initcall(sgio2_cmos_devinit);
|