ARM: tegra12: Enable device tree for bonaire
Alex Van Brunt [Mon, 18 Mar 2013 18:16:32 +0000 (11:16 -0700)]
Change-Id: I183b130a80ce8937137acab98d2d0c64dc65ee35
Signed-off-by: Alex Van Brunt <avanbrunt@nvidia.com>

arch/arm/boot/dts/Makefile
arch/arm/boot/dts/tegra124-bonaire.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra124-bonaire_sim.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra124.dtsi [new file with mode: 0644]
arch/arm/configs/tegra_bonaire_android_defconfig
arch/arm/configs/tegra_bonaire_sim_android_defconfig
arch/arm/mach-tegra/board-bonaire.c

index 9dfc46e..9f15a14 100644 (file)
@@ -198,7 +198,9 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra114-dalmore.dtb \
        tegra114-macallan.dtb \
        tegra114-roth.dtb \
-       tegra114-pluto.dtb
+       tegra114-pluto.dtb \
+       tegra124-bonaire_sim.dtb \
+       tegra124-bonaire.dtb
 dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
        versatile-pb.dtb
 dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
diff --git a/arch/arm/boot/dts/tegra124-bonaire.dts b/arch/arm/boot/dts/tegra124-bonaire.dts
new file mode 100644 (file)
index 0000000..6788f2d
--- /dev/null
@@ -0,0 +1,21 @@
+/dts-v1/;
+
+/include/ "tegra124.dtsi"
+
+/ {
+       model = "NVIDIA Tegra124 Bonaire";
+       compatible = "nvidia,bonaire", "nvidia,tegra124";
+       #address-cells = <2>;
+       #size-cells = <1>;
+
+       chosen {
+               bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,2400n8 earlyprintk";
+               linux,initrd-start = <0x85000000>;
+               linux,initrd-end = <0x851bc400>;
+       };
+
+       memory@0x80000000 {
+               device_type = "memory";
+               reg = <0x00000000 0x80000000 0x20000000>;
+       };
+};
diff --git a/arch/arm/boot/dts/tegra124-bonaire_sim.dts b/arch/arm/boot/dts/tegra124-bonaire_sim.dts
new file mode 100644 (file)
index 0000000..c453cc2
--- /dev/null
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+/include/ "tegra124.dtsi"
+
+/ {
+       model = "NVIDIA Tegra124 bonaire simulation";
+       compatible = "nvidia,bonaire", "nvidia,tegra124";
+
+};
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
new file mode 100644 (file)
index 0000000..a6b1043
--- /dev/null
@@ -0,0 +1,21 @@
+/include/ "skeleton.dtsi"
+
+/ {
+       compatible = "nvidia,tegra124";
+       interrupt-parent = <&intc>;
+
+       intc: interrupt-controller@50041000 {
+               compatible = "arm,cortex-a15-gic";
+               interrupt-controller;
+               #interrupt-cells = <3>;
+               reg = <0x50041000 0x1000>,
+                     <0x50042000 0x0100>;
+       };
+
+       timer {
+               compatible = "arm,armv7-timer";
+               interrupts = <1 13 0xf04
+                             1 14 0xf04>;
+       };
+
+};
index ee3802a..7699f6c 100644 (file)
@@ -38,6 +38,8 @@ CONFIG_PM_DEVFREQ=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
+CONFIG_USE_OF=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="mem=448@2048M console=ttyS0,115200n8 earlyprintk init=/bin/ash"
@@ -136,6 +138,7 @@ CONFIG_NET_ACT_GACT=y
 CONFIG_NET_ACT_MIRRED=y
 CONFIG_RFKILL=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_TEGRA_CRYPTO_DEV=y
 CONFIG_SCSI=y
index 492136e..c0b07f4 100644 (file)
@@ -40,6 +40,9 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
+CONFIG_USE_OF=y
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="mem=448@2048M console=ttyS0,115200n8 earlyprintk init=/bin/ash"
@@ -69,6 +72,7 @@ CONFIG_INET_ESP=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_WIRELESS is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
index 3dd5c72..ddef107 100644 (file)
@@ -632,6 +632,10 @@ static void __init tegra_bonaire_reserve(void)
 #endif
 }
 
+static const char * const bonaire_dt_board_compat[] = {
+       "nvidia,bonaire",
+       NULL
+};
 
 MACHINE_START(BONAIRE, BONAIRE_BOARD_NAME)
        .atag_offset    = 0x80000100,
@@ -642,4 +646,5 @@ MACHINE_START(BONAIRE, BONAIRE_BOARD_NAME)
        .handle_irq     = gic_handle_irq,
        .init_machine   = tegra_bonaire_init,
        .timer          = &tegra_sys_timer,
+       .dt_compat      = bonaire_dt_board_compat,
 MACHINE_END