Skip to contentSkip to conversation

arm/dts: Add omap3-beagle.dts

PATCH Superseded Jon Hunter 2 participants 3 messages Sep 10, 2012 – Sep 11, 2012

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jon Hunter

author
#0 lore raw

PATCH 1/1 arm/dts: Add omap3-beagle.dts

Add a minimal dts for original OMAP3430/3530 version of the Beagle board. This version of the Beagle board has 256MB of DDR and features the same TWL4030 power management IC (PMIC) as the Beagle board XM.

Given that the Beagle and Beagle-XM boards use the same PMIC, move the definition of the VSIM regulator into the TWL4030.dtsi file so that we do not need to duplicate in the Beagle board dts file.

This has been boot tested on an OMAP3530 Beagle board and verifing that the SD/MMC interface is working with a SD card.

This patch is generated on top of Tony's patch for adding the Beagle board XM dts file [1].

[1] http://marc.info/?l=linux-omap&m=134695790516943&w=2

---
 arch/arm/boot/dts/omap3-beagle-xm.dts |    6 -----
 arch/arm/boot/dts/omap3-beagle.dts    |   46 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/twl4030.dtsi        |    6 +++++
 arch/arm/mach-omap2/Makefile.boot     |    3 ++-
 4 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap3-beagle.dts
arch/arm/boot/dts/omap3-beagle-xm.dts +0 -6
index df6d485..ef2c711 100644
@@ -26,12 +26,6 @@
 		reg = <0x48>;
 		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
 		interrupt-parent = <&intc>;
-
-		vsim: regulator-vsim {
-			compatible = "ti,twl4030-vsim";
-			regulator-min-microvolt = <1800000>;
-			regulator-max-microvolt = <3000000>;
-		};
 	};
 };
 
arch/arm/boot/dts/omap3-beagle.dts new file +46 -0

46 lines not on this page · raw message

arch/arm/boot/dts/twl4030.dtsi +6 -0
index ff00017..c5337d4 100644
@@ -37,6 +37,12 @@
 		regulator-max-microvolt = <3150000>;
 	};
 
+	vsim: regulator-vsim {
+		compatible = "ti,twl4030-vsim";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <3000000>;
+	};
+
 	twl_gpio: gpio {
 		compatible = "ti,twl4030-gpio";
 		gpio-controller;
arch/arm/mach-omap2/Makefile.boot +2 -1
index 0e602b7..a469a55 100644
@@ -3,7 +3,8 @@ params_phys-y		:= 0x80000100
 initrd_phys-y		:= 0x80800000
 
 dtb-$(CONFIG_SOC_OMAP2420)	+= omap2420-h4.dtb
-dtb-$(CONFIG_ARCH_OMAP3)	+= omap3-beagle-xm.dtb omap3-evm.dtb
+dtb-$(CONFIG_ARCH_OMAP3)	+= omap3-beagle.dtb omap3-beagle-xm.dtb \
+				   omap3-evm.dtb
 dtb-$(CONFIG_ARCH_OMAP4)	+= omap4-panda.dtb omap4-pandaES.dtb
 dtb-$(CONFIG_ARCH_OMAP4)	+= omap4-var_som.dtb omap4-sdp.dtb
 dtb-$(CONFIG_SOC_OMAP5)		+= omap5-evm.dtb
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 arm/dts: Add omap3-beagle.dts

Hi Jon,

Quoted 3 lines · Jon Hunter

Add a minimal dts for original OMAP3430/3530 version of the Beagle board. This version of the Beagle board has 256MB of DDR and features the same TWL4030 power management IC (PMIC) as the Beagle board XM.

Thanks for the patch.

Quoted 3 lines

Given that the Beagle and Beagle-XM boards use the same PMIC, move the definition of the VSIM regulator into the TWL4030.dtsi file so that we do not need to duplicate in the Beagle board dts file.

Good, catch, regulator definition has indeed nothing to do outside the twl4030.dtsi.

Quoted 5 lines

This has been boot tested on an OMAP3530 Beagle board and verifing that the SD/MMC interface is working with a SD card.

This patch is generated on top of Tony's patch for adding the Beagle board XM dts file [1].

Tony has just updated his devel-dt with the DTS series I pushed plus the beagle-xm introduction, so I'm gonna put this one on top and built a for_3.7/dts_part2 branch sinec there are a couplf of USB / AM33xx pending.

Thanks,
Benoit

Quoted 34 lines

[1] http://marc.info/?l=linux-omap&m=134695790516943&w=2

---
 arch/arm/boot/dts/omap3-beagle-xm.dts |    6 -----
 arch/arm/boot/dts/omap3-beagle.dts    |   46 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/twl4030.dtsi        |    6 +++++
 arch/arm/mach-omap2/Makefile.boot     |    3 ++-
 4 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap3-beagle.dts
arch/arm/boot/dts/omap3-beagle-xm.dts +0 -6
index df6d485..ef2c711 100644
@@ -26,12 +26,6 @@
 		reg = <0x48>;
 		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
 		interrupt-parent = <&intc>;
-
-		vsim: regulator-vsim {
-			compatible = "ti,twl4030-vsim";
-			regulator-min-microvolt = <1800000>;
-			regulator-max-microvolt = <3000000>;
-		};
 	};
 };
 
