diff options
Diffstat (limited to 'recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch')
| -rw-r--r-- | recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch | 165 |
1 files changed, 0 insertions, 165 deletions
diff --git a/recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch b/recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch deleted file mode 100644 index 1d943cb08f..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch +++ /dev/null @@ -1,165 +0,0 @@ -From fae6228e203436ce0d82ce32da769bd91206865f Mon Sep 17 00:00:00 2001 -From: Steve Sakoman <steve@sakoman.com> -Date: Wed, 10 Feb 2010 14:51:48 -0800 -Subject: [PATCH 03/50] OMAP3: update Beagle revision detection to recognize C4 boards - ---- - board/ti/beagle/beagle.c | 77 +++++++++++++++++++++++++++------------------- - board/ti/beagle/beagle.h | 7 +++- - 2 files changed, 51 insertions(+), 33 deletions(-) - -diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c -index 3b4c9e7..ba16dd7 100644 ---- a/board/ti/beagle/beagle.c -+++ b/board/ti/beagle/beagle.c -@@ -38,7 +38,7 @@ - #include <asm/mach-types.h> - #include "beagle.h" - --static int beagle_revision_c; -+static int beagle_revision; - - /* - * Routine: board_init -@@ -60,41 +60,38 @@ int board_init(void) - /* - * Routine: beagle_get_revision - * Description: Return the revision of the BeagleBoard this code is running on. -- * If it is a revision Ax/Bx board, this function returns 0, -- * on a revision C board you will get a 1. - */ - int beagle_get_revision(void) - { -- return beagle_revision_c; -+ return beagle_revision; - } - - /* - * Routine: beagle_identify -- * Description: Detect if we are running on a Beagle revision Ax/Bx or -- * Cx. This can be done by GPIO_171. If this is low, we are -- * running on a revision C board. -+ * Description: Detect if we are running on a Beagle revision Ax/Bx, -+ * C1/2/3, C4 or D. This can be done by reading -+ * the level of GPIO173, GPIO172 and GPIO171. This should -+ * result in -+ * GPIO173, GPIO172, GPIO171: 1 1 1 => Ax/Bx -+ * GPIO173, GPIO172, GPIO171: 1 1 0 => C1/2/3 -+ * GPIO173, GPIO172, GPIO171: 1 0 1 => C4 -+ * GPIO173, GPIO172, GPIO171: 0 0 0 => D - */ - void beagle_identify(void) - { -- beagle_revision_c = 0; -- if (!omap_request_gpio(171)) { -- unsigned int val; -- -- omap_set_gpio_direction(171, 1); -- val = omap_get_gpio_datain(171); -- omap_free_gpio(171); -- -- if (val) -- beagle_revision_c = 0; -- else -- beagle_revision_c = 1; -- } -- -- printf("Board revision "); -- if (beagle_revision_c) -- printf("C\n"); -- else -- printf("Ax/Bx\n"); -+ omap_request_gpio(171); -+ omap_request_gpio(172); -+ omap_request_gpio(173); -+ omap_set_gpio_direction(171, 1); -+ omap_set_gpio_direction(172, 1); -+ omap_set_gpio_direction(173, 1); -+ -+ beagle_revision = omap_get_gpio_datain(173) << 2 | -+ omap_get_gpio_datain(172) << 1 | -+ omap_get_gpio_datain(171); -+ omap_free_gpio(171); -+ omap_free_gpio(172); -+ omap_free_gpio(173); - } - - /* -@@ -106,9 +103,31 @@ int misc_init_r(void) - struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE; - struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; - -+ beagle_identify(); -+ - twl4030_power_init(); - twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON); - -+ printf("Board revision "); -+ switch (beagle_revision) { -+ case REVISION_AXBX: -+ printf("Ax/Bx\n"); -+ break; -+ case REVISION_CX: -+ printf("C1/C2/C3\n"); -+ MUX_BEAGLE_C(); -+ break; -+ case REVISION_C4: -+ printf("C4\n"); -+ MUX_BEAGLE_C(); -+ break; -+ case REVISION_D: -+ printf("D\n"); -+ break; -+ default: -+ printf("unknown 0x%02x\n", beagle_revision); -+ } -+ - /* Configure GPIOs to output */ - writel(~(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1), &gpio6_base->oe); - writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | -@@ -120,8 +139,6 @@ int misc_init_r(void) - writel(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 | - GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout); - -- beagle_identify(); -- - dieid_num_r(); - - return 0; -@@ -136,8 +153,4 @@ int misc_init_r(void) - void set_muxconf_regs(void) - { - MUX_BEAGLE(); -- -- if (beagle_revision_c) { -- MUX_BEAGLE_C(); -- } - } -diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h -index 7fe6275..d95fd78 100644 ---- a/board/ti/beagle/beagle.h -+++ b/board/ti/beagle/beagle.h -@@ -34,6 +34,11 @@ const omap3_sysinfo sysinfo = { - }; - - #define BOARD_REVISION_MASK (0x1 << 11) -+/* BeagleBoard revisions */ -+#define REVISION_AXBX 0x7 -+#define REVISION_CX 0x6 -+#define REVISION_C4 0x5 -+#define REVISION_D 0x0 - - /* - * IEN - Input Enable -@@ -264,7 +269,7 @@ const omap3_sysinfo sysinfo = { - MUX_VAL(CP(HDQ_SIO), (IDIS | PTU | EN | M4)) /*GPIO_170*/\ - MUX_VAL(CP(MCSPI1_CLK), (IEN | PTU | EN | M4)) /*GPIO_171*/\ - MUX_VAL(CP(MCSPI1_SIMO), (IEN | PTU | EN | M4)) /*GPIO_172*/\ -- MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTD | DIS | M0)) /*McSPI1_SOMI*/\ -+ MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTU | EN | M4)) /*GPIO_173*/\ - MUX_VAL(CP(MCSPI1_CS0), (IEN | PTD | EN | M0)) /*McSPI1_CS0*/\ - MUX_VAL(CP(MCSPI1_CS1), (IDIS | PTD | EN | M0)) /*McSPI1_CS1*/\ - MUX_VAL(CP(MCSPI1_CS2), (IDIS | PTD | DIS | M4)) /*GPIO_176*/\ --- -1.6.6.1 - |