omap3_beagle: configs: improve BOOT_CMD options

We do not use JFFS2 by default and it conflicts with CONFIG_CMD_FS_GENERIC (ls command is the same). Since most of our BOOTCMD can be simplified by using the FS_GENERIC, dropping JFFS2

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |    8 --------
 1 file changed, 8 deletions(-)

include/configs/omap3_beagle.h +0 -1

index 48ce4c0..9adf4a5 100644
@@ -150,7 +150,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_EXT2                /* EXT2 Support                 */
 #define CONFIG_CMD_FAT         /* FAT support                  */
-#define CONFIG_CMD_JFFS2       /* JFFS2 Support                */
 #define CONFIG_CMD_MTDPARTS    /* Enable MTD parts commands */
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
 #define MTDIDS_DEFAULT                 "nand0=nand"

Quoted 23 lines · Nishanth Menon

We do not use JFFS2 by default and it conflicts with CONFIG_CMD_FS_GENERIC (ls command is the same). Since most of our BOOTCMD can be simplified by using the FS_GENERIC, dropping JFFS2

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |    8 --------
 1 file changed, 8 deletions(-)

include/configs/omap3_beagle.h +0 -1

index 48ce4c0..9adf4a5 100644
@@ -150,7 +150,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_EXT2                /* EXT2 Support                 */
 #define CONFIG_CMD_FAT         /* FAT support                  */
-#define CONFIG_CMD_JFFS2       /* JFFS2 Support                */
 #define CONFIG_CMD_MTDPARTS    /* Enable MTD parts commands */
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
 #define MTDIDS_DEFAULT                 "nand0=nand"

@@ -203,13 +202,6 @@
 

include/configs/omap3_beagle.h line 205

Quoted 9 lines

include/configs/omap3_beagle.h +0 -6

 #define CONFIG_SYS_MAX_NAND_DEVICE     1               /* Max number of NAND */
                                                        /* devices */
-#define CONFIG_JFFS2_NAND
-/* nand device jffs2 lives on */
-#define CONFIG_JFFS2_DEV               "nand0"
-/* start of jffs2 partition */
-#define CONFIG_JFFS2_PART_OFFSET       0x680000
-#define CONFIG_JFFS2_PART_SIZE         0xf980000       /* size of jffs2 */
 

Minor nit, can we perhaps leave the JFFS configuration and only remove/comment CONFIG_CMD_JFFS. That way we wont lose these paritition offsets/size for folks who might need them.

Quoted 24 lines · Joel Fernandes

Quoted 23 lines · Nishanth Menon

We do not use JFFS2 by default and it conflicts with CONFIG_CMD_FS_GENERIC (ls command is the same). Since most of our BOOTCMD can be simplified by using the FS_GENERIC, dropping JFFS2

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |    8 --------
 1 file changed, 8 deletions(-)

include/configs/omap3_beagle.h +0 -1

index 48ce4c0..9adf4a5 100644
@@ -150,7 +150,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_EXT2                /* EXT2 Support                 */
 #define CONFIG_CMD_FAT         /* FAT support                  */
-#define CONFIG_CMD_JFFS2       /* JFFS2 Support                */
 #define CONFIG_CMD_MTDPARTS    /* Enable MTD parts commands */
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
 #define MTDIDS_DEFAULT                 "nand0=nand"

@@ -203,13 +202,6 @@
 

Quoted 13 lines

include/configs/omap3_beagle.h line 205

Quoted 9 lines

include/configs/omap3_beagle.h +0 -6

 #define CONFIG_SYS_MAX_NAND_DEVICE     1               /* Max number of NAND */
                                                        /* devices */
-#define CONFIG_JFFS2_NAND
-/* nand device jffs2 lives on */
-#define CONFIG_JFFS2_DEV               "nand0"
-/* start of jffs2 partition */
-#define CONFIG_JFFS2_PART_OFFSET       0x680000
-#define CONFIG_JFFS2_PART_SIZE         0xf980000       /* size of jffs2 */
 

Minor nit, can we perhaps leave the JFFS configuration and only remove/comment CONFIG_CMD_JFFS. That way we wont lose these paritition offsets/size for folks who might need them.

then we have to drop the usage of FS_GENERIC. code wont build with both.

There is no point in keeping something as an option if it cant be used. dont you agree?

Quoted 38 lines · Nishanth Menon

Quoted 37 lines · Joel Fernandes

Quoted 22 lines · Nishanth Menon

We do not use JFFS2 by default and it conflicts with CONFIG_CMD_FS_GENERIC (ls command is the same). Since most of our BOOTCMD can be simplified by using the FS_GENERIC, dropping JFFS2

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |    8 --------
 1 file changed, 8 deletions(-)

