ux500: security: update

commit 1d3e28fa4e85d54434614575f37a4171e32dfe0c
Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Date:   Tue Aug 23 12:28:26 2011 +0200

    [Android]: pm: usecase: limit cpu frequency to 400MHz during voice-call

    ST Ericsson ID: 357594

commit 70f52392190a111758836d5fca7fb533ad8b4453
Author: Rickard Andersson <rickard.andersson@stericsson.com>
Date:   Tue Aug 23 11:05:58 2011 +0200

    ux500: cpuidle: Correct PRCMU error messages

    Show correct error messages when PRCMU requested
    sleep fails.

    ST-Ericsson ID: -

commit 912e987c1e46815c8cf128bce3d7077d3b05e7d6
Author: Rickard Andersson <rickard.andersson@stericsson.com>
Date:   Tue Aug 23 11:00:01 2011 +0200

    ux500: cpuidle: Optimize stack sizes

    Optimze the stack sizes for arm registers and
    CP15 registers

    ST-Ericsson ID: -

commit df0c08abadbdbe19c8c00ca09c3197f3fb0ead29
Author: Rickard Andersson <rickard.andersson@stericsson.com>
Date:   Mon Aug 22 11:19:13 2011 +0200

    ux500: cpuidle: GIC freeze delay optimized

    GIC freeze delay was previously unnecessary long.

    ST-Ericsson ID: -

commit a28fec98e99d5115b62d3d704452f427ca2a20ac
Author: Rajagopala V <rajagopala.v@stericsson.com>
Date:   Wed Aug 24 13:16:39 2011 +0530

    u5500: cpuidle: fix coverity warning

    check for clockevents_program_event return value in
    cpuidle driver during wakeup

    ST-Ericsson ID: ER356883

commit b716ed3140664c6b4b80381b18945032b792b853
Author: Rabin Vincent <rabin.vincent@stericsson.com>
Date:   Fri Aug 19 14:32:29 2011 +0530

    u5500: enable PRCMU QoS and debugging

    Dummy implementations are provided to get it to build.

    ST-Ericsson ID: 348762

commit 34cd29c2f8cd1ce8fa51be6d33624b441416d478
Author: om prakash <omprakash.pal@stericsson.com>
Date:   Tue Aug 23 14:08:52 2011 +0530

    cpuidle:Removed the CHECKED_RETURN error

    Removed the CHECKED_RETURN coverity error in cpuidle.

    ST-Ericsson ID: 354434

commit d9d500b6742ff1fcb12747cb55d7f26c89ef5c96
Author: Rabin Vincent <rabin.vincent@stericsson.com>
Date:   Mon Aug 22 10:23:36 2011 +0530

    u5500: support cpufreq only on v2

    Support cpufreq only on 5500v2+ only, since that is where
    the other power management features will be enabled.

    ST-Ericsson ID: 355981

commit 74cf0e658bb9abe240d04427d9043f145dd0505b
Author: Hemanth Puranik <hemanth.puranik@stericsson.com>
Date:   Wed Aug 3 10:29:10 2011 +0530

    U5500: Print PRCMU firware version

    ST-Ericsson ID: WP332193

commit bb04cadb6948a3a68f409fa7828457ce64540172
Author: Vijaya Kumar Kilari <vijay.kilari@stericsson.com>
Date:   Thu Aug 11 11:49:27 2011 +0530

    U5500: Add MSP1 and Cable detect clock support

    MSP1 and CD clocks are managed by PRCMU FW
    so special handling for these clocks are required

    ST-Ericsson ID: 332193

commit 0d9b20560a729b4674d9f55c77572db04272edbd
Author: Rajagopala V <rajagopala.v@stericsson.com>
Date:   Fri Aug 5 16:52:41 2011 +0530

    u5500: prcmu: add irqs for db5500 temperature sensor

    add irqs to support db5500 temp sensor high and low
    interrupts so as to clearly distinguish whether sensor
    temperature has crossed min/max values

    ST-Ericsson ID: WP257616

commit 63877225cb09c38d0fbea2dcf01eb6670eb05549
Author: Jonas Aaberg <jonas.aberg@stericsson.com>
Date:   Wed Jul 13 09:01:22 2011 +0200

    ARM: u8500: pm: Do not touch TPIU registers if JTAG disabled

    If JTAG is disabled, the Linux cannot touch the TPIU registers.

    ST-Ericsson ID: 349265

commit 9fcee5876ff138e85356b63d392b2a050a68601e
Author: Jonas Aaberg <jonas.aberg@stericsson.com>
Date:   Mon Jul 11 15:27:49 2011 +0200

    ARM: ux500: prcmu-debug: Add ARM opp to debugfs

    Add arm opp to debugfs interface, plus some code clean-up/simplification.

    ST-Ericsson ID: -

commit 0e1f18385d2416e03af308cac1e38997f6bbf044
Author: Jonas Aaberg <jonas.aberg@stericsson.com>
Date:   Thu Jul 14 12:49:30 2011 +0200

    ARM: ux500: context: Do not touch TPIU when not clocked

    ST-Ericsson ID: 352300

