diff options
4 files changed, 60 insertions, 1 deletions
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index a9a137c647..28ded38611 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-arm926ejs.inc # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r47" +MACHINE_KERNEL_PR = "r48" TARGET_ARCH = "arm" diff --git a/recipes/linux/linux-davinci/0001-ahci-ti-Fix-currently-harmless-typo-in-SATA-PHY.patch b/recipes/linux/linux-davinci/0001-ahci-ti-Fix-currently-harmless-typo-in-SATA-PHY.patch new file mode 100644 index 0000000000..5efc00db84 --- /dev/null +++ b/recipes/linux/linux-davinci/0001-ahci-ti-Fix-currently-harmless-typo-in-SATA-PHY.patch @@ -0,0 +1,26 @@ +From b0a773f958b03ba77317f8b762d90d3c00269292 Mon Sep 17 00:00:00 2001 +From: Roger Monk <r-monk@ti.com> +Date: Wed, 25 Aug 2010 16:45:46 +0100 +Subject: [PATCH] ahci-ti: Fix (currently harmless) typo in SATA PHY configuration + +Signed-off-by: Roger Monk <r-monk@ti.com> +--- + drivers/ata/ahci-ti.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/ata/ahci-ti.c b/drivers/ata/ahci-ti.c +index 9e36c9d..674b216 100644 +--- a/drivers/ata/ahci-ti.c ++++ b/drivers/ata/ahci-ti.c +@@ -80,7 +80,7 @@ void ata_plat_init (void __iomem *base) + phy_val = PHY_MPY << 0 | PHY_LB << 4 | PHY_LOS << 6 | + PHY_RXINVPAIR << 7 | PHY_RXTERM << 8 | + PHY_RXCDR << 10 | PHY_RXEQ << 13 | +- PHY_RXINVPAIR << 17 | PHY_TXCM << 18 | ++ PHY_TXINVPAIR << 17 | PHY_TXCM << 18 | + PHY_TXSWING << 19 | PHY_TXDE << 22 | + PHY_OVERRIDE << 30 | PHY_ENPLL << 31; + +-- +1.6.0.4 + diff --git a/recipes/linux/linux-davinci/0002-ahci-ti-Update-SATA-PHY-configuration-RXCDR.patch b/recipes/linux/linux-davinci/0002-ahci-ti-Update-SATA-PHY-configuration-RXCDR.patch new file mode 100644 index 0000000000..d4ea6ad1f6 --- /dev/null +++ b/recipes/linux/linux-davinci/0002-ahci-ti-Update-SATA-PHY-configuration-RXCDR.patch @@ -0,0 +1,29 @@ +From 37a7868b15be9415abd3f57477afc8be956666e6 Mon Sep 17 00:00:00 2001 +From: Roger Monk <r-monk@ti.com> +Date: Wed, 25 Aug 2010 16:46:28 +0100 +Subject: [PATCH] ahci-ti: Update SATA PHY configuration - RXCDR --> 4 + + * Update SATA PHY configuration for Receiver Clock/Data Recovery + * Set to 0x4 = 2nd order, low precision + +Signed-off-by: Roger Monk <r-monk@ti.com> +--- + drivers/ata/ahci-ti.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/ata/ahci-ti.c b/drivers/ata/ahci-ti.c +index 674b216..853d251 100644 +--- a/drivers/ata/ahci-ti.c ++++ b/drivers/ata/ahci-ti.c +@@ -55,7 +55,7 @@ void ata_plat_remove(struct ata_host *host); + #define PHY_LOS 1 /* bit6 1 */ + #define PHY_RXINVPAIR 0 /* bit7 1 */ + #define PHY_RXTERM 0 /* bits9:8 2 */ +-#define PHY_RXCDR 0 /* bits12:10 3 */ ++#define PHY_RXCDR 4 /* bits12:10 3 */ + #define PHY_RXEQ 1 /* bits16:13 4 */ + #define PHY_TXINVPAIR 0 /* bit17 1 */ + #define PHY_TXCM 0 /* bit18 1 */ +-- +1.6.0.4 + diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb index 3f28a537d4..3ea46de2d0 100644 --- a/recipes/linux/linux-davinci_git.bb +++ b/recipes/linux/linux-davinci_git.bb @@ -68,11 +68,15 @@ SRC_URI_append_da850-omapl138-evm = ${ARAGO_L1_URI} SRC_URI_append_hawkboard = ${ARAGO_L1_URI} SRC_URI_append_da850-omapl138-evm = "file://logo_linux_clut224.ppm \ + file://0001-ahci-ti-Fix-currently-harmless-typo-in-SATA-PHY.patch \ + file://0002-ahci-ti-Update-SATA-PHY-configuration-RXCDR.patch \ file://0001-board-da850-evm-Disable-NAND-SUBPAGE.patch \ " SRC_URI_append_hawkboard = "file://logo_linux_clut224.ppm \ file://patch-2.6.33rc4-psp-to-hawkboard.patch \ + file://0001-ahci-ti-Fix-currently-harmless-typo-in-SATA-PHY.patch \ + file://0002-ahci-ti-Update-SATA-PHY-configuration-RXCDR.patch \ file://0001-board-da850-hawk-Disable-NAND-SUBPAGE.patch \ " |