include/configs/omap3_beagle.h +0 -1

index 48ce4c0..9adf4a5 100644
@@ -150,7 +150,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_EXT2                /* EXT2 Support                 */
 #define CONFIG_CMD_FAT         /* FAT support                  */
-#define CONFIG_CMD_JFFS2       /* JFFS2 Support                */
 #define CONFIG_CMD_MTDPARTS    /* Enable MTD parts commands */
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
 #define MTDIDS_DEFAULT                 "nand0=nand"

include/configs/omap3_beagle.h line 205

Quoted 10 lines

include/configs/omap3_beagle.h +0 -6

@@ -203,13 +202,6 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE     1               /* Max number of NAND */
                                                        /* devices */
-#define CONFIG_JFFS2_NAND
-/* nand device jffs2 lives on */
-#define CONFIG_JFFS2_DEV               "nand0"
-/* start of jffs2 partition */
-#define CONFIG_JFFS2_PART_OFFSET       0x680000
-#define CONFIG_JFFS2_PART_SIZE         0xf980000       /* size of jffs2 */
 

Minor nit, can we perhaps leave the JFFS configuration and only remove/comment CONFIG_CMD_JFFS. That way we wont lose these paritition offsets/size for folks who might need them.

Quoted 1 line

then we have to drop the usage of FS_GENERIC. code wont build with both.

No I meant drop CMD_JFFS but not the other JFFS.

Quoted 3 lines

There is no point in keeping something as an option if it cant be used. dont you agree?

Either way is OK with me, you have a point too.

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
  include/configs/omap3_beagle.h |   17 +++++++++++++++++
  1 file changed, 17 insertions(+)

include/configs/omap3_beagle.h +2 -0

index bdeee17..614ab9b 100644
@@ -210,6 +210,8 @@
  #define CONFIG_EXTRA_ENV_SETTINGS \
  	"loadaddr=0x80200000\0" \
  	"rdaddr=0x81000000\0" \
+	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
  	"usbtty=cdc_acm\0" \
  	"bootfile=uImage\0" \
  	"ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,19 @@
  		"omapdss.def_disp=${defaultdisplay} " \
  		"root=${nandroot} " \

With the latest transition to device tree, there is a need to simplify the load of device tree depending on board type etc. While at it, simplify few other changes as well.

Testing:
with a uEnv.txt as:
bootdir=/
bootpart=0:1

The following were the boot results:
Beagle (rev C1D): http://pastebin.com/fMdsKkgr
Beagle XM (rev C1): http://pastebin.com/p1zp9AhG

Changes in V2 since v1:

	- removed xMB version support based on review comments.
		http://marc.info/?t=137357970500004&r=1&w=2&n=5

V1: http://marc.info/?l=u-boot&m=137357963227510&w=2

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
V3: Fixes typo mistake reported in http://marc.info/?t=137358212300006&r=1&w=2

include/configs/omap3_beagle.h | 15 +++++++++++++++

1 file changed, 15 insertions(+)

include/configs/omap3_beagle.h +3 -0

index bdeee17..5ec8ade 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"rdaddr=0x81000000\0" \
+	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage\0" \
 	"ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,17 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
+	"findfdt=" \

Op 15 jul. 2013, om 14:11 heeft Nishanth Menon <[email protected]> het volgende geschreven:

Quoted 35 lines

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
V3: Fixes typo mistake reported in http://marc.info/?t=137358212300006&r=1&w=2

include/configs/omap3_beagle.h | 15 +++++++++++++++

1 file changed, 15 insertions(+)

include/configs/omap3_beagle.h +7 -0

index bdeee17..5ec8ade 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"rdaddr=0x81000000\0" \
+	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage\0" \
 	"ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,17 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
+	"findfdt=" \
+		"if test $beaglerev = AxBx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \
+		"if test $beaglerev = Cx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \

include/configs/omap3_beagle.h line 265

Quoted 6 lines

include/configs/omap3_beagle.h +6 -0

+		"if test $beaglerev = xMAB; then " \
+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $beaglerev = xMC; then " \
+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $fdtfile = undefined; then " \
+			"echo WARNING: Could not determine device tree to use; fi; \0" \

With the remote chance of a future xM rev D, can you make the fallthrough be 'omap3-beagle-xm.dtb' intead of 'undefined'?

Quoted 38 lines

Op 15 jul. 2013, om 14:11 heeft Nishanth Menon <[email protected]> het volgende geschreven:

Quoted 35 lines

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
V3: Fixes typo mistake reported in http://marc.info/?t=137358212300006&r=1&w=2

include/configs/omap3_beagle.h | 15 +++++++++++++++

