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

Commit 7400c12e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

SoC-level changes for tegra and omap

This adds support for the new tegra30 SoC, as well as small
changes to support minor variations of existing omap SoCs.

* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits)
  arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF
  arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC
  arm/tegra: Delete tegra_init_clock()
  arm/tegra: Fix section mismatch errors in tegra30 pinmux
  arm/tegra: Fix section mismatch errors in tegra20 pinmux
  arm/tegra: refresh defconfig for tegra30
  arm/tegra: add support for tegra30 based board cardhu
  arm/tegra: implement support for tegra30
  arm/tegra: pinmux tables and definitions for tegra30
  arm/tegra: add new fields to struct tegra_pingroup_desc
  arm/tegra: prepare pinmux code for multiple tegra variants
  arm/tegra: rename tegra20 pinmux files
  arm/tegra: generalize L2 cache initialization
  arm/tegra: use PMC reset
  arm/tegra: rename board-dt.c to board-dt-tegra20.c
  arm/tegra: prepare early init for multiple tegra variants
  arm/tegra: don't export clk_measure_input_freq
  arm/tegra: prepare clock code for multiple tegra variants
  arm/tegra: cleanup tegra20 support
  arm/tegra: clk_get should not be fatal
  ...

Fix up trivial conflict in arch/arm/mach-tegra/board-dt-tegra20.c
parents 190a44e6 23c4c1c7

arch/arm/boot/dts/tegra-cardhu.dts

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "tegra30.dtsi"



/ {

	model = "NVIDIA Tegra30 Cardhu evaluation board";

	compatible = "nvidia,cardhu", "nvidia,tegra30";



	memory {

		reg = < 0x80000000 0x40000000 >;

	};



	serial@70006000 {

		clock-frequency = < 408000000 >;

	};



	i2c@7000c000 {

		clock-frequency = <100000>;

	};



	i2c@7000c400 {

		clock-frequency = <100000>;

	};



	i2c@7000c500 {

		clock-frequency = <100000>;

	};



	i2c@7000c700 {

		clock-frequency = <100000>;

	};



	i2c@7000d000 {

		clock-frequency = <100000>;

	};

};

arch/arm/configs/tegra_defconfig

+4 −5
Original line number Diff line number Diff line
@@ -9,9 +9,8 @@ CONFIG_RESOURCE_COUNTERS=y 
CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_ELF_CORE is not set

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -20,6 +19,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_TEGRA=y

CONFIG_ARCH_TEGRA_2x_SOC=y

CONFIG_ARCH_TEGRA_3x_SOC=y

CONFIG_MACH_HARMONY=y

CONFIG_MACH_KAEN=y

CONFIG_MACH_PAZ00=y
@@ -78,14 +79,12 @@ CONFIG_BLK_DEV_SD=y 
# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_NET_ETHERNET=y

CONFIG_R8169=y

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

CONFIG_USB_PEGASUS=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

arch/arm/mach-omap2/Kconfig

+8 −3
Original line number Diff line number Diff line
@@ -78,8 +78,13 @@ config SOC_OMAP3430 
	default y

	select ARCH_OMAP_OTG



config SOC_OMAPTI816X

	bool "TI816X support"

config SOC_OMAPTI81XX

	bool "TI81XX support"

	depends on ARCH_OMAP3

	default y



config SOC_OMAPAM33XX

	bool "AM33XX support"

	depends on ARCH_OMAP3

	default y
@@ -316,7 +321,7 @@ config MACH_OMAP_3630SDP 


config MACH_TI8168EVM

	bool "TI8168 Evaluation Module"

	depends on SOC_OMAPTI816X

	depends on SOC_OMAPTI81XX

	default y



config MACH_OMAP_4430SDP

arch/arm/mach-omap2/board-ti8168evm.c

+3 −8
Original line number Diff line number Diff line
@@ -35,17 +35,12 @@ static void __init ti8168_evm_init(void) 
	omap_board_config_size = ARRAY_SIZE(ti8168_evm_config);

}



static void __init ti8168_evm_map_io(void)

{

	omapti816x_map_common_io();

}



MACHINE_START(TI8168EVM, "ti8168evm")

	/* Maintainer: Texas Instruments */

	.atag_offset	= 0x100,

	.map_io		= ti8168_evm_map_io,

	.init_early	= ti816x_init_early,

	.init_irq	= ti816x_init_irq,

	.map_io		= ti81xx_map_io,

	.init_early	= ti81xx_init_early,

	.init_irq	= ti81xx_init_irq,

	.timer		= &omap3_timer,

	.init_machine	= ti8168_evm_init,

	.restart	= omap_prcm_restart,

arch/arm/mach-omap2/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "cm-regbits-24xx.h"

#include "cm-regbits-34xx.h"



u8 cpu_mask;

u16 cpu_mask;



/*

 * clkdm_control: if true, then when a clock is enabled in the