diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/arch/mips/netlogic/xlp | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/arch/mips/netlogic/xlp')
| -rw-r--r-- | kernel/arch/mips/netlogic/xlp/ahci-init-xlp2.c | 2 | ||||
| -rw-r--r-- | kernel/arch/mips/netlogic/xlp/dt.c | 1 | ||||
| -rw-r--r-- | kernel/arch/mips/netlogic/xlp/nlm_hal.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/kernel/arch/mips/netlogic/xlp/ahci-init-xlp2.c b/kernel/arch/mips/netlogic/xlp/ahci-init-xlp2.c index 7b066a44e..c11b9c7dc 100644 --- a/kernel/arch/mips/netlogic/xlp/ahci-init-xlp2.c +++ b/kernel/arch/mips/netlogic/xlp/ahci-init-xlp2.c @@ -152,7 +152,7 @@ static const u8 sata_phy_config1[] = { 0xC9, 0xC9, 0x07, 0x07, 0x18, 0x18, 0x01, 0x01, 0x22, 0x00 }; -/* SATA PHY config for register block 2 0x0x8065 .. 0x0x80A4 */ +/* SATA PHY config for register block 2 0x8065 .. 0x80A4 */ static const u8 sata_phy_config2[] = { 0xAA, 0x00, 0x4C, 0xC9, 0xC9, 0x07, 0x07, 0x18, 0x18, 0x05, 0x0C, 0x10, 0x00, 0x10, 0x00, 0xFF, diff --git a/kernel/arch/mips/netlogic/xlp/dt.c b/kernel/arch/mips/netlogic/xlp/dt.c index a625bdb6d..856a6e6d2 100644 --- a/kernel/arch/mips/netlogic/xlp/dt.c +++ b/kernel/arch/mips/netlogic/xlp/dt.c @@ -87,7 +87,6 @@ void __init *xlp_dt_init(void *fdtp) void __init xlp_early_init_devtree(void) { __dt_setup_arch(xlp_fdt_blob); - strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); } void __init device_tree_init(void) diff --git a/kernel/arch/mips/netlogic/xlp/nlm_hal.c b/kernel/arch/mips/netlogic/xlp/nlm_hal.c index a8f4144a0..80ec92974 100644 --- a/kernel/arch/mips/netlogic/xlp/nlm_hal.c +++ b/kernel/arch/mips/netlogic/xlp/nlm_hal.c @@ -91,6 +91,8 @@ static int xlp9xx_irq_to_irt(int irq) return 134; case PIC_SATA_IRQ: return 143; + case PIC_NAND_IRQ: + return 151; case PIC_SPI_IRQ: return 152; case PIC_MMC_IRQ: |