1 file changed, 15 insertions(+)

include/configs/omap3_beagle.h +7 -0

index bdeee17..5ec8ade 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"rdaddr=0x81000000\0" \
+	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage\0" \
 	"ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,17 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
+	"findfdt=" \
+		"if test $beaglerev = AxBx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \
+		"if test $beaglerev = Cx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \

Quoted 8 lines

include/configs/omap3_beagle.h line 265

Quoted 6 lines

include/configs/omap3_beagle.h +6 -0

+		"if test $beaglerev = xMAB; then " \
+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $beaglerev = xMC; then " \
+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $fdtfile = undefined; then " \
+			"echo WARNING: Could not determine device tree to use; fi; \0" \

With the remote chance of a future xM rev D, can you make the fallthrough be 'omap3-beagle-xm.dtb' intead of 'undefined'?

Lets add the detection of xMD and along with that we add omap3-beagle-xm.dtb detection - makes sense? OR do we assume all un-matched devices default to beagle xMD? what if there was a vanilla beagle rev D?

Op 15 jul. 2013, om 14:25 heeft Nishanth Menon <[email protected]> het volgende geschreven:

Quoted 3 lines · Koen Kooi

Quoted 2 lines

Op 15 jul. 2013, om 14:11 heeft Nishanth Menon <[email protected]> het volgende geschreven:

Quoted 13 lines

Quoted 13 lines

include/configs/omap3_beagle.h line 265

Quoted 11 lines

include/configs/omap3_beagle.h +11 -0

+	"findfdt=" \
+		"if test $beaglerev = AxBx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \
+		"if test $beaglerev = Cx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \
+		"if test $beaglerev = xMAB; then " \
+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $beaglerev = xMC; then " \
+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $fdtfile = undefined; then " \
+			"echo WARNING: Could not determine device tree to use; fi; \0" \

With the remote chance of a future xM rev D, can you make the fallthrough be 'omap3-beagle-xm.dtb' intead of 'undefined'?

Quoted 4 lines

Lets add the detection of xMD and along with that we add omap3-beagle-xm.dtb detection - makes sense? OR do we assume all un-matched devices default to beagle xMD? what if there was a vanilla beagle rev D?