commit 0ebdb6b6b2a7f9924bd2785654f0abfb1473dda0
Author: Jayarami Reddy <jayarami.reddy@stericsson.com>
Date:   Thu Jul 14 14:39:07 2011 +0530

    u5500: fix to boot the kernel in DB5500

commit a20f6a9088ac5d34634cd26207dd5a072f04c37b
Author: Jonas Aaberg <jonas.aberg@stericsson.com>
Date:   Mon Jul 11 15:26:40 2011 +0200

    ARM: ux500: prcmu-qos: Add ARM OPP qos

    Make it possible to request lowest ARM OPP. Must
    be bound to cpufreq to actually do something.

    ST-Ericsson ID: -

commit be6842df3ee21a9aa00216c84e93a643b4ddeabe
Author: Jonas Aaberg <jonas.aberg@stericsson.com>
Date:   Wed Jul 13 09:00:30 2011 +0200

    ARM: ux500: Read product settings at boot

    ST-Ericsson ID: 349265

commit 94843c6131bac39aa8e7d0ec4c9c2b34e2819c92
Author: Jonas Aaberg <jonas.aberg@stericsson.com>
Date:   Wed Jul 13 08:56:38 2011 +0200

    drivers: tee: Update with product id configuration

    Add structs and defines needed to detect product settings.

    ST-Ericsson ID: 349265

commit 4c70d615b782965c064b3f97963eff5a290acf68
Author: Jonas Aaberg <jonas.aberg@stericsson.com>
Date:   Wed Jul 6 08:26:41 2011 +0200

    ARM: ux500: prcmu-wdog: Remove check for fw bug

    In prcmu fw version 3.4.4 the issue with longer
    intervalls than 131 s was fixed.

    ST-Ericsson ID: -

commit f6ccbf262ddebe39584b4a4c01cfa16af1fbfac6
Author: Jonas Aaberg <jonas.aberg@stericsson.com>
Date:   Tue Jul 12 08:53:42 2011 +0200

    ARM: ux500: cpuidle: Remove duplicated ApIdle state

    The ARM PLL is handled automatic by the prcmu fw and
    cpuidle cannot affect it. Remove duplicated ApIdle
    state that does the same as the other ApIdle state.

    ST-Ericsson ID: -

commit bdf3c3dd8c22ffe0fbd8c674e8e6bdab83a5ec01
Author: Rabin Vincent <rabin.vincent@stericsson.com>
Date:   Fri Jul 8 14:33:23 2011 +0530

    ux500: support ApDeepSleep on 5500

    ST-Ericsson ID: 332193

commit 5326d7744cd226e67253774f30a2bb57c9b2badc
Author: Rabin Vincent <rabin.vincent@stericsson.com>
Date:   Mon Jul 11 11:27:45 2011 +0530

    u5500: fix prcmu_get_arm_opp()

    prcmu_set_arm_opp() maps between logical ARM OPP values and
    PRCMU firmware values, so prcmu_get_arm_opp() should do it too.

    ST-Ericsson ID: 332226

commit 6422856927e1230197ae674795eff6538df885e5
Author: Jonas Aaberg <jonas.aberg@stericsson.com>
Date:   Thu Jul 7 08:33:59 2011 +0200

    ARM: u8500: prcmu-dbg: display AVS settings

    Add debugfs node showing AVS settings.

    root@ME:/ cat /debugfs/prcmu/avs
    VBB_RET      : 0x 0
    VBB_MAX_OPP  : 0xdb
    VBB_100_OPP  : 0xdb
    VBB_50_OPP   : 0xdb
    VARM_MAX_OPP : 0x2f
    VARM_100_OPP : 0x2e
    VARM_50_OPP  : 0x1d
    VARM_RET     : 0x 0
    VAPE_100_OPP : 0x2a
    VAPE_50_OPP  : 0x1a
    VMOD_100_OPP : 0x29
    VMOD_50_OPP  : 0x1a
    VSAFE        : 0x29

    ST-Ericsson ID: -

commit 3184873f10bff0c7c54db75d9c2694e21ebc40b0
Author: Pawel Szyszuk <pawel.szyszuk@stericsson.com>
Date:   Wed Jun 22 16:03:29 2011 +0200

    ARM: U5500: PRCMU CLKOUTx configuration API

    U5500 API for setting the programmable CLKOUTx source and divisor.
    New API used for setting the sources of camera clocks.

    ST-Ericsson ID: -

commit 98e9cfc32a25f6cf3b5d4c3456bb6ff6a34ff9cb
Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Date:   Thu Jun 23 16:07:48 2011 +0200

    [ANDROID]: pm: usecase: add sysfs interface to disable the governor

    Move all the code to control the state of the governor in a separate function.

    ST-Ericsson ID: CR339643

