This change enables DT related options in DA8XX
defconfig. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABAgAGBQJQj+V2AAoJEGFBu2jqvgRNwZYP+wdcUqOG9uLFi+BHUcWCodDb G7uQdn/Pt+FoeBYQMqolU6eOM94+UEocixWjIxObLnM5xMdRyk4KKb6KjXudqi57 cF+Ol5QBv42+T3jockChgq1CACNyXYyGX7DXRKCxT1lfdbyFuWqw3osugLXptWZk /zcdH0wVz6ouZmMFmDOG760SaP0vGVZfV81Ef58Uf0PrpgsKBLWsYPYq/pW2lBrP uIT60Q35YgK8D1YIOHH1aC/qHoSKpNHiEMQtFJ0o1VpeZmGYZCy59OOqGf7KZIYc kTZV1KcTi8nfG2u/pcr7QDzCdwqzWtQcrZEo2Z4lSNUKluCM9fMjnBKq8JppaiJl CoaZJ3NHBwJxzqmnWfldctZ5a9Y03e0oDHmFhysoVHyFcRv/aUgqvsfAiSqcKQIb QkjCBx4ukK9bvN1yQh38I8aLpqxmoSyqiwY44aLpTOIo5mDHJT8S1WouTaKxmBKc 7VvKZpr/Gh/Qu1iiHHolPXMxbC8esuAdO+jBpbbCEEdOvoLyaug0aGX5cgDG4apW CaeW9teu1sPjKZ+pPLI+x1J7XteGeIKN7FXrHHaHg3YHZtGd8KFIZ9s2ZzTRTDzT IjUpzI3lGJcii1rES60muZ0baLar8MECbciopJkFNmwBUhZOsoqXlwPw8PaME94t oSlf2NAxovbnSq+KHWKm =bDAD -----END PGP SIGNATURE----- Merge tag 'davinci-for-v3.8/defconfig' of git://gitorious.org/linux-davinci/linux-davinci into next/boards From Sekhar Nori: This change enables DT related options in DA8XX defconfig. * tag 'davinci-for-v3.8/defconfig' of git://gitorious.org/linux-davinci/linux-davinci: ARM: davinci: da8xx defconfig: enable DT config options Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
commit
1443f8a0b9
17
Documentation/devicetree/bindings/arm/davinci.txt
Normal file
17
Documentation/devicetree/bindings/arm/davinci.txt
Normal file
@ -0,0 +1,17 @@
|
||||
Texas Instruments DaVinci Platforms Device Tree Bindings
|
||||
--------------------------------------------------------
|
||||
|
||||
DA850/OMAP-L138/AM18x Evaluation Module (EVM) board
|
||||
Required root node properties:
|
||||
- compatible = "ti,da850-evm", "ti,da850";
|
||||
|
||||
EnBW AM1808 based CMC board
|
||||
Required root node properties:
|
||||
- compatible = "enbw,cmc", "ti,da850;
|
||||
|
||||
Generic DaVinci Boards
|
||||
----------------------
|
||||
|
||||
DA850/OMAP-L138/AM18x generic board
|
||||
Required root node properties:
|
||||
- compatible = "ti,da850";
|
||||
@ -924,6 +924,7 @@ config ARCH_DAVINCI
|
||||
select GENERIC_IRQ_CHIP
|
||||
select HAVE_IDE
|
||||
select NEED_MACH_GPIO_H
|
||||
select USE_OF
|
||||
select ZONE_DMA
|
||||
help
|
||||
Support for TI's DaVinci platform.
|
||||
|
||||
30
arch/arm/boot/dts/da850-enbw-cmc.dts
Normal file
30
arch/arm/boot/dts/da850-enbw-cmc.dts
Normal file
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* Device Tree for AM1808 EnBW CMC board
|
||||
*
|
||||
* Copyright 2012 DENX Software Engineering GmbH
|
||||
* Heiko Schocher <hs@denx.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*/
|
||||
/dts-v1/;
|
||||
/include/ "da850.dtsi"
|
||||
|
||||
/ {
|
||||
compatible = "enbw,cmc", "ti,da850";
|
||||
model = "EnBW CMC";
|
||||
|
||||
soc {
|
||||
serial0: serial@1c42000 {
|
||||
status = "okay";
|
||||
};
|
||||
serial1: serial@1d0c000 {
|
||||
status = "okay";
|
||||
};
|
||||
serial2: serial@1d0d000 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
28
arch/arm/boot/dts/da850-evm.dts
Normal file
28
arch/arm/boot/dts/da850-evm.dts
Normal file
@ -0,0 +1,28 @@
|
||||
/*
|
||||
* Device Tree for DA850 EVM board
|
||||
*
|
||||
* Copyright (C) 2012 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 as published by the
|
||||
* Free Software Foundation, version 2.
|
||||
*/
|
||||
/dts-v1/;
|
||||
/include/ "da850.dtsi"
|
||||
|
||||
/ {
|
||||
compatible = "ti,da850-evm", "ti,da850";
|
||||
model = "DA850/AM1808/OMAP-L138 EVM";
|
||||
|
||||
soc {
|
||||
serial0: serial@1c42000 {
|
||||
status = "okay";
|
||||
};
|
||||
serial1: serial@1d0c000 {
|
||||
status = "okay";
|
||||
};
|
||||
serial2: serial@1d0d000 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
60
arch/arm/boot/dts/da850.dtsi
Normal file
60
arch/arm/boot/dts/da850.dtsi
Normal file
@ -0,0 +1,60 @@
|
||||
/*
|
||||
* Copyright 2012 DENX Software Engineering GmbH
|
||||
* Heiko Schocher <hs@denx.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*/
|
||||
/include/ "skeleton.dtsi"
|
||||
|
||||
/ {
|
||||
arm {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
intc: interrupt-controller {
|
||||
compatible = "ti,cp-intc";
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <1>;
|
||||
ti,intc-size = <100>;
|
||||
reg = <0xfffee000 0x2000>;
|
||||
};
|
||||
};
|
||||
soc {
|
||||
compatible = "simple-bus";
|
||||
model = "da850";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges = <0x0 0x01c00000 0x400000>;
|
||||
|
||||
serial0: serial@1c42000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x42000 0x100>;
|
||||
clock-frequency = <150000000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <25>;
|
||||
interrupt-parent = <&intc>;
|
||||
status = "disabled";
|
||||
};
|
||||
serial1: serial@1d0c000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x10c000 0x100>;
|
||||
clock-frequency = <150000000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <53>;
|
||||
interrupt-parent = <&intc>;
|
||||
status = "disabled";
|
||||
};
|
||||
serial2: serial@1d0d000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x10d000 0x100>;
|
||||
clock-frequency = <150000000>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <61>;
|
||||
interrupt-parent = <&intc>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -17,6 +17,7 @@ CONFIG_MODVERSIONS=y
|
||||
CONFIG_ARCH_DAVINCI=y
|
||||
CONFIG_ARCH_DAVINCI_DA830=y
|
||||
CONFIG_ARCH_DAVINCI_DA850=y
|
||||
CONFIG_MACH_DA8XX_DT=y
|
||||
CONFIG_MACH_MITYOMAPL138=y
|
||||
CONFIG_MACH_OMAPL138_HAWKBOARD=y
|
||||
CONFIG_DAVINCI_RESET_CLOCKS=y
|
||||
@ -26,6 +27,7 @@ CONFIG_PREEMPT=y
|
||||
CONFIG_AEABI=y
|
||||
# CONFIG_OABI_COMPAT is not set
|
||||
CONFIG_LEDS=y
|
||||
CONFIG_USE_OF=y
|
||||
CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||
CONFIG_CPU_FREQ=y
|
||||
@ -75,6 +77,7 @@ CONFIG_SERIO_LIBPS2=y
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_NR_UARTS=3
|
||||
CONFIG_SERIAL_OF_PLATFORM=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_DAVINCI=y
|
||||
|
||||
@ -58,6 +58,14 @@ config ARCH_DAVINCI_TNETV107X
|
||||
|
||||
comment "DaVinci Board Type"
|
||||
|
||||
config MACH_DA8XX_DT
|
||||
bool "Support DA8XX platforms using device tree"
|
||||
default y
|
||||
depends on ARCH_DAVINCI_DA8XX
|
||||
help
|
||||
Say y here to include support for TI DaVinci DA850 based using
|
||||
Flattened Device Tree. More information at Documentation/devicetree
|
||||
|
||||
config MACH_DAVINCI_EVM
|
||||
bool "TI DM644x EVM"
|
||||
default ARCH_DAVINCI_DM644x
|
||||
|
||||
@ -22,6 +22,7 @@ obj-$(CONFIG_AINTC) += irq.o
|
||||
obj-$(CONFIG_CP_INTC) += cp_intc.o
|
||||
|
||||
# Board specific
|
||||
obj-$(CONFIG_MACH_DA8XX_DT) += da8xx-dt.o
|
||||
obj-$(CONFIG_MACH_DAVINCI_EVM) += board-dm644x-evm.o
|
||||
obj-$(CONFIG_MACH_SFFSDR) += board-sffsdr.o
|
||||
obj-$(CONFIG_MACH_NEUROS_OSD2) += board-neuros-osd2.o
|
||||
|
||||
@ -11,3 +11,5 @@ else
|
||||
params_phys-y := 0x80000100
|
||||
initrd_phys-y := 0x80800000
|
||||
endif
|
||||
|
||||
dtb-$(CONFIG_MACH_DA8XX_DT) += da850-enbw-cmc.dtb da850-evm.dtb
|
||||
|
||||
66
arch/arm/mach-davinci/da8xx-dt.c
Normal file
66
arch/arm/mach-davinci/da8xx-dt.c
Normal file
@ -0,0 +1,66 @@
|
||||
/*
|
||||
* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
|
||||
*
|
||||
* Modified from mach-omap/omap2/board-generic.c
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
#include <linux/io.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <linux/irqdomain.h>
|
||||
|
||||
#include <asm/mach/arch.h>
|
||||
|
||||
#include <mach/common.h>
|
||||
#include <mach/cp_intc.h>
|
||||
#include <mach/da8xx.h>
|
||||
|
||||
#define DA8XX_NUM_UARTS 3
|
||||
|
||||
void __init da8xx_uart_clk_enable(void)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < DA8XX_NUM_UARTS; i++)
|
||||
davinci_serial_setup_clk(i, NULL);
|
||||
}
|
||||
|
||||
static struct of_device_id da8xx_irq_match[] __initdata = {
|
||||
{ .compatible = "ti,cp-intc", .data = cp_intc_of_init, },
|
||||
{ }
|
||||
};
|
||||
|
||||
static void __init da8xx_init_irq(void)
|
||||
{
|
||||
of_irq_init(da8xx_irq_match);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_ARCH_DAVINCI_DA850
|
||||
|
||||
static void __init da850_init_machine(void)
|
||||
{
|
||||
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
||||
|
||||
da8xx_uart_clk_enable();
|
||||
}
|
||||
|
||||
static const char *da850_boards_compat[] __initdata = {
|
||||
"enbw,cmc",
|
||||
"ti,da850-evm",
|
||||
"ti,da850",
|
||||
NULL,
|
||||
};
|
||||
|
||||
DT_MACHINE_START(DA850_DT, "Generic DA850/OMAP-L138/AM18x")
|
||||
.map_io = da850_init,
|
||||
.init_irq = da8xx_init_irq,
|
||||
.timer = &davinci_timer,
|
||||
.init_machine = da850_init_machine,
|
||||
.dt_compat = da850_boards_compat,
|
||||
.init_late = davinci_init_late,
|
||||
.restart = da8xx_restart,
|
||||
MACHINE_END
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user