The fallthrough case should always be the most recent board rev, any other way will just make the HW guys spoof the ID in the design and we all know how that ends :(

Op 15 jul. 2013, om 14:11 heeft Nishanth Menon <[email protected]> het volgende geschreven:

Quoted 36 lines

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
V3: Fixes typo mistake reported in http://marc.info/?t=137358212300006&r=1&w=2

include/configs/omap3_beagle.h | 15 +++++++++++++++

1 file changed, 15 insertions(+)

include/configs/omap3_beagle.h +8 -0

index bdeee17..5ec8ade 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"rdaddr=0x81000000\0" \
+	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage\0" \
 	"ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,17 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
+	"findfdt=" \
+		"if test $beaglerev = AxBx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \
+		"if test $beaglerev = Cx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \
+		"if test $beaglerev = xMAB; then " \

include/configs/omap3_beagle.h line 265

Quoted 5 lines

include/configs/omap3_beagle.h +5 -0

+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $beaglerev = xMC; then " \
+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $fdtfile = undefined; then " \
+			"echo WARNING: Could not determine device tree to use; fi; \0" \

With the remote chance of a future xM rev D, can you make the fallthrough be 'omap3-beagle-xm.dtb' intead of 'undefined'?

Quoted 39 lines

Op 15 jul. 2013, om 14:11 heeft Nishanth Menon <[email protected]> het volgende geschreven:

Quoted 36 lines

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
V3: Fixes typo mistake reported in http://marc.info/?t=137358212300006&r=1&w=2

include/configs/omap3_beagle.h | 15 +++++++++++++++

1 file changed, 15 insertions(+)

include/configs/omap3_beagle.h +8 -0

index bdeee17..5ec8ade 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"rdaddr=0x81000000\0" \
+	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage\0" \
 	"ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,17 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
+	"findfdt=" \
+		"if test $beaglerev = AxBx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \
+		"if test $beaglerev = Cx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \
+		"if test $beaglerev = xMAB; then " \

Quoted 8 lines

include/configs/omap3_beagle.h line 265

Quoted 5 lines

include/configs/omap3_beagle.h +5 -0

+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $beaglerev = xMC; then " \
+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $fdtfile = undefined; then " \
+			"echo WARNING: Could not determine device tree to use; fi; \0" \

With the remote chance of a future xM rev D, can you make the fallthrough be 'omap3-beagle-xm.dtb' intead of 'undefined'?

I don't like that idea. On am335x_evm configs we have undefined and then say "hey, it's undefined!" so it's clear that we don't know what to do. That in theory future xM rev D might need a different device tree for example.

Op 15 jul. 2013, om 16:49 heeft Tom Rini <[email protected]> het volgende geschreven:

Quoted 49 lines · Koen Kooi

Quoted 39 lines

Op 15 jul. 2013, om 14:11 heeft Nishanth Menon <[email protected]> het volgende geschreven:

Quoted 36 lines

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
V3: Fixes typo mistake reported in http://marc.info/?t=137358212300006&r=1&w=2

include/configs/omap3_beagle.h | 15 +++++++++++++++

1 file changed, 15 insertions(+)

include/configs/omap3_beagle.h +8 -0

index bdeee17..5ec8ade 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"rdaddr=0x81000000\0" \
+	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage\0" \
 	"ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,17 @@
 		"omapdss.def_disp=${defaultdisplay} " \
 		"root=${nandroot} " \
 		"rootfstype=${nandrootfstype}\0" \
+	"findfdt=" \
+		"if test $beaglerev = AxBx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \
+		"if test $beaglerev = Cx; then " \
+			"setenv fdtfile omap3-beagle.dtb; fi; " \
+		"if test $beaglerev = xMAB; then " \

Quoted 8 lines

include/configs/omap3_beagle.h line 265

Quoted 5 lines

include/configs/omap3_beagle.h +5 -0

+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $beaglerev = xMC; then " \
+			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+		"if test $fdtfile = undefined; then " \
+			"echo WARNING: Could not determine device tree to use; fi; \0" \

With the remote chance of a future xM rev D, can you make the fallthrough be 'omap3-beagle-xm.dtb' intead of 'undefined'?

Quoted 4 lines

I don't like that idea. On am335x_evm configs we have undefined and then say "hey, it's undefined!" so it's clear that we don't know what to do. That in theory future xM rev D might need a different device tree for example.

And that's patched out on the build that actually ships with the beaglebone and beaglebone black so it will fall back to BBB when it can't ID the board. You'll see that the u-boot bits that need the ID for the xM also fallback to the latest rev. I don't see why the boardfile and script need to have different behaviour.

Yes, I'm not terribly happy with what gets done for the shipping U-Boot on BBB, but I understand you're trying to not have too special of a binary used in programming versus distribution of the board. If the vendor wants to ship software that says "when in doubt, it's likely this board", that's OK for the vendor to do.

With the latest transition to device tree, there is a need to simplify the load of device tree depending on board type etc. While at it, simplify few other changes as well.

Testing:
with a uEnv.txt as:
bootdir=/
bootpart=0:1

The following were the boot results:
Beagle (rev C1D): http://pastebin.com/fMdsKkgr
Beagle XM (rev C1): http://pastebin.com/p1zp9AhG

Changes in V3 since v2:
- Minor fixes for RevB beagleboard DVIpup handling
http://marc.info/?t=137357970500004&r=1&w=2
- Picked up acked-by from http://marc.info/?t=137357970700007&r=1&w=2

V2: http://marc.info/?l=u-boot&m=137358206228251&w=2
V1: http://marc.info/?l=u-boot&m=137357963227510&w=2

Nishanth Menon (6):
omap3_beagle: remove JFFS2 support.
omap3_beagle: replace uImage.beagle with generic uImage
beagleboard: remove RevB support for BeagleBoard Xm
omap3_beagle: enable CMD_FS_GENERIC and simplify load of
image/ramdisk
omap3_beagle: support findfdt and loadfdt for devicetree support
omap3_beagle: support booting from zImage and device tree as last
option

 board/ti/beagle/beagle.c       |   28 +++++++------------------
 board/ti/beagle/beagle.h       |    3 +--
 include/configs/omap3_beagle.h |   44 ++++++++++++++++++++++++++++------------
 3 files changed, 39 insertions(+), 36 deletions(-)

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

include/configs/omap3_beagle.h +2 -0

index bdeee17..7833208 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \
        "rdaddr=0x81000000\0" \
+       "fdt_high=0xffffffff\0" \
+       "fdtaddr=0x80f80000\0" \
        "usbtty=cdc_acm\0" \
        "bootfile=uImage\0" \
        "ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,19 @@
                "omapdss.def_disp=${defaultdisplay} " \
                "root=${nandroot} " \

include/configs/omap3_beagle.h +5 -0

+               "if test $beaglerev = xMC; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+               "if test $fdtfile = undefined; then " \
+                       "echo WARNING: Could not determine device tree to use; fi; \0" \
        "bootenv=uEnv.txt\0" \
        "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
        "importbootenv=echo Importing environment from mmc ...; " \

@@ -265,6 +280,7 @@
                "rootfstype=${ramrootfstype}\0" \
        "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \
        "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+       "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
                "bootm ${loadaddr}\0" \

Quoted 35 lines · Nishanth Menon

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

include/configs/omap3_beagle.h +9 -0

index bdeee17..7833208 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \
        "rdaddr=0x81000000\0" \
+       "fdt_high=0xffffffff\0" \
+       "fdtaddr=0x80f80000\0" \
        "usbtty=cdc_acm\0" \
        "bootfile=uImage\0" \
        "ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,19 @@
                "omapdss.def_disp=${defaultdisplay} " \
                "root=${nandroot} " \
                "rootfstype=${nandrootfstype}\0" \
+       "findfdt=" \
+               "if test $beaglerev = AxBx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = Cx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = xMA; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

include/configs/omap3_beagle.h line 263

Quoted 2 lines

include/configs/omap3_beagle.h +2 -0

+               "if test $beaglerev = xMB; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

There is no need for the "xMB" variant, as the gpio pins used for identification where never changed from the xMA when the newer silcon was used for the xMB (i guess if we look at the omap's es revision, we could figure out which are xMB's, but right now that isn't done in u-boot....)

Quoted 36 lines · Robert Nelson

Quoted 35 lines · Nishanth Menon

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

include/configs/omap3_beagle.h +9 -0

index bdeee17..7833208 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \
        "rdaddr=0x81000000\0" \
+       "fdt_high=0xffffffff\0" \
+       "fdtaddr=0x80f80000\0" \
        "usbtty=cdc_acm\0" \
        "bootfile=uImage\0" \
        "ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,19 @@
                "omapdss.def_disp=${defaultdisplay} " \
                "root=${nandroot} " \
                "rootfstype=${nandrootfstype}\0" \
+       "findfdt=" \
+               "if test $beaglerev = AxBx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = Cx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = xMA; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

Quoted 8 lines

include/configs/omap3_beagle.h line 263

Quoted 2 lines

include/configs/omap3_beagle.h +2 -0

+               "if test $beaglerev = xMB; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

There is no need for the "xMB" variant, as the gpio pins used for identification where never changed from the xMA when the newer silcon was used for the xMB (i guess if we look at the omap's es revision, we could figure out which are xMB's, but right now that isn't done in u-boot....)

I suppose then the following is ok to do as well?

board/ti/beagle/beagle.c +0 -3

index c686f40..6094b0f 100644
@@ -369,16 +369,6 @@ int misc_init_r(void)
                                        TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
                                        TWL4030_PM_RECEIVER_DEV_GRP_P1);
                break;
-       case REVISION_XM_B:
-               printf("Beagle xM Rev B\n");
-               setenv("beaglerev", "xMB");

Quoted 57 lines · Nishanth Menon

Quoted 36 lines · Robert Nelson

Quoted 35 lines · Nishanth Menon

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

include/configs/omap3_beagle.h +9 -0

index bdeee17..7833208 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \
        "rdaddr=0x81000000\0" \
+       "fdt_high=0xffffffff\0" \
+       "fdtaddr=0x80f80000\0" \
        "usbtty=cdc_acm\0" \
        "bootfile=uImage\0" \
        "ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,19 @@
                "omapdss.def_disp=${defaultdisplay} " \
                "root=${nandroot} " \
                "rootfstype=${nandrootfstype}\0" \
+       "findfdt=" \
+               "if test $beaglerev = AxBx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = Cx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = xMA; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

Quoted 8 lines

include/configs/omap3_beagle.h line 263

Quoted 2 lines

include/configs/omap3_beagle.h +2 -0

+               "if test $beaglerev = xMB; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

There is no need for the "xMB" variant, as the gpio pins used for identification where never changed from the xMA when the newer silcon was used for the xMB (i guess if we look at the omap's es revision, we could figure out which are xMB's, but right now that isn't done in u-boot....)

I suppose then the following is ok to do as well?

board/ti/beagle/beagle.c +0 -3

index c686f40..6094b0f 100644
@@ -369,16 +369,6 @@ int misc_init_r(void)
                                        TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
                                        TWL4030_PM_RECEIVER_DEV_GRP_P1);
                break;
-       case REVISION_XM_B:
-               printf("Beagle xM Rev B\n");
-               setenv("beaglerev", "xMB");

board/ti/beagle/beagle.c int misc_init_r(void) · line 374

Quoted 10 lines

board/ti/beagle/beagle.c +0 -7

-               MUX_BEAGLE_XM();
-               /* Set VAUX2 to 1.8V for EHCI PHY */
-               twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
-                                       TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
-                                       TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
-                                       TWL4030_PM_RECEIVER_DEV_GRP_P1);
-               break;
        case REVISION_XM_C:
                printf("Beagle xM Rev C\n");
                setenv("beaglerev", "xMC");

Correct, as a cleanup we can nuke that xMB section..

For some bike shed paining we could rename:

Beagle xM Rev A -> Beagle xM Rev A/B

Above that too. ;)

