redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Browse source 
* 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm/dts: Add support for TI OMAP3 EVM board
  arm/dts: OMAP4: Update DTS file with new GIC bindings
  arm/dts: OMAP3: Add i2c controller nodes
  arm/dts: OMAP4: Add i2c controller nodes
  ARM: OMAP2+: Set Kconfig dependencies for PROC_DEVICETREE
  arm/dts: OMAP3&4: Remove the '0x' prefix for serial nodes
  ARM: OMAP1: kconfig: Enable IRQ_DOMAIN by default for OMAP1 platforms
  ARM: OMAP2+: pm: Do not init statically the SR and voltage layer with DT
  ARM: OMAP2+: omap_device: Replace dev_warn by dev_dbg in omap_device_build_from_dt
  ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE
  ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems
  arm/dts: OMAP: Remove bootargs node from board files
This commit is contained in:
Arnd Bergmann 2012-02-29 21:08:48 +00:00
parent e0e5ce59dc ffd76d8be3
commit 590d829a7c
11 changed files with 94 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/boot/dts/omap3-beagle.dts
View file

@ -13,15 +13,6 @@
model = "TI OMAP3 BeagleBoard"; model = "TI OMAP3 BeagleBoard";
compatible = "ti,omap3-beagle", "ti,omap3"; compatible = "ti,omap3-beagle", "ti,omap3";
/*
* Since the initial device tree board file does not create any
* devices (MMC, network...), the only way to boot is to provide a
* ramdisk.
*/
chosen {
bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug earlyprintk";
};
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */

20
arch/arm/boot/dts/omap3-evm.dts Normal file
View file

@ -0,0 +1,20 @@
/*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
/dts-v1/;
/include/ "omap3.dtsi"
/ {
model = "TI OMAP3 EVM (OMAP3530, AM/DM37x)";
compatible = "ti,omap3-evm", "ti,omap3";
memory {
device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */
};
};

29
arch/arm/boot/dts/omap3.dtsi
View file

@ -67,28 +67,49 @@
#interrupt-cells = <1>; #interrupt-cells = <1>;
}; };
uart1: serial@0x4806a000 { uart1: serial@4806a000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
ti,hwmods = "uart1"; ti,hwmods = "uart1";
clock-frequency = <48000000>; clock-frequency = <48000000>;
}; };
uart2: serial@0x4806c000 { uart2: serial@4806c000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
ti,hwmods = "uart2"; ti,hwmods = "uart2";
clock-frequency = <48000000>; clock-frequency = <48000000>;
}; };
uart3: serial@0x49020000 { uart3: serial@49020000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
ti,hwmods = "uart3"; ti,hwmods = "uart3";
clock-frequency = <48000000>; clock-frequency = <48000000>;
}; };
uart4: serial@0x49042000 { uart4: serial@49042000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
ti,hwmods = "uart4"; ti,hwmods = "uart4";
clock-frequency = <48000000>; clock-frequency = <48000000>;
}; };
i2c1: i2c@48070000 {
compatible = "ti,omap3-i2c";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c1";
};
i2c2: i2c@48072000 {
compatible = "ti,omap3-i2c";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c2";
};
i2c3: i2c@48060000 {
compatible = "ti,omap3-i2c";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c3";
};
}; };
}; };

9
arch/arm/boot/dts/omap4-panda.dts
View file

@ -13,15 +13,6 @@
model = "TI OMAP4 PandaBoard"; model = "TI OMAP4 PandaBoard";
compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"; compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4";
/*
* Since the initial device tree board file does not create any
* devices (MMC, network...), the only way to boot is to provide a
* ramdisk.
*/
chosen {
bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug";
};
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */

9
arch/arm/boot/dts/omap4-sdp.dts
View file

@ -13,15 +13,6 @@
model = "TI OMAP4 SDP board"; model = "TI OMAP4 SDP board";
compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4"; compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4";
/*
* Since the initial device tree board file does not create any
* devices (MMC, network...), the only way to boot is to provide a
* ramdisk.
*/
chosen {
bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug";
};
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */

38
arch/arm/boot/dts/omap4.dtsi
View file

@ -99,33 +99,61 @@
gic: interrupt-controller@48241000 { gic: interrupt-controller@48241000 {
compatible = "arm,cortex-a9-gic"; compatible = "arm,cortex-a9-gic";
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <3>;
reg = <0x48241000 0x1000>, reg = <0x48241000 0x1000>,
<0x48240100 0x0100>; <0x48240100 0x0100>;
}; };
uart1: serial@0x4806a000 { uart1: serial@4806a000 {
compatible = "ti,omap4-uart"; compatible = "ti,omap4-uart";
ti,hwmods = "uart1"; ti,hwmods = "uart1";
clock-frequency = <48000000>; clock-frequency = <48000000>;
}; };
uart2: serial@0x4806c000 { uart2: serial@4806c000 {
compatible = "ti,omap4-uart"; compatible = "ti,omap4-uart";
ti,hwmods = "uart2"; ti,hwmods = "uart2";
clock-frequency = <48000000>; clock-frequency = <48000000>;
}; };
uart3: serial@0x48020000 { uart3: serial@48020000 {
compatible = "ti,omap4-uart"; compatible = "ti,omap4-uart";
ti,hwmods = "uart3"; ti,hwmods = "uart3";
clock-frequency = <48000000>; clock-frequency = <48000000>;
}; };
uart4: serial@0x4806e000 { uart4: serial@4806e000 {
compatible = "ti,omap4-uart"; compatible = "ti,omap4-uart";
ti,hwmods = "uart4"; ti,hwmods = "uart4";
clock-frequency = <48000000>; clock-frequency = <48000000>;
}; };
i2c1: i2c@48070000 {
compatible = "ti,omap4-i2c";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c1";
};
i2c2: i2c@48072000 {
compatible = "ti,omap4-i2c";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c2";
};
i2c3: i2c@48060000 {
compatible = "ti,omap4-i2c";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c3";
};
i2c4: i2c@48350000 {
compatible = "ti,omap4-i2c";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c4";
};
}; };
}; };

