linux-ti33x-psp 3.1rc8: Add pin mux and init for beaglebone specific devices
authorJoel A Fernandes <joelagnel@ti.com>
Thu, 20 Oct 2011 06:54:16 +0000 (01:54 -0500)
committerKoen Kooi <koen@dominion.thruhere.net>
Thu, 20 Oct 2011 07:18:04 +0000 (09:18 +0200)
Updated the USER LED patch to include BeagleBone tester specific initialization/code.

Build and run time tested.

Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/0001-am335x-Add-pin-mux-and-init-for-beaglebone-specific-.patch [moved from recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/0001-am335x-evm-hack-in-LED-support-for-beaglebone.patch with 58% similarity]
recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb

similarity index 58%
rename from recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/0001-am335x-evm-hack-in-LED-support-for-beaglebone.patch
rename to recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/0001-am335x-Add-pin-mux-and-init-for-beaglebone-specific-.patch
index b043ce9b72179beed881aeec5d08d3a4726d65f6..a501c8a48bb73eb04d773245a231d514c0e870bb 100644 (file)
@@ -1,16 +1,20 @@
-From f658d7975f2e7232786190002ddd24d6b92ba965 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
+From 5be793dc9de7e694d9256396aecfdc136c8e2cf6 Mon Sep 17 00:00:00 2001
+From: Joel A Fernandes <joelagnel@ti.com>
 Date: Mon, 17 Oct 2011 02:00:39 -0400
 Date: Mon, 17 Oct 2011 02:00:39 -0400
-Subject: [PATCH] am335x-evm: hack in LED support for beaglebone
+Subject: [PATCH] am335x: Add pin mux and init for beaglebone specific devices
 
 
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+Currently added for following:
+  * User LEDs (added by Koen Kooi <k-kooi@ti.com>)
+  * BeagleBone tester
+
+Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
 ---
 ---
- arch/arm/mach-omap2/board-am335xevm.c |   63 +++++++++++++++++++++++++++++++++
- 1 files changed, 63 insertions(+), 0 deletions(-)
+ arch/arm/mach-omap2/board-am335xevm.c |   69 +++++++++++++++++++++++++++++++++
+ arch/arm/mach-omap2/mux33xx.c         |    2 +-
+ 2 files changed, 70 insertions(+), 1 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
 
 diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
-index 87eec7b..3a3c55b 100644
+index f625510..6beaa23 100644
 --- a/arch/arm/mach-omap2/board-am335xevm.c
 +++ b/arch/arm/mach-omap2/board-am335xevm.c
 @@ -17,6 +17,7 @@
 --- a/arch/arm/mach-omap2/board-am335xevm.c
 +++ b/arch/arm/mach-omap2/board-am335xevm.c
 @@ -17,6 +17,7 @@
@@ -21,7 +25,7 @@ index 87eec7b..3a3c55b 100644
  #include <linux/spi/spi.h>
  #include <linux/spi/flash.h>
  #include <linux/mtd/mtd.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/flash.h>
  #include <linux/mtd/mtd.h>
-@@ -588,6 +589,58 @@ static struct pinmux_config usb1_pin_mux[] = {
+@@ -590,6 +591,61 @@ static struct pinmux_config usb1_pin_mux[] = {
        {NULL, 0},
  };
  
        {NULL, 0},
  };
  
@@ -70,24 +74,30 @@ index 87eec7b..3a3c55b 100644
 +                  &leds_gpio,
 +};
 +
 +                  &leds_gpio,
 +};
 +