Quoted 71 lines · Robert Nelson

Quoted 57 lines · Nishanth Menon

Quoted 36 lines · Robert Nelson

Quoted 35 lines · Nishanth Menon

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

include/configs/omap3_beagle.h +9 -0

index bdeee17..7833208 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \
        "rdaddr=0x81000000\0" \
+       "fdt_high=0xffffffff\0" \
+       "fdtaddr=0x80f80000\0" \
        "usbtty=cdc_acm\0" \
        "bootfile=uImage\0" \
        "ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,19 @@
                "omapdss.def_disp=${defaultdisplay} " \
                "root=${nandroot} " \
                "rootfstype=${nandrootfstype}\0" \
+       "findfdt=" \
+               "if test $beaglerev = AxBx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = Cx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = xMA; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

Quoted 8 lines

include/configs/omap3_beagle.h line 263

Quoted 2 lines

include/configs/omap3_beagle.h +2 -0

+               "if test $beaglerev = xMB; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

There is no need for the "xMB" variant, as the gpio pins used for identification where never changed from the xMA when the newer silcon was used for the xMB (i guess if we look at the omap's es revision, we could figure out which are xMB's, but right now that isn't done in u-boot....)

I suppose then the following is ok to do as well?

board/ti/beagle/beagle.c +0 -3

index c686f40..6094b0f 100644
@@ -369,16 +369,6 @@ int misc_init_r(void)
                                        TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
                                        TWL4030_PM_RECEIVER_DEV_GRP_P1);
                break;
