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

Commit 21b7f153 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'for-3.5/ahb' of... 

Merge branch 'for-3.5/ahb' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra

 into next/drivers

* tegra/ahb:
  ARM: tegra: Add SMMU enabler in AHB
  ARM: tegra: Add Tegra AHB driver

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0200c0a6 89c788ba

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt

0 → 100644
+11 −0
Original line number Diff line number Diff line 
NVIDIA Tegra AHB



Required properties:

- compatible : "nvidia,tegra20-ahb" or "nvidia,tegra30-ahb"

- reg : Should contain 1 register ranges(address and length)



Example:

	ahb: ahb@6000c004 {

		compatible = "nvidia,tegra20-ahb";

		reg = <0x6000c004 0x10c>; /* AHB Arbitration + Gizmo Controller */

	};

arch/arm/mach-tegra/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -50,6 +50,14 @@ config TEGRA_PCI 
	depends on ARCH_TEGRA_2x_SOC

	select PCI



config TEGRA_AHB

	bool "Enable AHB driver for NVIDIA Tegra SoCs"

	default y

	help

	  Adds AHB configuration functionality for NVIDIA Tegra SoCs,

	  which controls AHB bus master arbitration and some

	  perfomance parameters(priority, prefech size).



comment "Tegra board type"



config MACH_HARMONY

arch/arm/mach-tegra/include/mach/tegra-ahb.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.

 *

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

 * under the terms and conditions of the GNU General Public License,

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

 *

 * This program is distributed in the hope 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 __MACH_TEGRA_AHB_H__

#define __MACH_TEGRA_AHB_H__



extern int tegra_ahb_enable_smmu(struct device_node *ahb);



#endif	/* __MACH_TEGRA_AHB_H__ */

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ obj-$(CONFIG_SFI) += sfi/ 
# PnP must come after ACPI since it will eventually need to check if acpi

# was used and do nothing if so

obj-$(CONFIG_PNP)		+= pnp/

obj-$(CONFIG_ARM_AMBA)		+= amba/

obj-y				+= amba/

# Many drivers will want to use DMA so this has to be made available

# really early.

obj-$(CONFIG_DMA_ENGINE)	+= dma/

drivers/amba/Makefile

+2 −2
Original line number Diff line number Diff line 
obj-y		+= bus.o

obj-$(CONFIG_ARM_AMBA)		+= bus.o

obj-$(CONFIG_TEGRA_AHB)		+= tegra-ahb.o