aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2016-03-17 14:41:33 -0500
committerPraneeth Bajjuri2016-03-17 14:41:33 -0500
commit09549df426f1ca688072fc41af4d6caafe38fadf (patch)
treeb67a319ff85852ae9ea45d10fc0a317f63625cc6
parent718acbdcfdff50f67d855a47a81c189ce0456eac (diff)
parent123a433acc383461b513cee46acc9a2d550c5a9b (diff)
downloadkernel-video-09549df426f1ca688072fc41af4d6caafe38fadf.tar.gz
kernel-video-09549df426f1ca688072fc41af4d6caafe38fadf.tar.xz
kernel-video-09549df426f1ca688072fc41af4d6caafe38fadf.zip
Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
* p-ti-linux-3.14.y-common: ARM: DRA722: OPP: reuse OPP information for Silicon Rev 2.0 ARM: DRA722: Add ID detect for Silicon Rev 2.0 ARM: DRA722: remove redundant definition of 1.0 device Change-Id: I0c0f7f5dd7c30b442dfdc4c3851e4b0150a9c369 Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--arch/arm/mach-omap2/id.c4
-rw-r--r--arch/arm/mach-omap2/opp7xx_data.c1
-rw-r--r--arch/arm/mach-omap2/soc.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 6e0876915a3..3638ffb796b 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -662,9 +662,9 @@ void __init dra7xxx_check_revision(void)
662 case 0: 662 case 0:
663 omap_revision = DRA722_REV_ES1_0; 663 omap_revision = DRA722_REV_ES1_0;
664 break; 664 break;
665 case 1:
665 default: 666 default:
666 /* If we have no new revisions */ 667 omap_revision = DRA722_REV_ES2_0;
667 omap_revision = DRA722_REV_ES1_0;
668 break; 668 break;
669 } 669 }
670 break; 670 break;
diff --git a/arch/arm/mach-omap2/opp7xx_data.c b/arch/arm/mach-omap2/opp7xx_data.c
index 7e6d02489af..c268f956b96 100644
--- a/arch/arm/mach-omap2/opp7xx_data.c
+++ b/arch/arm/mach-omap2/opp7xx_data.c
@@ -66,6 +66,7 @@ int __init dra7xx_opp_init(void)
66 case DRA752_REV_ES1_1: 66 case DRA752_REV_ES1_1:
67 case DRA752_REV_ES2_0: 67 case DRA752_REV_ES2_0:
68 case DRA722_REV_ES1_0: 68 case DRA722_REV_ES1_0:
69 case DRA722_REV_ES2_0:
69 default: 70 default:
70 /* 71 /*
71 * First read speed reg to detect supported frequency 72 * First read speed reg to detect supported frequency
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index ac15ea9c946..ec468672a2a 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -471,7 +471,7 @@ IS_OMAP_TYPE(3430, 0x3430)
471#define DRA752_REV_ES1_1 (DRA7XX_CLASS | (0x52 << 16) | (0x11 << 8)) 471#define DRA752_REV_ES1_1 (DRA7XX_CLASS | (0x52 << 16) | (0x11 << 8))
472#define DRA752_REV_ES2_0 (DRA7XX_CLASS | (0x52 << 16) | (0x20 << 8)) 472#define DRA752_REV_ES2_0 (DRA7XX_CLASS | (0x52 << 16) | (0x20 << 8))
473#define DRA722_REV_ES1_0 (DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8)) 473#define DRA722_REV_ES1_0 (DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8))
474#define DRA722_REV_ES1_0 (DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8)) 474#define DRA722_REV_ES2_0 (DRA7XX_CLASS | (0x22 << 16) | (0x20 << 8))
475 475
476void omap2xxx_check_revision(void); 476void omap2xxx_check_revision(void);
477void omap3xxx_check_revision(void); 477void omap3xxx_check_revision(void);