-       case REVISION_XM_B:
-               printf("Beagle xM Rev B\n");
-               setenv("beaglerev", "xMB");

board/ti/beagle/beagle.c int misc_init_r(void) · line 374

Quoted 10 lines

board/ti/beagle/beagle.c +0 -7

-               MUX_BEAGLE_XM();
-               /* Set VAUX2 to 1.8V for EHCI PHY */
-               twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
-                                       TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
-                                       TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
-                                       TWL4030_PM_RECEIVER_DEV_GRP_P1);
-               break;
        case REVISION_XM_C:
                printf("Beagle xM Rev C\n");
                setenv("beaglerev", "xMC");

Correct, as a cleanup we can nuke that xMB section..

Quoted 5 lines

For some bike shed paining we could rename:

Beagle xM Rev A -> Beagle xM Rev A/B

Above that too. ;)

OK - I suspect and am not sure how dvi_pup will get handled in the resultant diff, What do folks think of the following?

Quoted 72 lines · Nishanth Menon

Quoted 71 lines · Robert Nelson

Quoted 57 lines · Nishanth Menon

Quoted 36 lines · Robert Nelson

Quoted 35 lines · Nishanth Menon

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

include/configs/omap3_beagle.h +9 -0

index bdeee17..7833208 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \
        "rdaddr=0x81000000\0" \
+       "fdt_high=0xffffffff\0" \
+       "fdtaddr=0x80f80000\0" \
        "usbtty=cdc_acm\0" \
        "bootfile=uImage\0" \
        "ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,19 @@
                "omapdss.def_disp=${defaultdisplay} " \
                "root=${nandroot} " \
                "rootfstype=${nandrootfstype}\0" \
+       "findfdt=" \
+               "if test $beaglerev = AxBx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = Cx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = xMA; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

Quoted 8 lines

include/configs/omap3_beagle.h line 263

Quoted 2 lines

include/configs/omap3_beagle.h +2 -0

+               "if test $beaglerev = xMB; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

There is no need for the "xMB" variant, as the gpio pins used for identification where never changed from the xMA when the newer silcon was used for the xMB (i guess if we look at the omap's es revision, we could figure out which are xMB's, but right now that isn't done in u-boot....)

I suppose then the following is ok to do as well?

board/ti/beagle/beagle.c +0 -3

index c686f40..6094b0f 100644
@@ -369,16 +369,6 @@ int misc_init_r(void)
                                        TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
                                        TWL4030_PM_RECEIVER_DEV_GRP_P1);
                break;
-       case REVISION_XM_B:
-               printf("Beagle xM Rev B\n");
-               setenv("beaglerev", "xMB");

board/ti/beagle/beagle.c int misc_init_r(void) · line 374

Quoted 10 lines

board/ti/beagle/beagle.c +0 -7

