Changeset 2308

Timestamp:

06/20/07 16:27:40 (6 years ago)

Author:

laforge

Message:

• actually transition to the new state, if state change was successful
• fix parsing of state name if presented from userspace via sysfs

File:

• trunk/src/target/kernel/patches/gta01-jbt6k74.patch (modified) (6 diffs)

trunk/src/target/kernel/patches/gta01-jbt6k74.patch

@@ -2 +2 @@
 as found on the FIC GTA01 hardware
 
-Index: linux-2.6.21-moko/drivers/spi/Kconfig
+Index: linux-2.6.21.3-moko/drivers/spi/Kconfig
 ===================================================================
---- linux-2.6.21-moko.orig/drivers/spi/Kconfig
-+++ linux-2.6.21-moko/drivers/spi/Kconfig
+--- linux-2.6.21.3-moko.orig/drivers/spi/Kconfig
++++ linux-2.6.21.3-moko/drivers/spi/Kconfig
 @@ -160,5 +160,9 @@
  
@@ -16 +16 @@
  endmenu # "SPI support"
  
-Index: linux-2.6.21-moko/drivers/spi/Makefile
+Index: linux-2.6.21.3-moko/drivers/spi/Makefile
 ===================================================================
---- linux-2.6.21-moko.orig/drivers/spi/Makefile
-+++ linux-2.6.21-moko/drivers/spi/Makefile
+--- linux-2.6.21.3-moko.orig/drivers/spi/Makefile
++++ linux-2.6.21.3-moko/drivers/spi/Makefile
 @@ -30,4 +30,5 @@
  #      ... add above this line ...
@@ -26 +26 @@
 +obj-$(CONFIG_SPI_SLAVE_JBT6K74)                += jbt6k74.o
  #      ... add above this line ...
-Index: linux-2.6.21-moko/drivers/spi/jbt6k74.c
+Index: linux-2.6.21.3-moko/drivers/spi/jbt6k74.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21-moko/drivers/spi/jbt6k74.c
-@@ -0,0 +1,540 @@
++++ linux-2.6.21.3-moko/drivers/spi/jbt6k74.c
+@@ -0,0 +1,543 @@
 +/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
 + *
@@ -361 +361 @@
 +               break;
 +       }
++       if (rc == 0)
++               jbt->state = new_state;
 +
 +       return rc;
@@ -394 +396 @@
 +
 +       for (i = 0; i < ARRAY_SIZE(jbt_state_names); i++) {
-+               if (!strcmp(buf, jbt_state_names[i])) {
++               if (!strncmp(buf, jbt_state_names[i],
++                            strlen(jbt_state_names[i]))) {
 +                       jbt6k74_enter_state(jbt, i);
 +                       return count;
@@ -571 +574 @@
 +module_init(jbt_init);
 +module_exit(jbt_exit);
-Index: linux-2.6.21-moko/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6.21.3-moko/arch/arm/mach-s3c2410/Kconfig
 ===================================================================
---- linux-2.6.21-moko.orig/arch/arm/mach-s3c2410/Kconfig
-+++ linux-2.6.21-moko/arch/arm/mach-s3c2410/Kconfig
+--- linux-2.6.21.3-moko.orig/arch/arm/mach-s3c2410/Kconfig
++++ linux-2.6.21.3-moko/arch/arm/mach-s3c2410/Kconfig
 @@ -106,6 +106,7 @@
  config MACH_QT2410