-+static struct pinmux_config boneled_pin_mux[] = {
-+    {"gpmc_a5.rgmii2_td0", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, // gpio 21
-+    {"gpmc_a6.rgmii2_tclk", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, // gpio22
-+    {"gpmc_a7.rgmii2_rclk", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, // gpio23
-+    {"gpmc_a8.rgmii2_rd3", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, // gpio 24
++static struct pinmux_config bone_pin_mux[] = {
++      /* User LED gpios (gpio1_21 to gpio1_24) */
++    {"gpmc_a5.rgmii2_td0", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT},
++    {"gpmc_a6.rgmii2_tclk", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT},
++    {"gpmc_a7.rgmii2_rclk", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT},
++    {"gpmc_a8.rgmii2_rd3", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT},
++    /* Grounding gpio1_6 (pin 3 Conn A) signals bone tester to start diag tests */
++    {"gpmc_ad6.gpio1_6", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT_PULLUP},
 +};
 +
  /* Module pin mux for eCAP0 */
  static struct pinmux_config ecap0_pin_mux[] = {
        {"ecap0_in_pwm0_out.gpio0_7", AM33XX_PIN_OUTPUT},
 +};
 +
  /* Module pin mux for eCAP0 */
  static struct pinmux_config ecap0_pin_mux[] = {
        {"ecap0_in_pwm0_out.gpio0_7", AM33XX_PIN_OUTPUT},
-@@ -696,6 +749,15 @@ static void tsc_init(int evm_id, int profile)
+@@ -698,6 +754,18 @@ static void tsc_init(int evm_id, int profile)
                pr_err("failed to register touchscreen device\n");
  }
  
                pr_err("failed to register touchscreen device\n");
  }
  
-+static void bone_leds_init(int evm_id, int profil )
++/*
++ * Initialization of BeagleBone specific devices
++ */
++static void bone_init(int evm_id, int profil )
 +{
 +      int err;
 +{
 +      int err;
-+      setup_pin_mux(boneled_pin_mux);
++      setup_pin_mux(bone_pin_mux);
 +      err = platform_add_devices(bone_devices, ARRAY_SIZE(bone_devices));
 +      if (err)
 +              pr_err("failed to register LEDS\n");
 +      err = platform_add_devices(bone_devices, ARRAY_SIZE(bone_devices));
 +      if (err)
 +              pr_err("failed to register LEDS\n");
@@ -96,14 +106,27 @@ index 87eec7b..3a3c55b 100644
  static void rgmii1_init(int evm_id, int profile)
  {
        setup_pin_mux(rgmii1_pin_mux);
  static void rgmii1_init(int evm_id, int profile)
  {
        setup_pin_mux(rgmii1_pin_mux);
-@@ -1101,6 +1163,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = {
+@@ -1103,6 +1171,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = {
        {usb0_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
        {usb1_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
        {mmc0_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
        {usb0_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
        {usb1_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
        {mmc0_init,     DEV_ON_BASEBOARD, PROFILE_NONE},
-+      {bone_leds_init,  DEV_ON_BASEBOARD, PROFILE_ALL},
++      {bone_init,     DEV_ON_BASEBOARD, PROFILE_ALL},
        {NULL, 0, 0},
  };
  
        {NULL, 0, 0},
  };
  
+diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c
+index 0286c4f..f09e827 100644
+--- a/arch/arm/mach-omap2/mux33xx.c
++++ b/arch/arm/mach-omap2/mux33xx.c
+@@ -49,7 +49,7 @@ static struct omap_mux __initdata am33xx_muxmodes[] = {
+               NULL, NULL, NULL, NULL),
+       _AM33XX_MUXENTRY(GPMC_AD6, 0,
+               "gpmc_ad6", "mmc1_dat6", NULL, NULL,
+-              NULL, NULL, NULL, NULL),
++              NULL, NULL, NULL, "gpio1_6"),
+       _AM33XX_MUXENTRY(GPMC_AD7, 0,
+               "gpmc_ad7", "mmc1_dat7", NULL, NULL,
+               NULL, NULL, NULL, NULL),
 -- 
 -- 
-1.7.0.4
+1.7.1
 
 
index e42b8a0fda80cbd0ad09e84f0905120a0492f848..ba40bdbb7ff98ab2e0724350a7216f5f4e5e528f 100644 (file)
@@ -11,7 +11,7 @@ MULTI_CONFIG_BASE_SUFFIX = ""
 
 BRANCH = "master"
 SRCREV = "a95ceb11b5858feae89895d14d7f7bc41cca9fd6"
 
 BRANCH = "master"
 SRCREV = "a95ceb11b5858feae89895d14d7f7bc41cca9fd6"
-MACHINE_KERNEL_PR_append = "d+gitr${SRCREV}"
+MACHINE_KERNEL_PR_append = "e+gitr${SRCREV}"
 
 COMPATIBLE_MACHINE = "(ti33x)"
 
 
 COMPATIBLE_MACHINE = "(ti33x)"
 
@@ -26,7 +26,7 @@ SRC_URI += "git://arago-project.org/git/projects/linux-am33x.git;protocol=git;br
 
 PATCHES_OVER_PSP = " \
        file://0001-f_rndis-HACK-around-undefined-variables.patch \
 
 PATCHES_OVER_PSP = " \
        file://0001-f_rndis-HACK-around-undefined-variables.patch \
-       file://0001-am335x-evm-hack-in-LED-support-for-beaglebone.patch \
+       file://0001-am335x-Add-pin-mux-and-init-for-beaglebone-specific-.patch \
        file://0001-mach-types-Add-new-machine-type-beaglebone-to-mach-t.patch \
        file://0002-Kconfig-Add-support-for-beaglebone-machine-id.patch \
        file://0003-am335xevm-Use-new-beaglebone-machine-id.patch \
        file://0001-mach-types-Add-new-machine-type-beaglebone-to-mach-t.patch \
        file://0002-Kconfig-Add-support-for-beaglebone-machine-id.patch \
        file://0003-am335xevm-Use-new-beaglebone-machine-id.patch \