arch/arm/boot/dts/omap3-beagle.dts new file +0 -0
new file mode 100644
index 0000000..90790d9

arch/arm/boot/dts/omap3-beagle.dts line 2

Quoted 2 lines
arch/arm/boot/dts/omap3-beagle.dts new file +2 -0
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/

2012?

Quoted 76 lines
arch/arm/boot/dts/omap3-beagle.dts new file +44 -0
+ *
+ * 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 BeagleBoard";
+	compatible = "ti,omap3-beagle", "ti,omap3";
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */
+	};
+};
+
+&i2c1 {
+	clock-frequency = <2600000>;
+
+	twl: twl at 48 {
+		reg = <0x48>;
+		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+		interrupt-parent = <&intc>;
+	};
+};
+
+/include/ "twl4030.dtsi"
+
+&mmc1 {
+	vmmc-supply = <&vmmc1>;
+	vmmc_aux-supply = <&vsim>;
+	bus-width = <8>;
+};
+
+&mmc2 {
+	status = "disabled";
+};
+
+&mmc3 {
+	status = "disabled";
+};
arch/arm/boot/dts/twl4030.dtsi +6 -0
index ff00017..c5337d4 100644
@@ -37,6 +37,12 @@
 		regulator-max-microvolt = <3150000>;
 	};
 
+	vsim: regulator-vsim {
+		compatible = "ti,twl4030-vsim";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <3000000>;
+	};
+
 	twl_gpio: gpio {
 		compatible = "ti,twl4030-gpio";
 		gpio-controller;
arch/arm/mach-omap2/Makefile.boot +2 -1
index 0e602b7..a469a55 100644
@@ -3,7 +3,8 @@ params_phys-y		:= 0x80000100
 initrd_phys-y		:= 0x80800000
 
 dtb-$(CONFIG_SOC_OMAP2420)	+= omap2420-h4.dtb
-dtb-$(CONFIG_ARCH_OMAP3)	+= omap3-beagle-xm.dtb omap3-evm.dtb
+dtb-$(CONFIG_ARCH_OMAP3)	+= omap3-beagle.dtb omap3-beagle-xm.dtb \
+				   omap3-evm.dtb
 dtb-$(CONFIG_ARCH_OMAP4)	+= omap4-panda.dtb omap4-pandaES.dtb
 dtb-$(CONFIG_ARCH_OMAP4)	+= omap4-var_som.dtb omap4-sdp.dtb
 dtb-$(CONFIG_SOC_OMAP5)		+= omap5-evm.dtb
#2 lore raw

PATCH 1/1 arm/dts: Add omap3-beagle.dts

Quoted 19 lines · Benoit Cousson

Hi Jon,

Quoted 3 lines · Jon Hunter

Add a minimal dts for original OMAP3430/3530 version of the Beagle board. This version of the Beagle board has 256MB of DDR and features the same TWL4030 power management IC (PMIC) as the Beagle board XM.

Thanks for the patch.

Quoted 3 lines

Given that the Beagle and Beagle-XM boards use the same PMIC, move the definition of the VSIM regulator into the TWL4030.dtsi file so that we do not need to duplicate in the Beagle board dts file.

Good, catch, regulator definition has indeed nothing to do outside the twl4030.dtsi.

Quoted 3 lines

This has been boot tested on an OMAP3530 Beagle board and verifing that the SD/MMC interface is working with a SD card.

Quoted 6 lines
Quoted 2 lines

This patch is generated on top of Tony's patch for adding the Beagle board XM dts file [1].

Tony has just updated his devel-dt with the DTS series I pushed plus the beagle-xm introduction, so I'm gonna put this one on top and built a for_3.7/dts_part2 branch sinec there are a couplf of USB / AM33xx pending.

OK, so in fact, it does not apply very well due to all the changes I introduced in my for_3.7/dts pull and then the beagle is now missing all the LEDs support recently added.

So you should refresh that patch taking the latest devel-dt branch as a base and copying the latest beagle-xm.dts file.

Quoted 11 lines

arch/arm/mach-omap2/Makefile.boot params_phys-y := 0x80000100 · line 7

Quoted 11 lines
arch/arm/mach-omap2/Makefile.boot +2 -1
index 0e602b7..a469a55 100644
@@ -3,7 +3,8 @@ params_phys-y		:= 0x80000100
 initrd_phys-y		:= 0x80800000
 
 dtb-$(CONFIG_SOC_OMAP2420)	+= omap2420-h4.dtb
-dtb-$(CONFIG_ARCH_OMAP3)	+= omap3-beagle-xm.dtb omap3-evm.dtb
+dtb-$(CONFIG_ARCH_OMAP3)	+= omap3-beagle.dtb omap3-beagle-xm.dtb \
+				   omap3-evm.dtb

You'd better duplicate the whole line like it is done for OMAP4 instead of using the "\"

+dtb-$(CONFIG_ARCH_OMAP3) += omap3-evm.dtb

Regards,
Benoit