* [PATCH 1/3] Documentation: dts: OMAP: Fix typos in DRA752 device name
2014-03-14 9:20 [PATCH 0/3] ARM: DRA7: Add support for DRA72x devices Rajendra Nayak
@ 2014-03-14 9:20 ` Rajendra Nayak
2014-04-23 8:39 ` Rajendra Nayak
2014-03-14 9:20 ` [PATCH 2/3] arm: dts: Add support for DRA72x family of devices Rajendra Nayak
2014-03-14 9:20 ` [PATCH 3/3] ARM: OMAP2+: Add machine entry for dra72x devices Rajendra Nayak
2 siblings, 1 reply; 7+ messages in thread
From: Rajendra Nayak @ 2014-03-14 9:20 UTC (permalink / raw)
To: linux-omap, linux-arm-kernel, devicetree; +Cc: tony, bcousson, Rajendra Nayak
DRA752 device is wrongly documented as DRA742 device. Fix the typo.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
.../devicetree/bindings/arm/omap/omap.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
index af9b4a0..0491868 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -48,7 +48,7 @@ SoC Families:
compatible = "ti,omap4"
- OMAP5 generic - defaults to OMAP5430
compatible = "ti,omap5"
-- DRA7 generic - defaults to DRA742
+- DRA7 generic - defaults to DRA752
compatible = "ti,dra7"
- AM43x generic - defaults to AM4372
compatible = "ti,am43"
@@ -79,7 +79,7 @@ SoCs:
- OMAP5432
compatible = "ti,omap5432", "ti,omap5"
-- DRA742
+- DRA752
compatible = "ti,dra7xx", "ti,dra7"
- AM4372
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] arm: dts: Add support for DRA72x family of devices
2014-03-14 9:20 [PATCH 0/3] ARM: DRA7: Add support for DRA72x devices Rajendra Nayak
2014-03-14 9:20 ` [PATCH 1/3] Documentation: dts: OMAP: Fix typos in DRA752 device name Rajendra Nayak
@ 2014-03-14 9:20 ` Rajendra Nayak
2014-03-14 9:20 ` [PATCH 3/3] ARM: OMAP2+: Add machine entry for dra72x devices Rajendra Nayak
2 siblings, 0 replies; 7+ messages in thread
From: Rajendra Nayak @ 2014-03-14 9:20 UTC (permalink / raw)
To: linux-omap, linux-arm-kernel, devicetree; +Cc: tony, bcousson, Rajendra Nayak
DRA72x is a single core cortex A15 device with most infrastructure IPs otherwise
same as whats on the DRA75x devices.
So move the cpu nodes into dra75x.dtsi and dra72x.dtsi respectively.
Also add a minimal dra72-evm dts file.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
.../devicetree/bindings/arm/omap/omap.txt | 6 ++++
arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/dra7-evm.dts | 4 +--
arch/arm/boot/dts/dra7.dtsi | 22 ------------
arch/arm/boot/dts/dra72-evm.dts | 24 +++++++++++++
arch/arm/boot/dts/dra72x.dtsi | 25 ++++++++++++++
arch/arm/boot/dts/dra75x.dtsi | 36 ++++++++++++++++++++
7 files changed, 95 insertions(+), 25 deletions(-)
create mode 100644 arch/arm/boot/dts/dra72-evm.dts
create mode 100644 arch/arm/boot/dts/dra72x.dtsi
create mode 100644 arch/arm/boot/dts/dra75x.dtsi
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
index 0491868..a8b1a69 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -82,6 +82,9 @@ SoCs:
- DRA752
compatible = "ti,dra7xx", "ti,dra7"
+- DRA72x
+ compatible = "ti,dra72x", "ti,dra7"
+
- AM4372
compatible = "ti,am4372", "ti,am43"
@@ -116,3 +119,6 @@ Boards:
- DRA7 EVM: Software Developement Board for DRA7XX
compatible = "ti,dra7-evm", "ti,dra7"
+
+- DRA72 EVM: Software Development Board for DRA72x
+ compatible = "ti,dra72-evm", "ti,dra72x", "ti,dra7"
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 0320303..c0231da 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -231,7 +231,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
am3517-evm.dtb \
am3517_mt_ventoux.dtb \
am43x-epos-evm.dtb \
- dra7-evm.dtb
+ dra7-evm.dtb \
+ dra72-evm.dtb
dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 5babba0..f344de2 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -7,10 +7,10 @@
*/
/dts-v1/;
-#include "dra7.dtsi"
+#include "dra75x.dtsi"
/ {
- model = "TI DRA7";
+ model = "TI DRA75x";
compatible = "ti,dra7-evm", "ti,dra752", "ti,dra7";
memory {
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 1fd75aa..a1da2c71 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -33,28 +33,6 @@
serial5 = &uart6;
};
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu0: cpu@0 {
- device_type = "cpu";
- compatible = "arm,cortex-a15";
- reg = <0>;
-
- operating-points = <
- /* kHz uV */
- 1000000 1060000
- 1176000 1160000
- >;
- };
- cpu@1 {
- device_type = "cpu";
- compatible = "arm,cortex-a15";
- reg = <1>;
- };
- };
-
timer {
compatible = "arm,armv7-timer";
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
new file mode 100644
index 0000000..d105e66
--- /dev/null
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2014 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 "dra72x.dtsi"
+
+/ {
+ model = "TI DRA72x";
+ compatible = "ti,dra72-evm", "ti,dra72x", "ti,dra7";
+
+ memory {
+ device_type = "memory";
+ reg = <0x80000000 0x40000000>; /* 1024 MB */
+ };
+};
+
+&uart1 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
new file mode 100644
index 0000000..701e40c
--- /dev/null
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 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.
+ * Based on "omap4.dtsi"
+ */
+
+#include "dra7.dtsi"
+
+/ {
+ compatible = "ti,dra72x", "ti,dra7xx";
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu0: cpu@0 {
+ device_type = "cpu";
+ compatible = "arm,cortex-a15";
+ reg = <0>;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/dra75x.dtsi b/arch/arm/boot/dts/dra75x.dtsi
new file mode 100644
index 0000000..67da666
--- /dev/null
+++ b/arch/arm/boot/dts/dra75x.dtsi
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2014 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.
+ * Based on "omap4.dtsi"
+ */
+
+#include "dra7.dtsi"
+
+/ {
+ compatible = "ti,dra75x", "ti,dra7xx";
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu0: cpu@0 {
+ device_type = "cpu";
+ compatible = "arm,cortex-a15";
+ reg = <0>;
+
+ operating-points = <
+ /* kHz uV */
+ 1000000 1060000
+ 1176000 1160000
+ >;
+ };
+ cpu@1 {
+ device_type = "cpu";
+ compatible = "arm,cortex-a15";
+ reg = <1>;
+ };
+ };
+};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/3] ARM: OMAP2+: Add machine entry for dra72x devices
2014-03-14 9:20 [PATCH 0/3] ARM: DRA7: Add support for DRA72x devices Rajendra Nayak
2014-03-14 9:20 ` [PATCH 1/3] Documentation: dts: OMAP: Fix typos in DRA752 device name Rajendra Nayak
2014-03-14 9:20 ` [PATCH 2/3] arm: dts: Add support for DRA72x family of devices Rajendra Nayak
@ 2014-03-14 9:20 ` Rajendra Nayak
2014-03-15 2:21 ` Suman Anna
2 siblings, 1 reply; 7+ messages in thread
From: Rajendra Nayak @ 2014-03-14 9:20 UTC (permalink / raw)
To: linux-omap, linux-arm-kernel, devicetree; +Cc: tony, bcousson, Rajendra Nayak
The only difference from the dra75x devices is the missing .smp entry.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
arch/arm/mach-omap2/board-generic.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 8e3daa1..d803d99 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -253,4 +253,22 @@ DT_MACHINE_START(DRA7XX_DT, "Generic DRA7XX (Flattened Device Tree)")
.dt_compat = dra7xx_boards_compat,
.restart = omap44xx_restart,
MACHINE_END
+
+static const char *dra72_boards_compat[] __initdata = {
+ "ti,dra72x",
+ "ti,dra7",
+ NULL,
+};
+
+DT_MACHINE_START(DRA72_DT, "Generic DRA72 (Flattened Device Tree)")
+ .reserve = omap_reserve,
+ .map_io = omap5_map_io,
+ .init_early = dra7xx_init_early,
+ .init_late = dra7xx_init_late,
+ .init_irq = omap_gic_of_init,
+ .init_machine = omap_generic_init,
+ .init_time = omap5_realtime_timer_init,
+ .dt_compat = dra72_boards_compat,
+ .restart = omap44xx_restart,
+MACHINE_END
#endif
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread