Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00b2fa57 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-for-v3.8/board' of... 

Merge tag 'davinci-for-v3.8/board' of git://gitorious.org/linux-davinci/linux-davinci into next/boards

From Sekhar Nori:

These changes add PRUSS support on DA850 EVM. There is also fixup
of include file ordering in the EVM file.

* tag 'davinci-for-v3.8/board' of git://gitorious.org/linux-davinci/linux-davinci

:
  ARM: davinci: da850 evm: register uio_pruss device
  ARM: davinci: da850 evm: clean up include ordering
  ARM: davinci: da8xx: add DA850 PRUSS support
  ARM: davinci: add platform hook to fetch the SRAM pool
  ARM: davinci: da850: changed SRAM allocator to shared ram.
  ARM: davinci: sram: switch from iotable to ioremapped regions
  uio: uio_pruss: replace private SRAM API with genalloc
  ARM: davinci: serial: provide API to initialze UART clocks
  ARM: davinci: convert platform code to use clk_prepare/clk_unprepare

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a0c726cc ae41d17a

arch/arm/mach-davinci/board-da850-evm.c

+20 −14
Original line number Diff line number Diff line
@@ -11,39 +11,40 @@ 
 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 */

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/console.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/gpio_keys.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/i2c.h>

#include <linux/i2c/at24.h>

#include <linux/i2c/pca953x.h>

#include <linux/input.h>

#include <linux/input/tps6507x-ts.h>

#include <linux/mfd/tps6507x.h>

#include <linux/gpio.h>

#include <linux/gpio_keys.h>

#include <linux/platform_device.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/platform_data/mtd-davinci.h>

#include <linux/platform_data/mtd-davinci-aemif.h>

#include <linux/platform_data/spi-davinci.h>

#include <linux/platform_data/uio_pruss.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/tps6507x.h>

#include <linux/input/tps6507x-ts.h>

#include <linux/spi/spi.h>

#include <linux/spi/flash.h>

#include <linux/delay.h>

#include <linux/wl12xx.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/system_info.h>



#include <mach/cp_intc.h>

#include <mach/da8xx.h>

#include <linux/platform_data/mtd-davinci.h>

#include <mach/mux.h>

#include <linux/platform_data/mtd-davinci-aemif.h>

#include <linux/platform_data/spi-davinci.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/system_info.h>



#include <media/tvp514x.h>

#include <media/adv7343.h>
@@ -1516,6 +1517,11 @@ static __init void da850_evm_init(void) 
		pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n",

				ret);



	ret = da8xx_register_uio_pruss();

	if (ret)

		pr_warn("da850_evm_init: pruss initialization failed: %d\n",

				ret);



	/* Handle board specific muxing for LCD here */

	ret = davinci_cfg_reg_list(da850_evm_lcdc_pins);

	if (ret)

arch/arm/mach-davinci/board-dm355-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static __init void dm355_evm_init(void) 
	if (IS_ERR(aemif))

		WARN("%s: unable to get AEMIF clock\n", __func__);

	else

		clk_enable(aemif);

		clk_prepare_enable(aemif);



	platform_add_devices(davinci_evm_devices,

			     ARRAY_SIZE(davinci_evm_devices));

arch/arm/mach-davinci/board-dm355-leopard.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static __init void dm355_leopard_init(void) 
	if (IS_ERR(aemif))

		WARN("%s: unable to get AEMIF clock\n", __func__);

	else

		clk_enable(aemif);

		clk_prepare_enable(aemif);



	platform_add_devices(davinci_leopard_devices,

			     ARRAY_SIZE(davinci_leopard_devices));

arch/arm/mach-davinci/board-dm365-evm.c

+2 −2
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static void __init evm_init_cpld(void) 
	aemif_clk = clk_get(NULL, "aemif");

	if (IS_ERR(aemif_clk))

		return;

	clk_enable(aemif_clk);

	clk_prepare_enable(aemif_clk);



	if (request_mem_region(DM365_ASYNC_EMIF_DATA_CE1_BASE, SECTION_SIZE,

			"cpld") == NULL)
@@ -489,7 +489,7 @@ static void __init evm_init_cpld(void) 
				SECTION_SIZE);

fail:

		pr_err("ERROR: can't map CPLD\n");

		clk_disable(aemif_clk);

		clk_disable_unprepare(aemif_clk);

		return;

	}

arch/arm/mach-davinci/board-dm644x-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static __init void davinci_evm_init(void) 
	struct davinci_soc_info *soc_info = &davinci_soc_info;



	aemif_clk = clk_get(NULL, "aemif");

	clk_enable(aemif_clk);

	clk_prepare_enable(aemif_clk);



	if (HAS_ATA) {

		if (HAS_NAND || HAS_NOR)