diff options
| -rw-r--r-- | packages/linux/linux-omap-2.6.28/revert-XCCR.patch | 45 | ||||
| -rw-r--r-- | packages/linux/linux-omap_2.6.28.bb | 5 |
2 files changed, 2 insertions, 48 deletions
diff --git a/packages/linux/linux-omap-2.6.28/revert-XCCR.patch b/packages/linux/linux-omap-2.6.28/revert-XCCR.patch deleted file mode 100644 index fe9a91fe21..0000000000 --- a/packages/linux/linux-omap-2.6.28/revert-XCCR.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h -index 113c246..c727e89 100644 ---- a/arch/arm/plat-omap/include/mach/mcbsp.h -+++ b/arch/arm/plat-omap/include/mach/mcbsp.h -@@ -235,16 +235,11 @@ - #define XPBBLK(value) ((value)<<7) /* Bits 7:8 */ - - /*********************** McBSP XCCR bit definitions *************************/ --#define EXTCLKGATE 0x8000 --#define PPCONNECT 0x4000 --#define DXENDLY(value) ((value)<<12) /* Bits 12:13 */ --#define XFULL_CYCLE 0x0800 - #define DILB 0x0020 - #define XDMAEN 0x0008 - #define XDISABLE 0x0001 - - /********************** McBSP RCCR bit definitions *************************/ --#define RFULL_CYCLE 0x0800 - #define RDMAEN 0x0008 - #define RDISABLE 0x0001 - -@@ -276,8 +271,6 @@ struct omap_mcbsp_reg_cfg { - u16 rcerh; - u16 xcerg; - u16 xcerh; -- u16 xccr; -- u16 rccr; - }; - - typedef enum { -diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c -index e5842e3..6d70d2f 100644 ---- a/arch/arm/plat-omap/mcbsp.c -+++ b/arch/arm/plat-omap/mcbsp.c -@@ -173,10 +173,6 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) - OMAP_MCBSP_WRITE(io_base, MCR2, config->mcr2); - OMAP_MCBSP_WRITE(io_base, MCR1, config->mcr1); - OMAP_MCBSP_WRITE(io_base, PCR0, config->pcr0); -- if (cpu_is_omap2430() || cpu_is_omap34xx()) { -- OMAP_MCBSP_WRITE(io_base, XCCR, config->xccr); -- OMAP_MCBSP_WRITE(io_base, RCCR, config->rccr); -- } - } - EXPORT_SYMBOL(omap_mcbsp_config); - diff --git a/packages/linux/linux-omap_2.6.28.bb b/packages/linux/linux-omap_2.6.28.bb index a128ebf574..b2360bff85 100644 --- a/packages/linux/linux-omap_2.6.28.bb +++ b/packages/linux/linux-omap_2.6.28.bb @@ -7,10 +7,10 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| DEFAULT_PREFERENCE = "-1" -SRCREV = "9a6536c4eb086b43acab99ef3ac8b6e61ed9b7de" +SRCREV = "79d042a081d3e467c735bb0d9569ed6296f85a3c" PV = "2.6.28" -PR = "r9" +PR = "r10" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;branch=omap-2.6.28;protocol=git \ file://defconfig" @@ -47,7 +47,6 @@ SRC_URI_append = " \ file://0014-DSS-fix-clk_get_usecount.patch;patch=1 \ file://0001-ASoC-Add-support-for-OMAP3-EVM.patch;patch=1 \ file://0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch;patch=1 \ - file://revert-XCCR.patch;patch=1 \ file://0001-board-omap3beagle-set-i2c-3-to-100kHz.patch;patch=1 \ " |