Patchwork [v3] linux-omap-psp: Fix the user button GPIO to the correct value for a BeagleBoard-xM

login
register
mail settings
Submitter Joel A Fernandes
Date July 6, 2011, 4:02 p.m.
Message ID <1309968166-23347-1-git-send-email-agnel.joel@gmail.com>
Download mbox | patch
Permalink /patch/7091/
State New, archived
Headers show

Comments

Joel A Fernandes - July 6, 2011, 4:02 p.m.
The user-button wasn't working for me with the the linux-omap-psp-2.6.32 kernel, this change fixes it. I noticed the correct value in the linux-omap-2.6.39 sources

Signed-off-by: Joel A Fernandes <agnel.joel@gmail.com>
---
Changes since v2:
* Bumped PR
* Made the commit summary more descriptive, removed full stop

 conf/machine/include/omap3.inc                     |    2 +-
 ...agle-cleaned-up-board-revision-conditions.patch |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Joel A Fernandes - July 10, 2011, 11:51 p.m.
Hi,

On Wed, Jul 6, 2011 at 11:02 AM, Joel A Fernandes <agnel.joel@gmail.com> wrote:
> The user-button wasn't working for me with the the linux-omap-psp-2.6.32 kernel, this change fixes it. I noticed the correct value in the linux-omap-2.6.39 sources
>
> Signed-off-by: Joel A Fernandes <agnel.joel@gmail.com>
> ---
> Changes since v2:
> * Bumped PR
> * Made the commit summary more descriptive, removed full stop
>
>  conf/machine/include/omap3.inc                     |    2 +-
>  ...agle-cleaned-up-board-revision-conditions.patch |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc

Could this patch be ACKed and/or applied to the dev and maintenance trees?

Thanks
Joel
Jason Kridner - July 11, 2011, 12:16 a.m.
On Wed, Jul 6, 2011 at 12:02 PM, Joel A Fernandes <agnel.joel@gmail.com> wrote:
> The user-button wasn't working for me with the the linux-omap-psp-2.6.32 kernel, this change fixes it. I noticed the correct value in the linux-omap-2.6.39 sources
>
> Signed-off-by: Joel A Fernandes <agnel.joel@gmail.com>
> ---
> Changes since v2:
> * Bumped PR
> * Made the commit summary more descriptive, removed full stop

Acked-by: Jason Kridner <jkridner@beagleboard.org>

I confirmed by looking at the schematics that this is the correct
logic.  GPIO4 for BeagleBoard-xM and GPIO7 for BeagleBoard.

>
>  conf/machine/include/omap3.inc                     |    2 +-
>  ...agle-cleaned-up-board-revision-conditions.patch |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
> index c762d41..f806a32 100644
> --- a/conf/machine/include/omap3.inc
> +++ b/conf/machine/include/omap3.inc
> @@ -4,7 +4,7 @@ TARGET_ARCH = "arm"
>  require conf/machine/include/tune-cortexa8.inc
>  PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
>  # Increase this everytime you change something in the kernel
> -MACHINE_KERNEL_PR = "r102"
> +MACHINE_KERNEL_PR = "r103"
>
>  KERNEL_IMAGETYPE = "uImage"
>
> diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch
> index 513a101..fb91cb6 100644
> --- a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch
> +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch
> @@ -143,8 +143,8 @@ index 4bde54b..664a9c6 100644
>        omap3_beagle_i2c_init();
>
>  -      if (cpu_is_omap3630()) {
> -+      if ((omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMAB) &&
> -+              (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC)) {
> ++      if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMAB) ||
> ++              (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)) {
>                gpio_buttons[0].gpio = 4;
>        }
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index c762d41..f806a32 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -4,7 +4,7 @@  TARGET_ARCH = "arm"
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r102"
+MACHINE_KERNEL_PR = "r103"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch
index 513a101..fb91cb6 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard-xmc/0008-omap3-beagle-cleaned-up-board-revision-conditions.patch
@@ -143,8 +143,8 @@  index 4bde54b..664a9c6 100644
  	omap3_beagle_i2c_init();
  
 -	if (cpu_is_omap3630()) {
-+	if ((omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMAB) &&
-+		(omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC)) {
++	if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMAB) ||
++		(omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)) {
  		gpio_buttons[0].gpio = 4;
  	}