1
arch/arm/mach-omap2/Kconfig
View file

@ -117,7 +117,6 @@ comment "OMAP Board Type"
config MACH_OMAP_GENERIC config MACH_OMAP_GENERIC
bool "Generic OMAP2+ board" bool "Generic OMAP2+ board"
depends on ARCH_OMAP2PLUS depends on ARCH_OMAP2PLUS
select USE_OF
default y default y
help help
Support for generic TI OMAP2+ boards using Flattened Device Tree. Support for generic TI OMAP2+ boards using Flattened Device Tree.

12
arch/arm/mach-omap2/board-generic.c
View file

@ -91,14 +91,13 @@ static void __init omap3_init(void)
} }
#endif #endif
#if defined(CONFIG_SOC_OMAP2420) #ifdef CONFIG_SOC_OMAP2420
static const char *omap242x_boards_compat[] __initdata = { static const char *omap242x_boards_compat[] __initdata = {
"ti,omap2420", "ti,omap2420",
NULL, NULL,
}; };
DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
.atag_offset = 0x100,
.reserve = omap_reserve, .reserve = omap_reserve,
.map_io = omap242x_map_io, .map_io = omap242x_map_io,
.init_early = omap2420_init_early, .init_early = omap2420_init_early,
@ -111,14 +110,13 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
MACHINE_END MACHINE_END
#endif #endif
#if defined(CONFIG_SOC_OMAP2430) #ifdef CONFIG_SOC_OMAP2430
static const char *omap243x_boards_compat[] __initdata = { static const char *omap243x_boards_compat[] __initdata = {
"ti,omap2430", "ti,omap2430",
NULL, NULL,
}; };
DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)") DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
.atag_offset = 0x100,
.reserve = omap_reserve, .reserve = omap_reserve,
.map_io = omap243x_map_io, .map_io = omap243x_map_io,
.init_early = omap2430_init_early, .init_early = omap2430_init_early,
@ -131,14 +129,13 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
MACHINE_END MACHINE_END
#endif #endif
#if defined(CONFIG_ARCH_OMAP3) #ifdef CONFIG_ARCH_OMAP3
static const char *omap3_boards_compat[] __initdata = { static const char *omap3_boards_compat[] __initdata = {
"ti,omap3", "ti,omap3",
NULL, NULL,
}; };
DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
.atag_offset = 0x100,
.reserve = omap_reserve, .reserve = omap_reserve,
.map_io = omap3_map_io, .map_io = omap3_map_io,
.init_early = omap3430_init_early, .init_early = omap3430_init_early,
@ -151,14 +148,13 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
MACHINE_END MACHINE_END
#endif #endif
#if defined(CONFIG_ARCH_OMAP4) #ifdef CONFIG_ARCH_OMAP4
static const char *omap4_boards_compat[] __initdata = { static const char *omap4_boards_compat[] __initdata = {
"ti,omap4", "ti,omap4",
NULL, NULL,
}; };
DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
.atag_offset = 0x100,
.reserve = omap_reserve, .reserve = omap_reserve,
.map_io = omap4_map_io, .map_io = omap4_map_io,
.init_early = omap4430_init_early, .init_early = omap4430_init_early,

8
arch/arm/mach-omap2/pm.c
View file

@ -227,6 +227,14 @@ postcore_initcall(omap2_common_pm_init);
static int __init omap2_common_pm_late_init(void) static int __init omap2_common_pm_late_init(void)
{ {
/*
* In the case of DT, the PMIC and SR initialization will be done using
* a completely different mechanism.
* Disable this part if a DT blob is available.
*/
if (of_have_populated_dt())
return 0;
/* Init the voltage layer */ /* Init the voltage layer */
omap_pmic_late_init(); omap_pmic_late_init();
omap_voltage_late_init(); omap_voltage_late_init();

3
arch/arm/plat-omap/Kconfig
View file

@ -14,6 +14,7 @@ config ARCH_OMAP1
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select CLKSRC_MMIO select CLKSRC_MMIO
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select IRQ_DOMAIN
select HAVE_IDE select HAVE_IDE
select NEED_MACH_MEMORY_H select NEED_MACH_MEMORY_H
help help
@ -24,6 +25,8 @@ config ARCH_OMAP2PLUS
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select OMAP_DM_TIMER select OMAP_DM_TIMER
select USE_OF
select PROC_DEVICETREE if PROC_FS
help help
"Systems based on OMAP2, OMAP3 or OMAP4" "Systems based on OMAP2, OMAP3 or OMAP4"

2
arch/arm/plat-omap/omap_device.c
View file

@ -348,7 +348,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
oh_cnt = of_property_count_strings(node, "ti,hwmods"); oh_cnt = of_property_count_strings(node, "ti,hwmods");
if (!oh_cnt || IS_ERR_VALUE(oh_cnt)) { if (!oh_cnt || IS_ERR_VALUE(oh_cnt)) {
dev_warn(&pdev->dev, "No 'hwmods' to build omap_device\n"); dev_dbg(&pdev->dev, "No 'hwmods' to build omap_device\n");
return -ENODEV; return -ENODEV;
} }