-               MUX_BEAGLE_XM();
-               /* Set VAUX2 to 1.8V for EHCI PHY */
-               twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
-                                       TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
-                                       TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
-                                       TWL4030_PM_RECEIVER_DEV_GRP_P1);
-               break;
        case REVISION_XM_C:
                printf("Beagle xM Rev C\n");
                setenv("beaglerev", "xMC");

Correct, as a cleanup we can nuke that xMB section..

Quoted 7 lines

Quoted 5 lines

For some bike shed paining we could rename:

Beagle xM Rev A -> Beagle xM Rev A/B

Above that too. ;)

OK - I suspect and am not sure how dvi_pup will get handled in the resultant diff, What do folks think of the following?

A quick review of all my old xM schematics i have access to and the ones on https://github.com/CircuitCo/

For the "dvi_pup" function

GPIO_170 was only used on the pre-production xM's P8/P9, i doubt any of them still operate (mine died)..

It was then switched to GPIO_129 for the xMA, however there where MMC issues, so it was changed for xMA1 (and thus xMA2)
notes, top of this:
https://github.com/CircuitCo/BeagleBoard-xM-RevC/blob/master/BeagleBoard-xM_revC_SCH.pdf

TPS_GPIO_2: was then used on xMA3 -> and all later generations...

So also looking at:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mach-omap2/board-omap3beagle.c#n161

Looks like the original beagle needs GPIO_170..

So I'd just set GPIO_170 for:

case REVISION_AXBX:
case REVISION_CX:
case REVISION_C4:

and ignore all the pre-production xM P8/P8's/xMA..

Side note, I think 'first' customers just got the xMA2 and newer.. As i was one of the first, and it's still running downstairs..

Quoted 103 lines · Robert Nelson

Quoted 72 lines · Nishanth Menon

Quoted 71 lines · Robert Nelson

Quoted 57 lines · Nishanth Menon

Quoted 36 lines · Robert Nelson

Quoted 35 lines · Nishanth Menon

For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy.

So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts.

Signed-off-by Nishanth Menon <[email protected]>

---
 include/configs/omap3_beagle.h |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

include/configs/omap3_beagle.h +9 -0

index bdeee17..7833208 100644
@@ -210,6 +210,8 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \
        "rdaddr=0x81000000\0" \
+       "fdt_high=0xffffffff\0" \
+       "fdtaddr=0x80f80000\0" \
        "usbtty=cdc_acm\0" \
        "bootfile=uImage\0" \
        "ramdisk=ramdisk.gz\0" \

@@ -250,6 +252,19 @@
                "omapdss.def_disp=${defaultdisplay} " \
                "root=${nandroot} " \
                "rootfstype=${nandrootfstype}\0" \
+       "findfdt=" \
+               "if test $beaglerev = AxBx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = Cx; then " \
+                       "setenv fdtfile omap3-beagle.dtb; fi; " \
+               "if test $beaglerev = xMA; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

Quoted 8 lines

include/configs/omap3_beagle.h line 263

Quoted 2 lines

include/configs/omap3_beagle.h +2 -0

+               "if test $beaglerev = xMB; then " \
+                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \

There is no need for the "xMB" variant, as the gpio pins used for identification where never changed from the xMA when the newer silcon was used for the xMB (i guess if we look at the omap's es revision, we could figure out which are xMB's, but right now that isn't done in u-boot....)

I suppose then the following is ok to do as well?

board/ti/beagle/beagle.c +0 -3

index c686f40..6094b0f 100644
@@ -369,16 +369,6 @@ int misc_init_r(void)
                                        TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
                                        TWL4030_PM_RECEIVER_DEV_GRP_P1);
                break;
-       case REVISION_XM_B:
-               printf("Beagle xM Rev B\n");
-               setenv("beaglerev", "xMB");

board/ti/beagle/beagle.c int misc_init_r(void) · line 374

Quoted 10 lines

board/ti/beagle/beagle.c +0 -7

-               MUX_BEAGLE_XM();
-               /* Set VAUX2 to 1.8V for EHCI PHY */
-               twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
-                                       TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
-                                       TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
-                                       TWL4030_PM_RECEIVER_DEV_GRP_P1);
-               break;
        case REVISION_XM_C:
                printf("Beagle xM Rev C\n");
                setenv("beaglerev", "xMC");

Correct, as a cleanup we can nuke that xMB section..

Quoted 7 lines

Quoted 5 lines

For some bike shed paining we could rename:

Beagle xM Rev A -> Beagle xM Rev A/B

Above that too. ;)

OK - I suspect and am not sure how dvi_pup will get handled in the resultant diff, What do folks think of the following?

