hackndev-commit

[Hackndev-commit] SF.net SVN: hackndev: [1279] linux4palm/linux/trunk/arch/arm/mach-pxa/ htcsable

[<mar...@us...>]

Revision: 1279
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1279&view=rev
Author:   marex_z71
Date:     2007-08-26 03:17:16 -0700 (Sun, 26 Aug 2007)

Log Message:
-----------
HTC_Beetles: fix some bugs

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c
    linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c
    linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_lcd.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c	2007-08-26 05:59:10 UTC (rev 1278)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c	2007-08-26 10:17:16 UTC (rev 1279)
@@ -50,7 +50,7 @@
 
 static int __init htcsable_buttons_init(void)
 {
-	if (!machine_is_hw6900())
+	if (!(machine_is_hw6900() || machine_is_htcbeetles()))
 		return -ENODEV;
 
 	return platform_driver_register(&htcsable_buttons_driver);

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c	2007-08-26 05:59:10 UTC (rev 1278)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c	2007-08-26 10:17:16 UTC (rev 1279)
@@ -37,7 +37,7 @@
 
 static int __init htcsable_kbd_probe(struct platform_device * pdev)
 {
-	if (!machine_is_hw6900())
+	if (!(machine_is_hw6900() || machine_is_htcbeetles()))
 		return -ENODEV;
 
 	if (!(htcsable_kbd = input_allocate_device()))

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_lcd.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_lcd.c	2007-08-26 05:59:10 UTC (rev 1278)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_lcd.c	2007-08-26 10:17:16 UTC (rev 1279)
@@ -147,7 +147,7 @@
 
 static int htcsable_lcd_init(void)
 {
-	if (!machine_is_hw6900())
+	if (!(machine_is_hw6900() || machine_is_htcbeetles()))
 		return -ENODEV;
 
 	return platform_driver_register(&htcsable_lcd_driver);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hackndev-commit] SF.net SVN: hackndev: [1301] linux4palm/linux/trunk/arch/arm/mach-pxa/ htcsable

[<mar...@us...>]

Revision: 1301
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1301&view=rev
Author:   marex_z71
Date:     2007-09-03 00:19:52 -0700 (Mon, 03 Sep 2007)

Log Message:
-----------
HTC_Beetles: cleanups, fixes etc.

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c
    linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c	2007-09-02 13:11:19 UTC (rev 1300)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_buttons.c	2007-09-03 07:19:52 UTC (rev 1301)
@@ -42,9 +42,9 @@
 }
 
 static struct platform_driver htcsable_buttons_driver = {
-  .driver = {
-    .name           = "htcsable_buttons",
-  },
+	.driver = {
+		.name	= "htcsable_buttons",
+	},
 	.probe          = htcsable_buttons_probe,
 };
 

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c	2007-09-02 13:11:19 UTC (rev 1300)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/htcsable/htcsable_kbd.c	2007-09-03 07:19:52 UTC (rev 1301)
@@ -13,8 +13,8 @@
 #include <linux/input_pda.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <asm/arch/h4000-gpio.h>
-#include <asm/arch/h4000-asic.h>
+#include <asm/arch/htcsable-gpio.h>
+#include <asm/arch/htcsable-asic.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/hardware.h>
 #include <asm/arch/bitfield.h>
@@ -27,7 +27,7 @@
 static irqreturn_t htcsable_pwr_btn(int irq, void* data)
 {
 	int pressed;
-	pressed = !GET_H4000_GPIO(POWER_BUTTON_N);
+	pressed = !GET_HTCSABLE_GPIO(KEY_ON_N);
 
 	input_report_key(htcsable_kbd, KEY_POWER, pressed);
 	input_sync(htcsable_kbd);
@@ -47,9 +47,9 @@
 	htcsable_kbd->evbit[0]    = BIT(EV_KEY) | BIT(EV_REP);
 
 	set_bit(KEY_POWER, htcsable_kbd->keybit);
-	request_irq(IRQ_GPIO(GPIO_NR_H4000_POWER_BUTTON_N), htcsable_pwr_btn,
-			IRQF_SAMPLE_RANDOM, "Power button", NULL);
-	set_irq_type(IRQ_GPIO(GPIO_NR_H4000_POWER_BUTTON_N), IRQT_BOTHEDGE);
+	request_irq(IRQ_GPIO(GPIO_NR_HTCSABLE_KEY_ON_N), htcsable_pwr_btn,
+		    IRQF_SAMPLE_RANDOM, "Power button", NULL);
+	set_irq_type(IRQ_GPIO(GPIO_NR_HTCSABLE_KEY_ON_N), IRQT_BOTHEDGE);
 
 	input_register_device(htcsable_kbd);
 
@@ -59,7 +59,7 @@
 static int htcsable_kbd_remove(struct platform_device * pdev)
 {       
 	input_unregister_device(htcsable_kbd);
-	free_irq(IRQ_GPIO(GPIO_NR_H4000_POWER_BUTTON_N), NULL);
+	free_irq(IRQ_GPIO(GPIO_NR_HTCSABLE_KEY_ON_N), NULL);
 
 	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.