[meta-ti] [PATCHv2] linux-ti-staging: remove local patches that got merged to kernel tree
Denys Dmytriyenko
denis at denix.org
Tue Feb 18 08:04:30 PST 2014
From: Denys Dmytriyenko <denys at ti.com>
Signed-off-by: Denys Dmytriyenko <denys at ti.com>
---
...RM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch | 42 -----
...omap-Sync-up-omap2plus-defconfig-with-sav.patch | 195 ---------------------
...p_hwmod-Add-context-ops-to-am43xx-soc_ops.patch | 81 ---------
...omap-Make-advanced-networking-features-as.patch | 54 ------
...2-am43xx-Add-context-offset-for-dss-hwmod.patch | 44 -----
...M-config-omap-Disable-extra-debug-options.patch | 47 -----
..._hwmod-Maintain-legacy-context-loss-count.patch | 65 -------
...ge-ARM-config-omap-Disable-SMP-for-AM335x.patch | 44 -----
...ll-warning-in-CPUIDLE-code-with-CONFIG_SM.patch | 49 ------
recipes-kernel/linux/linux-ti-staging_3.12.bb | 16 +-
10 files changed, 2 insertions(+), 635 deletions(-)
delete mode 100644 recipes-kernel/linux/linux-ti-staging/0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch
delete mode 100644 recipes-kernel/linux/linux-ti-staging/0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch
delete mode 100644 recipes-kernel/linux/linux-ti-staging/0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch
delete mode 100644 recipes-kernel/linux/linux-ti-staging/0002-ARM-config-omap-Make-advanced-networking-features-as.patch
delete mode 100644 recipes-kernel/linux/linux-ti-staging/0003-ARM-OMAP2-am43xx-Add-context-offset-for-dss-hwmod.patch
delete mode 100644 recipes-kernel/linux/linux-ti-staging/0003-ARM-config-omap-Disable-extra-debug-options.patch
delete mode 100644 recipes-kernel/linux/linux-ti-staging/0004-ARM-OMAP2-omap_hwmod-Maintain-legacy-context-loss-count.patch
delete mode 100644 recipes-kernel/linux/linux-ti-staging/0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch
delete mode 100644 recipes-kernel/linux/linux-ti-staging/0005-ARM-OMAP-Kill-warning-in-CPUIDLE-code-with-CONFIG_SM.patch
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 00dceaf..0000000
--- a/recipes-kernel/linux/linux-ti-staging/0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: [v2,1/3] ARM: OMAP2+: am43xx: Use omap4 prm context ops
-Date: Sat, 15 Feb 2014 02:07:33 -0000
-From: Dave Gerlach <d-gerlach at ti.com>
-
-Context loss counting relies on several prm function pointers that
-serve as a "mapping" into the context loss registers and actually
-allow reading and clearing of the registers. Use the same
-from omap4 for am43xx as the layout of the prcm is similar.
-
-Signed-off-by: Dave Gerlach <d-gerlach at ti.com>
-
----
-arch/arm/mach-omap2/io.c | 1 +
- arch/arm/mach-omap2/prm44xx.c | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
-index 295e3e6..3eb9ae5 100644
---- a/arch/arm/mach-omap2/io.c
-+++ b/arch/arm/mach-omap2/io.c
-@@ -619,6 +619,7 @@ void __init am43xx_init_early(void)
- omap_prm_base_init();
- omap_cm_base_init();
- omap3xxx_check_revision();
-+ omap44xx_prm_init();
- am33xx_check_features();
- am43xx_powerdomains_init();
- am43xx_clockdomains_init();
-diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
-index 03a6034..2c97e53 100644
---- a/arch/arm/mach-omap2/prm44xx.c
-+++ b/arch/arm/mach-omap2/prm44xx.c
-@@ -660,7 +660,8 @@ static struct prm_ll_data omap44xx_prm_ll_data = {
-
- int __init omap44xx_prm_init(void)
- {
-- if (!cpu_is_omap44xx() && !soc_is_omap54xx() && !soc_is_dra7xx())
-+ if (!soc_is_am43xx() && !cpu_is_omap44xx() &&
-+ !soc_is_omap54xx() && !soc_is_dra7xx())
- return 0;
-
- 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 f666521..0000000
--- a/recipes-kernel/linux/linux-ti-staging/0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From 0e6113030205a51f16944d4f73e166792200def0 Mon Sep 17 00:00:00 2001
-From: Santosh Shilimkar <santosh.shilimkar at ti.com>
-Date: Thu, 13 Feb 2014 10:51:55 -0500
-Subject: [PATCH 1/6] ARM: config: omap: Sync up omap2plus defconfig with
- savedefconfig
-
-This is preparatory patch for some of the config fragment updates
-to be done for network performance issue.
-
-Signed-off-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
----
- arch/arm/configs/omap2plus_defconfig | 67 ++++++++++------------------------
- 1 file changed, 20 insertions(+), 47 deletions(-)
-
-diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
-index f0484a2..2e8dcb9 100644
---- a/arch/arm/configs/omap2plus_defconfig
-+++ b/arch/arm/configs/omap2plus_defconfig
-@@ -23,25 +23,22 @@ CONFIG_PARTITION_ADVANCED=y
- CONFIG_ARCH_OMAP2PLUS=y
- CONFIG_ARCH_MULTI_V6=y
- CONFIG_GPIO_PCA953X=y
-+CONFIG_OMAP_RESET_CLOCKS=y
-+CONFIG_OMAP_MUX_DEBUG=y
- CONFIG_ARCH_OMAP2=y
- CONFIG_ARCH_OMAP3=y
- CONFIG_ARCH_OMAP4=y
- CONFIG_SOC_OMAP5=y
--CONFIG_SOC_AM33XX=y
- CONFIG_SOC_AM43XX=y
- CONFIG_SOC_DRA7XX=y
--CONFIG_OMAP_RESET_CLOCKS=y
--CONFIG_OMAP_MUX_DEBUG=y
--CONFIG_ARCH_VEXPRESS_CA9X4=y
- CONFIG_OMAP4_ERRATA_I688=y
- CONFIG_ARM_THUMBEE=y
- CONFIG_ARM_ERRATA_411920=y
- CONFIG_PCIE_DRA7XX=y
- CONFIG_SMP=y
- CONFIG_NR_CPUS=2
--CONFIG_CMA=y
- CONFIG_PREEMPT=y
--CONFIG_LEDS=y
-+CONFIG_CMA=y
- CONFIG_ZBOOT_ROM_TEXT=0x0
- CONFIG_ZBOOT_ROM_BSS=0x0
- CONFIG_ARM_APPENDED_DTB=y
-@@ -75,30 +72,13 @@ CONFIG_IP_PNP_RARP=y
- # CONFIG_INET_LRO is not set
- # CONFIG_IPV6 is not set
- CONFIG_NETFILTER=y
--CONFIG_NETFILTER_ADVANCED=y
--CONFIG_NETFILTER_XTABLES=y
--CONFIG_NF_NAT=y
--CONFIG_NF_NAT_NEEDED=y
--CONFIG_NF_NAT_IPV4=y
--CONFIG_NF_DEFRAG_IPV4=y
- CONFIG_NF_CONNTRACK=y
- CONFIG_NF_CONNTRACK_IPV4=y
--CONFIG_NF_CONNTRACK_PROC_COMPAT=y
- CONFIG_IP_NF_IPTABLES=y
- CONFIG_IP_NF_FILTER=y
--CONFIG_IP_NF_TARGET_LOG=y
-+CONFIG_NF_NAT_IPV4=y
- CONFIG_IP_NF_TARGET_MASQUERADE=y
- CONFIG_BRIDGE=y
--CONFIG_BRIDGE_IGMP_SNOOPING=y
--CONFIG_BRIDGE_NETFILTER=y
--CONFIG_STP=y
--CONFIG_LLC=y
--CONFIG_INPUT_UINPUT=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_IOPORT=y
--CONFIG_HAS_DMA=y
--CONFIG_NLATTR=y
--CONFIG_AVERAGE=y
- CONFIG_VLAN_8021Q=y
- CONFIG_CAN=m
- CONFIG_CAN_C_CAN=m
-@@ -110,16 +90,13 @@ CONFIG_BT_HCIUART_BCSP=y
- CONFIG_BT_HCIUART_LL=y
- CONFIG_BT_HCIBCM203X=m
- CONFIG_BT_HCIBPA10X=m
--CONFIG_NL80211_TESTMODE=y
-+CONFIG_BT_WILINK=m
- CONFIG_CFG80211=m
-+CONFIG_NL80211_TESTMODE=y
- CONFIG_MAC80211=m
- CONFIG_MAC80211_RC_PID=y
- CONFIG_MAC80211_RC_DEFAULT_PID=y
--CONFIG_WL_TI=y
--CONFIG_WL12XX=m
--CONFIG_WL18XX=m
--CONFIG_WLCORE=m
--CONFIG_WLCORE_SDIO=m
-+CONFIG_RFKILL=y
- CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
- CONFIG_DEVTMPFS=y
- CONFIG_DEVTMPFS_MOUNT=y
-@@ -171,6 +148,10 @@ CONFIG_LIBERTAS=m
- CONFIG_LIBERTAS_USB=m
- CONFIG_LIBERTAS_SDIO=m
- CONFIG_LIBERTAS_DEBUG=y
-+CONFIG_WL_TI=y
-+CONFIG_WL12XX=m
-+CONFIG_WL18XX=m
-+CONFIG_WLCORE_SDIO=m
- CONFIG_INPUT_JOYDEV=y
- CONFIG_INPUT_EVDEV=y
- CONFIG_KEYBOARD_GPIO=y
-@@ -183,6 +164,7 @@ CONFIG_TOUCHSCREEN_TI_AM335X_TSC=y
- CONFIG_TOUCHSCREEN_PIXCIR=m
- CONFIG_INPUT_MISC=y
- CONFIG_INPUT_TWL4030_PWRBUTTON=y
-+CONFIG_INPUT_UINPUT=y
- # CONFIG_LEGACY_PTYS is not set
- CONFIG_SERIAL_8250=y
- CONFIG_SERIAL_8250_CONSOLE=y
-@@ -226,7 +208,6 @@ CONFIG_MFD_TPS65217=y
- CONFIG_MFD_TPS65218=y
- CONFIG_MFD_TPS65910=y
- CONFIG_TWL6040_CORE=y
--CONFIG_REGULATOR_FIXED_VOLTAGE=y
- CONFIG_REGULATOR_PALMAS=y
- CONFIG_REGULATOR_PBIAS=y
- CONFIG_REGULATOR_TPS65023=y
-@@ -240,6 +221,10 @@ CONFIG_MEDIA_SUPPORT=y
- CONFIG_MEDIA_CAMERA_SUPPORT=y
- CONFIG_MEDIA_USB_SUPPORT=y
- CONFIG_USB_VIDEO_CLASS=m
-+CONFIG_V4L_PLATFORM_DRIVERS=y
-+CONFIG_VIDEO_AM437X_VPFE=y
-+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-+CONFIG_VIDEO_OV2659=y
- CONFIG_FB=y
- CONFIG_FIRMWARE_EDID=y
- CONFIG_FB_TILEBLITTING=y
-@@ -252,6 +237,7 @@ CONFIG_FB_OMAP2=y
- CONFIG_DISPLAY_ENCODER_TFP410=y
- CONFIG_DISPLAY_ENCODER_TPD12S015=y
- CONFIG_DISPLAY_DRA_EVM_ENCODER_TPD12S015=y
-+CONFIG_DISPLAY_ENCODER_SIL9022=y
- CONFIG_DISPLAY_CONNECTOR_DVI=y
- CONFIG_DISPLAY_CONNECTOR_HDMI=y
- CONFIG_DISPLAY_PANEL_DPI=y
-@@ -276,6 +262,7 @@ CONFIG_SND_DAVINCI_SOC=m
- CONFIG_SND_AM33XX_SOC_EVM=m
- CONFIG_SND_AM43XX_SOC_EPOS_EVM=m
- CONFIG_SND_OMAP_SOC=m
-+CONFIG_SND_OMAP_SOC_DRA7EVM=m
- CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
- CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
- CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
-@@ -287,7 +274,6 @@ CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_MUSB_HDRC=m
- CONFIG_USB_MUSB_OMAP2PLUS=m
- CONFIG_USB_MUSB_DSPS=m
--CONFIG_USB_MUSB_AM335X_CHILD=m
- CONFIG_USB_TI_CPPI41_DMA=y
- CONFIG_USB_WDM=y
- CONFIG_USB_STORAGE=y
-@@ -390,17 +376,11 @@ CONFIG_SCHEDSTATS=y
- CONFIG_TIMER_STATS=y
- CONFIG_PROVE_LOCKING=y
- # CONFIG_DEBUG_BUGVERBOSE is not set
--CONFIG_RFKILL=y
--CONFIG_KEYS=y
--CONFIG_BT_WILINK=m
--CONFIG_WIRELESS_EXT=y
- CONFIG_SECURITY=y
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ARC4=y
--CONFIG_CRYPTO_ECB=y
--CONFIG_CRYPTO_AES=y
- CONFIG_CRYPTO_TEST=m
-+CONFIG_CRYPTO_ECB=y
- CONFIG_CRYPTO_MICHAEL_MIC=y
-+CONFIG_CRYPTO_ARC4=y
- # CONFIG_CRYPTO_ANSI_CPRNG is not set
- CONFIG_CRYPTO_USER_API_HASH=y
- CONFIG_CRYPTO_USER_API_SKCIPHER=y
-@@ -415,10 +395,3 @@ CONFIG_LIBCRC32C=y
- CONFIG_FONTS=y
- CONFIG_FONT_8x8=y
- CONFIG_FONT_8x16=y
--CONFIG_SND_OMAP_SOC_DRA7EVM=y
--CONFIG_DISPLAY_ENCODER_SIL9022=y
--CONFIG_VIDEO_V4L2=y
--CONFIG_V4L_PLATFORM_DRIVERS=y
--# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
--CONFIG_VIDEO_AM437X_VPFE=y
--CONFIG_VIDEO_OV2659=y
---
-1.7.9.5
-
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 246595f..0000000
--- 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 @@
-Subject: [v2,2/3] ARM: OMAP2+: omap_hwmod: Add context ops to am43xx soc_ops
-Date: Sat, 15 Feb 2014 02:07:34 -0000
-From: Dave Gerlach <d-gerlach at ti.com>
-
-AM43XX contains PRM_*_CONTEXT registers like OMAP4 did to track loss
-of context in modules so utilize the same get_context_loss_count soc_op
-present for OMAP4 but define a custom update context loss function for
-am43xx. Because we do not define context_offs for each hwmod, introduce
-a new flag to indicate when we have so we only bother to update when
-we know that it is valid.
-
-Certain drivers use the context loss count to determine if context was
-truly lost during a suspend operation to decide whether or not a
-context restore is truly necessary. Without this, some drivers may
-choose not to restore context when they have actually lost it and fail
-to properly resume.
-
-Signed-off-by: Dave Gerlach <d-gerlach at ti.com>
-
----
-arch/arm/mach-omap2/omap_hwmod.c | 27 +++++++++++++++++++++++++++
- arch/arm/mach-omap2/omap_hwmod.h | 1 +
- 2 files changed, 28 insertions(+)
-
-diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index 1f766fd..ad98b7f 100644
---- a/arch/arm/mach-omap2/omap_hwmod.c
-+++ b/arch/arm/mach-omap2/omap_hwmod.c
-@@ -2165,6 +2165,31 @@ static void _omap4_update_context_lost(struct omap_hwmod *oh)
- }
-
- /**
-+ * _am437x_update_context_lost - increment hwmod context loss counter if
-+ * hwmod context was lost, and clear hardware context loss reg
-+ * @oh: hwmod to check for context loss
-+ *
-+ * If the PRCM indicates that the hwmod @oh lost context, increment
-+ * our in-memory context loss counter, and clear the RM_*_CONTEXT
-+ * bits. No return value.
-+ */
-+static void _am437x_update_context_lost(struct omap_hwmod *oh)
-+{
-+ if (!(oh->prcm.omap4.flags & HWMOD_AM437X_HAS_CONTEXT_LOSS_BIT))
-+ return;
-+
-+ if (!prm_was_any_context_lost_old(oh->clkdm->pwrdm.ptr->prcm_partition,
-+ oh->clkdm->pwrdm.ptr->prcm_offs,
-+ oh->prcm.omap4.context_offs))
-+ return;
-+
-+ oh->prcm.omap4.context_lost_counter++;
-+ prm_clear_context_loss_flags_old(oh->clkdm->pwrdm.ptr->prcm_partition,
-+ oh->clkdm->pwrdm.ptr->prcm_offs,
-+ oh->prcm.omap4.context_offs);
-+}
-+
-+/**
- * _omap4_get_context_lost - get context loss counter for a hwmod
- * @oh: hwmod to get context loss counter for
- *
-@@ -4296,6 +4321,8 @@ void __init omap_hwmod_init(void)
- soc_ops.deassert_hardreset = _omap4_deassert_hardreset;
- soc_ops.is_hardreset_asserted = _omap4_is_hardreset_asserted;
- soc_ops.init_clkdm = _init_clkdm;
-+ soc_ops.update_context_lost = _am437x_update_context_lost;
-+ soc_ops.get_context_lost = _omap4_get_context_lost;
- } else if (soc_is_am33xx()) {
- soc_ops.enable_module = _am33xx_enable_module;
- soc_ops.disable_module = _am33xx_disable_module;
-diff --git a/arch/arm/mach-omap2/omap_hwmod.h b/arch/arm/mach-omap2/omap_hwmod.h
-index f16afc6..dad6b2d 100644
---- a/arch/arm/mach-omap2/omap_hwmod.h
-+++ b/arch/arm/mach-omap2/omap_hwmod.h
-@@ -450,6 +450,7 @@ struct omap_hwmod_omap2_prcm {
- * flag bit should be set in those cases
- */
- #define HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT (1 << 0)
-+#define HWMOD_AM437X_HAS_CONTEXT_LOSS_BIT (1 << 1)
-
- /**
- * 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 5c4ad5f..0000000
--- a/recipes-kernel/linux/linux-ti-staging/0002-ARM-config-omap-Make-advanced-networking-features-as.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c43131183974d2b02140dce3560cf7bba385b459 Mon Sep 17 00:00:00 2001
-From: Santosh Shilimkar <santosh.shilimkar at ti.com>
-Date: Thu, 13 Feb 2014 08:22:42 -0500
-Subject: [PATCH 2/6] ARM: config: omap: Make advanced networking features as
- modules
-
-Linux networking supports advanced networking features like IPSEC, NETFILTERS,
-BRIDGING etc and should be enabled only when user has specific usecase to
-use them. Thats why all typical distro's build them as modules so that all
-the standard network usecases don't get any additional overhead and specific
-case can load those modules when needed.
-
-Lets align the config accordingly. Created using typical 'savedefconfig' method.
-
-Signed-off-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
----
- arch/arm/configs/omap2plus_defconfig | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
-index 2e8dcb9..4c96d0c 100644
---- a/arch/arm/configs/omap2plus_defconfig
-+++ b/arch/arm/configs/omap2plus_defconfig
-@@ -69,16 +69,20 @@ CONFIG_IP_PNP=y
- CONFIG_IP_PNP_DHCP=y
- CONFIG_IP_PNP_BOOTP=y
- CONFIG_IP_PNP_RARP=y
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
- # CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=m
- # CONFIG_IPV6 is not set
- CONFIG_NETFILTER=y
--CONFIG_NF_CONNTRACK=y
--CONFIG_NF_CONNTRACK_IPV4=y
--CONFIG_IP_NF_IPTABLES=y
--CONFIG_IP_NF_FILTER=y
--CONFIG_NF_NAT_IPV4=y
--CONFIG_IP_NF_TARGET_MASQUERADE=y
--CONFIG_BRIDGE=y
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_NF_NAT_IPV4=m
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_BRIDGE=m
- CONFIG_VLAN_8021Q=y
- CONFIG_CAN=m
- CONFIG_CAN_C_CAN=m
---
-1.7.9.5
-
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 5dc3725..0000000
--- a/recipes-kernel/linux/linux-ti-staging/0003-ARM-OMAP2-am43xx-Add-context-offset-for-dss-hwmod.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Subject: [v2,3/3] ARM: OMAP2+: am43xx: Add context offset for dss hwmod
-Date: Sat, 15 Feb 2014 02:07:35 -0000
-From: Dave Gerlach <d-gerlach at ti.com>
-
-Add context_offs to the DSS hwmod for am43xx as the driver uses the
-context loss count to determine whether or not to restore context to the
-module. Also add prcm flag indicating this bit is valid. Without this the
-display does not return after a suspend cycle.
-
-Signed-off-by: Dave Gerlach <d-gerlach at ti.com>
-
----
-arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 ++
- arch/arm/mach-omap2/prcm43xx.h | 3 +++
- 2 files changed, 5 insertions(+)
-
-diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
-index 978356d..b298d6d 100644
---- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
-+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
-@@ -1921,7 +1921,9 @@ static struct omap_hwmod am43xx_dss_core_hwmod = {
- .prcm = {
- .omap4 = {
- .clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
-+ .context_offs = AM43XX_PRM_RM_PER_DSS_CONTEXT,
- .modulemode = MODULEMODE_SWCTRL,
-+ .flags = HWMOD_AM437X_HAS_CONTEXT_LOSS_BIT,
- },
- },
- };
-diff --git a/arch/arm/mach-omap2/prcm43xx.h b/arch/arm/mach-omap2/prcm43xx.h
-index f5344ab..55c41bb 100644
---- a/arch/arm/mach-omap2/prcm43xx.h
-+++ b/arch/arm/mach-omap2/prcm43xx.h
-@@ -25,6 +25,9 @@
- #define AM43XX_PRM_WKUP_INST 0x2000
- #define AM43XX_PRM_DEVICE_INST 0x4000
-
-+/* PRM.PRM_PER offsets */
-+#define AM43XX_PRM_RM_PER_DSS_CONTEXT 0x0A24
-+
- /* RM RSTCTRL offsets */
- #define AM43XX_RM_PER_RSTCTRL_OFFSET 0x0010
- #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 f515524..0000000
--- a/recipes-kernel/linux/linux-ti-staging/0003-ARM-config-omap-Disable-extra-debug-options.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2d7b208a86b15d2c35336783efa4b604d96ee31e Mon Sep 17 00:00:00 2001
-From: Santosh Shilimkar <santosh.shilimkar at ti.com>
-Date: Thu, 13 Feb 2014 08:33:49 -0500
-Subject: [PATCH 3/6] ARM: config: omap: Disable extra debug options
-
-LOCK debug, SCHED debug, PREEMPT debug are very expensive operations and
-always in fast path of kernel operations. These are typical kernel development
-options and should be disabled in production kernel builds.
-
-Also enable JUMP_LABEL to take advantage of compiler optimisations.
-
-Created using typical 'savedefconfig' method. Hence you see some crypto
-option noise which unrelated and no impact on the end config.
-
-Signed-off-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
----
- arch/arm/configs/omap2plus_defconfig | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
-index 4c96d0c..4106761 100644
---- a/arch/arm/configs/omap2plus_defconfig
-+++ b/arch/arm/configs/omap2plus_defconfig
-@@ -12,6 +12,7 @@ CONFIG_SLAB=y
- CONFIG_PROFILING=y
- CONFIG_OPROFILE=y
- CONFIG_KPROBES=y
-+CONFIG_JUMP_LABEL=y
- CONFIG_MODULES=y
- CONFIG_MODULE_FORCE_LOAD=y
- CONFIG_MODULE_UNLOAD=y
-@@ -376,10 +377,9 @@ CONFIG_NLS_ISO8859_1=y
- CONFIG_PRINTK_TIME=y
- CONFIG_DEBUG_INFO=y
- CONFIG_MAGIC_SYSRQ=y
--CONFIG_SCHEDSTATS=y
--CONFIG_TIMER_STATS=y
--CONFIG_PROVE_LOCKING=y
-+# CONFIG_SCHED_DEBUG is not set
- # CONFIG_DEBUG_BUGVERBOSE is not set
-+# CONFIG_FTRACE is not set
- CONFIG_SECURITY=y
- CONFIG_CRYPTO_TEST=m
- CONFIG_CRYPTO_ECB=y
---
-1.7.9.5
-
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 65e89e9..0000000
--- a/recipes-kernel/linux/linux-ti-staging/0004-ARM-OMAP2-omap_hwmod-Maintain-legacy-context-loss-count.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Subject: ARM: OMAP2+: omap_hwmod: Maintain legacy context loss count
-Date: Sat, 15 Feb 2014 03:14:40 -0000
-From: Dave Gerlach <d-gerlach at ti.com>
-
-In the case of am43xx, make sure we allow hwmods that don't use the hwmod
-context_offs for context loss counting to still use powerdomains to count
-context loss.
-
-Signed-off-by: Dave Gerlach <d-gerlach at ti.com>
-
----
-arch/arm/mach-omap2/omap_hwmod.c | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index ad98b7f..3fe29a2 100644
---- a/arch/arm/mach-omap2/omap_hwmod.c
-+++ b/arch/arm/mach-omap2/omap_hwmod.c
-@@ -182,6 +182,9 @@
- * device drivers. Until then, this should avoid huge blocks of cpu_is_*()
- * conditionals in this code.
- */
-+
-+#define SOC_HWMOD_CHECK_FOR_CONTEXT_FLAG (0x1 << 0)
-+
- struct omap_hwmod_soc_ops {
- void (*enable_module)(struct omap_hwmod *oh);
- int (*disable_module)(struct omap_hwmod *oh);
-@@ -195,6 +198,7 @@ struct omap_hwmod_soc_ops {
- int (*init_clkdm)(struct omap_hwmod *oh);
- void (*update_context_lost)(struct omap_hwmod *oh);
- int (*get_context_lost)(struct omap_hwmod *oh);
-+ u8 flags;
- };
-
- /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
-@@ -4193,9 +4197,19 @@ int omap_hwmod_get_context_loss_count(struct omap_hwmod *oh)
- struct powerdomain *pwrdm;
- int ret = 0;
-
-- if (soc_ops.get_context_lost)
-+ if (soc_ops.get_context_lost) {
-+ /*
-+ * On SoCs like AM437x where we dont use hwmod to check context
-+ * loss on certain devices..
-+ */
-+ if ((soc_ops.flags & SOC_HWMOD_CHECK_FOR_CONTEXT_FLAG) &&
-+ !(oh->prcm.omap4.flags & HWMOD_AM437X_HAS_CONTEXT_LOSS_BIT))
-+ goto get_pwrdm_context_loss_count;
-+
- return soc_ops.get_context_lost(oh);
-+ }
-
-+get_pwrdm_context_loss_count:
- pwrdm = omap_hwmod_get_pwrdm(oh);
- if (pwrdm)
- ret = pwrdm_get_context_loss_count(pwrdm);
-@@ -4323,6 +4337,7 @@ void __init omap_hwmod_init(void)
- soc_ops.init_clkdm = _init_clkdm;
- soc_ops.update_context_lost = _am437x_update_context_lost;
- soc_ops.get_context_lost = _omap4_get_context_lost;
-+ soc_ops.flags = SOC_HWMOD_CHECK_FOR_CONTEXT_FLAG;
- } else if (soc_is_am33xx()) {
- soc_ops.enable_module = _am33xx_enable_module;
- 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 3813504..0000000
--- 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 @@
-From adf38b7b71b35fcd1e229399e8eea7628be35815 Mon Sep 17 00:00:00 2001
-From: Santosh Shilimkar <santosh.shilimkar at ti.com>
-Date: Thu, 13 Feb 2014 08:52:41 -0500
-Subject: [PATCH 4/6] Not-for-merge: ARM: config: omap: Disable SMP for AM335x
- build
-
-SMP and SMP_ON_UP introduces some extra barriers and code many fast paths
-including kernel lock functions.
-
-Performance sensitive usecases like networking gets impacted because of this.
-In typical production kernel which is targeted for single core device
-like AM335x family, you don't want to take this hit.
-
-Ideally one should just create a device specific config feed as done by all
-typical distro's. Other option is to apply this specifically during build
-time using recipe.
-
-Whichever option, one definitely don't want this overhead for performance
-critical usecases.
-
-Disabling SMP in the build introduces one warining in cpuidle44xx.c driver
-and fix is included in the series
-
-Signed-off-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
----
- arch/arm/configs/omap2plus_defconfig | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
-index 4106761..bf49ab6 100644
---- a/arch/arm/configs/omap2plus_defconfig
-+++ b/arch/arm/configs/omap2plus_defconfig
-@@ -36,8 +36,6 @@ CONFIG_OMAP4_ERRATA_I688=y
- CONFIG_ARM_THUMBEE=y
- CONFIG_ARM_ERRATA_411920=y
- CONFIG_PCIE_DRA7XX=y
--CONFIG_SMP=y
--CONFIG_NR_CPUS=2
- CONFIG_PREEMPT=y
- CONFIG_CMA=y
- CONFIG_ZBOOT_ROM_TEXT=0x0
---
-1.7.9.5
-
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 ef6e0a7..0000000
--- 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 @@
-From a612d323c1e5a88a46323d5ee8547283917dd3b6 Mon Sep 17 00:00:00 2001
-From: Santosh Shilimkar <santosh.shilimkar at ti.com>
-Date: Wed, 12 Feb 2014 16:42:39 -0500
-Subject: [PATCH 5/6] ARM: OMAP: Kill warning in CPUIDLE code with !CONFIG_SMP
-
-for non SMP build, NR_CPUS is 1 and hence the code complains with below
-warnings.
-
-arch/arm/mach-omap2/cpuidle44xx.c:207:8: warning: array subscript is above array bounds [-Warray-bounds]
-arch/arm/mach-omap2/cpuidle44xx.c:212:11: warning: array subscript is above array bounds [-Warray-bounds]
-
-Kill it by making array size fixed.
-
-Signed-off-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
----
- arch/arm/mach-omap2/cpuidle44xx.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
-index 4c8982a..5e85f1e 100644
---- a/arch/arm/mach-omap2/cpuidle44xx.c
-+++ b/arch/arm/mach-omap2/cpuidle44xx.c
-@@ -23,6 +23,8 @@
- #include "prm.h"
- #include "clockdomain.h"
-
-+#define MAX_CPUS 2
-+
- /* Machine specific information */
- struct idle_statedata {
- u32 cpu_state;
-@@ -48,11 +50,11 @@ static struct idle_statedata omap4_idle_data[] = {
- },
- };
-
--static struct powerdomain *mpu_pd, *cpu_pd[NR_CPUS];
--static struct clockdomain *cpu_clkdm[NR_CPUS];
-+static struct powerdomain *mpu_pd, *cpu_pd[MAX_CPUS];
-+static struct clockdomain *cpu_clkdm[MAX_CPUS];
-
- static atomic_t abort_barrier;
--static bool cpu_done[NR_CPUS];
-+static bool cpu_done[MAX_CPUS];
- static struct idle_statedata *state_ptr = &omap4_idle_data[0];
-
- /* Private functions */
---
-1.7.9.5
-
diff --git a/recipes-kernel/linux/linux-ti-staging_3.12.bb b/recipes-kernel/linux/linux-ti-staging_3.12.bb
index 2561e12..0b4815e 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"
BRANCH = "ti-linux-3.12.y"
-SRCREV = "9d5b470605a6e5df5c46444c2b2c108d21f9a24a"
+SRCREV = "d5e4bfd196e114c885c5c42cf0a7b3edc7e54829"
PV = "3.12.10"
# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "f+gitr${SRCPV}"
+MACHINE_KERNEL_PR_append = "g+gitr${SRCPV}"
PR = "${MACHINE_KERNEL_PR}"
SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \
file://defconfig \
"
-
-# Performance fixes
-SRC_URI += "file://0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch \
- file://0002-ARM-config-omap-Make-advanced-networking-features-as.patch \
- file://0003-ARM-config-omap-Disable-extra-debug-options.patch \
- "
-# LCD resume fixes
-SRC_URI += "file://0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch \
- file://0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch \
- file://0003-ARM-OMAP2-am43xx-Add-context-offset-for-dss-hwmod.patch \
- file://0004-ARM-OMAP2-omap_hwmod-Maintain-legacy-context-loss-count.patch \
- "
--
1.8.3.2
More information about the meta-ti
mailing list