A quick review of all my old xM schematics i have access to and the ones on https://github.com/CircuitCo/

For the "dvi_pup" function

GPIO_170 was only used on the pre-production xM's P8/P9, i doubt any of them still operate (mine died)..

It was then switched to GPIO_129 for the xMA, however there where MMC issues, so it was changed for xMA1 (and thus xMA2)
notes, top of this:
https://github.com/CircuitCo/BeagleBoard-xM-RevC/blob/master/BeagleBoard-xM_revC_SCH.pdf

TPS_GPIO_2: was then used on xMA3 -> and all later generations...

So also looking at:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mach-omap2/board-omap3beagle.c#n161

Looks like the original beagle needs GPIO_170..

So I'd just set GPIO_170 for:

Quoted 8 lines

case REVISION_AXBX:
case REVISION_CX:
case REVISION_C4:

and ignore all the pre-production xM P8/P8's/xMA..

Side note, I think 'first' customers just got the xMA2 and newer.. As i was one of the first, and it's still running downstairs..

ok, here is how the code looks like with the V2 of my series:

Do we just default to none for XM_AB for dvi_pup?

static void beagle_dvi_pup(void)

{
        uchar val;

        switch (get_board_revision()) {
        case REVISION_AXBX:
        case REVISION_CX:
        case REVISION_C4:
        case REVISION_XM_AB:
                gpio_request(170, "");
                gpio_direction_output(170, 0);
                gpio_set_value(170, 1);
                break;
        case REVISION_XM_C:
        default:
                #define GPIODATADIR1 (TWL4030_BASEADD_GPIO+3)
                #define GPIODATAOUT1 (TWL4030_BASEADD_GPIO+6)

                i2c_read(TWL4030_CHIP_GPIO, GPIODATADIR1, 1, &val, 1);
                val |= 4;

                i2c_write(TWL4030_CHIP_GPIO, GPIODATADIR1, 1, &val, 1);

                i2c_read(TWL4030_CHIP_GPIO, GPIODATAOUT1, 1, &val, 1);
                val |= 4;
                i2c_write(TWL4030_CHIP_GPIO, GPIODATAOUT1, 1, &val, 1);
                break;
        }
}

Quoted 24 lines · Nishanth Menon

ok, here is how the code looks like with the V2 of my series:

Do we just default to none for XM_AB for dvi_pup?

static void beagle_dvi_pup(void)

{
        uchar val;

        switch (get_board_revision()) {
        case REVISION_AXBX:
        case REVISION_CX:
        case REVISION_C4:
        case REVISION_XM_AB:
                gpio_request(170, "");
                gpio_direction_output(170, 0);
                gpio_set_value(170, 1);
                break;
        case REVISION_XM_C:
        default:
                #define GPIODATADIR1 (TWL4030_BASEADD_GPIO+3)
                #define GPIODATAOUT1 (TWL4030_BASEADD_GPIO+6)

                i2c_read(TWL4030_CHIP_GPIO, GPIODATADIR1, 1, &val, 1);
                val |= 4;

Quoted 8 lines

                i2c_write(TWL4030_CHIP_GPIO, GPIODATADIR1, 1, &val, 1);

                i2c_read(TWL4030_CHIP_GPIO, GPIODATAOUT1, 1, &val, 1);
                val |= 4;
                i2c_write(TWL4030_CHIP_GPIO, GPIODATAOUT1, 1, &val, 1);
                break;
        }
}

I'd do it like this, as...

On the xMA, xMA1, & xMA2: TPS_GPIO2 is not connected to anything... xMA3->xMC: TPS_GPIO2 is connected to dvi_pup

static void beagle_dvi_pup(void)

{
        uchar val;

        switch (get_board_revision()) {
        case REVISION_AXBX:
        case REVISION_CX:
        case REVISION_C4:
                gpio_request(170, "");
                gpio_direction_output(170, 0);
                gpio_set_value(170, 1);
                break;
        case REVISION_XM_AB:
        case REVISION_XM_C:
        default:
                #define GPIODATADIR1 (TWL4030_BASEADD_GPIO+3)
                #define GPIODATAOUT1 (TWL4030_BASEADD_GPIO+6)

                i2c_read(TWL4030_CHIP_GPIO, GPIODATADIR1, 1, &val, 1);
                val |= 4;

                i2c_write(TWL4030_CHIP_GPIO, GPIODATADIR1, 1, &val, 1);

                i2c_read(TWL4030_CHIP_GPIO, GPIODATAOUT1, 1, &val, 1);
                val |= 4;
                i2c_write(TWL4030_CHIP_GPIO, GPIODATAOUT1, 1, &val, 1);
                break;
        }
}