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

Commit 0056a985 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Sekhar Nori:

SoC updates for DaVinci. Changes include:

1) Support for PRUSS UIO driver for DA850 SoC
   and related SRAM support updates.
2) Prepration for common clock migration
3) Serial support related changes for DA850 DT boot

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

:
  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 db2f95de 8e0d72d2

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)

arch/arm/mach-davinci/board-neuros-osd2.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static __init void davinci_ntosd2_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)