commit 6e9ab8ab3013d0b372a51d94d617d24fd8b38664
Author: Rickard Andersson <rickard.andersson@stericsson.com>
Date:   Tue Jun 7 13:04:08 2011 +0200

    ARM: ux500: pm: Turn off unnecessary GIC IRQs in deep sleep

    In the sleep state ApDeepSleep turn off all IRQs in the
    GIC except for the PRCMU IRQs

    ST-Ericsson ID: ER338876

commit ba5f28731b27386cb90cf87c4e7b1910e09474a9
Author: Rickard Andersson <rickard.andersson@stericsson.com>
Date:   Fri May 27 08:56:47 2011 +0200

    ARM: ux500: pm: Deepsleep bugfix and optimization

    Fixing deep sleep sync problems. Also cache clean and saves to
    backup RAM is now only done when really needed.

    ST-Ericsson ID: ER338876

commit 0415c755958de0d613a9bd52f73b820cb3a2b916
Author: Rabin Vincent <rabin.vincent@stericsson.com>
Date:   Tue Jun 28 18:18:36 2011 +0530

    u5500: handle SDMMC0 clock change on DB5500v2

    On DB5500v2, SDMMC0 is parented to SPARE1CLK instead of
    SDMMCCLK.

    Also, correct the PRCM_IRDACLK_MGT register address which is
    wrong even for v1.

    ST-Ericsson ID: 349062

commit 2036360d62f3c3f0cd722d751ba90a8739034c0f
Author: Rabin Vincent <rabin.vincent@stericsson.com>
Date:   Mon Jun 27 20:25:06 2011 +0530

    u5500: cpufreq: DB5500v2 support

    ST-Ericsson ID: 349062

commit 190b11834463e835de2d792116dfd8673d775752
Author: Rabin Vincent <rabin.vincent@stericsson.com>
Date:   Wed Jun 22 07:45:00 2011 +0530

    u5500: allow SUSPEND_STANDBY and CPUIDLE to be enabled

    ST-Ericsson ID: 332226

commit 7c4906d6ee888df46baa64b690dfdfaf44502d86
Author: Pawel Szyszuk <pawel.szyszuk@stericsson.com>
Date:   Mon Jun 20 15:28:34 2011 +0200

    ARM: u5500: PRCMU reset API

    Added API for rebooting the board and for getting the last reboot code.

    ST-Ericsson ID: 341245

Change-Id: Ibbcd9e3528cd605c724b9c2c88ae3b41a27f2f1c

2 files changed, 37 insertions, 1 deletions

diff --git a/drivers/tee/tee_driver.c b/drivers/tee/tee_driver.c
index 73c62871ddc..5ae0cc9508b 100644
--- a/drivers/tee/tee_driver.c
+++ b/drivers/tee/tee_driver.c
@@ -636,7 +636,7 @@ static void __exit tee_exit(void)
 	misc_deregister(&tee_dev);
 }
 
-module_init(tee_init);
+subsys_initcall(tee_init);
 module_exit(tee_exit);
 
 MODULE_LICENSE("Dual BSD/GPL");
diff --git a/include/linux/tee.h b/include/linux/tee.h
index 4928e4dca1f..8b71224ac77 100644
--- a/include/linux/tee.h
+++ b/include/linux/tee.h
@@ -74,8 +74,44 @@
 /*
  * Exposed functions (command_id) in the static TA
  */
+#define TEE_STA_GET_PRODUCT_CONFIG		10
 #define TEE_STA_SET_L2CC_PREFETCH_CTRL_REGISTER 11
 
+/* Flags indicating run-time environment */
+#define TEE_RT_FLAGS_NORMAL		0x00000000
+#define TEE_RT_FLAGS_MASK_ITP_PROD      0x00000001
+#define TEE_RT_FLAGS_MODEM_DEBUG	0x00000002
+#define TEE_RT_FLAGS_RNG_REG_PUBLIC     0x00000004
+#define TEE_RT_FLAGS_JTAG_ENABLED       0x00000008
+
+/*
+ * Product id numbers
+ */
+#define TEE_PRODUCT_ID_UNKNOWN 0
+#define TEE_PRODUCT_ID_8400    1
+#define TEE_PRODUCT_ID_8500    2
+#define TEE_PRODUCT_ID_9500    3
+#define TEE_PRODUCT_ID_5500    4
+#define TEE_PRODUCT_ID_7400    5
+#define TEE_PRODUCT_ID_8500C   6
+
+/* Flags indicating fuses */
+#define TEE_FUSE_FLAGS_MODEM_DISABLE    0x00000001
+
+/**
+ * struct tee_product_config - System configuration structure.
+ *
+ * @product_id: Product identification.
+ * @rt_flags: Runtime configuration flags.
+ * @fuse_flags: Fuse flags.
+ *
+ */
+struct tee_product_config {
+	uint32_t product_id;
+	uint32_t rt_flags;
+	uint32_t fuse_flags;
+};
+
 /**
  * struct tee_uuid - Structure that represent an uuid.
  * @timeLow: The low field of the time stamp.