summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2014-02-18 10:52:58 -0500
committerDenys Dmytriyenko <denys@ti.com>2014-02-18 11:47:06 -0500
commitbb73d1506091dee8225c3a661413a858a3e71d29 (patch)
treec80debaf134624085bcc3a58842a625bc349c426 /recipes-kernel
parent7969c525c26dde8b601b7122b95182c9cce3f65c (diff)
downloadmeta-ti-bb73d1506091dee8225c3a661413a858a3e71d29.tar.gz
linux-ti-staging: remove local patches that got merged to kernel tree
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-ti-staging/0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch42
-rw-r--r--recipes-kernel/linux/linux-ti-staging/0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch195
-rw-r--r--recipes-kernel/linux/linux-ti-staging/0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch81
-rw-r--r--recipes-kernel/linux/linux-ti-staging/0002-ARM-config-omap-Make-advanced-networking-features-as.patch54
-rw-r--r--recipes-kernel/linux/linux-ti-staging/0003-ARM-OMAP2-am43xx-Add-context-offset-for-dss-hwmod.patch44
-rw-r--r--recipes-kernel/linux/linux-ti-staging/0003-ARM-config-omap-Disable-extra-debug-options.patch47
-rw-r--r--recipes-kernel/linux/linux-ti-staging/0004-ARM-OMAP2-omap_hwmod-Maintain-legacy-context-loss-count.patch65
-rw-r--r--recipes-kernel/linux/linux-ti-staging/0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch44
-rw-r--r--recipes-kernel/linux/linux-ti-staging/0005-ARM-OMAP-Kill-warning-in-CPUIDLE-code-with-CONFIG_SM.patch49
-rw-r--r--recipes-kernel/linux/linux-ti-staging_3.12.bb16
10 files changed, 2 insertions, 635 deletions
diff --git a/recipes-kernel/linux/linux-ti-staging/0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch b/recipes-kernel/linux/linux-ti-staging/0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch
deleted file mode 100644
index 00dceaf7..00000000
--- a/recipes-kernel/linux/linux-ti-staging/0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Subject: [v2,1/3] ARM: OMAP2+: am43xx: Use omap4 prm context ops
2Date: Sat, 15 Feb 2014 02:07:33 -0000
3From: Dave Gerlach <d-gerlach@ti.com>
4
5Context loss counting relies on several prm function pointers that
6serve as a "mapping" into the context loss registers and actually
7allow reading and clearing of the registers. Use the same
8from omap4 for am43xx as the layout of the prcm is similar.
9
10Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
11
12---
13arch/arm/mach-omap2/io.c | 1 +
14 arch/arm/mach-omap2/prm44xx.c | 3 ++-
15 2 files changed, 3 insertions(+), 1 deletion(-)
16
17diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
18index 295e3e6..3eb9ae5 100644
19--- a/arch/arm/mach-omap2/io.c
20+++ b/arch/arm/mach-omap2/io.c
21@@ -619,6 +619,7 @@ void __init am43xx_init_early(void)
22 omap_prm_base_init();
23 omap_cm_base_init();
24 omap3xxx_check_revision();
25+ omap44xx_prm_init();
26 am33xx_check_features();
27 am43xx_powerdomains_init();
28 am43xx_clockdomains_init();
29diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
30index 03a6034..2c97e53 100644
31--- a/arch/arm/mach-omap2/prm44xx.c
32+++ b/arch/arm/mach-omap2/prm44xx.c
33@@ -660,7 +660,8 @@ static struct prm_ll_data omap44xx_prm_ll_data = {
34
35 int __init omap44xx_prm_init(void)
36 {
37- if (!cpu_is_omap44xx() && !soc_is_omap54xx() && !soc_is_dra7xx())
38+ if (!soc_is_am43xx() && !cpu_is_omap44xx() &&
39+ !soc_is_omap54xx() && !soc_is_dra7xx())
40 return 0;
41
42 return prm_register(&omap44xx_prm_ll_data);
diff --git a/recipes-kernel/linux/linux-ti-staging/0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch b/recipes-kernel/linux/linux-ti-staging/0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch
deleted file mode 100644
index f6665211..00000000
--- a/recipes-kernel/linux/linux-ti-staging/0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch
+++ /dev/null
@@ -1,195 +0,0 @@
1From 0e6113030205a51f16944d4f73e166792200def0 Mon Sep 17 00:00:00 2001
2From: Santosh Shilimkar <santosh.shilimkar@ti.com>
3Date: Thu, 13 Feb 2014 10:51:55 -0500
4Subject: [PATCH 1/6] ARM: config: omap: Sync up omap2plus defconfig with
5 savedefconfig
6
7This is preparatory patch for some of the config fragment updates
8to be done for network performance issue.
9
10Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
11---
12 arch/arm/configs/omap2plus_defconfig | 67 ++++++++++------------------------
13 1 file changed, 20 insertions(+), 47 deletions(-)
14
15diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
16index f0484a2..2e8dcb9 100644
17--- a/arch/arm/configs/omap2plus_defconfig
18+++ b/arch/arm/configs/omap2plus_defconfig
19@@ -23,25 +23,22 @@ CONFIG_PARTITION_ADVANCED=y
20 CONFIG_ARCH_OMAP2PLUS=y
21 CONFIG_ARCH_MULTI_V6=y
22 CONFIG_GPIO_PCA953X=y
23+CONFIG_OMAP_RESET_CLOCKS=y
24+CONFIG_OMAP_MUX_DEBUG=y
25 CONFIG_ARCH_OMAP2=y
26 CONFIG_ARCH_OMAP3=y
27 CONFIG_ARCH_OMAP4=y
28 CONFIG_SOC_OMAP5=y
29-CONFIG_SOC_AM33XX=y
30 CONFIG_SOC_AM43XX=y
31 CONFIG_SOC_DRA7XX=y
32-CONFIG_OMAP_RESET_CLOCKS=y
33-CONFIG_OMAP_MUX_DEBUG=y
34-CONFIG_ARCH_VEXPRESS_CA9X4=y
35 CONFIG_OMAP4_ERRATA_I688=y
36 CONFIG_ARM_THUMBEE=y
37 CONFIG_ARM_ERRATA_411920=y
38 CONFIG_PCIE_DRA7XX=y
39 CONFIG_SMP=y
40 CONFIG_NR_CPUS=2
41-CONFIG_CMA=y
42 CONFIG_PREEMPT=y
43-CONFIG_LEDS=y
44+CONFIG_CMA=y
45 CONFIG_ZBOOT_ROM_TEXT=0x0
46 CONFIG_ZBOOT_ROM_BSS=0x0
47 CONFIG_ARM_APPENDED_DTB=y
48@@ -75,30 +72,13 @@ CONFIG_IP_PNP_RARP=y
49 # CONFIG_INET_LRO is not set
50 # CONFIG_IPV6 is not set
51 CONFIG_NETFILTER=y
52-CONFIG_NETFILTER_ADVANCED=y
53-CONFIG_NETFILTER_XTABLES=y
54-CONFIG_NF_NAT=y
55-CONFIG_NF_NAT_NEEDED=y
56-CONFIG_NF_NAT_IPV4=y
57-CONFIG_NF_DEFRAG_IPV4=y
58 CONFIG_NF_CONNTRACK=y
59 CONFIG_NF_CONNTRACK_IPV4=y
60-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
61 CONFIG_IP_NF_IPTABLES=y
62 CONFIG_IP_NF_FILTER=y
63-CONFIG_IP_NF_TARGET_LOG=y
64+CONFIG_NF_NAT_IPV4=y
65 CONFIG_IP_NF_TARGET_MASQUERADE=y
66 CONFIG_BRIDGE=y
67-CONFIG_BRIDGE_IGMP_SNOOPING=y
68-CONFIG_BRIDGE_NETFILTER=y
69-CONFIG_STP=y
70-CONFIG_LLC=y
71-CONFIG_INPUT_UINPUT=y
72-CONFIG_HAS_IOMEM=y
73-CONFIG_HAS_IOPORT=y
74-CONFIG_HAS_DMA=y
75-CONFIG_NLATTR=y
76-CONFIG_AVERAGE=y
77 CONFIG_VLAN_8021Q=y
78 CONFIG_CAN=m
79 CONFIG_CAN_C_CAN=m
80@@ -110,16 +90,13 @@ CONFIG_BT_HCIUART_BCSP=y
81 CONFIG_BT_HCIUART_LL=y
82 CONFIG_BT_HCIBCM203X=m
83 CONFIG_BT_HCIBPA10X=m
84-CONFIG_NL80211_TESTMODE=y
85+CONFIG_BT_WILINK=m
86 CONFIG_CFG80211=m
87+CONFIG_NL80211_TESTMODE=y
88 CONFIG_MAC80211=m
89 CONFIG_MAC80211_RC_PID=y
90 CONFIG_MAC80211_RC_DEFAULT_PID=y
91-CONFIG_WL_TI=y
92-CONFIG_WL12XX=m
93-CONFIG_WL18XX=m
94-CONFIG_WLCORE=m
95-CONFIG_WLCORE_SDIO=m
96+CONFIG_RFKILL=y
97 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
98 CONFIG_DEVTMPFS=y
99 CONFIG_DEVTMPFS_MOUNT=y
100@@ -171,6 +148,10 @@ CONFIG_LIBERTAS=m
101 CONFIG_LIBERTAS_USB=m
102 CONFIG_LIBERTAS_SDIO=m
103 CONFIG_LIBERTAS_DEBUG=y
104+CONFIG_WL_TI=y
105+CONFIG_WL12XX=m
106+CONFIG_WL18XX=m
107+CONFIG_WLCORE_SDIO=m
108 CONFIG_INPUT_JOYDEV=y
109 CONFIG_INPUT_EVDEV=y
110 CONFIG_KEYBOARD_GPIO=y
111@@ -183,6 +164,7 @@ CONFIG_TOUCHSCREEN_TI_AM335X_TSC=y
112 CONFIG_TOUCHSCREEN_PIXCIR=m
113 CONFIG_INPUT_MISC=y
114 CONFIG_INPUT_TWL4030_PWRBUTTON=y
115+CONFIG_INPUT_UINPUT=y
116 # CONFIG_LEGACY_PTYS is not set
117 CONFIG_SERIAL_8250=y
118 CONFIG_SERIAL_8250_CONSOLE=y
119@@ -226,7 +208,6 @@ CONFIG_MFD_TPS65217=y
120 CONFIG_MFD_TPS65218=y
121 CONFIG_MFD_TPS65910=y
122 CONFIG_TWL6040_CORE=y
123-CONFIG_REGULATOR_FIXED_VOLTAGE=y
124 CONFIG_REGULATOR_PALMAS=y
125 CONFIG_REGULATOR_PBIAS=y
126 CONFIG_REGULATOR_TPS65023=y
127@@ -240,6 +221,10 @@ CONFIG_MEDIA_SUPPORT=y
128 CONFIG_MEDIA_CAMERA_SUPPORT=y
129 CONFIG_MEDIA_USB_SUPPORT=y
130 CONFIG_USB_VIDEO_CLASS=m
131+CONFIG_V4L_PLATFORM_DRIVERS=y
132+CONFIG_VIDEO_AM437X_VPFE=y
133+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
134+CONFIG_VIDEO_OV2659=y
135 CONFIG_FB=y
136 CONFIG_FIRMWARE_EDID=y
137 CONFIG_FB_TILEBLITTING=y
138@@ -252,6 +237,7 @@ CONFIG_FB_OMAP2=y
139 CONFIG_DISPLAY_ENCODER_TFP410=y
140 CONFIG_DISPLAY_ENCODER_TPD12S015=y
141 CONFIG_DISPLAY_DRA_EVM_ENCODER_TPD12S015=y
142+CONFIG_DISPLAY_ENCODER_SIL9022=y
143 CONFIG_DISPLAY_CONNECTOR_DVI=y
144 CONFIG_DISPLAY_CONNECTOR_HDMI=y
145 CONFIG_DISPLAY_PANEL_DPI=y
146@@ -276,6 +262,7 @@ CONFIG_SND_DAVINCI_SOC=m
147 CONFIG_SND_AM33XX_SOC_EVM=m
148 CONFIG_SND_AM43XX_SOC_EPOS_EVM=m
149 CONFIG_SND_OMAP_SOC=m
150+CONFIG_SND_OMAP_SOC_DRA7EVM=m
151 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
152 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
153 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
154@@ -287,7 +274,6 @@ CONFIG_USB_EHCI_HCD=y
155 CONFIG_USB_MUSB_HDRC=m
156 CONFIG_USB_MUSB_OMAP2PLUS=m
157 CONFIG_USB_MUSB_DSPS=m
158-CONFIG_USB_MUSB_AM335X_CHILD=m
159 CONFIG_USB_TI_CPPI41_DMA=y
160 CONFIG_USB_WDM=y
161 CONFIG_USB_STORAGE=y
162@@ -390,17 +376,11 @@ CONFIG_SCHEDSTATS=y
163 CONFIG_TIMER_STATS=y
164 CONFIG_PROVE_LOCKING=y
165 # CONFIG_DEBUG_BUGVERBOSE is not set
166-CONFIG_RFKILL=y
167-CONFIG_KEYS=y
168-CONFIG_BT_WILINK=m
169-CONFIG_WIRELESS_EXT=y
170 CONFIG_SECURITY=y
171-CONFIG_CRYPTO=y
172-CONFIG_CRYPTO_ARC4=y
173-CONFIG_CRYPTO_ECB=y
174-CONFIG_CRYPTO_AES=y
175 CONFIG_CRYPTO_TEST=m
176+CONFIG_CRYPTO_ECB=y
177 CONFIG_CRYPTO_MICHAEL_MIC=y
178+CONFIG_CRYPTO_ARC4=y
179 # CONFIG_CRYPTO_ANSI_CPRNG is not set
180 CONFIG_CRYPTO_USER_API_HASH=y
181 CONFIG_CRYPTO_USER_API_SKCIPHER=y
182@@ -415,10 +395,3 @@ CONFIG_LIBCRC32C=y
183 CONFIG_FONTS=y
184 CONFIG_FONT_8x8=y
185 CONFIG_FONT_8x16=y
186-CONFIG_SND_OMAP_SOC_DRA7EVM=y
187-CONFIG_DISPLAY_ENCODER_SIL9022=y
188-CONFIG_VIDEO_V4L2=y
189-CONFIG_V4L_PLATFORM_DRIVERS=y
190-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
191-CONFIG_VIDEO_AM437X_VPFE=y
192-CONFIG_VIDEO_OV2659=y
193--
1941.7.9.5
195
diff --git a/recipes-kernel/linux/linux-ti-staging/0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch b/recipes-kernel/linux/linux-ti-staging/0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch
deleted file mode 100644
index 246595fe..00000000
--- a/recipes-kernel/linux/linux-ti-staging/0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1Subject: [v2,2/3] ARM: OMAP2+: omap_hwmod: Add context ops to am43xx soc_ops
2Date: Sat, 15 Feb 2014 02:07:34 -0000
3From: Dave Gerlach <d-gerlach@ti.com>
4
5AM43XX contains PRM_*_CONTEXT registers like OMAP4 did to track loss
6of context in modules so utilize the same get_context_loss_count soc_op
7present for OMAP4 but define a custom update context loss function for
8am43xx. Because we do not define context_offs for each hwmod, introduce
9a new flag to indicate when we have so we only bother to update when
10we know that it is valid.
11
12Certain drivers use the context loss count to determine if context was
13truly lost during a suspend operation to decide whether or not a
14context restore is truly necessary. Without this, some drivers may
15choose not to restore context when they have actually lost it and fail
16to properly resume.
17
18Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
19
20---
21arch/arm/mach-omap2/omap_hwmod.c | 27 +++++++++++++++++++++++++++
22 arch/arm/mach-omap2/omap_hwmod.h | 1 +
23 2 files changed, 28 insertions(+)
24
25diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
26index 1f766fd..ad98b7f 100644
27--- a/arch/arm/mach-omap2/omap_hwmod.c
28+++ b/arch/arm/mach-omap2/omap_hwmod.c
29@@ -2165,6 +2165,31 @@ static void _omap4_update_context_lost(struct omap_hwmod *oh)
30 }
31
32 /**
33+ * _am437x_update_context_lost - increment hwmod context loss counter if
34+ * hwmod context was lost, and clear hardware context loss reg
35+ * @oh: hwmod to check for context loss
36+ *
37+ * If the PRCM indicates that the hwmod @oh lost context, increment
38+ * our in-memory context loss counter, and clear the RM_*_CONTEXT
39+ * bits. No return value.
40+ */
41+static void _am437x_update_context_lost(struct omap_hwmod *oh)
42+{
43+ if (!(oh->prcm.omap4.flags & HWMOD_AM437X_HAS_CONTEXT_LOSS_BIT))
44+ return;
45+
46+ if (!prm_was_any_context_lost_old(oh->clkdm->pwrdm.ptr->prcm_partition,
47+ oh->clkdm->pwrdm.ptr->prcm_offs,
48+ oh->prcm.omap4.context_offs))
49+ return;
50+
51+ oh->prcm.omap4.context_lost_counter++;
52+ prm_clear_context_loss_flags_old(oh->clkdm->pwrdm.ptr->prcm_partition,
53+ oh->clkdm->pwrdm.ptr->prcm_offs,
54+ oh->prcm.omap4.context_offs);
55+}
56+
57+/**
58 * _omap4_get_context_lost - get context loss counter for a hwmod
59 * @oh: hwmod to get context loss counter for
60 *
61@@ -4296,6 +4321,8 @@ void __init omap_hwmod_init(void)
62 soc_ops.deassert_hardreset = _omap4_deassert_hardreset;
63 soc_ops.is_hardreset_asserted = _omap4_is_hardreset_asserted;
64 soc_ops.init_clkdm = _init_clkdm;
65+ soc_ops.update_context_lost = _am437x_update_context_lost;
66+ soc_ops.get_context_lost = _omap4_get_context_lost;
67 } else if (soc_is_am33xx()) {
68 soc_ops.enable_module = _am33xx_enable_module;
69 soc_ops.disable_module = _am33xx_disable_module;
70diff --git a/arch/arm/mach-omap2/omap_hwmod.h b/arch/arm/mach-omap2/omap_hwmod.h
71index f16afc6..dad6b2d 100644
72--- a/arch/arm/mach-omap2/omap_hwmod.h
73+++ b/arch/arm/mach-omap2/omap_hwmod.h
74@@ -450,6 +450,7 @@ struct omap_hwmod_omap2_prcm {
75 * flag bit should be set in those cases
76 */
77 #define HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT (1 << 0)
78+#define HWMOD_AM437X_HAS_CONTEXT_LOSS_BIT (1 << 1)
79
80 /**
81 * struct omap_hwmod_omap4_prcm - OMAP4-specific PRCM data
diff --git a/recipes-kernel/linux/linux-ti-staging/0002-ARM-config-omap-Make-advanced-networking-features-as.patch b/recipes-kernel/linux/linux-ti-staging/0002-ARM-config-omap-Make-advanced-networking-features-as.patch
deleted file mode 100644
index 5c4ad5f9..00000000
--- a/recipes-kernel/linux/linux-ti-staging/0002-ARM-config-omap-Make-advanced-networking-features-as.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From c43131183974d2b02140dce3560cf7bba385b459 Mon Sep 17 00:00:00 2001
2From: Santosh Shilimkar <santosh.shilimkar@ti.com>
3Date: Thu, 13 Feb 2014 08:22:42 -0500
4Subject: [PATCH 2/6] ARM: config: omap: Make advanced networking features as
5 modules
6
7Linux networking supports advanced networking features like IPSEC, NETFILTERS,
8BRIDGING etc and should be enabled only when user has specific usecase to
9use them. Thats why all typical distro's build them as modules so that all
10the standard network usecases don't get any additional overhead and specific
11case can load those modules when needed.
12
13Lets align the config accordingly. Created using typical 'savedefconfig' method.
14
15Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
16---
17 arch/arm/configs/omap2plus_defconfig | 18 +++++++++++-------
18 1 file changed, 11 insertions(+), 7 deletions(-)
19
20diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
21index 2e8dcb9..4c96d0c 100644
22--- a/arch/arm/configs/omap2plus_defconfig
23+++ b/arch/arm/configs/omap2plus_defconfig
24@@ -69,16 +69,20 @@ CONFIG_IP_PNP=y
25 CONFIG_IP_PNP_DHCP=y
26 CONFIG_IP_PNP_BOOTP=y
27 CONFIG_IP_PNP_RARP=y
28+CONFIG_INET_XFRM_MODE_TRANSPORT=m
29+CONFIG_INET_XFRM_MODE_TUNNEL=m
30+CONFIG_INET_XFRM_MODE_BEET=m
31 # CONFIG_INET_LRO is not set
32+CONFIG_INET_DIAG=m
33 # CONFIG_IPV6 is not set
34 CONFIG_NETFILTER=y
35-CONFIG_NF_CONNTRACK=y
36-CONFIG_NF_CONNTRACK_IPV4=y
37-CONFIG_IP_NF_IPTABLES=y
38-CONFIG_IP_NF_FILTER=y
39-CONFIG_NF_NAT_IPV4=y
40-CONFIG_IP_NF_TARGET_MASQUERADE=y
41-CONFIG_BRIDGE=y
42+CONFIG_NF_CONNTRACK=m
43+CONFIG_NF_CONNTRACK_IPV4=m
44+CONFIG_IP_NF_IPTABLES=m
45+CONFIG_IP_NF_FILTER=m
46+CONFIG_NF_NAT_IPV4=m
47+CONFIG_IP_NF_TARGET_MASQUERADE=m
48+CONFIG_BRIDGE=m
49 CONFIG_VLAN_8021Q=y
50 CONFIG_CAN=m
51 CONFIG_CAN_C_CAN=m
52--
531.7.9.5
54
diff --git a/recipes-kernel/linux/linux-ti-staging/0003-ARM-OMAP2-am43xx-Add-context-offset-for-dss-hwmod.patch b/recipes-kernel/linux/linux-ti-staging/0003-ARM-OMAP2-am43xx-Add-context-offset-for-dss-hwmod.patch
deleted file mode 100644
index 5dc37259..00000000
--- a/recipes-kernel/linux/linux-ti-staging/0003-ARM-OMAP2-am43xx-Add-context-offset-for-dss-hwmod.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1Subject: [v2,3/3] ARM: OMAP2+: am43xx: Add context offset for dss hwmod
2Date: Sat, 15 Feb 2014 02:07:35 -0000
3From: Dave Gerlach <d-gerlach@ti.com>
4
5Add context_offs to the DSS hwmod for am43xx as the driver uses the
6context loss count to determine whether or not to restore context to the
7module. Also add prcm flag indicating this bit is valid. Without this the
8display does not return after a suspend cycle.
9
10Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
11
12---
13arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 ++
14 arch/arm/mach-omap2/prcm43xx.h | 3 +++
15 2 files changed, 5 insertions(+)
16
17diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
18index 978356d..b298d6d 100644
19--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
20+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
21@@ -1921,7 +1921,9 @@ static struct omap_hwmod am43xx_dss_core_hwmod = {
22 .prcm = {
23 .omap4 = {
24 .clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
25+ .context_offs = AM43XX_PRM_RM_PER_DSS_CONTEXT,
26 .modulemode = MODULEMODE_SWCTRL,
27+ .flags = HWMOD_AM437X_HAS_CONTEXT_LOSS_BIT,
28 },
29 },
30 };
31diff --git a/arch/arm/mach-omap2/prcm43xx.h b/arch/arm/mach-omap2/prcm43xx.h
32index f5344ab..55c41bb 100644
33--- a/arch/arm/mach-omap2/prcm43xx.h
34+++ b/arch/arm/mach-omap2/prcm43xx.h
35@@ -25,6 +25,9 @@
36 #define AM43XX_PRM_WKUP_INST 0x2000
37 #define AM43XX_PRM_DEVICE_INST 0x4000
38
39+/* PRM.PRM_PER offsets */
40+#define AM43XX_PRM_RM_PER_DSS_CONTEXT 0x0A24
41+
42 /* RM RSTCTRL offsets */
43 #define AM43XX_RM_PER_RSTCTRL_OFFSET 0x0010
44 #define AM43XX_RM_GFX_RSTCTRL_OFFSET 0x0010
diff --git a/recipes-kernel/linux/linux-ti-staging/0003-ARM-config-omap-Disable-extra-debug-options.patch b/recipes-kernel/linux/linux-ti-staging/0003-ARM-config-omap-Disable-extra-debug-options.patch
deleted file mode 100644
index f515524e..00000000
--- a/recipes-kernel/linux/linux-ti-staging/0003-ARM-config-omap-Disable-extra-debug-options.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 2d7b208a86b15d2c35336783efa4b604d96ee31e Mon Sep 17 00:00:00 2001
2From: Santosh Shilimkar <santosh.shilimkar@ti.com>
3Date: Thu, 13 Feb 2014 08:33:49 -0500
4Subject: [PATCH 3/6] ARM: config: omap: Disable extra debug options
5
6LOCK debug, SCHED debug, PREEMPT debug are very expensive operations and
7always in fast path of kernel operations. These are typical kernel development
8options and should be disabled in production kernel builds.
9
10Also enable JUMP_LABEL to take advantage of compiler optimisations.
11
12Created using typical 'savedefconfig' method. Hence you see some crypto
13option noise which unrelated and no impact on the end config.
14
15Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
16---
17 arch/arm/configs/omap2plus_defconfig | 6 +++---
18 1 file changed, 3 insertions(+), 3 deletions(-)
19
20diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
21index 4c96d0c..4106761 100644
22--- a/arch/arm/configs/omap2plus_defconfig
23+++ b/arch/arm/configs/omap2plus_defconfig
24@@ -12,6 +12,7 @@ CONFIG_SLAB=y
25 CONFIG_PROFILING=y
26 CONFIG_OPROFILE=y
27 CONFIG_KPROBES=y
28+CONFIG_JUMP_LABEL=y
29 CONFIG_MODULES=y
30 CONFIG_MODULE_FORCE_LOAD=y
31 CONFIG_MODULE_UNLOAD=y
32@@ -376,10 +377,9 @@ CONFIG_NLS_ISO8859_1=y
33 CONFIG_PRINTK_TIME=y
34 CONFIG_DEBUG_INFO=y
35 CONFIG_MAGIC_SYSRQ=y
36-CONFIG_SCHEDSTATS=y
37-CONFIG_TIMER_STATS=y
38-CONFIG_PROVE_LOCKING=y
39+# CONFIG_SCHED_DEBUG is not set
40 # CONFIG_DEBUG_BUGVERBOSE is not set
41+# CONFIG_FTRACE is not set
42 CONFIG_SECURITY=y
43 CONFIG_CRYPTO_TEST=m
44 CONFIG_CRYPTO_ECB=y
45--
461.7.9.5
47
diff --git a/recipes-kernel/linux/linux-ti-staging/0004-ARM-OMAP2-omap_hwmod-Maintain-legacy-context-loss-count.patch b/recipes-kernel/linux/linux-ti-staging/0004-ARM-OMAP2-omap_hwmod-Maintain-legacy-context-loss-count.patch
deleted file mode 100644
index 65e89e9c..00000000
--- a/recipes-kernel/linux/linux-ti-staging/0004-ARM-OMAP2-omap_hwmod-Maintain-legacy-context-loss-count.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1Subject: ARM: OMAP2+: omap_hwmod: Maintain legacy context loss count
2Date: Sat, 15 Feb 2014 03:14:40 -0000
3From: Dave Gerlach <d-gerlach@ti.com>
4
5In the case of am43xx, make sure we allow hwmods that don't use the hwmod
6context_offs for context loss counting to still use powerdomains to count
7context loss.
8
9Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
10
11---
12arch/arm/mach-omap2/omap_hwmod.c | 17 ++++++++++++++++-
13 1 file changed, 16 insertions(+), 1 deletion(-)
14
15diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
16index ad98b7f..3fe29a2 100644
17--- a/arch/arm/mach-omap2/omap_hwmod.c
18+++ b/arch/arm/mach-omap2/omap_hwmod.c
19@@ -182,6 +182,9 @@
20 * device drivers. Until then, this should avoid huge blocks of cpu_is_*()
21 * conditionals in this code.
22 */
23+
24+#define SOC_HWMOD_CHECK_FOR_CONTEXT_FLAG (0x1 << 0)
25+
26 struct omap_hwmod_soc_ops {
27 void (*enable_module)(struct omap_hwmod *oh);
28 int (*disable_module)(struct omap_hwmod *oh);
29@@ -195,6 +198,7 @@ struct omap_hwmod_soc_ops {
30 int (*init_clkdm)(struct omap_hwmod *oh);
31 void (*update_context_lost)(struct omap_hwmod *oh);
32 int (*get_context_lost)(struct omap_hwmod *oh);
33+ u8 flags;
34 };
35
36 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
37@@ -4193,9 +4197,19 @@ int omap_hwmod_get_context_loss_count(struct omap_hwmod *oh)
38 struct powerdomain *pwrdm;
39 int ret = 0;
40
41- if (soc_ops.get_context_lost)
42+ if (soc_ops.get_context_lost) {
43+ /*
44+ * On SoCs like AM437x where we dont use hwmod to check context
45+ * loss on certain devices..
46+ */
47+ if ((soc_ops.flags & SOC_HWMOD_CHECK_FOR_CONTEXT_FLAG) &&
48+ !(oh->prcm.omap4.flags & HWMOD_AM437X_HAS_CONTEXT_LOSS_BIT))
49+ goto get_pwrdm_context_loss_count;
50+
51 return soc_ops.get_context_lost(oh);
52+ }
53
54+get_pwrdm_context_loss_count:
55 pwrdm = omap_hwmod_get_pwrdm(oh);
56 if (pwrdm)
57 ret = pwrdm_get_context_loss_count(pwrdm);
58@@ -4323,6 +4337,7 @@ void __init omap_hwmod_init(void)
59 soc_ops.init_clkdm = _init_clkdm;
60 soc_ops.update_context_lost = _am437x_update_context_lost;
61 soc_ops.get_context_lost = _omap4_get_context_lost;
62+ soc_ops.flags = SOC_HWMOD_CHECK_FOR_CONTEXT_FLAG;
63 } else if (soc_is_am33xx()) {
64 soc_ops.enable_module = _am33xx_enable_module;
65 soc_ops.disable_module = _am33xx_disable_module;
diff --git a/recipes-kernel/linux/linux-ti-staging/0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch b/recipes-kernel/linux/linux-ti-staging/0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch
deleted file mode 100644
index 3813504f..00000000
--- a/recipes-kernel/linux/linux-ti-staging/0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From adf38b7b71b35fcd1e229399e8eea7628be35815 Mon Sep 17 00:00:00 2001
2From: Santosh Shilimkar <santosh.shilimkar@ti.com>
3Date: Thu, 13 Feb 2014 08:52:41 -0500
4Subject: [PATCH 4/6] Not-for-merge: ARM: config: omap: Disable SMP for AM335x
5 build
6
7SMP and SMP_ON_UP introduces some extra barriers and code many fast paths
8including kernel lock functions.
9
10Performance sensitive usecases like networking gets impacted because of this.
11In typical production kernel which is targeted for single core device
12like AM335x family, you don't want to take this hit.
13
14Ideally one should just create a device specific config feed as done by all
15typical distro's. Other option is to apply this specifically during build
16time using recipe.
17
18Whichever option, one definitely don't want this overhead for performance
19critical usecases.
20
21Disabling SMP in the build introduces one warining in cpuidle44xx.c driver
22and fix is included in the series
23
24Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
25---
26 arch/arm/configs/omap2plus_defconfig | 2 --
27 1 file changed, 2 deletions(-)
28
29diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
30index 4106761..bf49ab6 100644
31--- a/arch/arm/configs/omap2plus_defconfig
32+++ b/arch/arm/configs/omap2plus_defconfig
33@@ -36,8 +36,6 @@ CONFIG_OMAP4_ERRATA_I688=y
34 CONFIG_ARM_THUMBEE=y
35 CONFIG_ARM_ERRATA_411920=y
36 CONFIG_PCIE_DRA7XX=y
37-CONFIG_SMP=y
38-CONFIG_NR_CPUS=2
39 CONFIG_PREEMPT=y
40 CONFIG_CMA=y
41 CONFIG_ZBOOT_ROM_TEXT=0x0
42--
431.7.9.5
44
diff --git a/recipes-kernel/linux/linux-ti-staging/0005-ARM-OMAP-Kill-warning-in-CPUIDLE-code-with-CONFIG_SM.patch b/recipes-kernel/linux/linux-ti-staging/0005-ARM-OMAP-Kill-warning-in-CPUIDLE-code-with-CONFIG_SM.patch
deleted file mode 100644
index ef6e0a77..00000000
--- a/recipes-kernel/linux/linux-ti-staging/0005-ARM-OMAP-Kill-warning-in-CPUIDLE-code-with-CONFIG_SM.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From a612d323c1e5a88a46323d5ee8547283917dd3b6 Mon Sep 17 00:00:00 2001
2From: Santosh Shilimkar <santosh.shilimkar@ti.com>
3Date: Wed, 12 Feb 2014 16:42:39 -0500
4Subject: [PATCH 5/6] ARM: OMAP: Kill warning in CPUIDLE code with !CONFIG_SMP
5
6for non SMP build, NR_CPUS is 1 and hence the code complains with below
7warnings.
8
9arch/arm/mach-omap2/cpuidle44xx.c:207:8: warning: array subscript is above array bounds [-Warray-bounds]
10arch/arm/mach-omap2/cpuidle44xx.c:212:11: warning: array subscript is above array bounds [-Warray-bounds]
11
12Kill it by making array size fixed.
13
14Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
15---
16 arch/arm/mach-omap2/cpuidle44xx.c | 8 +++++---
17 1 file changed, 5 insertions(+), 3 deletions(-)
18
19diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
20index 4c8982a..5e85f1e 100644
21--- a/arch/arm/mach-omap2/cpuidle44xx.c
22+++ b/arch/arm/mach-omap2/cpuidle44xx.c
23@@ -23,6 +23,8 @@
24 #include "prm.h"
25 #include "clockdomain.h"
26
27+#define MAX_CPUS 2
28+
29 /* Machine specific information */
30 struct idle_statedata {
31 u32 cpu_state;
32@@ -48,11 +50,11 @@ static struct idle_statedata omap4_idle_data[] = {
33 },
34 };
35
36-static struct powerdomain *mpu_pd, *cpu_pd[NR_CPUS];
37-static struct clockdomain *cpu_clkdm[NR_CPUS];
38+static struct powerdomain *mpu_pd, *cpu_pd[MAX_CPUS];
39+static struct clockdomain *cpu_clkdm[MAX_CPUS];
40
41 static atomic_t abort_barrier;
42-static bool cpu_done[NR_CPUS];
43+static bool cpu_done[MAX_CPUS];
44 static struct idle_statedata *state_ptr = &omap4_idle_data[0];
45
46 /* Private functions */
47--
481.7.9.5
49
diff --git a/recipes-kernel/linux/linux-ti-staging_3.12.bb b/recipes-kernel/linux/linux-ti-staging_3.12.bb
index 2561e12b..0b4815ed 100644
--- a/recipes-kernel/linux/linux-ti-staging_3.12.bb
+++ b/recipes-kernel/linux/linux-ti-staging_3.12.bb
@@ -36,25 +36,13 @@ S = "${WORKDIR}/git"
36 36
37BRANCH = "ti-linux-3.12.y" 37BRANCH = "ti-linux-3.12.y"
38 38
39SRCREV = "9d5b470605a6e5df5c46444c2b2c108d21f9a24a" 39SRCREV = "d5e4bfd196e114c885c5c42cf0a7b3edc7e54829"
40PV = "3.12.10" 40PV = "3.12.10"
41 41
42# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild 42# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
43MACHINE_KERNEL_PR_append = "f+gitr${SRCPV}" 43MACHINE_KERNEL_PR_append = "g+gitr${SRCPV}"
44PR = "${MACHINE_KERNEL_PR}" 44PR = "${MACHINE_KERNEL_PR}"
45 45
46SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \ 46SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \
47 file://defconfig \ 47 file://defconfig \
48 " 48 "
49
50# Performance fixes
51SRC_URI += "file://0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch \
52 file://0002-ARM-config-omap-Make-advanced-networking-features-as.patch \
53 file://0003-ARM-config-omap-Disable-extra-debug-options.patch \
54 "
55# LCD resume fixes
56SRC_URI += "file://0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch \
57 file://0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch \
58 file://0003-ARM-OMAP2-am43xx-Add-context-offset-for-dss-hwmod.patch \
59 file://0004-ARM-OMAP2-omap_hwmod-Maintain-legacy-context-loss-count.patch \
60 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 22:37:07 +0000