Commit 857b50f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS updates from Ralf Baechle:
 "This is the MIPS pull request for the next kernel:

   - Zubair's patch series adds CMA support for MIPS.  Doing so it also
     touches ARM64 and x86.
   - remove the last instance of IRQF_DISABLED from arch/mips
   - updates to two of the MIPS defconfig files.
   - cleanup of how cache coherency bits are handled on MIPS and
     implement support for write-combining.
   - platform upgrades for Alchemy
   - move MIPS DTS files to arch/mips/boot/dts/"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (24 commits)
  MIPS: ralink: remove deprecated IRQF_DISABLED
  MIPS: pgtable.h: Implement the pgprot_writecombine function for MIPS
  MIPS: cpu-probe: Set the write-combine CCA value on per core basis
  MIPS: pgtable-bits: Define the CCA bit for WC writes on Ingenic cores
  MIPS: pgtable-bits: Move the CCA bits out of the core's ifdef blocks
  MIPS: DMA: Add cma support
  x86: use generic dma-contiguous.h
  arm64: use generic dma-contiguous.h
  asm-generic: Add dma-contiguous.h
  MIPS: BPF: Add new emit_long_instr macro
  MIPS: ralink: Move device-trees to arch/mips/boot/dts/
  MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/
  MIPS: sead3: Move device-trees to arch/mips/boot/dts/
  MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/
  MIPS: Octeon: Move device-trees to arch/mips/boot/dts/
  MIPS: Add support for building device-tree binaries
  MIPS: Create common infrastructure for building built-in device-trees
  MIPS: SEAD3: Enable DEVTMPFS
  MIPS: SEAD3: Regenerate defconfigs
  MIPS: Alchemy: DB1300: Add touch penirq support
  ...
parents 168f07a1 31d6f57d

arch/arm64/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ generic-y += current.h 
generic-y += delay.h

generic-y += div64.h

generic-y += dma.h

generic-y += dma-contiguous.h

generic-y += early_ioremap.h

generic-y += emergency-restart.h

generic-y += errno.h

arch/arm64/include/asm/dma-contiguous.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef _ASM_DMA_CONTIGUOUS_H

#define _ASM_DMA_CONTIGUOUS_H



#ifdef __KERNEL__

#ifdef CONFIG_DMA_CMA



#include <linux/types.h>



static inline void

dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }



#endif

#endif



#endif

arch/mips/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ config MIPS 
	select GENERIC_ATOMIC64 if !64BIT

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select HAVE_DMA_ATTRS

	select HAVE_DMA_CONTIGUOUS

	select HAVE_DMA_API_DEBUG

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW
@@ -353,6 +354,7 @@ config MIPS_SEAD3 
	bool "MIPS SEAD3 board"

	select BOOT_ELF32

	select BOOT_RAW

	select BUILTIN_DTB

	select CEVT_R4K

	select CSRC_R4K

	select CSRC_GIC
@@ -742,6 +744,7 @@ config CAVIUM_OCTEON_SOC 
	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_SMP

	select NR_CPUS_DEFAULT_16

	select BUILTIN_DTB

	help

	  This option supports all of the Octeon reference boards from Cavium

	  Networks. It builds a kernel that dynamically determines the Octeon
@@ -2482,6 +2485,9 @@ config USE_OF 
	select OF_EARLY_FLATTREE

	select IRQ_DOMAIN



config BUILTIN_DTB

	bool



endmenu



config LOCKDEP_SUPPORT

arch/mips/Makefile

+11 −0
Original line number Diff line number Diff line
@@ -333,6 +333,16 @@ endif 


CLEAN_FILES += vmlinux.32 vmlinux.64



# device-trees

core-$(CONFIG_BUILTIN_DTB) += arch/mips/boot/dts/



%.dtb %.dtb.S %.dtb.o: | scripts

	$(Q)$(MAKE) $(build)=arch/mips/boot/dts arch/mips/boot/dts/$@



PHONY += dtbs

dtbs: scripts

	$(Q)$(MAKE) $(build)=arch/mips/boot/dts dtbs



archprepare:

ifdef CONFIG_MIPS32_N32

	@echo '  Checking missing-syscalls for N32'
@@ -367,6 +377,7 @@ define archhelp 
	echo '  vmlinuz.srec         - SREC zboot image'

	echo '  uImage               - U-Boot image'

	echo '  uImage.gz            - U-Boot image (gzip)'

	echo '  dtbs                 - Device-tree blobs for enabled boards'

	echo

	echo '  These will be default as appropriate for a configured platform.'

endef

arch/mips/alchemy/devboards/db1300.c

+46 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/platform_device.h>

#include <linux/smsc911x.h>

#include <linux/wm97xx.h>



#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-au1x00/au1100_mmc.h>
@@ -711,6 +712,46 @@ static struct platform_device db1300_lcd_dev = { 


/**********************************************************************/



static void db1300_wm97xx_irqen(struct wm97xx *wm, int enable)

{

	if (enable)

		enable_irq(DB1300_AC97_PEN_INT);

	else

		disable_irq_nosync(DB1300_AC97_PEN_INT);

}



static struct wm97xx_mach_ops db1300_wm97xx_ops = {

	.irq_enable	= db1300_wm97xx_irqen,

	.irq_gpio	= WM97XX_GPIO_3,

};



static int db1300_wm97xx_probe(struct platform_device *pdev)

{

	struct wm97xx *wm = platform_get_drvdata(pdev);



	/* external pendown indicator */

	wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN,

			   WM97XX_GPIO_POL_LOW, WM97XX_GPIO_STICKY,

			   WM97XX_GPIO_WAKE);



	/* internal "virtual" pendown gpio */

	wm97xx_config_gpio(wm, WM97XX_GPIO_3, WM97XX_GPIO_OUT,

			   WM97XX_GPIO_POL_LOW, WM97XX_GPIO_NOTSTICKY,

			   WM97XX_GPIO_NOWAKE);



	wm->pen_irq = DB1300_AC97_PEN_INT;



	return wm97xx_register_mach_ops(wm, &db1300_wm97xx_ops);

}



static struct platform_driver db1300_wm97xx_driver = {

	.driver.name	= "wm97xx-touch",

	.driver.owner	= THIS_MODULE,

	.probe		= db1300_wm97xx_probe,

};



/**********************************************************************/



static struct platform_device *db1300_dev[] __initdata = {

	&db1300_eth_dev,

	&db1300_i2c_dev,
@@ -755,6 +796,9 @@ int __init db1300_dev_setup(void) 
	i2c_register_board_info(0, db1300_i2c_devs,

				ARRAY_SIZE(db1300_i2c_devs));



	if (platform_driver_register(&db1300_wm97xx_driver))

		pr_warn("DB1300: failed to init touch pen irq support!\n");



	/* Audio PSC clock is supplied by codecs (PSC1, 2) */

	__raw_writel(PSC_SEL_CLK_SERCLK,

	    (void __iomem *)KSEG1ADDR(AU1300_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);
@@ -762,9 +806,10 @@ int __init db1300_dev_setup(void) 
	__raw_writel(PSC_SEL_CLK_SERCLK,

	    (void __iomem *)KSEG1ADDR(AU1300_PSC2_PHYS_ADDR) + PSC_SEL_OFFSET);

	wmb();

	/* I2C uses internal 48MHz EXTCLK1 */

	/* I2C driver wants 50MHz, get as close as possible */

	c = clk_get(NULL, "psc3_intclk");

	if (!IS_ERR(c)) {

		clk_set_rate(c, 50000000);

		clk_prepare_enable(c);

		clk_put(c);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE