[Armadeus-commitlog] SF.net SVN: armadeus:[1325] trunk/buildroot/target/device/armadeus/linux/ kern
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1325] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.29
|
From: <ar...@us...> - 2009-06-04 07:49:03
|
Revision: 1325
http://armadeus.svn.sourceforge.net/armadeus/?rev=1325&view=rev
Author: artemys
Date: 2009-06-04 07:48:59 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[LINUX] Divides 030-armadeus-add_USB_registers.patch
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/028-armadeus-add_reg8_macro_to_hardware_h.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/029-armadeus-add_csi_and_spi_registers_to_imx-regs_h.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-fixes_typo_for_usbdrcv_in_imx-regs_h.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-add_USB_registers.patch
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/028-armadeus-add_reg8_macro_to_hardware_h.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/028-armadeus-add_reg8_macro_to_hardware_h.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/028-armadeus-add_reg8_macro_to_hardware_h.patch 2009-06-04 07:48:59 UTC (rev 1325)
@@ -0,0 +1,13 @@
+Index: linux-2.6.29/arch/arm/mach-imx/include/mach/hardware.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-05-01 11:35:31.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/hardware.h 2009-05-01 13:59:45.000000000 +0200
+@@ -24,6 +24,8 @@
+ #include "imx-regs.h"
+
+ #ifndef __ASSEMBLY__
++# define __REG8(x) (*((volatile u8 *)IO_ADDRESS(x)))
++
+ # define __REG(x) (*((volatile u32 *)IO_ADDRESS(x)))
+
+ # define __REG2(x,y) (*(volatile u32 *)((u32)&__REG(x) + (y)))
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/029-armadeus-add_csi_and_spi_registers_to_imx-regs_h.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/029-armadeus-add_csi_and_spi_registers_to_imx-regs_h.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/029-armadeus-add_csi_and_spi_registers_to_imx-regs_h.patch 2009-06-04 07:48:59 UTC (rev 1325)
@@ -0,0 +1,48 @@
+
+JB: I think these declarations should only be in the corresponding driver...
+
+Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 11:33:45.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 14:02:48.000000000 +0200
+@@ -373,4 +373,40 @@
+ #define TSTAT_CAPT (1<<1)
+ #define TSTAT_COMP (1<<0)
+
++/*
++ * CSI register
++ */
++#define CSICR1 __REG(0x00 + IMX_CSI_BASE)
++#define CSICR2 __REG(0x04 + IMX_CSI_BASE)
++#define CSISR __REG(0x08 + IMX_CSI_BASE)
++#define CSISTATR __REG(0x0C + IMX_CSI_BASE)
++#define CSIRXR __REG(0x10 + IMX_CSI_BASE)
++
++/* CSI bit fields */
++#define CSICR1_RXOR_INTEN (1<<24)
++#define CSICR1_RXFF_INTEN (1<<18)
++#define CSICR1_RXFF_LEVEL(x) ((x & 0x3)<<19)
++#define CSICR1_SOF_POL (1<<17)
++#define CSICR1_SOF_INTEN (1<<16)
++#define CSICR1_MCLKDIV(x) ((x & 0xf)<<12)
++#define CSICR1_MCLKEN (1<<9)
++#define CSICR1_FCC (1<<8)
++#define CSICR1_BIG_ENDIAN (1<<7)
++#define CSICR1_CLR_STATFIFO (1<<6)
++#define CSICR1_CLR_RXFIFO (1<<5)
++#define CSICR1_GCLK_MODE (1<<4)
++#define CSICR1_INV_DATA (1<<3)
++#define CSICR1_REDGE (1<<1)
++#define CSICR1_ENABLE (1)
++
++/* SPI regiters */
++#define SPI1_RXDATA __REG(IMX_SPI1_BASE + 0x00)
++#define SPI1_TXDATA __REG(IMX_SPI1_BASE + 0x04)
++#define SPI1_CONTROL __REG(IMX_SPI1_BASE + 0x08)
++#define SPI1_INT __REG(IMX_SPI1_BASE + 0x0c)
++#define SPI1_TEST __REG(IMX_SPI1_BASE + 0x10)
++#define SPI1_PERIOD __REG(IMX_SPI1_BASE + 0x14)
++#define SPI1_DMA __REG(IMX_SPI1_BASE + 0x18)
++#define SPI1_RESET __REG(IMX_SPI1_BASE + 0x1c)
++
+ #endif // _IMX_REGS_H
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-add_USB_registers.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-add_USB_registers.patch 2009-06-04 07:11:47 UTC (rev 1324)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-add_USB_registers.patch 2009-06-04 07:48:59 UTC (rev 1325)
@@ -1,67 +0,0 @@
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/hardware.h
-===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-05-01 11:35:31.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/hardware.h 2009-05-01 13:59:45.000000000 +0200
-@@ -24,6 +24,8 @@
- #include "imx-regs.h"
-
- #ifndef __ASSEMBLY__
-+# define __REG8(x) (*((volatile u8 *)IO_ADDRESS(x)))
-+
- # define __REG(x) (*((volatile u32 *)IO_ADDRESS(x)))
-
- # define __REG2(x,y) (*(volatile u32 *)((u32)&__REG(x) + (y)))
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h
-===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 11:33:45.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 14:02:48.000000000 +0200
-@@ -186,7 +186,7 @@
- #define PB19_AF_SSI_TXCLK ( GPIO_PORTB | GPIO_AF | 19 )
- #define PB20_PF_USBD_AFE ( GPIO_PORTB | GPIO_PF | 20 )
- #define PB21_PF_USBD_OE ( GPIO_PORTB | GPIO_PF | 21 )
--#define PB22_PFUSBD_RCV ( GPIO_PORTB | GPIO_PF | 22 )
-+#define PB22_PF_USBD_RCV ( GPIO_PORTB | GPIO_PF | 22 )
- #define PB23_PF_USBD_SUSPND ( GPIO_PORTB | GPIO_PF | 23 )
- #define PB24_PF_USBD_VP ( GPIO_PORTB | GPIO_PF | 24 )
- #define PB25_PF_USBD_VM ( GPIO_PORTB | GPIO_PF | 25 )
-@@ -373,4 +373,40 @@
- #define TSTAT_CAPT (1<<1)
- #define TSTAT_COMP (1<<0)
-
-+/*
-+ * CSI register
-+ */
-+#define CSICR1 __REG(0x00 + IMX_CSI_BASE)
-+#define CSICR2 __REG(0x04 + IMX_CSI_BASE)
-+#define CSISR __REG(0x08 + IMX_CSI_BASE)
-+#define CSISTATR __REG(0x0C + IMX_CSI_BASE)
-+#define CSIRXR __REG(0x10 + IMX_CSI_BASE)
-+
-+/* CSI bit fields */
-+#define CSICR1_RXOR_INTEN (1<<24)
-+#define CSICR1_RXFF_INTEN (1<<18)
-+#define CSICR1_RXFF_LEVEL(x) ((x & 0x3)<<19)
-+#define CSICR1_SOF_POL (1<<17)
-+#define CSICR1_SOF_INTEN (1<<16)
-+#define CSICR1_MCLKDIV(x) ((x & 0xf)<<12)
-+#define CSICR1_MCLKEN (1<<9)
-+#define CSICR1_FCC (1<<8)
-+#define CSICR1_BIG_ENDIAN (1<<7)
-+#define CSICR1_CLR_STATFIFO (1<<6)
-+#define CSICR1_CLR_RXFIFO (1<<5)
-+#define CSICR1_GCLK_MODE (1<<4)
-+#define CSICR1_INV_DATA (1<<3)
-+#define CSICR1_REDGE (1<<1)
-+#define CSICR1_ENABLE (1)
-+
-+/* SPI regiters */
-+#define SPI1_RXDATA __REG(IMX_SPI1_BASE + 0x00)
-+#define SPI1_TXDATA __REG(IMX_SPI1_BASE + 0x04)
-+#define SPI1_CONTROL __REG(IMX_SPI1_BASE + 0x08)
-+#define SPI1_INT __REG(IMX_SPI1_BASE + 0x0c)
-+#define SPI1_TEST __REG(IMX_SPI1_BASE + 0x10)
-+#define SPI1_PERIOD __REG(IMX_SPI1_BASE + 0x14)
-+#define SPI1_DMA __REG(IMX_SPI1_BASE + 0x18)
-+#define SPI1_RESET __REG(IMX_SPI1_BASE + 0x1c)
-+
- #endif // _IMX_REGS_H
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-fixes_typo_for_usbdrcv_in_imx-regs_h.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-fixes_typo_for_usbdrcv_in_imx-regs_h.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-fixes_typo_for_usbdrcv_in_imx-regs_h.patch 2009-06-04 07:48:59 UTC (rev 1325)
@@ -0,0 +1,13 @@
+Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 11:33:45.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 14:02:48.000000000 +0200
+@@ -186,7 +186,7 @@
+ #define PB19_AF_SSI_TXCLK ( GPIO_PORTB | GPIO_AF | 19 )
+ #define PB20_PF_USBD_AFE ( GPIO_PORTB | GPIO_PF | 20 )
+ #define PB21_PF_USBD_OE ( GPIO_PORTB | GPIO_PF | 21 )
+-#define PB22_PFUSBD_RCV ( GPIO_PORTB | GPIO_PF | 22 )
++#define PB22_PF_USBD_RCV ( GPIO_PORTB | GPIO_PF | 22 )
+ #define PB23_PF_USBD_SUSPND ( GPIO_PORTB | GPIO_PF | 23 )
+ #define PB24_PF_USBD_VP ( GPIO_PORTB | GPIO_PF | 24 )
+ #define PB25_PF_USBD_VM ( GPIO_PORTB | GPIO_PF | 25 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
