-Date: Thu, 5 May 2016 09:48:16 -0400
-Subject: [PATCH 2/5] Nuke analytics
-
-Change-Id: Iced69b10508f8a5a1926ae475272982ee41ffb17
----
- src/com/android/launcher3/Launcher.java | 3 -
- src/com/android/launcher3/LauncherApplication.java | 15 --
- src/com/android/launcher3/stats/LauncherStats.java | 246 ---------------------
- .../stats/internal/model/TrackingEvent.java | 206 -----------------
- .../internal/service/AggregationIntentService.java | 238 --------------------
- 5 files changed, 708 deletions(-)
- delete mode 100644 src/com/android/launcher3/stats/LauncherStats.java
- delete mode 100644 src/com/android/launcher3/stats/internal/model/TrackingEvent.java
- delete mode 100644 src/com/android/launcher3/stats/internal/service/AggregationIntentService.java
-
-diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
-index 37f3931..f5744dd 100644
---- a/src/com/android/launcher3/Launcher.java
-+++ b/src/com/android/launcher3/Launcher.java
-@@ -5297,9 +5297,6 @@ public class Launcher extends Activity
-
- AnimationDrawable frameAnimation = (AnimationDrawable) mAnimatedArrow.getBackground();
- frameAnimation.start();
--
-- LauncherApplication.getLauncherStats().sendSettingsOpenedEvent(
-- LauncherStats.ORIGIN_TREB_LONGPRESS);
- }
-
- @Override
-diff --git a/src/com/android/launcher3/LauncherApplication.java b/src/com/android/launcher3/LauncherApplication.java
-index 4bbcec0..a921128 100644
---- a/src/com/android/launcher3/LauncherApplication.java
-+++ b/src/com/android/launcher3/LauncherApplication.java
-@@ -18,27 +18,12 @@ package com.android.launcher3;
-
- import android.app.Application;
-
--import com.android.launcher3.stats.LauncherStats;
--import com.android.launcher3.stats.internal.service.AggregationIntentService;
-
- public class LauncherApplication extends Application {
-
-- private static LauncherStats sLauncherStats = null;
--
-- /**
-- * Get the reference handle for LauncherStats commands
-- *
-- * @return {@link LauncherStats}
-- */
-- public static LauncherStats getLauncherStats() {
-- return sLauncherStats;
-- }
--
- @Override
- public void onCreate() {
- super.onCreate();
-- sLauncherStats = LauncherStats.getInstance(this);
-- AggregationIntentService.scheduleService(this);
- }
-
- }
-diff --git a/src/com/android/launcher3/stats/LauncherStats.java b/src/com/android/launcher3/stats/LauncherStats.java
-deleted file mode 100644
-index 5e8cb83..0000000
---- a/src/com/android/launcher3/stats/LauncherStats.java
-+++ /dev/null
-@@ -1,246 +0,0 @@
--/*
-- * Copyright (c) 2015. The CyanogenMod Project
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--
--package com.android.launcher3.stats;
--
--import android.content.Context;
--import android.os.Handler;
--import android.os.HandlerThread;
--import android.os.Message;
--import android.text.TextUtils;
--import android.util.Log;
--import com.android.launcher3.stats.internal.db.DatabaseHelper;
--import com.android.launcher3.stats.internal.model.TrackingEvent;
--
--/**
-- *
-- * Utility class made specifically for Launcher related events
-- *
-- */
--public class LauncherStats {
--
-- // Constants
-- private static final String TAG = LauncherStats.class.getSimpleName();
-- private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-- private static final int MSG_STORE_EVENT = 1000;
-- public static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
-- public static final String ORIGIN_HOMESCREEN = "homescreen";
-- public static final String ORIGIN_APPDRAWER = "appdrawer";
-- public static final String ORIGIN_TREB_LONGPRESS = "trebuchet_longpress";
-- public static final String ORIGIN_CHOOSER = "theme_chooser";
-- public static final String ORIGIN_SETTINGS = "settings";
-- public static final String ORIGIN_DRAG_DROP = "drag_drop";
-- public static final String ORIGIN_FOLDER = "folder";
--
-- private static void log(String msg) throws IllegalArgumentException {
-- if (TextUtils.isEmpty(msg)) {
-- throw new IllegalArgumentException("'msg' cannot be null or empty!");
-- }
-- if (DEBUG) {
-- Log.d(TAG, msg);
-- }
-- }
--
-- private static void loge(String msg) throws IllegalArgumentException {
-- if (TextUtils.isEmpty(msg)) {
-- throw new IllegalArgumentException("'msg' cannot be null or empty!");
-- }
-- Log.e(TAG, msg);
-- }
--
-- /**
-- *
-- * This is a thread responsible for writing events to a database
-- *
-- *
-- * @see {@link HandlerThread}
-- */
-- private static class WriteHandlerThread extends HandlerThread {
-- public WriteHandlerThread() {
-- super(WriteHandlerThread.class.getSimpleName());
-- }
-- }
--
-- /**
-- *
-- * Handler for issuing db writes
-- *
-- *
-- * @see {@link Handler}
-- */
-- private static class WriteHandler extends Handler {
--
-- public WriteHandler() {
-- super(sHandlerThread.getLooper());
-- }
--
-- @Override
-- public void handleMessage(Message msg) {
-- log("Handling message: " + msg.what);
-- switch (msg.what) {
-- case MSG_STORE_EVENT:
-- handleStoreEvent((TrackingEvent) msg.obj);
-- break;
-- default:
-- super.handleMessage(msg);
-- }
-- }
-- }
--
-- // Instance
-- private static LauncherStats sInstance = null;
--
-- // Members
-- private static WriteHandlerThread sHandlerThread;
-- private static WriteHandler sWriteHandler;
-- private static DatabaseHelper sDatabaseHelper;
--
-- /**
-- * Send a message to the handler to store event data
-- *
-- * @param trackingEvent {@link TrackingEvent}
-- */
-- protected void sendStoreEventMessage(TrackingEvent trackingEvent) {
-- log("Sending tracking event to handler: " + trackingEvent);
-- Message msg = new Message();
-- msg.what = MSG_STORE_EVENT;
-- msg.obj = trackingEvent;
-- sWriteHandler.sendMessage(msg);
-- }
--
-- /**
-- * Handle the storing work
-- *
-- * @param trackingEvent {@link TrackingEvent}
-- */
-- private static void handleStoreEvent(TrackingEvent trackingEvent) {
-- log("Handling store event: " + trackingEvent);
-- if (trackingEvent != null) {
-- sDatabaseHelper.writeEvent(trackingEvent);
-- } else {
-- loge("Tracking event was null!");
-- }
-- }
--
-- /**
-- * Used only for overlay extensions
-- */
-- protected LauncherStats() { }
--
-- /**
-- * Constructor
-- *
-- * @param context {@link Context} not null!
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- private LauncherStats(Context context) throws IllegalArgumentException {
-- if (context == null) {
-- throw new IllegalArgumentException("'context' cannot be null!");
-- }
-- sDatabaseHelper = new DatabaseHelper(context);
-- sHandlerThread = new WriteHandlerThread();
-- sHandlerThread.start();
-- sWriteHandler = new WriteHandler();
-- }
--
-- /**
-- * Gets a singleton instance of the stats utility
-- *
-- * @param context {@link Context} not null!
-- * @return {@link LauncherStats}
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- public static LauncherStats getInstance(Context context)
-- throws IllegalArgumentException {
-- if (sInstance == null) {
-- sInstance = new LauncherStats(context);
-- }
-- return sInstance;
-- }
--
-- /**
-- * Interface for posting a new widget add event
-- *
-- * @param pkg {@link String} package name of widget
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- public void sendWidgetAddEvent(String pkg) throws IllegalArgumentException {
-- if (TextUtils.isEmpty(pkg)) {
-- throw new IllegalArgumentException("'pkg' cannot be null!");
-- }
-- TrackingEvent trackingEvent = new TrackingEvent(TrackingEvent.Category.WIDGET_ADD);
-- trackingEvent.setMetaData(TrackingEvent.KEY_PACKAGE, pkg);
-- sendStoreEventMessage(trackingEvent);
-- }
--
-- /**
-- * Interface for posting a new widget removal event
-- *
-- * @param pkg {@link String} package name of widget
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- public void sendWidgetRemoveEvent(String pkg) throws IllegalArgumentException {
-- if (TextUtils.isEmpty(pkg)) {
-- throw new IllegalArgumentException("'pkg' cannot be null!");
-- }
-- TrackingEvent trackingEvent = new TrackingEvent(TrackingEvent.Category.WIDGET_REMOVE);
-- trackingEvent.setMetaData(TrackingEvent.KEY_PACKAGE, pkg);
-- sendStoreEventMessage(trackingEvent);
-- }
--
-- /**
-- * Interface for posting an app launch event
-- *
-- * @param origin {@link String} origin of application launch
-- * @param pkg {@link String} package of app launched
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- public void sendAppLaunchEvent(String origin, String pkg) throws IllegalArgumentException {
-- if (TextUtils.isEmpty(origin)) {
-- throw new IllegalArgumentException("'origin' cannot be null!");
-- }
-- if (TextUtils.isEmpty(pkg)) {
-- throw new IllegalArgumentException("'pkg' cannot be null!");
-- }
-- TrackingEvent trackingEvent = new TrackingEvent(TrackingEvent.Category.APP_LAUNCH);
-- trackingEvent.setMetaData(TrackingEvent.KEY_ORIGIN, origin);
-- trackingEvent.setMetaData(TrackingEvent.KEY_PACKAGE, pkg);
-- sendStoreEventMessage(trackingEvent);
-- }
--
-- /**
-- * Interface for sending a "settings opened" event
-- *
-- * @param origin {@link String} origin of the event
-- */
-- public void sendSettingsOpenedEvent(String origin) {
-- TrackingEvent trackingEvent = new TrackingEvent(TrackingEvent.Category.SETTINGS_OPEN);
-- trackingEvent.setMetaData(TrackingEvent.KEY_ORIGIN, origin);
-- sendStoreEventMessage(trackingEvent);
-- }
--
-- /**
-- * Interface for sending a "wallpaper changed" event
-- *
-- * @param origin {@link String} origin of the event
-- */
-- public void sendWallpaperChangedEvent(String origin) {
-- TrackingEvent trackingEvent = new TrackingEvent(TrackingEvent.Category.WALLPAPER_CHANGE);
-- trackingEvent.setMetaData(TrackingEvent.KEY_ORIGIN, origin);
-- sendStoreEventMessage(trackingEvent);
-- }
--
--}
-diff --git a/src/com/android/launcher3/stats/internal/model/TrackingEvent.java b/src/com/android/launcher3/stats/internal/model/TrackingEvent.java
-deleted file mode 100644
-index 44aaeb3..0000000
---- a/src/com/android/launcher3/stats/internal/model/TrackingEvent.java
-+++ /dev/null
-@@ -1,206 +0,0 @@
--/*
-- * Copyright (c) 2015. The CyanogenMod Project
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--
--package com.android.launcher3.stats.internal.model;
--
--import android.content.ContentValues;
--import android.database.Cursor;
--import android.os.Bundle;
--import android.text.TextUtils;
--import android.util.Log;
--import com.android.launcher3.stats.external.TrackingBundle;
--import com.android.launcher3.stats.internal.db.TrackingEventContract;
--import com.android.launcher3.stats.util.Logger;
--
--import java.util.HashMap;
--import java.util.Map;
--import java.util.Set;
--
--/**
-- *
-- * Model of an event to track
-- *
-- */
--public class TrackingEvent {
--
-- // Constants
-- private static final String TAG = TrackingEvent.class.getSimpleName();
--
-- // Members
-- private Category mCategory;
-- private final Map mMetaData = new HashMap();
--
-- public enum Category {
-- APP_LAUNCH,
-- WIDGET_ADD,
-- WIDGET_REMOVE,
-- SETTINGS_OPEN,
-- WALLPAPER_CHANGE,
-- HOMESCREEN_PAGE,
-- WIDGET,
-- REMOTE_FOLDER
-- }
--
-- public static final String KEY_ORIGIN = TrackingBundle.KEY_METADATA_ORIGIN;
-- public static final String KEY_VALUE = TrackingBundle.KEY_METADATA_VALUE;
-- public static final String KEY_PACKAGE = TrackingBundle.KEY_METADATA_PACKAGE;
-- public static final String KEY_ACTION = TrackingBundle.KEY_EVENT_ACTION;
--
-- /**
-- * Constructor
-- *
-- * @param category {@link TrackingEvent.Category}
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- public TrackingEvent(Category category) throws IllegalArgumentException {
-- if (category == null) {
-- throw new IllegalArgumentException("'category' cannot be null or empty!");
-- }
-- mCategory = category;
-- }
--
-- /**
-- * Constructor
-- *
-- * @param cursor {@link Cursor}
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- public TrackingEvent(Cursor cursor) throws IllegalArgumentException {
-- if (cursor == null) {
-- throw new IllegalArgumentException("'cursor' cannot be null!");
-- }
-- mCategory = Category.valueOf(cursor.getString(cursor.getColumnIndex(
-- TrackingEventContract.EVENT_COLUMN_CATEGORY)));
-- String metadata = cursor.getString(cursor.getColumnIndex(
-- TrackingEventContract.EVENT_COLUMN_METADATA));
-- if (!TextUtils.isEmpty(metadata)) {
-- String[] parts = metadata.split(",");
-- for (String part : parts) {
-- try {
-- String key = part.split("=")[0];
-- String val = part.split("=")[1];
-- mMetaData.put(key, val);
-- } catch (IndexOutOfBoundsException e) {
-- Log.w(TAG, e.getMessage(), e);
-- }
-- }
-- }
-- }
--
-- /**
-- * Get the category
-- *
-- * @return {@link TrackingEvent.Category}
-- */
-- public Category getCategory() {
-- return mCategory;
-- }
--
-- /**
-- * Get the set of meta data keys
-- *
-- * @return {@link Set}
-- */
-- public Set getMetaDataKeySet() {
-- return mMetaData.keySet();
-- }
--
-- /**
-- * Set some meta data
-- *
-- * @param key {@link String}
-- * @param value {@link String}
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- public void setMetaData(String key, String value) throws IllegalArgumentException {
-- if (TextUtils.isEmpty(key)) {
-- throw new IllegalArgumentException("'key' cannot be null or empty!");
-- }
-- if (TextUtils.isEmpty(value)) {
-- throw new IllegalArgumentException("'value' cannot be null or empty!");
-- }
-- mMetaData.put(key, value);
-- }
--
-- /**
-- * Get some meta data value
-- *
-- * @param key {@link String}
-- * @return {@link String}
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- public String getMetaData(String key) throws IllegalArgumentException {
-- if (TextUtils.isEmpty(key)) {
-- throw new IllegalArgumentException("'key' cannot be null or empty!");
-- }
-- if (mMetaData.containsKey(key)) {
-- return mMetaData.get(key);
-- }
-- return null;
-- }
--
-- /**
-- * Remove some meta data
-- *
-- * @param key {@link String}
-- * @return {@link String} or null
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- public String removeMetaData(String key) throws IllegalArgumentException {
-- if (TextUtils.isEmpty(key)) {
-- throw new IllegalArgumentException("'key' cannot be null or empty!");
-- }
-- if (mMetaData.containsKey(key)) {
-- return mMetaData.remove(key);
-- }
-- return null;
-- }
--
-- /**
-- * Converts this object into content values for use with sqlite
-- *
-- * @return {@link ContentValues}
-- */
-- public ContentValues toContentValues() {
-- ContentValues contentValues = new ContentValues();
-- contentValues.put(TrackingEventContract.EVENT_COLUMN_CATEGORY, mCategory.name());
-- StringBuilder sb = new StringBuilder();
-- for (String key : mMetaData.keySet()) {
-- sb.append(key).append("=").append(mMetaData.get(key)).append(",");
-- }
-- if (sb.length() > 0) {
-- String metadata = sb.toString();
-- metadata = metadata.substring(0, metadata.length() - 1);
-- Logger.logd(TAG, "MetaData: " + metadata);
-- contentValues.put(TrackingEventContract.EVENT_COLUMN_METADATA, metadata);
-- }
-- return contentValues;
-- }
--
-- /**
-- * Convert this object into a tracking bundle
-- *
-- * @param trackingId {@link String}
-- * @param action {@link ITrackingAction}
-- * @return {@link Bundle}
-- */
-- public Bundle toTrackingBundle(String trackingId, ITrackingAction action) {
-- Bundle bundle = TrackingBundle.createTrackingBundle(trackingId, mCategory.name(),
-- action.toString());
-- return bundle;
-- }
--
--}
-diff --git a/src/com/android/launcher3/stats/internal/service/AggregationIntentService.java b/src/com/android/launcher3/stats/internal/service/AggregationIntentService.java
-deleted file mode 100644
-index b32d79b..0000000
---- a/src/com/android/launcher3/stats/internal/service/AggregationIntentService.java
-+++ /dev/null
-@@ -1,238 +0,0 @@
--/*
-- * Copyright (c) 2015. The CyanogenMod Project
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--
--package com.android.launcher3.stats.internal.service;
--
--import android.app.AlarmManager;
--import android.app.IntentService;
--import android.app.PendingIntent;
--import android.content.ComponentName;
--import android.content.Context;
--import android.content.Intent;
--import android.content.IntentFilter;
--import android.content.SharedPreferences;
--import android.content.pm.PackageManager;
--import android.os.Bundle;
--import android.preference.PreferenceManager;
--import android.util.Log;
--
--import com.android.launcher3.LauncherAppState;
--import com.android.launcher3.stats.external.StatsUtil;
--import com.android.launcher3.stats.external.TrackingBundle;
--import com.android.launcher3.stats.internal.db.DatabaseHelper;
--import com.android.launcher3.stats.internal.model.CountAction;
--import com.android.launcher3.stats.internal.model.CountOriginByPackageAction;
--import com.android.launcher3.stats.internal.model.ITrackingAction;
--import com.android.launcher3.stats.internal.model.RemoteFolderAction;
--import com.android.launcher3.stats.internal.model.TrackingEvent;
--import com.android.launcher3.stats.util.Logger;
--
--import java.util.ArrayList;
--import java.util.List;
--
--/**
-- *
-- * Service that starts on a timer and handles aggregating events and sending them to
-- * CyanogenStats
-- *
-- *
-- * @see {@link IntentService}
-- */
--public class AggregationIntentService extends IntentService {
--
-- // Constants
-- private static final String TAG = AggregationIntentService.class.getSimpleName();
-- private static final String TRACKING_ID = "com.cyanogenmod.trebuchet";
-- public static final String ACTION_AGGREGATE_AND_TRACK =
-- "com.cyanogenmod.trebuchet.AGGREGATE_AND_TRACK";
-- private static final List TRACKED_ACTIONS = new ArrayList() {
-- {
-- add(new CountAction());
-- add(new CountOriginByPackageAction());
-- }
-- };
-- private static final int INVALID_COUNT = -1;
-- private static final String KEY_LAST_TIME_RAN = "last_time_stats_ran";
-- public static final String PREF_KEY_PAGE_COUNT = "page_count";
-- public static final String PREF_KEY_WIDGET_COUNT = "widget_count";
--
-- // Members
-- private DatabaseHelper mDatabaseHelper = null;
-- private int mInstanceId = -1;
-- private SharedPreferences mPrefs = null;
--
-- /**
-- * Creates an IntentService. Invoked by your subclass's constructor.
-- */
-- public AggregationIntentService() {
-- super(AggregationIntentService.class.getSimpleName());
-- }
--
-- @Override
-- protected void onHandleIntent(Intent intent) {
-- if (!isTrebuchetDefaultLauncher()) {
-- // Cancel repeating schedule
-- unscheduleService();
-- // don't return b/c we still want to upload whatever metrics are left.
-- }
-- String action = intent.getAction();
-- if (ACTION_AGGREGATE_AND_TRACK.equals(action)) {
-- mPrefs = getSharedPreferences(LauncherAppState.getSharedPreferencesKey(),
-- Context.MODE_PRIVATE);
-- mPrefs.edit().putLong(KEY_LAST_TIME_RAN, System.currentTimeMillis()).apply();
-- mInstanceId = (int) System.currentTimeMillis();
-- mDatabaseHelper = DatabaseHelper.createInstance(this);
-- performAggregation();
-- deleteTrackingEventsForInstance();
-- handleNonEventMetrics();
-- }
-- }
--
-- private void performAggregation() {
--
-- // Iterate available categories
-- for (TrackingEvent.Category category : TrackingEvent.Category.values()) {
--
-- // Fetch the events from the database based on the category
-- List eventList =
-- mDatabaseHelper.getTrackingEventsByCategory(mInstanceId, category);
--
-- Logger.logd(TAG, "Event list size: " + eventList.size());
-- // Short circuit if no events for the category
-- if (eventList.size() < 1) {
-- continue;
-- }
--
-- // Now crunch the data into actionable events for the server.
-- // Remote Folder data will process itself separately.
-- if (category == TrackingEvent.Category.REMOTE_FOLDER) {
-- performTrackingCall(new RemoteFolderAction(), category, eventList);
-- } else {
-- for (ITrackingAction action : TRACKED_ACTIONS) {
-- performTrackingCall(action, category, eventList);
-- }
-- }
-- }
-- }
--
-- private void deleteTrackingEventsForInstance() {
-- mDatabaseHelper.deleteEventsByInstanceId(mInstanceId);
-- }
--
-- /**
-- * These are metrics that are not event based and need a snapshot every INTERVAL
-- */
-- private void handleNonEventMetrics() {
-- sendPageCountStats();
-- sendWidgetCountStats();
--
-- }
--
-- private void sendPageCountStats() {
-- int pageCount = mPrefs.getInt(PREF_KEY_PAGE_COUNT, INVALID_COUNT);
-- if (pageCount == INVALID_COUNT) {
-- return;
-- }
-- Bundle bundle = TrackingBundle
-- .createTrackingBundle(TRACKING_ID, TrackingEvent.Category.HOMESCREEN_PAGE.name(),
-- "count");
-- bundle.putString(TrackingEvent.KEY_VALUE, String.valueOf(pageCount));
-- StatsUtil.sendEvent(this, bundle);
-- }
--
-- private void sendWidgetCountStats() {
-- int widgetCount = mPrefs.getInt(PREF_KEY_WIDGET_COUNT, INVALID_COUNT);
-- if (widgetCount == INVALID_COUNT) {
-- return;
-- }
-- Bundle bundle = TrackingBundle
-- .createTrackingBundle(TRACKING_ID, TrackingEvent.Category.WIDGET.name(), "count");
-- bundle.putString(TrackingEvent.KEY_VALUE, String.valueOf(widgetCount));
-- StatsUtil.sendEvent(this, bundle);
-- }
--
-- private void performTrackingCall(ITrackingAction action, TrackingEvent.Category category,
-- List eventList)
-- throws IllegalArgumentException {
-- try {
-- for (Bundle bundle : action.createTrackingBundles(TRACKING_ID, category, eventList)) {
-- StatsUtil.sendEvent(this, bundle);
-- }
-- } catch (NullPointerException e) {
-- Log.e(TAG, "NPE fetching bundle list!", e);
-- } catch (IllegalArgumentException e) {
-- Log.e(TAG, "Illegal argument!", e);
-- }
-- }
--
-- private void unscheduleService() {
-- Intent intent = new Intent(this, AggregationIntentService.class);
-- intent.setAction(ACTION_AGGREGATE_AND_TRACK);
-- PendingIntent pi = PendingIntent.getService(this, 0, intent,
-- PendingIntent.FLAG_UPDATE_CURRENT);
-- AlarmManager alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
-- alarmManager.cancel(pi);
-- }
--
-- private boolean isTrebuchetDefaultLauncher() {
-- final IntentFilter filter = new IntentFilter(Intent.ACTION_MAIN);
-- filter.addCategory(Intent.CATEGORY_HOME);
--
-- List filters = new ArrayList();
-- filters.add(filter);
--
-- final String myPackageName = getPackageName();
-- List activities = new ArrayList();
-- final PackageManager packageManager = getPackageManager();
--
-- // You can use name of your package here as third argument
-- packageManager.getPreferredActivities(filters, activities, null);
--
-- for (ComponentName activity : activities) {
-- if (myPackageName.equals(activity.getPackageName())) {
-- Logger.logd(TAG, "Trebuchet IS default launcher!");
-- return true;
-- }
-- }
-- Logger.logd(TAG, "Trebuchet IS NOT default launcher!");
-- return false;
-- }
--
-- private static final long ALARM_INTERVAL = 86400000; // 1 day
--
-- /**
-- * Schedule an alarm service, will cancel existing
-- *
-- * @param context {@link Context}
-- * @throws IllegalArgumentException {@link IllegalArgumentException}
-- */
-- public static void scheduleService(Context context) throws IllegalArgumentException {
-- if (context == null) {
-- throw new IllegalArgumentException("'context' cannot be null!");
-- }
-- SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-- long lastTimeRan = prefs.getLong(KEY_LAST_TIME_RAN, 0);
-- Intent intent = new Intent(context, AggregationIntentService.class);
-- intent.setAction(ACTION_AGGREGATE_AND_TRACK);
-- PendingIntent pi = PendingIntent.getService(context, 0, intent,
-- PendingIntent.FLAG_UPDATE_CURRENT);
-- AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-- alarmManager.cancel(pi);
-- alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, lastTimeRan + ALARM_INTERVAL,
-- ALARM_INTERVAL, pi);
-- }
--
--}
---
-2.8.2
-
-
-From 3a182fd5cd65ca8ee85fddd458cbe32c562a58eb Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Thu, 5 May 2016 10:05:20 -0400
-Subject: [PATCH 3/5] Nuke remotefolder
-
-Change-Id: Ie56aa15051c66a3957c9dfd3b2b20639e27512cc
----
- RemoteFolder/Android-prebuilt-libs.mk | 1 -
- RemoteFolder/Android.mk | 1 -
- .../com/android/launcher3/RemoteFolderManager.java | 151 ---------------------
- .../stats/internal/model/RemoteFolderAction.java | 30 ----
- res/layout/user_folder.xml | 4 -
- res/values/preferences_defaults.xml | 2 -
- src/com/android/launcher3/FolderInfo.java | 20 ---
- src/com/android/launcher3/Launcher.java | 37 +----
- src/com/android/launcher3/LauncherModel.java | 7 +-
- .../list/SettingsPinnedHeaderAdapter.java | 26 ----
- .../launcher3/settings/SettingsProvider.java | 2 -
- 11 files changed, 7 insertions(+), 274 deletions(-)
- delete mode 100644 RemoteFolder/Android-prebuilt-libs.mk
- delete mode 100644 RemoteFolder/Android.mk
- delete mode 100644 RemoteFolder/src/com/android/launcher3/RemoteFolderManager.java
- delete mode 100644 RemoteFolder/src/com/android/launcher3/stats/internal/model/RemoteFolderAction.java
-
-diff --git a/RemoteFolder/Android-prebuilt-libs.mk b/RemoteFolder/Android-prebuilt-libs.mk
-deleted file mode 100644
-index 65357a8..0000000
---- a/RemoteFolder/Android-prebuilt-libs.mk
-+++ /dev/null
-@@ -1 +0,0 @@
--# Empty file needed to mirror lib makefile in overlay
-\ No newline at end of file
-diff --git a/RemoteFolder/Android.mk b/RemoteFolder/Android.mk
-deleted file mode 100644
-index 2a74413..0000000
---- a/RemoteFolder/Android.mk
-+++ /dev/null
-@@ -1 +0,0 @@
--LOCAL_SRC_FILES += $(call all-java-files-under, RemoteFolder/src)
-diff --git a/RemoteFolder/src/com/android/launcher3/RemoteFolderManager.java b/RemoteFolder/src/com/android/launcher3/RemoteFolderManager.java
-deleted file mode 100644
-index 142a4d1..0000000
---- a/RemoteFolder/src/com/android/launcher3/RemoteFolderManager.java
-+++ /dev/null
-@@ -1,151 +0,0 @@
--package com.android.launcher3;
--
--import android.content.Context;
--import android.graphics.drawable.Drawable;
--import android.os.Bundle;
--import android.view.View;
--import android.view.ViewGroup;
--import com.android.launcher3.allapps.AllAppsGridAdapter;
--import com.android.launcher3.allapps.AlphabeticalAppsList;
--
--import java.util.ArrayList;
--import java.util.List;
--
--/**
-- * Manages adding and removing the remote folder from the workspace.
-- */
--public class RemoteFolderManager {
--
-- public RemoteFolderManager(final Launcher launcher) { }
--
-- /**
-- * Called when launcher receives a non-initial {@link Launcher#onCreate(Bundle)} call.
-- * @param launcher new launcher activity.
-- */
-- public void onRecreateLauncher(final Launcher launcher) { }
--
-- /**
-- * Called when Launcher's views are loaded and ready.
-- */
-- public void onSetupViews() { }
--
-- /**
-- * Create a remote folder view.
-- * @param icon folder icon view on the workspace.
-- * @return a view for the remote folder.
-- */
-- public Folder createRemoteFolder(final FolderIcon icon, ViewGroup root) { return null; }
--
-- /**
-- * Get a drawable for the supplied item in the folder icon preview.
-- * @param items list of views in the folder.
-- * @param position index of icon to retreive.
-- * @return an icon to draw in the folder preview.
-- */
-- public Drawable getFolderIconDrawable(final ArrayList items,
-- final int position) { return null; }
--
-- /**
-- * Called when Launcher finishes binding items from the model.
-- */
-- public void bindFinished() { }
--
-- /**
-- * Called when a setting for remote folder is updated.
-- */
-- public void onSettingChanged() { }
--
-- /**
-- * Called when the remote folder is dropped into the delete area on the workspace.
-- */
-- public void onFolderDeleted() { }
--
-- /**
-- * Called when the app drawer is opened.
-- */
-- public void onAppDrawerOpened() { }
--
-- /**
-- * Called when the app drawer is reloaded.
-- */
-- public void onReloadAppDrawer() { }
--
-- /**
-- * Called when the app drawer is measured.
-- * @param numAppsPerRow the number of apps the drawer will show in a row.
-- */
-- public void onMeasureDrawer(int numAppsPerRow) { }
--
-- /**
-- * Called when new apps are added to launcher.
-- * @param apps list of added apps.
-- */
-- public void onBindAddApps(ArrayList apps) { }
--
-- /**
-- * Called when the info icon is clicked
-- */
-- public void onInfoIconClicked() { }
--
-- /**
-- * Called when the grid size for launcher is updated.
-- */
-- public void onGridSizeChanged() { }
--
-- /**
-- * Change the appearance of FolderIcon for our RemoteFolder by adding a badge
-- * @param icon the FolderIcon to update
-- * @return a FolderIcon with an added ImageView
-- */
-- public static FolderIcon addBadgeToFolderIcon(FolderIcon icon) {
-- return icon;
-- }
--
-- /**
-- * Called when adapter items for predicted apps are updated.
-- * @param items current list of built adapter items.
-- * @param fastScrollInfo fast scroller info for this section.
-- * @param sectionInfo info about apps in this section.
-- * @param position current position of item to be built into the adapter.
-- * @return the new position to start from for next adapter items.
-- */
-- public int onUpdateAdapterItems(final List items,
-- final AlphabeticalAppsList.FastScrollSectionInfo fastScrollInfo,
-- final AlphabeticalAppsList.SectionInfo sectionInfo,
-- int position) { return position; }
--
-- /**
-- * Called when a view holder is created for a remote app.
-- * @param holder remote view holder.
-- * @param viewType specific type of view holder.
-- */
-- public void onCreateViewHolder(final AllAppsGridAdapter.ViewHolder holder, final int viewType) { }
--
-- /**
-- * Called when a view holder is bound for a remote app.
-- * @param holder remote view holder.
-- * @param item info for this app.
-- */
-- public void onBindViewHolder(final AllAppsGridAdapter.ViewHolder holder, final AppInfo item) { }
--
-- /**
-- * Populate home settings list with additional values as needed.
-- * @param values list of settings strings.
-- * @param context application context.
-- */
-- public static void onInitializeHomeSettings(final ArrayList values,
-- final Context context) { }
--
-- /**
-- * Populate drawer settings list with additional values as needed.
-- * @param values list of settings strings.
-- * @param context application context.
-- */
-- public static void onInitializeDrawerSettings(final ArrayList values,
-- final Context context) { }
--
-- /**
-- * Apply icon pack when the theme changes.
-- */
-- public synchronized void onThemeChanged() { }
--}
-diff --git a/RemoteFolder/src/com/android/launcher3/stats/internal/model/RemoteFolderAction.java b/RemoteFolder/src/com/android/launcher3/stats/internal/model/RemoteFolderAction.java
-deleted file mode 100644
-index dc36332..0000000
---- a/RemoteFolder/src/com/android/launcher3/stats/internal/model/RemoteFolderAction.java
-+++ /dev/null
-@@ -1,30 +0,0 @@
--/*
-- * Copyright (c) 2016. The CyanogenMod Project
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--
--package com.android.launcher3.stats.internal.model;
--
--import android.os.Bundle;
--
--import java.util.ArrayList;
--import java.util.List;
--
--public class RemoteFolderAction implements ITrackingAction {
-- @Override
-- public List createTrackingBundles(String trackingId, TrackingEvent.Category category,
-- List eventList) {
-- return new ArrayList();
-- }
--}
-diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
-index 516da30..c2712ff 100644
---- a/res/layout/user_folder.xml
-+++ b/res/layout/user_folder.xml
-@@ -24,10 +24,6 @@
- android:layout_margin="@dimen/folder_margin"
- android:layout_gravity="bottom|center_horizontal">
-
--
--
- true
- true
- false
-- false
-- false
- 1
-
-diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java
-index 7969d62..2fa3dbc 100644
---- a/src/com/android/launcher3/FolderInfo.java
-+++ b/src/com/android/launcher3/FolderInfo.java
-@@ -28,7 +28,6 @@ import java.util.Arrays;
- * Represents a folder containing shortcuts or apps.
- */
- public class FolderInfo extends ItemInfo {
-- public static final int REMOTE_SUBTYPE = 1;
-
- public static final int NO_FLAGS = 0x00000000;
-
-@@ -123,25 +122,6 @@ public class FolderInfo extends ItemInfo {
- itemsChanged();
- }
-
-- /**
-- * @return true if this info represents a remote folder, false otherwise
-- */
-- public boolean isRemote() {
-- return (subType & REMOTE_SUBTYPE) != 0;
-- }
--
-- /**
-- * Set flag indicating whether this folder is remote
-- * @param remote true if folder is remote, false otherwise
-- */
-- public void setRemote(final boolean remote) {
-- if (remote) {
-- subType |= REMOTE_SUBTYPE;
-- } else {
-- subType &= ~REMOTE_SUBTYPE;
-- }
-- }
--
- public void setTitle(CharSequence title) {
- this.title = title;
- for (int i = 0; i < listeners.size(); i++) {
-diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
-index f5744dd..77f7db6 100644
---- a/src/com/android/launcher3/Launcher.java
-+++ b/src/com/android/launcher3/Launcher.java
-@@ -264,8 +264,6 @@ public class Launcher extends Activity
- private View mWeightWatcher;
- private DynamicGridSizeFragment mDynamicGridSizeFragment;
-
-- protected static RemoteFolderManager sRemoteFolderManager;
--
- private AppWidgetManagerCompat mAppWidgetManager;
- private LauncherAppWidgetHost mAppWidgetHost;
-
-@@ -519,12 +517,6 @@ public class Launcher extends Activity
-
- mAppWidgetHost = new LauncherAppWidgetHost(this, APPWIDGET_HOST_ID);
-
-- if (sRemoteFolderManager == null) {
-- sRemoteFolderManager = new RemoteFolderManager(this);
-- } else {
-- sRemoteFolderManager.onRecreateLauncher(this);
-- }
--
- // If we are getting an onCreate, we can actually preempt onResume and unset mPaused here,
- // this also ensures that any synchronous binding below doesn't re-trigger another
- // LauncherModel load.
-@@ -1629,7 +1621,6 @@ public class Launcher extends Activity
- mWeightWatcher.setVisibility(show ? View.VISIBLE : View.GONE);
- }
-
-- sRemoteFolderManager.onSetupViews();
- }
-
- /**
-@@ -1887,7 +1878,6 @@ public class Launcher extends Activity
- mAppsView.addApps(addedApps);
- tryAndUpdatePredictedApps();
- mAppsView.onReloadAppDrawer();
-- sRemoteFolderManager.onReloadAppDrawer();
- }
-
- public void reloadWidgetView() {
-@@ -1945,9 +1935,6 @@ public class Launcher extends Activity
- reloadLauncher(false, true);
- }
-
-- // Must be called after reload and before settings invalidation.
-- sRemoteFolderManager.onGridSizeChanged();
--
- mOverviewSettingsPanel.notifyDataSetInvalidated();
-
- FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
-@@ -2154,10 +2141,6 @@ public class Launcher extends Activity
- return mWorkspace;
- }
-
-- public RemoteFolderManager getRemoteFolderManager() {
-- return sRemoteFolderManager;
-- }
--
- public Hotseat getHotseat() {
- return mHotseat;
- }
-@@ -3797,8 +3780,6 @@ public class Launcher extends Activity
- tryAndUpdatePredictedApps();
- }
- showAppsOrWidgets(State.APPS, animated, focusSearchBar);
--
-- sRemoteFolderManager.onAppDrawerOpened();
- }
-
- /**
-@@ -3918,18 +3899,13 @@ public class Launcher extends Activity
- * resumed.
- */
- private void tryAndUpdatePredictedApps() {
-- boolean mRemoteDrawerEnabled = SettingsProvider.getBoolean(this,
-- SettingsProvider.SETTINGS_UI_DRAWER_REMOTE_APPS,
-- R.bool.preferences_interface_drawer_remote_apps_default);
-- if (!mRemoteDrawerEnabled) {
-- if (mLauncherCallbacks != null) {
-- List apps = mLauncherCallbacks.getPredictedApps();
-- if (apps != null) {
-- mAppsView.setPredictedAppComponents(apps);
-- }
-- }
-+ if (mLauncherCallbacks != null) {
-+ List apps = mLauncherCallbacks.getPredictedApps();
-+ if (apps != null) {
-+ mAppsView.setPredictedAppComponents(apps);
- }
- }
-+ }
-
- void lockAllApps() {
- // TODO
-@@ -4213,7 +4189,6 @@ public class Launcher extends Activity
-
- if (addedApps != null && mAppsView != null) {
- mAppsView.addApps(addedApps);
-- sRemoteFolderManager.onBindAddApps(addedApps);
- }
- }
-
-@@ -4539,8 +4514,6 @@ public class Launcher extends Activity
- }
-
- mWorkspace.stripEmptyScreens();
--
-- sRemoteFolderManager.bindFinished();
- }
-
- private void sendLoadingCompleteBroadcastIfNecessary() {
-diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
-index e758817..beabeaa 100644
---- a/src/com/android/launcher3/LauncherModel.java
-+++ b/src/com/android/launcher3/LauncherModel.java
-@@ -2707,9 +2707,7 @@ public class LauncherModel extends BroadcastReceiver
- finalItem.container = folder.container;
- LauncherModel.deleteItemFromDatabase(mContext, folder);
- // only replace this item back on the workspace if it's not protected
-- // and not a remote folder.
-- if (!mHiddenApps.contains(finalItem.intent.getComponent()) &&
-- !folder.isRemote()) {
-+ if (!mHiddenApps.contains(finalItem.intent.getComponent())) {
- LauncherModel.addOrMoveItemInDatabase(mContext, finalItem,
- folder.container, folder.screenId, folder.cellX, folder.cellY);
- workspaceItems.add(finalItem);
-@@ -2717,8 +2715,7 @@ public class LauncherModel extends BroadcastReceiver
- workspaceItems.remove(i);
- folders.remove(Long.valueOf(item.id));
-
-- // Remote folders are always empty on bind.
-- } else if (folder.contents.size() == 0 && !folder.isRemote()) {
-+ } else if (folder.contents.size() == 0) {
- LauncherModel.deleteFolderContentsFromDatabase(mContext, folder);
- workspaceItems.remove(i);
- folders.remove(Long.valueOf(item.id));
-diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
-index 1ccd2da..d1dbbf7 100644
---- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
-+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
-@@ -125,13 +125,6 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
- SettingsProvider.SETTINGS_UI_ALLOW_ROTATION,
- R.bool.preferences_interface_allow_rotation);
- setSettingSwitch(stateView, settingSwitch, current);
-- break;
-- case 5:
-- current = SettingsProvider.getBoolean(mContext,
-- SettingsProvider.SETTINGS_UI_HOMESCREEN_REMOTE_FOLDER,
-- R.bool.preferences_interface_homescreen_remote_folder_default);
-- setSettingSwitch(stateView, settingSwitch, current);
-- break;
- default:
- hideStates(stateView, settingSwitch);
- }
-@@ -181,12 +174,6 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
- R.bool.preferences_interface_drawer_search_default);
- setSettingSwitch(stateView, settingSwitch, current);
- break;
-- case 6:
-- current = SettingsProvider.getBoolean(mContext,
-- SettingsProvider.SETTINGS_UI_DRAWER_REMOTE_APPS,
-- R.bool.preferences_interface_drawer_remote_apps_default);
-- setSettingSwitch(stateView, settingSwitch, current);
-- break;
- default:
- hideStates(stateView, settingSwitch);
- }
-@@ -295,13 +282,6 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
- key, extras);
-
- break;
-- case 5:
-- onSettingsBooleanChanged(v,
-- SettingsProvider.SETTINGS_UI_HOMESCREEN_REMOTE_FOLDER,
-- R.bool.preferences_interface_homescreen_remote_folder_default,
-- false);
-- mLauncher.getRemoteFolderManager().onSettingChanged();
-- break;
- }
- break;
- case OverviewSettingsPanel.DRAWER_SETTINGS_POSITION:
-@@ -351,12 +331,6 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
- R.bool.preferences_interface_drawer_search_default, false);
- mLauncher.reloadAppDrawer();
- break;
-- case 6:
-- onSettingsBooleanChanged(v,
-- SettingsProvider.SETTINGS_UI_DRAWER_REMOTE_APPS,
-- R.bool.preferences_interface_drawer_remote_apps_default, false);
-- mLauncher.getRemoteFolderManager().onSettingChanged();
-- break;
- }
- break;
- case OverviewSettingsPanel.APP_SETTINGS_POSITION:
-diff --git a/src/com/android/launcher3/settings/SettingsProvider.java b/src/com/android/launcher3/settings/SettingsProvider.java
-index e809a8a..a0e18cb 100644
---- a/src/com/android/launcher3/settings/SettingsProvider.java
-+++ b/src/com/android/launcher3/settings/SettingsProvider.java
-@@ -26,8 +26,6 @@ public final class SettingsProvider {
- public static final String SETTINGS_UI_HOMESCREEN_SEARCH = "ui_homescreen_search";
- public static final String SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS = "ui_homescreen_general_hide_icon_labels";
- public static final String SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL = "ui_homescreen_scrolling_wallpaper_scroll";
-- public static final String SETTINGS_UI_HOMESCREEN_REMOTE_FOLDER = "ui_homescreen_remote_folder";
-- public static final String SETTINGS_UI_DRAWER_REMOTE_APPS = "ui_drawer_remote_apps";
- public static final String SETTINGS_UI_DYNAMIC_GRID_SIZE = "ui_dynamic_grid_size";
- public static final String SETTINGS_UI_HOMESCREEN_ROWS = "ui_homescreen_rows";
- public static final String SETTINGS_UI_HOMESCREEN_COLUMNS = "ui_homescreen_columns";
---
-2.8.2
-
-
-From 10d5ba7b72cf47eec82dee12ba8cf0b8b77ae8b5 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Thu, 5 May 2016 10:17:17 -0400
-Subject: [PATCH 4/5] Nuke remote folder some more
-
-Change-Id: I55d1c6a995fe009b91eb94d3c961389a78da768c
----
- Android.mk | 6 ----
- src/com/android/launcher3/DeleteDropTarget.java | 9 ++----
- src/com/android/launcher3/FolderIcon.java | 34 ++++------------------
- .../android/launcher3/OverviewSettingsPanel.java | 6 ----
- .../android/launcher3/ThemeChangedReceiver.java | 4 ---
- .../launcher3/allapps/AllAppsContainerView.java | 2 --
- .../launcher3/allapps/AllAppsGridAdapter.java | 10 -------
- .../launcher3/allapps/AlphabeticalAppsList.java | 5 ----
- 8 files changed, 8 insertions(+), 68 deletions(-)
-
-diff --git a/Android.mk b/Android.mk
-index 9915fc5..3ef528d 100644
---- a/Android.mk
-+++ b/Android.mk
-@@ -61,16 +61,10 @@ LOCAL_OVERRIDES_PACKAGES := Launcher3
- LOCAL_PROGUARD_FLAG_FILES := proguard.flags
- LOCAL_PROGUARD_ENABLED := full
-
--REMOTE_FOLDER_UPDATER ?= $(LOCAL_PATH)/RemoteFolder
--include $(REMOTE_FOLDER_UPDATER)/Android.mk
--
- include $(BUILD_PACKAGE)
-
- include $(CLEAR_VARS)
-
--REMOTE_FOLDER_UPDATER ?= $(LOCAL_PATH)/RemoteFolder
--include $(REMOTE_FOLDER_UPDATER)/Android-prebuilt-libs.mk
--
- include $(BUILD_MULTI_PREBUILT)
-
- include $(CLEAR_VARS)
-diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
-index f51a43a..a442442 100644
---- a/src/com/android/launcher3/DeleteDropTarget.java
-+++ b/src/com/android/launcher3/DeleteDropTarget.java
-@@ -75,13 +75,8 @@ public class DeleteDropTarget extends ButtonDropTarget {
- } else if (item instanceof FolderInfo) {
- FolderInfo folder = (FolderInfo) item;
-
-- // Remote folder should not really be deleted. Let the manager handle it.
-- if (folder.isRemote()) {
-- launcher.getRemoteFolderManager().onFolderDeleted();
-- } else {
-- launcher.removeFolder(folder);
-- LauncherModel.deleteFolderContentsFromDatabase(launcher, folder);
-- }
-+ launcher.removeFolder(folder);
-+ LauncherModel.deleteFolderContentsFromDatabase(launcher, folder);
- } else if (item instanceof LauncherAppWidgetInfo) {
- final LauncherAppWidgetInfo widget = (LauncherAppWidgetInfo) item;
-
-diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java
-index 356c275..c43f120 100644
---- a/src/com/android/launcher3/FolderIcon.java
-+++ b/src/com/android/launcher3/FolderIcon.java
-@@ -174,16 +174,7 @@ public class FolderIcon extends FrameLayout implements FolderListener {
- icon.mLauncher = launcher;
- icon.setContentDescription(String.format(launcher.getString(R.string.folder_name_format),
- folderInfo.title));
-- Folder folder;
-- if (folderInfo.isRemote()) {
-- folder = launcher.getRemoteFolderManager().createRemoteFolder(icon, launcher.getDragLayer());
-- if (folder == null) {
-- LauncherModel.deleteItemFromDatabase(launcher, folderInfo);
-- return null;
-- }
-- } else {
-- folder = Folder.fromXml(launcher, launcher.getDragLayer());
-- }
-+ Folder folder = Folder.fromXml(launcher, launcher.getDragLayer());
- folder.setDragController(launcher.getDragController());
- folder.setFolderIcon(icon);
- folder.bind(folderInfo);
-@@ -245,11 +236,6 @@ public class FolderIcon extends FrameLayout implements FolderListener {
- }
- }
-
-- // Create an overlay badge if this FolderIcon is for a RemoteFolder
-- if (folderInfo.isRemote()) {
-- icon = RemoteFolderManager.addBadgeToFolderIcon(icon);
-- }
--
- return icon;
- }
-
-@@ -391,14 +377,10 @@ public class FolderIcon extends FrameLayout implements FolderListener {
- }
-
- private boolean willAcceptItem(ItemInfo item) {
-- if (mInfo.isRemote()) return false;
--
- final int itemType = item.itemType;
-
- boolean hidden = false;
- if (item instanceof FolderInfo){
-- if (((FolderInfo) item).isRemote()) return false;
--
- hidden = ((FolderInfo) item).hidden;
- }
- return ((itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION ||
-@@ -704,7 +686,7 @@ public class FolderIcon extends FrameLayout implements FolderListener {
- super.dispatchDraw(canvas);
-
- if (mFolder == null) return;
-- if (mFolder.getItemCount() == 0 && !mAnimating && !mInfo.isRemote()) return;
-+ if (mFolder.getItemCount() == 0 && !mAnimating) return;
-
- ArrayList items = mFolder.getItemsInReadingOrder();
- Drawable d;
-@@ -740,14 +722,10 @@ public class FolderIcon extends FrameLayout implements FolderListener {
- if (!mAnimating) {
- for (int i = 0; i < NUM_ITEMS_IN_PREVIEW; i++) {
- d = null;
-- if (mInfo.isRemote()) {
-- d = mLauncher.getRemoteFolderManager().getFolderIconDrawable(items, i);
-- } else if (i < items.size()) {
-- v = (TextView) items.get(i);
-- if (!mHiddenItems.contains(v.getTag())) {
-- d = getTopDrawable(v);
-- }
-- }
-+ v = (TextView) items.get(i);
-+ if (!mHiddenItems.contains(v.getTag())) {
-+ d = getTopDrawable(v);
-+ }
-
- if (d != null) {
- mParams = computePreviewItemDrawingParams(i, mParams);
-diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
-index 8f1b435..3fbb65a 100644
---- a/src/com/android/launcher3/OverviewSettingsPanel.java
-+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
-@@ -75,9 +75,6 @@ public class OverviewSettingsPanel {
- res.getString(R.string.grid_size_text),
- res.getString(R.string.allow_rotation_title)}));
-
-- // Add additional external settings.
-- RemoteFolderManager.onInitializeHomeSettings(values, mLauncher);
--
- String[] valuesArr = new String[values.size()];
- values.toArray(valuesArr);
- return valuesArr;
-@@ -93,9 +90,6 @@ public class OverviewSettingsPanel {
- res.getString(R.string.fast_scroller_type),
- res.getString(R.string.home_screen_search_text)}));
-
-- // Add additional external settings.
-- RemoteFolderManager.onInitializeDrawerSettings(values, mLauncher);
--
- String[] valuesArr = new String[values.size()];
- values.toArray(valuesArr);
- return valuesArr;
-diff --git a/src/com/android/launcher3/ThemeChangedReceiver.java b/src/com/android/launcher3/ThemeChangedReceiver.java
-index 3f4f3af..6dac0be 100644
---- a/src/com/android/launcher3/ThemeChangedReceiver.java
-+++ b/src/com/android/launcher3/ThemeChangedReceiver.java
-@@ -43,10 +43,6 @@ public class ThemeChangedReceiver extends BroadcastReceiver {
- app.recreateWidgetPreviewDb();
- app.getIconCache().flush();
- app.getModel().forceReload();
--
-- if (Launcher.sRemoteFolderManager != null) {
-- Launcher.sRemoteFolderManager.onThemeChanged();
-- }
- }
- }
-
-diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
-index 989148f..23f4f70 100644
---- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
-+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
-@@ -377,8 +377,6 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
-
- boolean mergeSections = mSectionStrategy == SECTION_STRATEGY_GRID;
- mApps.setNumAppsPerRow(mNumAppsPerRow, mNumPredictedAppsPerRow, mergeSections);
--
-- mLauncher.getRemoteFolderManager().onMeasureDrawer(mNumPredictedAppsPerRow);
- }
-
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
-index 6431825..56ce38d 100644
---- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
-+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
-@@ -42,7 +42,6 @@ import com.android.launcher3.BaseRecyclerViewFastScrollBar.FastScrollFocusable;
- import com.android.launcher3.BubbleTextView;
- import com.android.launcher3.Launcher;
- import com.android.launcher3.R;
--import com.android.launcher3.RemoteFolderManager;
- import com.android.launcher3.Utilities;
- import com.android.launcher3.settings.SettingsProvider;
- import com.android.launcher3.util.Thunk;
-@@ -329,8 +328,6 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter
-Date: Thu, 5 May 2016 15:20:44 -0400
-Subject: [PATCH 5/5] Fix build breakage
-
-Change-Id: I82319301b59da5d04fe3c0b68791999f04717579
----
- src/com/android/launcher3/LauncherModel.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
-index beabeaa..c6d5e21 100644
---- a/src/com/android/launcher3/LauncherModel.java
-+++ b/src/com/android/launcher3/LauncherModel.java
-@@ -47,7 +47,7 @@ import android.text.TextUtils;
- import android.util.Log;
- import android.util.LongSparseArray;
- import android.util.Pair;
--
-+import com.android.launcher3.settings.SettingsProvider;
- import com.android.launcher3.compat.AppWidgetManagerCompat;
- import com.android.launcher3.compat.LauncherActivityInfoCompat;
- import com.android.launcher3.compat.LauncherAppsCompat;
---
-2.8.2
-
diff --git a/Patches/CyanogenMod-13.0/android_packages_services_Telephony/PreferredNetworkType_Fix.patch b/Patches/CyanogenMod-13.0/android_packages_services_Telephony/PreferredNetworkType_Fix.patch
deleted file mode 100644
index 503f21d0..00000000
--- a/Patches/CyanogenMod-13.0/android_packages_services_Telephony/PreferredNetworkType_Fix.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From b003454ab2ece62db5ae6c621aa6ec5c93c5c0b5 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Sun, 20 Mar 2016 14:40:17 -0400
-Subject: [PATCH] Actually fix profiles failing to set users preferred network
- type
-
-Change-Id: I325430f971b35b07d6852f3647fa60ec935a5b52
----
- src/com/android/phone/PhoneToggler.java | 38 +++++++++++++++++++++++++++++----
- 1 file changed, 34 insertions(+), 4 deletions(-)
-
-diff --git a/src/com/android/phone/PhoneToggler.java b/src/com/android/phone/PhoneToggler.java
-index 90234f9..a38dd68 100644
---- a/src/com/android/phone/PhoneToggler.java
-+++ b/src/com/android/phone/PhoneToggler.java
-@@ -21,6 +21,8 @@ import android.content.Context;
- import android.content.Intent;
- import android.telephony.SubscriptionManager;
- import android.util.Log;
-+import android.os.Handler;
-+import android.os.Message;
-
- import com.android.internal.telephony.Phone;
- import com.android.internal.telephony.PhoneFactory;
-@@ -42,6 +44,15 @@ public class PhoneToggler extends BroadcastReceiver {
- private static final String LOG_TAG = "PhoneToggler";
- private static final boolean DBG = false;
-
-+ private MyHandler mHandler;
-+
-+ private MyHandler getHandler() {
-+ if (mHandler == null) {
-+ mHandler = new MyHandler();
-+ }
-+ return mHandler;
-+ }
-+
- @Override
- public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
-@@ -51,8 +62,7 @@ public class PhoneToggler extends BroadcastReceiver {
- SubscriptionController subCtrl = SubscriptionController.getInstance();
-
- int networkMode = intent.getExtras().getInt(EXTRA_NETWORK_MODE, -1);
-- int subId = intent.getExtras().getInt(EXTRA_SUB_ID,
-- SubscriptionManager.getDefaultDataSubId());
-+ int subId = SubscriptionManager.getDefaultDataSubId();
-
- // since the caller must be a system app, it's assumed that they have already
- // chosen a valid network mode for this subId, so only basic validation is done
-@@ -60,8 +70,9 @@ public class PhoneToggler extends BroadcastReceiver {
- if (DBG) Log.d(LOG_TAG, "Changing network mode to " + networkMode);
- subCtrl.setUserNwMode(subId, networkMode);
- try {
-- PhoneFactory.getPhone(SubscriptionManager.getPhoneId(subId))
-- .setPreferredNetworkType(networkMode, null);
-+ Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(subId));
-+ Message response = getHandler().obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE);
-+ phone.setPreferredNetworkType(networkMode, response);
- } catch (Throwable t) {
- Log.d(LOG_TAG, "error setting preferred network", t);
- }
-@@ -117,4 +128,23 @@ public class PhoneToggler extends BroadcastReceiver {
- }
- }
-
-+ private class MyHandler extends Handler {
-+ private static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 0;
-+
-+ @Override
-+ public void handleMessage(Message msg) {
-+ switch (msg.what) {
-+ case MESSAGE_SET_PREFERRED_NETWORK_TYPE:
-+ handleSetPreferredNetworkTypeResponse(msg);
-+ break;
-+ }
-+ }
-+
-+ private void handleSetPreferredNetworkTypeResponse(Message msg) {
-+ if (DBG) {
-+ Log.e(LOG_TAG, "handleSetPreferredNetworkTypeResponse() called");
-+ }
-+ }
-+ }
-+
- }
---
-2.7.4
-
diff --git a/Patches/CyanogenMod-13.0/android_system_core/MAC_Rand.patch b/Patches/CyanogenMod-13.0/android_system_core/MAC_Rand.patch
deleted file mode 100644
index a7cbbbde..00000000
--- a/Patches/CyanogenMod-13.0/android_system_core/MAC_Rand.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 978d511140a6391ef82243fe6500e207697b9b41 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Mon, 18 Apr 2016 08:54:51 -0400
-Subject: [PATCH] Implement MAC Randomization
-
-Change-Id: I3276bfb674801572ab9ff286fb1b036253eaf409
----
- rootdir/init.rc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/rootdir/init.rc b/rootdir/init.rc
-index 78adacc..8cff499 100644
---- a/rootdir/init.rc
-+++ b/rootdir/init.rc
-@@ -559,6 +559,8 @@ on property:sys.sysctl.extra_free_kbytes=*
- on property:sys.sysctl.tcp_def_init_rwnd=*
- write /proc/sys/net/ipv4/tcp_default_init_rwnd ${sys.sysctl.tcp_def_init_rwnd}
-
-+on property:persist.privacy.randomize_mac=*
-+ write /proc/sys/net/core/randomize_mac ${persist.privacy.randomize_mac}
-
- ## Daemon processes to be run by init.
- ##
---
-2.8.0
-
diff --git a/Patches/CyanogenMod-13.0/android_vendor_cm/DNSCrypt.patch b/Patches/CyanogenMod-13.0/android_vendor_cm/DNSCrypt.patch
deleted file mode 100644
index 3b5aa181..00000000
--- a/Patches/CyanogenMod-13.0/android_vendor_cm/DNSCrypt.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 28fec2a2867a8a0fea386038bc366e630ac1ed4e Mon Sep 17 00:00:00 2001
-From: Martin Brabham
-Date: Thu, 7 May 2015 11:22:13 -0700
-Subject: [PATCH] DNSCrypt - Add sepolicy for dnscrypt proxy to run - Add
- service entry to init.local.rc
-
-Change-Id: Id2ee42738c10a7a024fcf25edc3a6cbe2fe0bbc8
----
- prebuilt/common/etc/init.local.rc | 6 ++++++
- sepolicy/dnscryptproxy.te | 8 ++++++++
- 2 files changed, 14 insertions(+)
- create mode 100644 sepolicy/dnscryptproxy.te
-
-diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc
-index 1f66b77..8042c29 100644
---- a/prebuilt/common/etc/init.local.rc
-+++ b/prebuilt/common/etc/init.local.rc
-@@ -128,6 +128,12 @@ on boot
- # Persistent properties (only created if persist exists)
- mkdir /persist/properties 0770 system system
-
-+# For now default this to opendns until we modify the code to read a system propery
-+# dnscrypt proxy
-+service dnscrypt-proxy /system/xbin/dnscrypt-proxy
-+ class main
-+ disabled
-+
- # sysinit (/system/etc/init.d)
- service sysinit /system/bin/sysinit
- user root
-diff --git a/sepolicy/dnscryptproxy.te b/sepolicy/dnscryptproxy.te
-new file mode 100644
-index 0000000..3f143c9
---- /dev/null
-+++ b/sepolicy/dnscryptproxy.te
-@@ -0,0 +1,8 @@
-+allow init self:udp_socket { bind setopt write read };
-+allow init port:udp_socket name_bind;
-+allow init node:udp_socket node_bind;
-+
-+allow init self:tcp_socket { create ioctl setopt bind listen };
-+allow init port:tcp_socket name_bind;
-+allow init node:tcp_socket node_bind;
-+
---
-2.7.4
-
diff --git a/Patches/CyanogenMod-13.0/android_vendor_cm/Remove_Analytics.patch b/Patches/CyanogenMod-13.0/android_vendor_cm/Remove_Analytics.patch
deleted file mode 100644
index f98f3100..00000000
--- a/Patches/CyanogenMod-13.0/android_vendor_cm/Remove_Analytics.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a32d4f29bb1ed433326eebe496df7c3b5483e192 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Wed, 24 Feb 2016 09:05:13 -0500
-Subject: [PATCH] Remove analytics
-
-Change-Id: I44ad1e35e086eb6287ea1065a1d77474ca6c295a
----
- .../vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml b/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml
-index eec242d..58fb154 100644
---- a/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml
-+++ b/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml
-@@ -24,7 +24,4 @@
- 1
-
-
--
--
-- true
-
---
-2.7.1
-
diff --git a/Patches/CyanogenMod-13.0/android_vendor_cm/Wallpaper.patch b/Patches/CyanogenMod-13.0/android_vendor_cm/Wallpaper.patch
deleted file mode 100644
index f1a1c387..00000000
--- a/Patches/CyanogenMod-13.0/android_vendor_cm/Wallpaper.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3698eabdc4057a2e977ffb4db60bffb1cea062fa Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Sun, 19 Jun 2016 15:13:50 -0400
-Subject: [PATCH] Bring back the custom wallpaper picker [5/5]
-
-Change-Id: Icb52423c63206927b45b72f1d1785c3574f2c0d6
----
- config/common.mk | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/config/common.mk b/config/common.mk
-index 75191ba..c2a15ae 100644
---- a/config/common.mk
-+++ b/config/common.mk
-@@ -154,7 +154,8 @@ PRODUCT_PACKAGES += \
- CMSettingsProvider \
- ExactCalculator \
- LiveLockScreenService \
-- WeatherProvider
-+ WeatherProvider \
-+ WallpaperPicker
-
- # Exchange support
- PRODUCT_PACKAGES += \
---
-2.7.4
-
diff --git a/Patches/CyanogenMod-13.0/cm_platform_sdk/Radio-2.patch b/Patches/CyanogenMod-13.0/cm_platform_sdk/Radio-2.patch
deleted file mode 100644
index ec6cd82e..00000000
--- a/Patches/CyanogenMod-13.0/cm_platform_sdk/Radio-2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From aceee7358fa39da71425c6db7fe6c984c846128a Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Mon, 8 Aug 2016 16:04:56 -0400
-Subject: [PATCH] Add radio tile (2/2)
-
-Change-Id: Iacc6ed7ce384d955ff2494e55c318e054b7ff206
----
- sdk/src/java/org/cyanogenmod/internal/util/QSConstants.java | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sdk/src/java/org/cyanogenmod/internal/util/QSConstants.java b/sdk/src/java/org/cyanogenmod/internal/util/QSConstants.java
-index c5e62eb..a2b5269 100644
---- a/sdk/src/java/org/cyanogenmod/internal/util/QSConstants.java
-+++ b/sdk/src/java/org/cyanogenmod/internal/util/QSConstants.java
-@@ -48,6 +48,7 @@ public class QSConstants {
- public static final String TILE_SCREEN_TIMEOUT = "screen_timeout";
- public static final String TILE_USB_TETHER = "usb_tether";
- public static final String TILE_HEADS_UP = "heads_up";
-+ public static final String TILE_RADIO_POWER = "radio_power";
- public static final String TILE_AMBIENT_DISPLAY = "ambient_display";
- public static final String TILE_SYNC = "sync";
- public static final String TILE_BATTERY_SAVER = "battery_saver";
-@@ -96,6 +97,7 @@ public class QSConstants {
- STATIC_TILES_AVAILABLE.add(TILE_SCREEN_TIMEOUT);
- STATIC_TILES_AVAILABLE.add(TILE_USB_TETHER);
- STATIC_TILES_AVAILABLE.add(TILE_HEADS_UP);
-+ STATIC_TILES_AVAILABLE.add(TILE_RADIO_POWER);
- STATIC_TILES_AVAILABLE.add(TILE_AMBIENT_DISPLAY);
- STATIC_TILES_AVAILABLE.add(TILE_SYNC);
- STATIC_TILES_AVAILABLE.add(TILE_BATTERY_SAVER);
---
-2.7.4
-
diff --git a/Patches/CyanogenMod-13.0/cm_platform_sdk/Remove_Analytics.patch b/Patches/CyanogenMod-13.0/cm_platform_sdk/Remove_Analytics.patch
deleted file mode 100644
index e1957582..00000000
--- a/Patches/CyanogenMod-13.0/cm_platform_sdk/Remove_Analytics.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From b90e97cdb84542a787f1361633a662f57852d9d3 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Sat, 2 Apr 2016 11:31:27 -0400
-Subject: [PATCH] Remove analytics
-
-Change-Id: I4aa2a69fd7eb68d9ab8a4ba426532944901f2322
----
- host/migration/example-cm12.1-settings.txt | 3 +--
- host/migration/src/CMSettings.java | 7 -------
- packages/CMSettingsProvider/res/values/defaults.xml | 3 ---
- .../src/org/cyanogenmod/cmsettings/CMDatabaseHelper.java | 3 ---
- .../cmsettings/tests/CMSettingsProviderDefaultsTest.java | 3 ---
- sdk/src/java/cyanogenmod/providers/CMSettings.java | 13 -------------
- 6 files changed, 1 insertion(+), 31 deletions(-)
-
-diff --git a/host/migration/example-cm12.1-settings.txt b/host/migration/example-cm12.1-settings.txt
-index 7534be3..9f454aa 100644
---- a/host/migration/example-cm12.1-settings.txt
-+++ b/host/migration/example-cm12.1-settings.txt
-@@ -64,7 +64,6 @@ Row: 60 name=swap_volume_keys_on_rotation, type=s, value=0, type=s
- Row: 61 name=status_bar_brightness_control, type=s, value=0, type=s
- Row: 62 name=status_bar_notif_count, type=s, value=1, type=s
- Row: 63 name=dev_force_show_navbar, type=s, value=0, type=s
--Row: 64 name=stats_collection, type=s, value=1, type=s
- Row: 65 name=advanced_mode, type=s, value=1, type=s
- Row: 66 name=default_theme_package, type=s, value=com.cyngn.hexo, type=s
- Row: 67 name=default_theme_components, type=s, value=mods_overlays|mods_status_bar|mods_navigation_bar|mods_icons|mods_homescreen|mods_fonts, type=s
-@@ -118,4 +117,4 @@ Row: 114 name=ring_home_button_behavior, type=s, value=1, type=s
- Row: 115 name=show_alarm_icon, type=s, value=1, type=s
- Row: 116 name=status_bar_am_pm, type=s, value=1, type=s
- Row: 117 name=status_bar_quick_qs_pulldown, type=s, value=1, type=s
--Row: 118 name=t9_search_input_locale, type=s, value=enUS, type=s
-\ No newline at end of file
-+Row: 118 name=t9_search_input_locale, type=s, value=enUS, type=s
-diff --git a/host/migration/src/CMSettings.java b/host/migration/src/CMSettings.java
-index 0d57b0d..b4f5be9 100644
---- a/host/migration/src/CMSettings.java
-+++ b/host/migration/src/CMSettings.java
-@@ -833,12 +833,6 @@ public final class CMSettings {
- public static final String QS_USE_MAIN_TILES = "sysui_qs_main_tiles";
-
- /**
-- * Global stats collection
-- * @hide
-- */
-- public static final String STATS_COLLECTION = "stats_collection";
--
-- /**
- * Boolean value whether to link ringtone and notification volume
- *
- * @hide
-@@ -1021,7 +1015,6 @@ public final class CMSettings {
- CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR,
- CMSettings.Secure.KEYBOARD_BRIGHTNESS,
- CMSettings.Secure.POWER_MENU_ACTIONS,
-- CMSettings.Secure.STATS_COLLECTION,
- CMSettings.Secure.QS_SHOW_BRIGHTNESS_SLIDER,
- CMSettings.Secure.QS_TILES,
- CMSettings.Secure.QS_USE_MAIN_TILES,
-diff --git a/packages/CMSettingsProvider/res/values/defaults.xml b/packages/CMSettingsProvider/res/values/defaults.xml
-index 5d590ad..916bb10 100644
---- a/packages/CMSettingsProvider/res/values/defaults.xml
-+++ b/packages/CMSettingsProvider/res/values/defaults.xml
-@@ -48,9 +48,6 @@
- Comma-delimited, quick settings tiles. See QSConstants.java for a list of all available tiles
- wifi,bt,cell,airplane,rotation,flashlight,location,cast,hotspot,live_display -->
-
--
-- false
--
-
-- GSM|WCDMA
-+ GPRS|EDGE|UMTS|HSDPA|HSUPA|HSPA|LTE|HSPAP|GSM|WCDMA
-
-
- true
-diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
-index af352a4..22c65ea 100644
---- a/overlay/packages/services/Telephony/res/values/config.xml
-+++ b/overlay/packages/services/Telephony/res/values/config.xml
-@@ -21,4 +21,7 @@
- are routed through the android.media.AudioManager class (true) or through
- the com.android.internal.telephony.Phone interface (false). -->
- true
-+
-+
-+ true
-
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_device_lge_mako/0002-TWRP.patch b/Patches/CyanogenMod-14.1/android_device_lge_mako/0002-TWRP.patch
deleted file mode 100644
index cab814d0..00000000
--- a/Patches/CyanogenMod-14.1/android_device_lge_mako/0002-TWRP.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 65d11ac33d0a3da260668c6dd18e5d28fefb272e Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Wed, 23 Nov 2016 18:38:32 -0500
-Subject: [PATCH] TWRP Support
-
-Change-Id: Ib0a86923a40e21cddc1199141c70a7c776de3d1e
----
- BoardConfig.mk | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/BoardConfig.mk b/BoardConfig.mk
-index ec97bae..ecf5253 100644
---- a/BoardConfig.mk
-+++ b/BoardConfig.mk
-@@ -132,3 +132,19 @@ MALLOC_IMPL := dlmalloc
- BOARD_HAS_NO_SELECT_BUTTON := true
-
- BOARD_HARDWARE_CLASS := device/lge/mako/cmhw/
-+
-+#TWRP
-+TW_THEME := portrait_hdpi
-+RECOVERY_SDCARD_ON_DATA := true
-+RECOVERY_GRAPHICS_USE_LINELENGTH := true
-+BOARD_HAS_NO_REAL_SDCARD := true
-+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
-+TW_INCLUDE_JB_CRYPTO := true
-+TW_FLASH_FROM_STORAGE := true
-+TW_NO_USB_STORAGE := true
-+TW_MAX_BRIGHTNESS := 255
-+TW_BRIGHTNESS_PATH := /sys/class/leds/lcd-backlight/brightness
-+TW_INTERNAL_STORAGE_PATH := "/data/media"
-+TW_INTERNAL_STORAGE_MOUNT_POINT := "data"
-+TW_EXTERNAL_STORAGE_PATH := "/usb-otg"
-+TW_EXTERNAL_STORAGE_MOUNT_POINT := "usb-otg"
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_device_motorola_clark/0001-Build_Fix.patch b/Patches/CyanogenMod-14.1/android_device_motorola_clark/0001-Build_Fix.patch
deleted file mode 100644
index 3a900f4f..00000000
--- a/Patches/CyanogenMod-14.1/android_device_motorola_clark/0001-Build_Fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6fdf689f450e577750212ac5f0d3ffce50965651 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Thu, 17 Nov 2016 15:39:23 -0500
-Subject: [PATCH] Fix build failure
-
-Change-Id: I94282a3df32daa97992c17476b0eb3e8f21e2499
----
- overlay/frameworks/base/core/res/res/values/config.xml | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
-index e0358e2..0b0549b 100644
---- a/overlay/frameworks/base/core/res/res/values/config.xml
-+++ b/overlay/frameworks/base/core/res/res/values/config.xml
-@@ -421,9 +421,6 @@
- format is UMTS|LTE|... -->
- GSM | WCDMA | LTE | CDMA | EVDO
-
--
-- com.qualcomm.location
--
-
- - "lte:2097152,4194304,8388608,262144,524288,1048576"
- - "lte_ca:2097152,4194304,8388608,262144,524288,1048576"
-@@ -442,9 +439,6 @@
- rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
- 524288,2097152,4194304,262144,524288,1048576
-
--
-- true
--
-
- true
-
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_device_motorola_clark/0002-Remove_Sprint_DM.patch b/Patches/CyanogenMod-14.1/android_device_motorola_clark/0002-Remove_Sprint_DM.patch
deleted file mode 100644
index 908983e7..00000000
--- a/Patches/CyanogenMod-14.1/android_device_motorola_clark/0002-Remove_Sprint_DM.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9e22fca4c687d84ba84428788d55b356069e29c7 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Thu, 17 Nov 2016 15:40:05 -0500
-Subject: [PATCH] Remove Sprint DM
-
-Change-Id: I94d44bb4753cac72106f7c49997d69a0ec5556bd
----
- proprietary-files.txt | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/proprietary-files.txt b/proprietary-files.txt
-index f97d3e6..3675ce9 100644
---- a/proprietary-files.txt
-+++ b/proprietary-files.txt
-@@ -290,21 +290,6 @@ lib64/libqti-iop.so
- vendor/lib/libqti-iop-client.so
- vendor/lib64/libqti-iop-client.so
-
--# DM/Sprint
---app/DMConfigUpdateLight/DMConfigUpdateLight.apk
---app/HiddenMenuLight/HiddenMenuLight.apk
--lib/libdmengine.so
--lib/libdmjavaplugin.so
---priv-app/CQATest/CQATest.apk
---priv-app/ConnMO/ConnMO.apk
---priv-app/DCMO/DCMO.apk
---priv-app/DMService/DMService.apk
--lib/libdmengine.so:priv-app/DMService/lib/arm/libdmengine.so
--lib/libdmjavaplugin.so:priv-app/DMService/lib/arm/libdmjavaplugin.so
---priv-app/DiagMon/DiagMon.apk
---priv-app/LifetimeData/LifetimeData.apk
---priv-app/SprintDM/SprintDM.apk
--
- # DRM
- # TZBSP
- bin/qseecomd
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_device_motorola_clark/0003-Enable_Dex_Preopt.patch b/Patches/CyanogenMod-14.1/android_device_motorola_clark/0003-Enable_Dex_Preopt.patch
deleted file mode 100644
index dcf151be..00000000
--- a/Patches/CyanogenMod-14.1/android_device_motorola_clark/0003-Enable_Dex_Preopt.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 44299d2cda16b60235cc682988d59dd3dcd823a5 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Fri, 18 Nov 2016 02:21:47 -0500
-Subject: [PATCH] Enable Dex-preopt
-
-Change-Id: I7634ebac4af7a977cff21a6be83bbda11dc943f4
----
- BoardConfig.mk | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/BoardConfig.mk b/BoardConfig.mk
-index 40022b4..250bbb5 100644
---- a/BoardConfig.mk
-+++ b/BoardConfig.mk
-@@ -182,3 +182,6 @@ TARGET_USES_WCNSS_MAC_ADDR_REV := true
- WIFI_DRIVER_FW_PATH_STA := "sta"
- WIFI_DRIVER_FW_PATH_AP := "ap"
- WPA_SUPPLICANT_VERSION := VER_0_8_X
-+
-+#Dex pre-optimization
-+WITH_DEXPREOPT := true
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_device_motorola_clark/0004-Remove_Widevine.patch b/Patches/CyanogenMod-14.1/android_device_motorola_clark/0004-Remove_Widevine.patch
deleted file mode 100644
index fa4a3290..00000000
--- a/Patches/CyanogenMod-14.1/android_device_motorola_clark/0004-Remove_Widevine.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 755b36c6f5e6feaac20112e0819299f63be3553d Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Fri, 18 Nov 2016 18:22:00 -0500
-Subject: [PATCH] Remove Widevine and disable DRM server
-
-Change-Id: I24d3ba704d00d85747d851a9a497dd577ad03b5f
----
- Android.mk | 10 +---------
- proprietary-files.txt | 2 --
- system.prop | 2 +-
- 3 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/Android.mk b/Android.mk
-index a69917c..693cba1 100644
---- a/Android.mk
-+++ b/Android.mk
-@@ -52,14 +52,6 @@ $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
- @rm -rf $@
- $(hide) ln -sf /system/vendor/lib64/$(notdir $@) $@
-
--WV_IMAGES := widevine.b00 widevine.b01 widevine.b02 widevine.b03 widevine.mdt
--WV_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(WV_IMAGES)))
--$(WV_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-- @echo "Widevine firmware link: $@"
-- @mkdir -p $(dir $@)
-- @rm -rf $@
-- $(hide) ln -sf /firmware/image/$(notdir $@) $@
--
- FIRMWARE_FILES := firmware fsg
- FIRMWARE_SYMLINKS := $(addprefix $(TARGET_OUT)/rfs/msm/mpss/readonly/,$(notdir $(FIRMWARE_FILES)))
- $(FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-@@ -68,6 +60,6 @@ $(FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
- @rm -rf $@
- $(hide) ln -sf /$(notdir $@) $@
-
--ALL_DEFAULT_INSTALLED_MODULES += $(PERSIST_WCNSS) $(WCNSS_CFG_INI) $(IMS_SYMLINKS) $(WV_SYMLINKS) $(FIRMWARE_SYMLINKS)
-+ALL_DEFAULT_INSTALLED_MODULES += $(PERSIST_WCNSS) $(WCNSS_CFG_INI) $(IMS_SYMLINKS) $(FIRMWARE_SYMLINKS)
-
- endif
-diff --git a/proprietary-files.txt b/proprietary-files.txt
-index 3675ce9..45dd63b 100644
---- a/proprietary-files.txt
-+++ b/proprietary-files.txt
-@@ -293,8 +293,6 @@ vendor/lib64/libqti-iop-client.so
- # DRM
- # TZBSP
- bin/qseecomd
--etc/permissions/com.google.widevine.software.drm.xml
--framework/com.google.widevine.software.drm.jar
- lib/hw/keystore.qcom.so
- lib64/hw/keystore.qcom.so
- vendor/lib/libdrmfs.so
-diff --git a/system.prop b/system.prop
-index 6b1967c..4124bd4 100644
---- a/system.prop
-+++ b/system.prop
-@@ -56,7 +56,7 @@ dalvik.vm.dex2oat-threads=2
- dalvik.vm.image-dex2oat-threads=4
-
- # DRM
--drm.service.enabled=true
-+drm.service.enabled=false
-
- # FM
- ro.fm.transmitter=false
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_device_motorola_clark/0005-TWRP.patch b/Patches/CyanogenMod-14.1/android_device_motorola_clark/0005-TWRP.patch
deleted file mode 100644
index 5a9cd7a2..00000000
--- a/Patches/CyanogenMod-14.1/android_device_motorola_clark/0005-TWRP.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From aa91f3c0beab9dbb78041540b59558631f63e30e Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Mon, 28 Nov 2016 07:04:58 -0500
-Subject: [PATCH] TWRP Support
-
-Change-Id: I9c9caf279898f7f6cab5f2da81715e0a5440ca17
----
- BoardConfig.mk | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/BoardConfig.mk b/BoardConfig.mk
-index 250bbb5..9be8f1c 100644
---- a/BoardConfig.mk
-+++ b/BoardConfig.mk
-@@ -185,3 +185,14 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X
-
- #Dex pre-optimization
- WITH_DEXPREOPT := true
-+
-+# TWRP
-+TW_THEME := portrait_hdpi
-+DEVICE_RESOLUTION := 1440x2560
-+TW_INCLUDE_L_CRYPTO := true
-+TW_TARGET_USES_QCOM_BSP := true
-+TW_NEW_ION_HEAP := true
-+TW_INCLUDE_CRYPTO := true
-+TW_SCREEN_BLANK_ON_BOOT := true
-+TARGET_RECOVERY_QCOM_RTC_FIX := true
-+TARGET_RECOVERY_FSTAB = $(DEVICE_PATH)/rootdir/fstab.qcom
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_device_oneplus_bacon/0001-Remove_DRM.patch b/Patches/CyanogenMod-14.1/android_device_oneplus_bacon/0001-Remove_DRM.patch
deleted file mode 100644
index 6edc112e..00000000
--- a/Patches/CyanogenMod-14.1/android_device_oneplus_bacon/0001-Remove_DRM.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 5debdc1dd573384f7a1556a6db2d6960bd7259c5 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Thu, 17 Nov 2016 16:35:14 -0500
-Subject: [PATCH] Remove Widevine
-
-Change-Id: I531feb804092b596af47e75530fa88b5c85f628a
----
- Android.mk | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/Android.mk b/Android.mk
-index dde02c7..08fc62e 100644
---- a/Android.mk
-+++ b/Android.mk
-@@ -124,30 +124,6 @@ $(MC_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-
- ALL_DEFAULT_INSTALLED_MODULES += $(MC_SYMLINKS)
-
--PLAYREADY_IMAGES := \
-- playread.b00 playread.b01 playread.b02 playread.b03 playread.mdt
--
--PLAYREADY_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(PLAYREADY_IMAGES)))
--$(PLAYREADY_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-- @echo "Playready firmware link: $@"
-- @mkdir -p $(dir $@)
-- @rm -rf $@
-- $(hide) ln -sf /firmware/image/$(notdir $@) $@
--
--ALL_DEFAULT_INSTALLED_MODULES += $(PLAYREADY_SYMLINKS)
--
--WV_IMAGES := \
-- widevine.b00 widevine.b01 widevine.b02 widevine.b03 widevine.mdt
--
--WV_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(notdir $(WV_IMAGES)))
--$(WV_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-- @echo "Widevine firmware link: $@"
-- @mkdir -p $(dir $@)
-- @rm -rf $@
-- $(hide) ln -sf /firmware/image/$(notdir $@) $@
--
--ALL_DEFAULT_INSTALLED_MODULES += $(WV_SYMLINKS)
--
- # Create links for audcal data files
- $(shell mkdir -p $(TARGET_OUT)/etc/firmware/wcd9320; \
- ln -sf /data/misc/audio/wcd9320_anc.bin \
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_device_oneplus_bacon/0002-Enable_Dex_Preopt.patch b/Patches/CyanogenMod-14.1/android_device_oneplus_bacon/0002-Enable_Dex_Preopt.patch
deleted file mode 100644
index dc098901..00000000
--- a/Patches/CyanogenMod-14.1/android_device_oneplus_bacon/0002-Enable_Dex_Preopt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e12aa9baa815d0279aab7756edc4e9c130f0bbff Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Fri, 18 Nov 2016 02:23:46 -0500
-Subject: [PATCH] Enable Dex-preopt
-
-Change-Id: Id0ee761ca93a2a4cab0d40959610520b193d0528
----
- BoardConfig.mk | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/BoardConfig.mk b/BoardConfig.mk
-index 35bde5d..ff476f7 100644
---- a/BoardConfig.mk
-+++ b/BoardConfig.mk
-@@ -197,4 +197,7 @@ TARGET_LDPRELOAD := libNimsWrap.so
- endif
- endif
-
-+#Dex pre-optimization
-+WITH_DEXPREOPT := true
-+
- -include vendor/oneplus/bacon/BoardConfigVendor.mk
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_external_sqlite/0001-Secure_Delete.patch b/Patches/CyanogenMod-14.1/android_external_sqlite/0001-Secure_Delete.patch
deleted file mode 100644
index b2edcd6c..00000000
--- a/Patches/CyanogenMod-14.1/android_external_sqlite/0001-Secure_Delete.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d06526ec844bf89e77c518dbcd0deb331babf8dd Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Sun, 18 Dec 2016 09:30:44 -0500
-Subject: [PATCH] Enable secure_delete by default
-
-Change-Id: Ic2604b78f57998c001df9737ab0fdec2298122c4
----
- dist/Android.mk | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dist/Android.mk b/dist/Android.mk
-index bf277d2..8113e32 100644
---- a/dist/Android.mk
-+++ b/dist/Android.mk
-@@ -27,7 +27,8 @@ minimal_sqlite_flags := \
- -DSQLITE_OMIT_BUILTIN_TEST \
- -DSQLITE_OMIT_COMPILEOPTION_DIAGS \
- -DSQLITE_OMIT_LOAD_EXTENSION \
-- -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600
-+ -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 \
-+ -DSQLITE_SECURE_DELETE
-
- device_sqlite_flags := $(minimal_sqlite_flags) \
- -DSQLITE_ENABLE_ICU \
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_frameworks_base/0001-Userspace_Location.patch b/Patches/CyanogenMod-14.1/android_frameworks_base/0001-Userspace_Location.patch
deleted file mode 100644
index b018a5e1..00000000
--- a/Patches/CyanogenMod-14.1/android_frameworks_base/0001-Userspace_Location.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4211c35467725729615cce8fe3cd25f0de58da2a Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Fri, 18 Nov 2016 12:30:43 -0500
-Subject: [PATCH] Allow location providers outside of /system
-
-Change-Id: I405981605aeb00a4482d7191905963fc97a5d424
----
- services/core/java/com/android/server/ServiceWatcher.java | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/services/core/java/com/android/server/ServiceWatcher.java b/services/core/java/com/android/server/ServiceWatcher.java
-index 383e25a..31ae918 100644
---- a/services/core/java/com/android/server/ServiceWatcher.java
-+++ b/services/core/java/com/android/server/ServiceWatcher.java
-@@ -92,8 +92,7 @@ public class ServiceWatcher implements ServiceConnection {
- String pkg = initialPackageNames.get(i);
- try {
- HashSet set = new HashSet();
-- Signature[] sigs = pm.getPackageInfo(pkg, PackageManager.MATCH_SYSTEM_ONLY
-- | PackageManager.GET_SIGNATURES).signatures;
-+ Signature[] sigs = pm.getPackageInfo(pkg, PackageManager.GET_SIGNATURES).signatures;
- set.addAll(Arrays.asList(sigs));
- sigSets.add(set);
- } catch (NameNotFoundException e) {
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_frameworks_base/0002-Failed_Unlock_Shutdown.patch b/Patches/CyanogenMod-14.1/android_frameworks_base/0002-Failed_Unlock_Shutdown.patch
deleted file mode 100644
index 7f4c21cd..00000000
--- a/Patches/CyanogenMod-14.1/android_frameworks_base/0002-Failed_Unlock_Shutdown.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4921beaf996a89c9a56b98f213401ceeb2a23082 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Fri, 18 Nov 2016 14:52:59 -0500
-Subject: [PATCH] Shutdown after 5 failed unlock attempts
-
-Change-Id: Icc23122e5a25b756872fe132cd0e93684e8bafca
----
- .../Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java | 5 +++++
- packages/SystemUI/AndroidManifest.xml | 1 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
-index aaff265..865956f 100644
---- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
-+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
-@@ -22,6 +22,7 @@ import android.app.admin.DevicePolicyManager;
- import android.content.Context;
- import android.content.DialogInterface;
- import android.content.Intent;
-+import android.os.PowerManager;
- import android.os.UserHandle;
- import android.util.AttributeSet;
- import android.util.Log;
-@@ -366,6 +367,10 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
- if (!enableTimesCounter && (timeoutMs > 0)) {
- showTimeoutDialog(timeoutMs);
- }
-+ if (failedAttempts >=5) {
-+ final PowerManager powerManager = mContext.getSystemService(PowerManager.class);
-+ powerManager.shutdown(false, false);
-+ }
- }
-
- /**
-diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
-index 2248baf..b13b0fd 100644
---- a/packages/SystemUI/AndroidManifest.xml
-+++ b/packages/SystemUI/AndroidManifest.xml
-@@ -112,6 +112,7 @@
-
-
-
-+
-
-
-
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_frameworks_base/0003-Signature_Spoofing.patch b/Patches/CyanogenMod-14.1/android_frameworks_base/0003-Signature_Spoofing.patch
deleted file mode 100644
index 361e17bf..00000000
--- a/Patches/CyanogenMod-14.1/android_frameworks_base/0003-Signature_Spoofing.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 44cda6f5e47c33e91980ae35c8bc6d88e4d3763c Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Thu, 24 Nov 2016 13:01:30 -0500
-Subject: [PATCH] Allow packages to spoof their signature
-
-Change-Id: I9acf48c7607804890d0d0fa7fe30bb36779cb40d
----
- core/res/AndroidManifest.xml | 7 +++++++
- core/res/res/values/config.xml | 2 ++
- core/res/res/values/strings.xml | 5 +++++
- .../android/server/pm/PackageManagerService.java | 23 ++++++++++++++++++++--
- 4 files changed, 35 insertions(+), 2 deletions(-)
-
-diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index b624305..43eec1f 100644
---- a/core/res/AndroidManifest.xml
-+++ b/core/res/AndroidManifest.xml
-@@ -1926,6 +1926,13 @@
- android:description="@string/permdesc_getPackageSize"
- android:protectionLevel="normal" />
-
-+
-+
-+
-
-diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 4a95f6e..702e02a 100644
---- a/core/res/res/values/config.xml
-+++ b/core/res/res/values/config.xml
-@@ -1383,6 +1383,8 @@
-
-
- - com.android.location.fused
-+
-+ - com.google.android.gms
-
-
-
-diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
-index 345d377..26814f1 100644
---- a/core/res/res/values/strings.xml
-+++ b/core/res/res/values/strings.xml
-@@ -660,6 +660,11 @@
-
-
-
-+
-+ Spoof package signature
-+
-+ Allows the app to pretend to be a different app. Malicious applications might be able to use this to access private application data. Grant this permission with caution only!
-+
-
- disable or modify status bar
-
-diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index d450288..9194e69 100644
---- a/services/core/java/com/android/server/pm/PackageManagerService.java
-+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
-@@ -3141,8 +3141,27 @@ public class PackageManagerService extends IPackageManager.Stub {
- ? Collections.emptySet() : permissionsState.getPermissions(userId);
- final PackageUserState state = ps.readUserState(userId);
-
-- return PackageParser.generatePackageInfo(p, gids, flags,
-- ps.firstInstallTime, ps.lastUpdateTime, permissions, state, userId);
-+ return mayFakeSignature(p, PackageParser.generatePackageInfo(p, gids, flags,
-+ ps.firstInstallTime, ps.lastUpdateTime, permissions, state, userId),
-+ permissions);
-+ }
-+
-+ private PackageInfo mayFakeSignature(PackageParser.Package p, PackageInfo pi,
-+ Set permissions) {
-+ try {
-+ if (permissions.contains("android.permission.FAKE_PACKAGE_SIGNATURE")
-+ && p.applicationInfo.targetSdkVersion > Build.VERSION_CODES.LOLLIPOP_MR1
-+ && p.mAppMetaData != null) {
-+ String sig = p.mAppMetaData.getString("fake-signature");
-+ if (sig != null) {
-+ pi.signatures = new Signature[] {new Signature(sig)};
-+ }
-+ }
-+ } catch (Throwable t) {
-+ // We should never die because of any failures, this is system code!
-+ Log.w("PackageManagerService.FAKE_PACKAGE_SIGNATURE", t);
-+ }
-+ return pi;
- }
-
- @Override
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_frameworks_base/0004-Hide_Passwords.patch b/Patches/CyanogenMod-14.1/android_frameworks_base/0004-Hide_Passwords.patch
deleted file mode 100644
index a59676b3..00000000
--- a/Patches/CyanogenMod-14.1/android_frameworks_base/0004-Hide_Passwords.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c46d22ad7a92e72f4ba9ba3a36e8dbdb566f4a07 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Sun, 18 Dec 2016 09:36:07 -0500
-Subject: [PATCH] Hide passwords by default
-
-Change-Id: I95e26ff6219f6209d5b9fc7ae92a453b53b0aa76
----
- core/java/android/text/method/TextKeyListener.java | 2 +-
- core/java/com/android/internal/widget/PasswordEntryKeyboardHelper.java | 2 +-
- packages/Keyguard/src/com/android/keyguard/PasswordTextView.java | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/core/java/android/text/method/TextKeyListener.java b/core/java/android/text/method/TextKeyListener.java
-index 994f3d7..b2ac244 100644
---- a/core/java/android/text/method/TextKeyListener.java
-+++ b/core/java/android/text/method/TextKeyListener.java
-@@ -291,7 +291,7 @@ public class TextKeyListener extends BaseKeyListener implements SpanWatcher {
- boolean cap = System.getInt(resolver, System.TEXT_AUTO_CAPS, 1) > 0;
- boolean text = System.getInt(resolver, System.TEXT_AUTO_REPLACE, 1) > 0;
- boolean period = System.getInt(resolver, System.TEXT_AUTO_PUNCTUATE, 1) > 0;
-- boolean pw = System.getInt(resolver, System.TEXT_SHOW_PASSWORD, 1) > 0;
-+ boolean pw = System.getInt(resolver, System.TEXT_SHOW_PASSWORD, 0) > 0;
-
- mPrefs = (cap ? AUTO_CAP : 0) |
- (text ? AUTO_TEXT : 0) |
-diff --git a/core/java/com/android/internal/widget/PasswordEntryKeyboardHelper.java b/core/java/com/android/internal/widget/PasswordEntryKeyboardHelper.java
-index b2c9dc5..dc5b7f9 100644
---- a/core/java/com/android/internal/widget/PasswordEntryKeyboardHelper.java
-+++ b/core/java/com/android/internal/widget/PasswordEntryKeyboardHelper.java
-@@ -159,7 +159,7 @@ public class PasswordEntryKeyboardHelper implements OnKeyboardActionListener {
- mKeyboardState = KEYBOARD_STATE_NORMAL;
- final boolean visiblePassword = Settings.System.getInt(
- mContext.getContentResolver(),
-- Settings.System.TEXT_SHOW_PASSWORD, 1) != 0;
-+ Settings.System.TEXT_SHOW_PASSWORD, 0) != 0;
- final boolean enablePreview = false; // TODO: grab from configuration
- mKeyboardView.setPreviewEnabled(visiblePassword && enablePreview);
- break;
-diff --git a/packages/Keyguard/src/com/android/keyguard/PasswordTextView.java b/packages/Keyguard/src/com/android/keyguard/PasswordTextView.java
-index 48737f9..3f4c381 100644
---- a/packages/Keyguard/src/com/android/keyguard/PasswordTextView.java
-+++ b/packages/Keyguard/src/com/android/keyguard/PasswordTextView.java
-@@ -134,7 +134,7 @@ public class PasswordTextView extends View {
- mDrawPaint.setColor(0xffffffff);
- mDrawPaint.setTypeface(Typeface.create("sans-serif-light", 0));
- mShowPassword = Settings.System.getInt(mContext.getContentResolver(),
-- Settings.System.TEXT_SHOW_PASSWORD, 1) == 1;
-+ Settings.System.TEXT_SHOW_PASSWORD, 0) == 1;
- mAppearInterpolator = AnimationUtils.loadInterpolator(mContext,
- android.R.interpolator.linear_out_slow_in);
- mDisappearInterpolator = AnimationUtils.loadInterpolator(mContext,
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_frameworks_base/0005-Harden_Sig_Spoofing.patch b/Patches/CyanogenMod-14.1/android_frameworks_base/0005-Harden_Sig_Spoofing.patch
deleted file mode 100644
index 8d573695..00000000
--- a/Patches/CyanogenMod-14.1/android_frameworks_base/0005-Harden_Sig_Spoofing.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6c9c966622adbfe0ad92ed90d90f93a782c99f02 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Sun, 18 Dec 2016 19:10:20 -0500
-Subject: [PATCH] Harden signature spoofing
-
-Change-Id: I31e2a20923fff883c87fa6425408971657d3d7b3
----
- core/res/AndroidManifest.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 486999b..182acbf 100644
---- a/core/res/AndroidManifest.xml
-+++ b/core/res/AndroidManifest.xml
-@@ -1937,7 +1937,7 @@
-
-
-
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_kernel_lge_bullhead/0001-OverUnderClock.patch b/Patches/CyanogenMod-14.1/android_kernel_lge_bullhead/0001-OverUnderClock.patch
deleted file mode 100644
index 40914170..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_lge_bullhead/0001-OverUnderClock.patch
+++ /dev/null
@@ -1,484 +0,0 @@
-From 28793d3021e480bba68fe8b76d9848a6b8aee5d5 Mon Sep 17 00:00:00 2001
-From: flar2
-Date: Tue, 3 Nov 2015 21:21:34 -0500
-Subject: [PATCH 1/3] msm8992 initial overclocking
-
----
- arch/arm/boot/dts/qcom/msm8992-regulator.dtsi | 30 ++++++++++++--------
- arch/arm/boot/dts/qcom/msm8992.dtsi | 40 +++++++++++++++++++-------
- drivers/clk/qcom/clock-cpu-8994.c | 8 +++---
- drivers/cpufreq/qcom-cpufreq.c | 41 +++++++++++++++++++++++++++
- 4 files changed, 93 insertions(+), 26 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-index d5f6860..23b23ba 100644
---- a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-@@ -605,7 +605,7 @@
- regulator-name = "apc0_corner";
- qcom,cpr-fuse-corners = <4>;
- regulator-min-microvolt = <1>;
-- regulator-max-microvolt = <10>;
-+ regulator-max-microvolt = <12>;
-
- qcom,cpr-voltage-ceiling = <900000 900000 1000000 1180000>;
- qcom,cpr-voltage-floor = <640000 700000 800000 850000>;
-@@ -669,15 +669,15 @@
- qcom,cpr-init-voltage-ref = <900000 900000 1000000 1230000>;
- qcom,cpr-init-voltage-step = <10000>;
-
-- qcom,cpr-corner-map = <1 1 2 2 3 3 4 4 4 4>;
-+ qcom,cpr-corner-map = <1 1 2 2 3 3 4 4 4 4 4 4>;
- qcom,cpr-voltage-ceiling-override =
- <0xFFFFFFFF 0 800000 800000 900000 900000
- 1000000 1000000 1115000 1115000
-- 1180000 1180000>;
-+ 1180000 1180000 1180000 1180000>;
- qcom,cpr-voltage-floor-override =
- <0xFFFFFFFF 0 640000 655000 700000 735000
- 800000 835000 850000 875000
-- 950000 1000000>;
-+ 950000 1000000 1000000 1000000>;
- qcom,cpr-fuse-version-map =
- <0 0xffffffff 0 0 0 0 0>,
- <0 0xffffffff 1 0 0 0 0>,
-@@ -759,10 +759,12 @@
- <7 864000000>,
- <8 960000000>,
- <9 1248000000>,
-- <10 1440000000>;
-+ <10 1440000000>,
-+ <11 1536000000>,
-+ <12 1632000000>;
- qcom,cpr-speed-bin-max-corners =
- <0 0 2 4 6 9>,
-- <1 0 2 4 6 10>;
-+ <1 0 2 4 6 12>;
- qcom,cpr-enable;
- };
-
-@@ -774,7 +776,7 @@
- regulator-name = "apc1_corner";
- qcom,cpr-fuse-corners = <4>;
- regulator-min-microvolt = <1>;
-- regulator-max-microvolt = <15>;
-+ regulator-max-microvolt = <17>;
-
- qcom,cpr-voltage-ceiling = <900000 900000 1000000 1180000>;
- qcom,cpr-voltage-floor = <640000 640000 745000 850000>;
-@@ -841,17 +843,19 @@
- qcom,cpr-init-voltage-ref = <900000 900000 1000000 1230000>;
- qcom,cpr-init-voltage-step = <10000>;
-
-- qcom,cpr-corner-map = <1 2 2 2 2 3 3 3 4 4 4 4 4 4 4>;
-+ qcom,cpr-corner-map = <1 2 2 2 2 3 3 3 4 4 4 4 4 4 4 4 4>;
- qcom,cpr-voltage-ceiling-override =
- <0xFFFFFFFF 0 900000 900000 900000 900000
- 900000 1000000 1000000 1000000
- 1115000 1115000 1115000 1115000
-- 1115000 1115000 1180000>;
-+ 1115000 1115000 1180000 1180000
-+ 1180000>;
- qcom,cpr-voltage-floor-override =
- <0xFFFFFFFF 0 640000 640000 665000 690000
- 735000 745000 770000 785000
- 850000 860000 880000 900000
-- 920000 935000 1000000>;
-+ 920000 935000 1000000 1000000
-+ 1000000>;
- qcom,cpr-fuse-version-map =
- <0xffffffff 0xffffffff 0 4 4 4 4>,
- <0xffffffff 0xffffffff 1 4 4 4 4>,
-@@ -908,9 +912,11 @@
- <12 1536000000>,
- <13 1632000000>,
- <14 1689600000>,
-- <15 1824000000>;
-+ <15 1824000000>,
-+ <16 1958400000>,
-+ <17 2016000000>;
- qcom,cpr-speed-bin-max-corners =
-- <0xFFFFFFFF 0 1 5 8 15>;
-+ <0xFFFFFFFF 0 1 5 8 17>;
- qcom,cpr-enable;
- };
-
-diff --git a/arch/arm/boot/dts/qcom/msm8992.dtsi b/arch/arm/boot/dts/qcom/msm8992.dtsi
-index 5ba420c..8892b56 100644
---- a/arch/arm/boot/dts/qcom/msm8992.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992.dtsi
-@@ -852,7 +852,9 @@
- < 787200 3509 >,
- < 864000 4173 >,
- < 960000 5271 >,
-- < 1440000 7102 >;
-+ < 1440000 7102 >,
-+ < 1536000 7102 >,
-+ < 1632000 7102 >;
- cpu-to-dev-map-4 =
- < 384000 1525 >,
- < 633600 2288 >,
-@@ -860,16 +862,22 @@
- < 864000 4173 >,
- < 960000 5271 >,
- < 1344000 5928 >,
-- < 1824000 7102 >;
-+ < 1824000 7102 >,
-+ < 1958400 7102 >,
-+ < 2016000 7102 >;
- };
-
- mincpubw-cpufreq {
- target-dev = <&mincpubw>;
- cpu-to-dev-map-0 =
-- < 1440000 1525 >;
-+ < 1440000 1525 >,
-+ < 1536000 1525 >,
-+ < 1632000 1525 >;
- cpu-to-dev-map-4 =
- < 1689600 1525 >,
-- < 1824000 5928 >;
-+ < 1824000 1525 >,
-+ < 1958400 1525 >,
-+ < 2016000 5928 >;
- };
-
- cci-cpufreq {
-@@ -880,7 +888,9 @@
- < 787200 384000 >,
- < 864000 556800 >,
- < 960000 729600 >,
-- < 1440000 787200 >;
-+ < 1440000 787200 >,
-+ < 1536000 787200 >,
-+ < 1632000 787200 >;
- cpu-to-dev-map-4 =
- < 384000 134400 >,
- < 480000 300000 >,
-@@ -888,7 +898,9 @@
- < 768000 556800 >,
- < 960000 600000 >,
- < 1440000 729600 >,
-- < 1824000 787200 >;
-+ < 1824000 787200 >,
-+ < 1958400 787200 >,
-+ < 2016000 787200 >;
- };
- };
-
-@@ -915,7 +927,9 @@
- < 864000 >,
- < 960000 >,
- < 1248000 >,
-- < 1440000 >;
-+ < 1440000 >,
-+ < 1536000 >,
-+ < 1632000 >;
-
- qcom,cpufreq-table-4 =
- < 384000 >,
-@@ -930,7 +944,9 @@
- < 1536000 >,
- < 1632000 >,
- < 1689600 >,
-- < 1824000 >;
-+ < 1824000 >,
-+ < 1958400 >,
-+ < 2016000 >;
-
- };
-
-@@ -968,7 +984,9 @@
- < 864000000 7>,
- < 960000000 8>,
- < 1248000000 9>,
-- < 1440000000 10>;
-+ < 1440000000 10>,
-+ < 1536000000 11>,
-+ < 1632000000 12>;
- qcom,a57-speedbin0-v0 =
- < 0 0>,
- < 384000000 5>,
-@@ -983,7 +1001,9 @@
- < 1536000000 12>,
- < 1632000000 13>,
- < 1689600000 14>,
-- < 1824000000 15>;
-+ < 1824000000 15>,
-+ < 1958400000 16>,
-+ < 2016000000 17>;
- qcom,cci-speedbin0-v0 =
- < 0 0>,
- < 134400000 2>,
-diff --git a/drivers/clk/qcom/clock-cpu-8994.c b/drivers/clk/qcom/clock-cpu-8994.c
-index 6eb346b..de3d72f 100644
---- a/drivers/clk/qcom/clock-cpu-8994.c
-+++ b/drivers/clk/qcom/clock-cpu-8994.c
-@@ -191,13 +191,13 @@ static struct pll_clk a57_pll0 = {
- .test_ctl_lo_val = 0x00010000,
- },
- .min_rate = 1209600000,
-- .max_rate = 1996800000,
-+ .max_rate = 2073600000,
- .base = &vbases[C1_PLL_BASE],
- .c = {
- .parent = &xo_ao.c,
- .dbg_name = "a57_pll0",
- .ops = &clk_ops_variable_rate_pll,
-- VDD_DIG_FMAX_MAP2(LOW, 1593600000, NOMINAL, 1996800000),
-+ VDD_DIG_FMAX_MAP2(LOW, 1593600000, NOMINAL, 2073600000),
- CLK_INIT(a57_pll0.c),
- },
- };
-@@ -229,13 +229,13 @@ static struct pll_clk a57_pll1 = {
- /* Necessary since we'll be setting a rate before handoff on V1 */
- .src_rate = 19200000,
- .min_rate = 1209600000,
-- .max_rate = 1996800000,
-+ .max_rate = 2073600000,
- .base = &vbases[C1_PLL_BASE],
- .c = {
- .parent = &xo_ao.c,
- .dbg_name = "a57_pll1",
- .ops = &clk_ops_variable_rate_pll,
-- VDD_DIG_FMAX_MAP2(LOW, 1593600000, NOMINAL, 1996800000),
-+ VDD_DIG_FMAX_MAP2(LOW, 1593600000, NOMINAL, 2073600000),
- CLK_INIT(a57_pll1.c),
- },
- };
-diff --git a/drivers/cpufreq/qcom-cpufreq.c b/drivers/cpufreq/qcom-cpufreq.c
-index e30b0cb..dd3a589 100644
---- a/drivers/cpufreq/qcom-cpufreq.c
-+++ b/drivers/cpufreq/qcom-cpufreq.c
-@@ -31,6 +31,40 @@
-
- static DEFINE_MUTEX(l2bw_lock);
-
-+static unsigned long arg_cpu_max_a53 = 1440000;
-+
-+static int __init cpufreq_read_cpu_max_a53(char *cpu_max_a53)
-+{
-+ unsigned long ui_khz;
-+ int ret;
-+
-+ ret = kstrtoul(cpu_max_a53, 0, &ui_khz);
-+ if (ret)
-+ return -EINVAL;
-+
-+ arg_cpu_max_a53 = ui_khz;
-+ printk("cpu_max_a53=%lu\n", arg_cpu_max_a53);
-+ return ret;
-+}
-+__setup("cpu_max_a53=", cpufreq_read_cpu_max_a53);
-+
-+static unsigned long arg_cpu_max_a57 = 1824000;
-+
-+static int __init cpufreq_read_cpu_max_a57(char *cpu_max_a57)
-+{
-+ unsigned long ui_khz;
-+ int ret;
-+
-+ ret = kstrtoul(cpu_max_a57, 0, &ui_khz);
-+ if (ret)
-+ return -EINVAL;
-+
-+ arg_cpu_max_a57 = ui_khz;
-+ printk("cpu_max_a57=%lu\n", arg_cpu_max_a57);
-+ return ret;
-+}
-+__setup("cpu_max_a57=", cpufreq_read_cpu_max_a57);
-+
- static struct clk *cpu_clk[NR_CPUS];
- static struct clk *l2_clk;
- static DEFINE_PER_CPU(struct cpufreq_frequency_table *, freq_table);
-@@ -364,6 +398,13 @@ static struct cpufreq_frequency_table *cpufreq_parse_dt(struct device *dev,
- if (i > 0 && f <= ftbl[i-1].frequency)
- break;
-
-+ //Custom max freq
-+ if ((cpu < 4 && f > arg_cpu_max_a53) ||
-+ (cpu >= 4 && f > arg_cpu_max_a57)) {
-+ nf = i;
-+ break;
-+ }
-+
- ftbl[i].driver_data = i;
- ftbl[i].frequency = f;
- }
---
-2.9.3
-
-
-From 9dfe99b9f8eead920f7cdefdb2ae7b1cea776d9b Mon Sep 17 00:00:00 2001
-From: dirtyhank
-Date: Thu, 14 Jan 2016 12:56:07 +0100
-Subject: [PATCH 2/3] CPU underclocking
-
- Based on underclocking to Nexus 6P by anarkia1976
----
- arch/arm/boot/dts/qcom/msm8992-regulator.dtsi | 6 +++---
- arch/arm/boot/dts/qcom/msm8992.dtsi | 14 +++++++++++---
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-index 23b23ba..1ef9eb3 100644
---- a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-@@ -750,7 +750,7 @@
- qcom,cpr-voltage-scaling-factor-max = <0 0 2000 2000>;
- qcom,cpr-quot-adjust-scaling-factor-max = <0 2000 2000 2000>;
- qcom,cpr-corner-frequency-map =
-- <1 300000000>,
-+ <1 302400000>,
- <2 384000000>,
- <3 460800000>,
- <4 600000000>,
-@@ -898,8 +898,8 @@
- qcom,cpr-voltage-scaling-factor-max = <0 0 2000 2000>;
- qcom,cpr-quot-adjust-scaling-factor-max = <0 0 2000 2000>;
- qcom,cpr-corner-frequency-map =
-- <1 300000000>, /* SVS Fmin for "SVS2" */
-- <2 300000000>,
-+ <1 302400000>, /* SVS Fmin for "SVS2" */
-+ <2 302400000>,
- <3 384000000>,
- <4 480000000>,
- <5 633600000>,
-diff --git a/arch/arm/boot/dts/qcom/msm8992.dtsi b/arch/arm/boot/dts/qcom/msm8992.dtsi
-index 8892b56..f6a39cd 100644
---- a/arch/arm/boot/dts/qcom/msm8992.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992.dtsi
-@@ -796,7 +796,7 @@
- governor = "cpufreq";
- freq-tbl-khz =
- < 134400 >,
-- < 300000 >,
-+ < 302400 >,
- < 384000 >,
- < 556800 >,
- < 600000 >,
-@@ -856,7 +856,8 @@
- < 1536000 7102 >,
- < 1632000 7102 >;
- cpu-to-dev-map-4 =
-- < 384000 1525 >,
-+ < 302400 1525 >,
-+ < 384000 1525 >,
- < 633600 2288 >,
- < 768000 3509 >,
- < 864000 4173 >,
-@@ -883,6 +884,7 @@
- cci-cpufreq {
- target-dev = <&cci_cache>;
- cpu-to-dev-map-0 =
-+ < 302400 134400 >,
- < 384000 134400 >,
- < 600000 300000 >,
- < 787200 384000 >,
-@@ -892,6 +894,7 @@
- < 1536000 787200 >,
- < 1632000 787200 >;
- cpu-to-dev-map-4 =
-+ < 302400 134400 >,
- < 384000 134400 >,
- < 480000 300000 >,
- < 633600 384000 >,
-@@ -919,6 +922,7 @@
- qcom,governor-per-policy;
-
- qcom,cpufreq-table-0 =
-+ < 302400 >,
- < 384000 >,
- < 460800 >,
- < 600000 >,
-@@ -932,6 +936,7 @@
- < 1632000 >;
-
- qcom,cpufreq-table-4 =
-+ < 302400 >,
- < 384000 >,
- < 480000 >,
- < 633600 >,
-@@ -966,6 +971,7 @@
- vdd-dig-supply = <&pm8994_s2_corner_ao>;
- qcom,a53-speedbin0-v0 =
- < 0 0>,
-+ < 302400000 1>,
- < 384000000 2>,
- < 460800000 3>,
- < 600000000 4>,
-@@ -976,6 +982,7 @@
- < 1248000000 9>;
- qcom,a53-speedbin1-v0 =
- < 0 0>,
-+ < 302400000 1>,
- < 384000000 2>,
- < 460800000 3>,
- < 600000000 4>,
-@@ -989,6 +996,7 @@
- < 1632000000 12>;
- qcom,a57-speedbin0-v0 =
- < 0 0>,
-+ < 302400000 5>,
- < 384000000 5>,
- < 480000000 5>,
- < 633600000 5>,
-@@ -1007,7 +1015,7 @@
- qcom,cci-speedbin0-v0 =
- < 0 0>,
- < 134400000 2>,
-- < 300000000 4>,
-+ < 302400000 4>,
- < 384000000 6>,
- < 556800000 6>,
- < 600000000 8>,
---
-2.9.3
-
-
-From b7e24657fb125b77bb5d9a39493040e1234c7c83 Mon Sep 17 00:00:00 2001
-From: flar2
-Date: Mon, 21 Nov 2016 21:40:09 -0500
-Subject: [PATCH 3/3] msm8992: bump oc voltages
-
----
- arch/arm/boot/dts/qcom/msm8992-regulator.dtsi | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-index 1ef9eb3..d2a875b 100644
---- a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-@@ -673,11 +673,11 @@
- qcom,cpr-voltage-ceiling-override =
- <0xFFFFFFFF 0 800000 800000 900000 900000
- 1000000 1000000 1115000 1115000
-- 1180000 1180000 1180000 1180000>;
-+ 1180000 1180000 1180000 1200000>;
- qcom,cpr-voltage-floor-override =
- <0xFFFFFFFF 0 640000 655000 700000 735000
- 800000 835000 850000 875000
-- 950000 1000000 1000000 1000000>;
-+ 950000 1000000 1000000 1100000>;
- qcom,cpr-fuse-version-map =
- <0 0xffffffff 0 0 0 0 0>,
- <0 0xffffffff 1 0 0 0 0>,
-@@ -849,13 +849,13 @@
- 900000 1000000 1000000 1000000
- 1115000 1115000 1115000 1115000
- 1115000 1115000 1180000 1180000
-- 1180000>;
-+ 1200000>;
- qcom,cpr-voltage-floor-override =
- <0xFFFFFFFF 0 640000 640000 665000 690000
- 735000 745000 770000 785000
- 850000 860000 880000 900000
- 920000 935000 1000000 1000000
-- 1000000>;
-+ 1100000>;
- qcom,cpr-fuse-version-map =
- <0xffffffff 0xffffffff 0 4 4 4 4>,
- <0xffffffff 0xffffffff 1 4 4 4 4>,
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_kernel_lge_bullhead/0002-MMC_Tweak.patch b/Patches/CyanogenMod-14.1/android_kernel_lge_bullhead/0002-MMC_Tweak.patch
deleted file mode 100644
index 0c6fc863..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_lge_bullhead/0002-MMC_Tweak.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f24f2dec25043cf7e6ef0f80a65dde45f2f131dd Mon Sep 17 00:00:00 2001
-From: franciscofranco
-Date: Wed, 20 Jan 2016 01:45:39 +0000
-Subject: [PATCH] IKSWM-6057: dts: mmc: remove wakeup on idle flag
-
-Remove the wakeup-on-idle flag can improve the mmc
-performance(verified with iozone). No current drain
-and other system performance impact.
-
-Change-Id: Ia90cdfb66569b5ee3713d2c9785a2b7a9d24760e
-Signed-off-by: Lianwei Wang
-Reviewed-on: http://gerrit.mot.com/785887
-SLTApproved: Slta Waiver
-SME-Granted: SME Approvals Granted
-Tested-by: Jira Key
-Reviewed-by: Zhi-Ming Yuan
-Submit-Approved: Jira Key
-Signed-off-by: franciscofranco
----
- arch/arm/boot/dts/qcom/msm8992.dtsi | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/msm8992.dtsi b/arch/arm/boot/dts/qcom/msm8992.dtsi
-index 5dedecb..dc70365 100644
---- a/arch/arm/boot/dts/qcom/msm8992.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992.dtsi
-@@ -1706,7 +1706,6 @@
- qcom,cpu-dma-latency-us = <301 70>;
- qcom,cpu-affinity = "affine_cores";
- qcom,cpu-affinity-mask = <0x0f 0xf0>;
-- qcom,wakeup-on-idle;
-
- qcom,msm-bus,name = "sdhc1";
- qcom,msm-bus,num-cases = <9>;
-@@ -1746,7 +1745,6 @@
- qcom,cpu-dma-latency-us = <301 70>;
- qcom,cpu-affinity = "affine_cores";
- qcom,cpu-affinity-mask = <0x0f 0xf0>;
-- qcom,wakeup-on-idle;
-
- qcom,msm-bus,name = "sdhc2";
- qcom,msm-bus,num-cases = <8>;
diff --git a/Patches/CyanogenMod-14.1/android_kernel_lge_hammerhead/0001-OverUnderClock.patch b/Patches/CyanogenMod-14.1/android_kernel_lge_hammerhead/0001-OverUnderClock.patch
deleted file mode 100644
index 87c7e002..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_lge_hammerhead/0001-OverUnderClock.patch
+++ /dev/null
@@ -1,757 +0,0 @@
-From ec5d8918e9d3149ce489900f48d6e6ebd2fd5031 Mon Sep 17 00:00:00 2001
-From: Paul Reioux
-Date: Sun, 20 Oct 2013 22:30:36 -0500
-Subject: [PATCH 1/5] Voltage Control: initial voltage control for MSM
- Snapdragon 800 SOC
-
-Signed-off-by: Paul Reioux
-Signed-off-by: flar2
----
- arch/arm/mach-msm/Kconfig | 6 +++++
- arch/arm/mach-msm/acpuclock-krait.c | 48 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 54 insertions(+)
-
-diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
-index ba5a33c..44db2ca 100644
---- a/arch/arm/mach-msm/Kconfig
-+++ b/arch/arm/mach-msm/Kconfig
-@@ -1918,6 +1918,12 @@ config MSM_CPU_FREQ_MIN
-
- endif # CPU_FREQ_MSM
-
-+config CPU_VOLTAGE_TABLE
-+ bool "Enable CPU Voltage Table via sysfs for adjustements"
-+ default n
-+ help
-+ Krait User Votlage Control
-+
- config MSM_AVS_HW
- bool "Enable Adaptive Voltage Scaling (AVS)"
- default n
-diff --git a/arch/arm/mach-msm/acpuclock-krait.c b/arch/arm/mach-msm/acpuclock-krait.c
-index 84e2fc1..c7eceb1 100644
---- a/arch/arm/mach-msm/acpuclock-krait.c
-+++ b/arch/arm/mach-msm/acpuclock-krait.c
-@@ -937,6 +937,54 @@ static void __init bus_init(const struct l2_level *l2_level)
- dev_err(drv.dev, "initial bandwidth req failed (%d)\n", ret);
- }
-
-+#ifdef CONFIG_CPU_VOLTAGE_TABLE
-+
-+#define HFPLL_MIN_VDD 800000
-+#define HFPLL_MAX_VDD 1350000
-+
-+ssize_t acpuclk_get_vdd_levels_str(char *buf) {
-+
-+ int i, len = 0;
-+
-+ if (buf) {
-+ mutex_lock(&driver_lock);
-+
-+ for (i = 0; drv.acpu_freq_tbl[i].speed.khz; i++) {
-+ /* updated to use uv required by 8x60 architecture - faux123 */
-+ len += sprintf(buf + len, "%8lu: %8d\n", drv.acpu_freq_tbl[i].speed.khz,
-+ drv.acpu_freq_tbl[i].vdd_core );
-+ }
-+
-+ mutex_unlock(&driver_lock);
-+ }
-+ return len;
-+}
-+
-+/* updated to use uv required by 8x60 architecture - faux123 */
-+void acpuclk_set_vdd(unsigned int khz, int vdd_uv) {
-+
-+ int i;
-+ unsigned int new_vdd_uv;
-+
-+ mutex_lock(&driver_lock);
-+
-+ for (i = 0; drv.acpu_freq_tbl[i].speed.khz; i++) {
-+ if (khz == 0)
-+ new_vdd_uv = min(max((unsigned int)(drv.acpu_freq_tbl[i].vdd_core + vdd_uv),
-+ (unsigned int)HFPLL_MIN_VDD), (unsigned int)HFPLL_MAX_VDD);
-+ else if ( drv.acpu_freq_tbl[i].speed.khz == khz)
-+ new_vdd_uv = min(max((unsigned int)vdd_uv,
-+ (unsigned int)HFPLL_MIN_VDD), (unsigned int)HFPLL_MAX_VDD);
-+ else
-+ continue;
-+
-+ drv.acpu_freq_tbl[i].vdd_core = new_vdd_uv;
-+ }
-+ pr_warn("faux123: user voltage table modified!\n");
-+ mutex_unlock(&driver_lock);
-+}
-+#endif /* CONFIG_CPU_VOTALGE_TABLE */
-+
- #ifdef CONFIG_CPU_FREQ_MSM
- static struct cpufreq_frequency_table freq_table[NR_CPUS][35];
-
---
-2.9.3
-
-
-From 1e4ac53ff15efeaf4cb3998b9ba009095d582413 Mon Sep 17 00:00:00 2001
-From: flar2
-Date: Sat, 9 Nov 2013 00:17:33 -0500
-Subject: [PATCH 2/5] Increase voltage limits
-
-Signed-off-by: flar2
----
- arch/arm/boot/dts/msm8974-regulator.dtsi | 8 ++++----
- arch/arm/mach-msm/acpuclock-8974.c | 8 ++++----
- arch/arm/mach-msm/acpuclock-krait.c | 4 ++--
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/boot/dts/msm8974-regulator.dtsi b/arch/arm/boot/dts/msm8974-regulator.dtsi
-index 9de41f4..6a38980 100644
---- a/arch/arm/boot/dts/msm8974-regulator.dtsi
-+++ b/arch/arm/boot/dts/msm8974-regulator.dtsi
-@@ -477,7 +477,7 @@
- <0xf908a800 0x1000>; /* APCS_ALIAS0_KPSS_MDD */
- reg-names = "acs", "mdd";
- regulator-min-microvolt = <500000>;
-- regulator-max-microvolt = <1100000>;
-+ regulator-max-microvolt = <1200000>;
- qcom,headroom-voltage = <150000>;
- qcom,retention-voltage = <675000>;
- qcom,ldo-default-voltage = <750000>;
-@@ -493,7 +493,7 @@
- <0xf909a800 0x1000>; /* APCS_ALIAS1_KPSS_MDD */
- reg-names = "acs", "mdd";
- regulator-min-microvolt = <500000>;
-- regulator-max-microvolt = <1100000>;
-+ regulator-max-microvolt = <1200000>;
- qcom,headroom-voltage = <150000>;
- qcom,retention-voltage = <675000>;
- qcom,ldo-default-voltage = <750000>;
-@@ -509,7 +509,7 @@
- <0xf90aa800 0x1000>; /* APCS_ALIAS2_KPSS_MDD */
- reg-names = "acs", "mdd";
- regulator-min-microvolt = <500000>;
-- regulator-max-microvolt = <1100000>;
-+ regulator-max-microvolt = <1200000>;
- qcom,headroom-voltage = <150000>;
- qcom,retention-voltage = <675000>;
- qcom,ldo-default-voltage = <750000>;
-@@ -525,7 +525,7 @@
- <0xf90ba800 0x1000>; /* APCS_ALIAS3_KPSS_MDD */
- reg-names = "acs", "mdd";
- regulator-min-microvolt = <500000>;
-- regulator-max-microvolt = <1100000>;
-+ regulator-max-microvolt = <1200000>;
- qcom,headroom-voltage = <150000>;
- qcom,retention-voltage = <675000>;
- qcom,ldo-default-voltage = <750000>;
-diff --git a/arch/arm/mach-msm/acpuclock-8974.c b/arch/arm/mach-msm/acpuclock-8974.c
-index 694d783..8b7d74e 100644
---- a/arch/arm/mach-msm/acpuclock-8974.c
-+++ b/arch/arm/mach-msm/acpuclock-8974.c
-@@ -55,7 +55,7 @@ static struct scalable scalable[] __initdata = {
- .hfpll_phys_base = 0xF908A000,
- .l2cpmr_iaddr = 0x4501,
- .sec_clk_sel = 2,
-- .vreg[VREG_CORE] = { "krait0", 1100000 },
-+ .vreg[VREG_CORE] = { "krait0", 1200000 },
- .vreg[VREG_MEM] = { "krait0_mem", 1050000 },
- .vreg[VREG_DIG] = { "krait0_dig", LVL_HIGH },
- .vreg[VREG_HFPLL_A] = { "krait0_hfpll", 1800000 },
-@@ -64,7 +64,7 @@ static struct scalable scalable[] __initdata = {
- .hfpll_phys_base = 0xF909A000,
- .l2cpmr_iaddr = 0x5501,
- .sec_clk_sel = 2,
-- .vreg[VREG_CORE] = { "krait1", 1100000 },
-+ .vreg[VREG_CORE] = { "krait1", 1200000 },
- .vreg[VREG_MEM] = { "krait1_mem", 1050000 },
- .vreg[VREG_DIG] = { "krait1_dig", LVL_HIGH },
- .vreg[VREG_HFPLL_A] = { "krait1_hfpll", 1800000 },
-@@ -73,7 +73,7 @@ static struct scalable scalable[] __initdata = {
- .hfpll_phys_base = 0xF90AA000,
- .l2cpmr_iaddr = 0x6501,
- .sec_clk_sel = 2,
-- .vreg[VREG_CORE] = { "krait2", 1100000 },
-+ .vreg[VREG_CORE] = { "krait2", 1200000 },
- .vreg[VREG_MEM] = { "krait2_mem", 1050000 },
- .vreg[VREG_DIG] = { "krait2_dig", LVL_HIGH },
- .vreg[VREG_HFPLL_A] = { "krait2_hfpll", 1800000 },
-@@ -82,7 +82,7 @@ static struct scalable scalable[] __initdata = {
- .hfpll_phys_base = 0xF90BA000,
- .l2cpmr_iaddr = 0x7501,
- .sec_clk_sel = 2,
-- .vreg[VREG_CORE] = { "krait3", 1100000 },
-+ .vreg[VREG_CORE] = { "krait3", 1200000 },
- .vreg[VREG_MEM] = { "krait3_mem", 1050000 },
- .vreg[VREG_DIG] = { "krait3_dig", LVL_HIGH },
- .vreg[VREG_HFPLL_A] = { "krait3_hfpll", 1800000 },
-diff --git a/arch/arm/mach-msm/acpuclock-krait.c b/arch/arm/mach-msm/acpuclock-krait.c
-index c7eceb1..2211ad3 100644
---- a/arch/arm/mach-msm/acpuclock-krait.c
-+++ b/arch/arm/mach-msm/acpuclock-krait.c
-@@ -939,8 +939,8 @@ static void __init bus_init(const struct l2_level *l2_level)
-
- #ifdef CONFIG_CPU_VOLTAGE_TABLE
-
--#define HFPLL_MIN_VDD 800000
--#define HFPLL_MAX_VDD 1350000
-+#define HFPLL_MIN_VDD 500000
-+#define HFPLL_MAX_VDD 1200000
-
- ssize_t acpuclk_get_vdd_levels_str(char *buf) {
-
---
-2.9.3
-
-
-From 28d7063d0b5a45d328633e4a59d20ac148f1fadd Mon Sep 17 00:00:00 2001
-From: flar2
-Date: Sat, 9 Nov 2013 01:27:36 -0500
-Subject: [PATCH 3/5] CPU overclocking
-
-Signed-off-by: flar2
----
- arch/arm/mach-msm/acpuclock-8974.c | 42 ++++++++++
- arch/arm/mach-msm/acpuclock-krait.c | 148 +++++++++++++++++++++++++++++++++++-
- 2 files changed, 189 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-msm/acpuclock-8974.c b/arch/arm/mach-msm/acpuclock-8974.c
-index 8b7d74e..cb878d9 100644
---- a/arch/arm/mach-msm/acpuclock-8974.c
-+++ b/arch/arm/mach-msm/acpuclock-8974.c
-@@ -710,6 +710,12 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs0[] __initdata = {
- { 0, { 2112000, HFPLL, 1, 110 }, L2(19), 1070000, 627 },
- { 0, { 2188800, HFPLL, 1, 114 }, L2(19), 1085000, 659 },
- { 1, { 2265600, HFPLL, 1, 118 }, L2(19), 1100000, 691 },
-+ { 1, { 2342400, HFPLL, 1, 122 }, L2(19), 1115000, 714 },
-+ { 1, { 2419200, HFPLL, 1, 126 }, L2(19), 1130000, 738 },
-+ { 1, { 2496000, HFPLL, 1, 130 }, L2(19), 1145000, 761 },
-+ { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1160000, 784 },
-+ { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1175000, 808 },
-+ { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1195000, 831 },
- { 0, { 0 } }
- };
-
-@@ -741,6 +747,12 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs1[] __initdata = {
- { 0, { 2112000, HFPLL, 1, 110 }, L2(19), 1045000, 627 },
- { 0, { 2188800, HFPLL, 1, 114 }, L2(19), 1060000, 659 },
- { 1, { 2265600, HFPLL, 1, 118 }, L2(19), 1075000, 691 },
-+ { 1, { 2342400, HFPLL, 1, 122 }, L2(19), 1090000, 714 },
-+ { 1, { 2419200, HFPLL, 1, 126 }, L2(19), 1105000, 738 },
-+ { 1, { 2496000, HFPLL, 1, 130 }, L2(19), 1120000, 761 },
-+ { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1135000, 784 },
-+ { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1150000, 808 },
-+ { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1165000, 831 },
- { 0, { 0 } }
- };
-
-@@ -772,6 +784,12 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs2[] __initdata = {
- { 0, { 2112000, HFPLL, 1, 110 }, L2(19), 1020000, 627 },
- { 0, { 2188800, HFPLL, 1, 114 }, L2(19), 1035000, 659 },
- { 1, { 2265600, HFPLL, 1, 118 }, L2(19), 1050000, 691 },
-+ { 1, { 2342400, HFPLL, 1, 122 }, L2(19), 1065000, 714 },
-+ { 1, { 2419200, HFPLL, 1, 126 }, L2(19), 1080000, 738 },
-+ { 1, { 2496000, HFPLL, 1, 130 }, L2(19), 1095000, 761 },
-+ { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1110000, 784 },
-+ { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1125000, 808 },
-+ { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1140000, 831 },
- { 0, { 0 } }
- };
-
-@@ -803,6 +821,12 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs3[] __initdata = {
- { 0, { 2112000, HFPLL, 1, 110 }, L2(19), 995000, 627 },
- { 0, { 2188800, HFPLL, 1, 114 }, L2(19), 1010000, 659 },
- { 1, { 2265600, HFPLL, 1, 118 }, L2(19), 1025000, 691 },
-+ { 1, { 2342400, HFPLL, 1, 122 }, L2(19), 1040000, 714 },
-+ { 1, { 2419200, HFPLL, 1, 126 }, L2(19), 1055000, 738 },
-+ { 1, { 2496000, HFPLL, 1, 130 }, L2(19), 1070000, 761 },
-+ { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1085000, 784 },
-+ { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1100000, 808 },
-+ { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1115000, 831 },
- { 0, { 0 } }
- };
-
-@@ -834,6 +858,12 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs4[] __initdata = {
- { 0, { 2112000, HFPLL, 1, 110 }, L2(19), 975000, 627 },
- { 0, { 2188800, HFPLL, 1, 114 }, L2(19), 985000, 659 },
- { 1, { 2265600, HFPLL, 1, 118 }, L2(19), 1000000, 691 },
-+ { 1, { 2342400, HFPLL, 1, 122 }, L2(19), 1015000, 714 },
-+ { 1, { 2419200, HFPLL, 1, 126 }, L2(19), 1030000, 738 },
-+ { 1, { 2496000, HFPLL, 1, 130 }, L2(19), 1045000, 761 },
-+ { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1060000, 784 },
-+ { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1075000, 808 },
-+ { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1090000, 831 },
- { 0, { 0 } }
- };
-
-@@ -865,6 +895,12 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs5[] __initdata = {
- { 0, { 2112000, HFPLL, 1, 110 }, L2(19), 955000, 627 },
- { 0, { 2188800, HFPLL, 1, 114 }, L2(19), 965000, 659 },
- { 1, { 2265600, HFPLL, 1, 118 }, L2(19), 975000, 691 },
-+ { 1, { 2342400, HFPLL, 1, 122 }, L2(19), 990000, 714 },
-+ { 1, { 2419200, HFPLL, 1, 126 }, L2(19), 1005000, 738 },
-+ { 1, { 2496000, HFPLL, 1, 130 }, L2(19), 1020000, 761 },
-+ { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1035000, 784 },
-+ { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1050000, 808 },
-+ { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1065000, 831 },
- { 0, { 0 } }
- };
-
-@@ -896,6 +932,12 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs6[] __initdata = {
- { 0, { 2112000, HFPLL, 1, 110 }, L2(19), 930000, 627 },
- { 0, { 2188800, HFPLL, 1, 114 }, L2(19), 940000, 659 },
- { 1, { 2265600, HFPLL, 1, 118 }, L2(19), 950000, 691 },
-+ { 1, { 2342400, HFPLL, 1, 122 }, L2(19), 960000, 714 },
-+ { 1, { 2419200, HFPLL, 1, 126 }, L2(19), 975000, 738 },
-+ { 1, { 2496000, HFPLL, 1, 130 }, L2(19), 990000, 761 },
-+ { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1005000, 784 },
-+ { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1020000, 808 },
-+ { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1035000, 831 },
- { 0, { 0 } }
- };
-
-diff --git a/arch/arm/mach-msm/acpuclock-krait.c b/arch/arm/mach-msm/acpuclock-krait.c
-index 2211ad3..bcd3e44 100644
---- a/arch/arm/mach-msm/acpuclock-krait.c
-+++ b/arch/arm/mach-msm/acpuclock-krait.c
-@@ -45,6 +45,113 @@
- #define PRI_SRC_SEL_HFPLL 1
- #define PRI_SRC_SEL_HFPLL_DIV2 2
-
-+
-+/** elementalx defs **/
-+static int uv_bin = 2;
-+static uint32_t arg_max_oc0 = 2265600;
-+static uint32_t arg_max_oc1 = 2265600;
-+static uint32_t arg_max_oc2 = 2265600;
-+static uint32_t arg_max_oc3 = 2265600;
-+
-+int pvs_number = 0;
-+module_param(pvs_number, int, 0755);
-+
-+/* boot arg max_oc */
-+static int __init cpufreq_read_arg_max_oc0(char *max_oc0)
-+{
-+ unsigned long ui_khz;
-+ int err;
-+ err = strict_strtoul(max_oc0, 0, &ui_khz);
-+ if (err) {
-+ arg_max_oc0 = 2265600;
-+ printk(KERN_INFO "[elementalx]: max_oc0='%i'\n", arg_max_oc0);
-+ return 1;
-+ }
-+
-+ arg_max_oc0 = ui_khz;
-+
-+ return 0;
-+}
-+__setup("max_oc0=", cpufreq_read_arg_max_oc0);
-+
-+static int __init cpufreq_read_arg_max_oc1(char *max_oc1)
-+{
-+ unsigned long ui_khz;
-+ int err;
-+ err = strict_strtoul(max_oc1, 0, &ui_khz);
-+ if (err) {
-+ arg_max_oc1 = 2265600;
-+ printk(KERN_INFO "[elementalx]: max_oc1='%i'\n", arg_max_oc1);
-+ return 1;
-+ }
-+
-+ arg_max_oc1 = ui_khz;
-+
-+ return 0;
-+}
-+__setup("max_oc1=", cpufreq_read_arg_max_oc1);
-+
-+static int __init cpufreq_read_arg_max_oc2(char *max_oc2)
-+{
-+ unsigned long ui_khz;
-+ int err;
-+ err = strict_strtoul(max_oc2, 0, &ui_khz);
-+ if (err) {
-+ arg_max_oc2 = 2265600;
-+ printk(KERN_INFO "[elementalx]: max_oc2='%i'\n", arg_max_oc2);
-+ return 1;
-+ }
-+
-+ arg_max_oc2 = ui_khz;
-+
-+ return 0;
-+}
-+__setup("max_oc2=", cpufreq_read_arg_max_oc2);
-+
-+static int __init cpufreq_read_arg_max_oc3(char *max_oc3)
-+{
-+ unsigned long ui_khz;
-+ int err;
-+ err = strict_strtoul(max_oc3, 0, &ui_khz);
-+ if (err) {
-+ arg_max_oc3 = 2265600;
-+ printk(KERN_INFO "[elementalx]: max_oc3='%i'\n", arg_max_oc3);
-+ return 1;
-+ }
-+
-+ arg_max_oc3 = ui_khz;
-+
-+ return 0;
-+}
-+__setup("max_oc3=", cpufreq_read_arg_max_oc3);
-+
-+static int __init get_uv_level(char *vdd_uv)
-+{
-+ if (strcmp(vdd_uv, "0") == 0) {
-+ uv_bin = 0;
-+ } else if (strcmp(vdd_uv, "1") == 0) {
-+ uv_bin = 1;
-+ } else if (strcmp(vdd_uv, "2") == 0) {
-+ uv_bin = 2;
-+ } else if (strcmp(vdd_uv, "3") == 0) {
-+ uv_bin = 3;
-+ } else if (strcmp(vdd_uv, "4") == 0) {
-+ uv_bin = 4;
-+ } else if (strcmp(vdd_uv, "5") == 0) {
-+ uv_bin = 5;
-+ } else if (strcmp(vdd_uv, "6") == 0) {
-+ uv_bin = 6;
-+ } else {
-+ uv_bin = 0;
-+ }
-+ return 0;
-+}
-+
-+__setup("vdd_uv=", get_uv_level);
-+
-+/** end elementalx defs **/
-+
-+
- static DEFINE_MUTEX(driver_lock);
- static DEFINE_SPINLOCK(l2_lock);
-
-@@ -992,13 +1099,14 @@ static void __init cpufreq_table_init(void)
- {
- int cpu;
- int freq_cnt = 0;
-+ uint32_t limit_max_oc[4] = {arg_max_oc0, arg_max_oc1, arg_max_oc2, arg_max_oc3};
-
- for_each_possible_cpu(cpu) {
- int i;
- /* Construct the freq_table tables from acpu_freq_tbl. */
- for (i = 0, freq_cnt = 0; drv.acpu_freq_tbl[i].speed.khz != 0
- && freq_cnt < ARRAY_SIZE(*freq_table); i++) {
-- if (drv.acpu_freq_tbl[i].use_for_scaling) {
-+ if (drv.acpu_freq_tbl[i].speed.khz <= limit_max_oc[cpu]) {
- freq_table[cpu][freq_cnt].index = freq_cnt;
- freq_table[cpu][freq_cnt].frequency
- = drv.acpu_freq_tbl[i].speed.khz;
-@@ -1109,6 +1217,39 @@ static void __init krait_apply_vmin(struct acpu_level *tbl)
- }
- }
-
-+static void apply_undervolting(void)
-+{
-+ if (uv_bin == 6) {
-+ drv.acpu_freq_tbl[0].vdd_core = 625000;
-+ printk(KERN_INFO "[elementalx]: min_voltage='%i'\n", drv.acpu_freq_tbl[0].vdd_core );
-+ }
-+
-+ if (uv_bin == 5) {
-+ drv.acpu_freq_tbl[0].vdd_core = 650000;
-+ printk(KERN_INFO "[elementalx]: min_voltage='%i'\n", drv.acpu_freq_tbl[0].vdd_core );
-+ }
-+
-+ if (uv_bin == 4) {
-+ drv.acpu_freq_tbl[0].vdd_core = 675000;
-+ printk(KERN_INFO "[elementalx]: min_voltage='%i'\n", drv.acpu_freq_tbl[0].vdd_core );
-+ }
-+
-+ if (uv_bin == 3) {
-+ drv.acpu_freq_tbl[0].vdd_core = 700000;
-+ printk(KERN_INFO "[elementalx]: min_voltage='%i'\n", drv.acpu_freq_tbl[0].vdd_core );
-+ }
-+
-+ if (uv_bin == 2) {
-+ drv.acpu_freq_tbl[0].vdd_core = 725000;
-+ printk(KERN_INFO "[elementalx]: min_voltage='%i'\n", drv.acpu_freq_tbl[0].vdd_core );
-+ }
-+
-+ if (uv_bin == 1) {
-+ drv.acpu_freq_tbl[0].vdd_core = 750000;
-+ printk(KERN_INFO "[elementalx]: min_voltage='%i'\n", drv.acpu_freq_tbl[0].vdd_core );
-+ }
-+}
-+
- void __init get_krait_bin_format_a(void __iomem *base, struct bin_info *bin)
- {
- u32 pte_efuse = readl_relaxed(base);
-@@ -1143,6 +1284,8 @@ void __init get_krait_bin_format_b(void __iomem *base, struct bin_info *bin)
- }
- bin->speed_valid = true;
-
-+ pvs_number = bin->pvs;
-+
- /* Check PVS_BLOW_STATUS */
- pte_efuse = readl_relaxed(base + 0x4);
- bin->pvs_valid = !!(pte_efuse & BIT(21));
-@@ -1229,6 +1372,9 @@ static void __init hw_init(void)
- if (krait_needs_vmin())
- krait_apply_vmin(drv.acpu_freq_tbl);
-
-+ if (uv_bin)
-+ apply_undervolting();
-+
- l2->hfpll_base = ioremap(l2->hfpll_phys_base, SZ_32);
- BUG_ON(!l2->hfpll_base);
-
---
-2.9.3
-
-
-From cbc2f6c8893c773d4dbdf9d5f538f6b44a02baa4 Mon Sep 17 00:00:00 2001
-From: flar2
-Date: Sat, 9 Nov 2013 08:43:31 -0500
-Subject: [PATCH 4/5] L2 cache and bus bandwidth overclocking
-
-Signed-off-by: flar2
----
- arch/arm/mach-msm/acpuclock-8974.c | 46 +++++++++++++++++++++++++++++++++++++
- arch/arm/mach-msm/acpuclock-krait.c | 2 +-
- 2 files changed, 47 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-msm/acpuclock-8974.c b/arch/arm/mach-msm/acpuclock-8974.c
-index cb878d9..933bd0e 100644
---- a/arch/arm/mach-msm/acpuclock-8974.c
-+++ b/arch/arm/mach-msm/acpuclock-8974.c
-@@ -28,6 +28,8 @@
- #define LVL_NOM RPM_REGULATOR_CORNER_NORMAL
- #define LVL_HIGH RPM_REGULATOR_CORNER_SUPER_TURBO
-
-+static int opt_bin = 0;
-+
- static struct hfpll_data hfpll_data __initdata = {
- .mode_offset = 0x00,
- .l_offset = 0x04,
-@@ -257,6 +259,7 @@ static struct msm_bus_paths bw_level_tbl_v2[] __initdata = {
- [6] = BW_MBPS(4912), /* At least 614 MHz on bus. */
- [7] = BW_MBPS(6400), /* At least 800 MHz on bus. */
- [8] = BW_MBPS(7448), /* At least 931 MHz on bus. */
-+ [9] = BW_MBPS(8000), /* At least 1000 MHz on bus. */
- };
-
- static struct l2_level l2_freq_tbl_v2[] __initdata = {
-@@ -283,6 +286,30 @@ static struct l2_level l2_freq_tbl_v2[] __initdata = {
- { }
- };
-
-+static struct l2_level l2_freq_tbl_v2_elementalx[] __initdata = {
-+ [0] = { { 300000, PLL_0, 0, 0 }, LVL_LOW, 950000, 0 },
-+ [1] = { { 345600, HFPLL, 2, 36 }, LVL_LOW, 950000, 1 },
-+ [2] = { { 422400, HFPLL, 2, 44 }, LVL_LOW, 950000, 2 },
-+ [3] = { { 499200, HFPLL, 2, 52 }, LVL_LOW, 950000, 3 },
-+ [4] = { { 576000, HFPLL, 1, 30 }, LVL_LOW, 950000, 4 },
-+ [5] = { { 652800, HFPLL, 1, 34 }, LVL_NOM, 950000, 4 },
-+ [6] = { { 729600, HFPLL, 1, 38 }, LVL_NOM, 950000, 4 },
-+ [7] = { { 806400, HFPLL, 1, 42 }, LVL_NOM, 950000, 4 },
-+ [8] = { { 883200, HFPLL, 1, 46 }, LVL_NOM, 950000, 5 },
-+ [9] = { { 960000, HFPLL, 1, 50 }, LVL_NOM, 950000, 5 },
-+ [10] = { { 1036800, HFPLL, 1, 54 }, LVL_NOM, 950000, 5 },
-+ [11] = { { 1113600, HFPLL, 1, 58 }, LVL_HIGH, 1050000, 6 },
-+ [12] = { { 1190400, HFPLL, 1, 62 }, LVL_HIGH, 1050000, 6 },
-+ [13] = { { 1267200, HFPLL, 1, 66 }, LVL_HIGH, 1050000, 6 },
-+ [14] = { { 1344000, HFPLL, 1, 70 }, LVL_HIGH, 1050000, 6 },
-+ [15] = { { 1420800, HFPLL, 1, 74 }, LVL_HIGH, 1050000, 6 },
-+ [16] = { { 1497600, HFPLL, 1, 78 }, LVL_HIGH, 1050000, 6 },
-+ [17] = { { 1574400, HFPLL, 1, 82 }, LVL_HIGH, 1050000, 7 },
-+ [18] = { { 1651200, HFPLL, 1, 86 }, LVL_HIGH, 1050000, 7 },
-+ [19] = { { 1804800, HFPLL, 1, 94 }, LVL_HIGH, 1050000, 9 },
-+ { }
-+};
-+
- static struct acpu_level acpu_freq_tbl_2g_pvs0[] __initdata = {
- { 1, { 300000, PLL_0, 0, 0 }, L2(0), 815000, 73 },
- { 0, { 345600, HFPLL, 2, 36 }, L2(1), 825000, 85 },
-@@ -1003,6 +1030,20 @@ static struct acpuclk_krait_params acpuclk_8974_params __initdata = {
- .stby_khz = 300000,
- };
-
-+static int __init get_opt_level(char *l2_opt)
-+{
-+ if (strcmp(l2_opt, "0") == 0) {
-+ opt_bin = 0;
-+ } else if (strcmp(l2_opt, "1") == 0) {
-+ opt_bin = 1;
-+ } else {
-+ opt_bin = 0;
-+ }
-+ return 0;
-+}
-+
-+__setup("l2_opt=", get_opt_level);
-+
- static void __init apply_v1_l2_workaround(void)
- {
- static struct l2_level resticted_l2_tbl[] __initdata = {
-@@ -1042,6 +1083,11 @@ static int __init acpuclk_8974_probe(struct platform_device *pdev)
- apply_v1_l2_workaround();
- }
-
-+ if (opt_bin == 1) {
-+ acpuclk_8974_params.l2_freq_tbl = l2_freq_tbl_v2_elementalx;
-+ acpuclk_8974_params.l2_freq_tbl_size = sizeof(l2_freq_tbl_v2_elementalx);
-+ }
-+
- return acpuclk_krait_init(&pdev->dev, &acpuclk_8974_params);
- }
-
-diff --git a/arch/arm/mach-msm/acpuclock-krait.c b/arch/arm/mach-msm/acpuclock-krait.c
-index bcd3e44..a1c8fbb 100644
---- a/arch/arm/mach-msm/acpuclock-krait.c
-+++ b/arch/arm/mach-msm/acpuclock-krait.c
-@@ -47,7 +47,7 @@
-
-
- /** elementalx defs **/
--static int uv_bin = 2;
-+static int uv_bin = 0;
- static uint32_t arg_max_oc0 = 2265600;
- static uint32_t arg_max_oc1 = 2265600;
- static uint32_t arg_max_oc2 = 2265600;
---
-2.9.3
-
-
-From bfd08d2e2a997ac4f5b6e8353be663472643b746 Mon Sep 17 00:00:00 2001
-From: flar2
-Date: Mon, 11 Nov 2013 00:42:12 -0500
-Subject: [PATCH 5/5] More overclocking options
-
-Signed-off-by: flar2
----
- arch/arm/mach-msm/acpuclock-8974.c | 50 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 50 insertions(+)
-
-diff --git a/arch/arm/mach-msm/acpuclock-8974.c b/arch/arm/mach-msm/acpuclock-8974.c
-index 933bd0e..b436816 100644
---- a/arch/arm/mach-msm/acpuclock-8974.c
-+++ b/arch/arm/mach-msm/acpuclock-8974.c
-@@ -310,6 +310,29 @@ static struct l2_level l2_freq_tbl_v2_elementalx[] __initdata = {
- { }
- };
-
-+static struct l2_level l2_freq_tbl_v2_ultra[] __initdata = {
-+ [0] = { { 300000, PLL_0, 0, 0 }, LVL_LOW, 950000, 0 },
-+ [1] = { { 345600, HFPLL, 2, 36 }, LVL_LOW, 950000, 1 },
-+ [2] = { { 422400, HFPLL, 2, 44 }, LVL_LOW, 950000, 2 },
-+ [3] = { { 499200, HFPLL, 2, 52 }, LVL_LOW, 950000, 3 },
-+ [4] = { { 576000, HFPLL, 1, 30 }, LVL_LOW, 950000, 4 },
-+ [5] = { { 652800, HFPLL, 1, 34 }, LVL_NOM, 950000, 4 },
-+ [6] = { { 729600, HFPLL, 1, 38 }, LVL_NOM, 950000, 4 },
-+ [7] = { { 806400, HFPLL, 1, 42 }, LVL_NOM, 950000, 4 },
-+ [8] = { { 883200, HFPLL, 1, 46 }, LVL_NOM, 950000, 5 },
-+ [9] = { { 960000, HFPLL, 1, 50 }, LVL_NOM, 950000, 5 },
-+ [10] = { { 1036800, HFPLL, 1, 54 }, LVL_NOM, 950000, 5 },
-+ [11] = { { 1113600, HFPLL, 1, 58 }, LVL_HIGH, 1050000, 6 },
-+ [12] = { { 1190400, HFPLL, 1, 62 }, LVL_HIGH, 1050000, 6 },
-+ [13] = { { 1267200, HFPLL, 1, 66 }, LVL_HIGH, 1050000, 6 },
-+ [14] = { { 1344000, HFPLL, 1, 70 }, LVL_HIGH, 1050000, 6 },
-+ [15] = { { 1420800, HFPLL, 1, 74 }, LVL_HIGH, 1050000, 6 },
-+ [16] = { { 1497600, HFPLL, 1, 78 }, LVL_HIGH, 1050000, 6 },
-+ [17] = { { 1574400, HFPLL, 1, 82 }, LVL_HIGH, 1050000, 7 },
-+ [18] = { { 1651200, HFPLL, 1, 86 }, LVL_HIGH, 1050000, 7 },
-+ [19] = { { 1920000, HFPLL, 1, 100 }, LVL_HIGH, 1050000, 9 },
-+ { }
-+};
- static struct acpu_level acpu_freq_tbl_2g_pvs0[] __initdata = {
- { 1, { 300000, PLL_0, 0, 0 }, L2(0), 815000, 73 },
- { 0, { 345600, HFPLL, 2, 36 }, L2(1), 825000, 85 },
-@@ -743,6 +766,9 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs0[] __initdata = {
- { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1160000, 784 },
- { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1175000, 808 },
- { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1195000, 831 },
-+ { 1, { 2803200, HFPLL, 1, 146 }, L2(19), 1195000, 854 },
-+ { 1, { 2880000, HFPLL, 1, 150 }, L2(19), 1195000, 876 },
-+ { 1, { 2956800, HFPLL, 1, 154 }, L2(19), 1195000, 897 },
- { 0, { 0 } }
- };
-
-@@ -780,6 +806,9 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs1[] __initdata = {
- { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1135000, 784 },
- { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1150000, 808 },
- { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1165000, 831 },
-+ { 1, { 2803200, HFPLL, 1, 146 }, L2(19), 1180000, 854 },
-+ { 1, { 2880000, HFPLL, 1, 150 }, L2(19), 1195000, 876 },
-+ { 1, { 2956800, HFPLL, 1, 154 }, L2(19), 1195000, 897 },
- { 0, { 0 } }
- };
-
-@@ -817,6 +846,9 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs2[] __initdata = {
- { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1110000, 784 },
- { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1125000, 808 },
- { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1140000, 831 },
-+ { 1, { 2803200, HFPLL, 1, 146 }, L2(19), 1165000, 854 },
-+ { 1, { 2880000, HFPLL, 1, 150 }, L2(19), 1180000, 876 },
-+ { 1, { 2956800, HFPLL, 1, 154 }, L2(19), 1195000, 897 },
- { 0, { 0 } }
- };
-
-@@ -854,6 +886,9 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs3[] __initdata = {
- { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1085000, 784 },
- { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1100000, 808 },
- { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1115000, 831 },
-+ { 1, { 2803200, HFPLL, 1, 146 }, L2(19), 1130000, 854 },
-+ { 1, { 2880000, HFPLL, 1, 150 }, L2(19), 1145000, 876 },
-+ { 1, { 2956800, HFPLL, 1, 154 }, L2(19), 1160000, 897 },
- { 0, { 0 } }
- };
-
-@@ -891,6 +926,9 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs4[] __initdata = {
- { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1060000, 784 },
- { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1075000, 808 },
- { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1090000, 831 },
-+ { 1, { 2803200, HFPLL, 1, 146 }, L2(19), 1105000, 854 },
-+ { 1, { 2880000, HFPLL, 1, 150 }, L2(19), 1120000, 876 },
-+ { 1, { 2956800, HFPLL, 1, 154 }, L2(19), 1135000, 897 },
- { 0, { 0 } }
- };
-
-@@ -928,6 +966,9 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs5[] __initdata = {
- { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1035000, 784 },
- { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1050000, 808 },
- { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1065000, 831 },
-+ { 1, { 2803200, HFPLL, 1, 146 }, L2(19), 1080000, 854 },
-+ { 1, { 2880000, HFPLL, 1, 150 }, L2(19), 1095000, 876 },
-+ { 1, { 2956800, HFPLL, 1, 154 }, L2(19), 1110000, 897 },
- { 0, { 0 } }
- };
-
-@@ -965,6 +1006,9 @@ static struct acpu_level acpu_freq_tbl_2p3g_pvs6[] __initdata = {
- { 1, { 2572800, HFPLL, 1, 134 }, L2(19), 1005000, 784 },
- { 1, { 2649600, HFPLL, 1, 138 }, L2(19), 1020000, 808 },
- { 1, { 2726400, HFPLL, 1, 142 }, L2(19), 1035000, 831 },
-+ { 1, { 2803200, HFPLL, 1, 146 }, L2(19), 1050000, 854 },
-+ { 1, { 2880000, HFPLL, 1, 150 }, L2(19), 1065000, 876 },
-+ { 1, { 2956800, HFPLL, 1, 154 }, L2(19), 1080000, 897 },
- { 0, { 0 } }
- };
-
-@@ -1036,6 +1080,8 @@ static int __init get_opt_level(char *l2_opt)
- opt_bin = 0;
- } else if (strcmp(l2_opt, "1") == 0) {
- opt_bin = 1;
-+ } else if (strcmp(l2_opt, "2") == 0) {
-+ opt_bin = 2;
- } else {
- opt_bin = 0;
- }
-@@ -1087,6 +1133,10 @@ static int __init acpuclk_8974_probe(struct platform_device *pdev)
- acpuclk_8974_params.l2_freq_tbl = l2_freq_tbl_v2_elementalx;
- acpuclk_8974_params.l2_freq_tbl_size = sizeof(l2_freq_tbl_v2_elementalx);
- }
-+ if (opt_bin == 2) {
-+ acpuclk_8974_params.l2_freq_tbl = l2_freq_tbl_v2_ultra;
-+ acpuclk_8974_params.l2_freq_tbl_size = sizeof(l2_freq_tbl_v2_ultra);
-+ }
-
- return acpuclk_krait_init(&pdev->dev, &acpuclk_8974_params);
- }
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_kernel_lge_mako/0001-OverUnderClock.patch b/Patches/CyanogenMod-14.1/android_kernel_lge_mako/0001-OverUnderClock.patch
deleted file mode 100644
index d6341012..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_lge_mako/0001-OverUnderClock.patch
+++ /dev/null
@@ -1,609 +0,0 @@
-From 92d396b53cbdf91a7b61a857ca335f39cdb0f8bb Mon Sep 17 00:00:00 2001
-From: anarkia1976
-Date: Sun, 12 Jan 2014 20:26:27 +0100
-Subject: [PATCH 1/4] msm: cpu: overclock: added low (162Mhz) and high
- (1944Mhz) cpu
-
----
- arch/arm/mach-msm/Kconfig | 12 +++++
- arch/arm/mach-msm/acpuclock-8064.c | 91 +++++++++++++++++++++++++++++++++++++
- arch/arm/mach-msm/acpuclock-krait.c | 8 +++-
- arch/arm/mach-msm/msm_dcvs.c | 5 ++
- 4 files changed, 115 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
-index 5f37d1d..b5ab505 100644
---- a/arch/arm/mach-msm/Kconfig
-+++ b/arch/arm/mach-msm/Kconfig
-@@ -1634,6 +1634,18 @@ config MSM_CPU_FREQ_MIN
-
- endif # CPU_FREQ_MSM
-
-+config LOW_CPUCLOCKS
-+ bool "Enable ultra low CPU clocks"
-+ default n
-+ help
-+ Ultra low cpu frequencies enabled for CPU and L2 Cache
-+
-+config CPU_OVERCLOCK
-+ bool "Enable CPU Overclocking option"
-+ default n
-+ help
-+ Krait overclocking up to 1.9 GHz
-+
- config MSM_AVS_HW
- bool "Enable Adaptive Voltage Scaling (AVS)"
- default n
-diff --git a/arch/arm/mach-msm/acpuclock-8064.c b/arch/arm/mach-msm/acpuclock-8064.c
-index 8262946..f40edd3 100644
---- a/arch/arm/mach-msm/acpuclock-8064.c
-+++ b/arch/arm/mach-msm/acpuclock-8064.c
-@@ -47,7 +47,11 @@ static struct scalable scalable[] __initdata = {
- .aux_clk_sel = 3,
- .sec_clk_sel = 2,
- .l2cpmr_iaddr = 0x4501,
-+#ifdef CONFIG_CPU_OVERCLOCK
-+ .vreg[VREG_CORE] = { "krait0", 1450000 },
-+#else
- .vreg[VREG_CORE] = { "krait0", 1300000 },
-+#endif
- .vreg[VREG_MEM] = { "krait0_mem", 1150000 },
- .vreg[VREG_DIG] = { "krait0_dig", 1150000 },
- .vreg[VREG_HFPLL_A] = { "krait0_hfpll", 1800000 },
-@@ -58,7 +62,11 @@ static struct scalable scalable[] __initdata = {
- .aux_clk_sel = 3,
- .sec_clk_sel = 2,
- .l2cpmr_iaddr = 0x5501,
-+#ifdef CONFIG_CPU_OVERCLOCK
-+ .vreg[VREG_CORE] = { "krait1", 1450000 },
-+#else
- .vreg[VREG_CORE] = { "krait1", 1300000 },
-+#endif
- .vreg[VREG_MEM] = { "krait1_mem", 1150000 },
- .vreg[VREG_DIG] = { "krait1_dig", 1150000 },
- .vreg[VREG_HFPLL_A] = { "krait1_hfpll", 1800000 },
-@@ -69,7 +77,11 @@ static struct scalable scalable[] __initdata = {
- .aux_clk_sel = 3,
- .sec_clk_sel = 2,
- .l2cpmr_iaddr = 0x6501,
-+#ifdef CONFIG_CPU_OVERCLOCK
-+ .vreg[VREG_CORE] = { "krait2", 1450000 },
-+#else
- .vreg[VREG_CORE] = { "krait2", 1300000 },
-+#endif
- .vreg[VREG_MEM] = { "krait2_mem", 1150000 },
- .vreg[VREG_DIG] = { "krait2_dig", 1150000 },
- .vreg[VREG_HFPLL_A] = { "krait2_hfpll", 1800000 },
-@@ -80,7 +92,11 @@ static struct scalable scalable[] __initdata = {
- .aux_clk_sel = 3,
- .sec_clk_sel = 2,
- .l2cpmr_iaddr = 0x7501,
-+#ifdef CONFIG_CPU_OVERCLOCK
-+ .vreg[VREG_CORE] = { "krait3", 1450000 },
-+#else
- .vreg[VREG_CORE] = { "krait3", 1300000 },
-+#endif
- .vreg[VREG_MEM] = { "krait3_mem", 1150000 },
- .vreg[VREG_DIG] = { "krait3_dig", 1150000 },
- .vreg[VREG_HFPLL_A] = { "krait3_hfpll", 1800000 },
-@@ -116,6 +132,24 @@ static struct msm_bus_scale_pdata bus_scale_data __initdata = {
- };
-
- static struct l2_level l2_freq_tbl[] __initdata = {
-+#ifdef CONFIG_LOW_CPUCLOCKS
-+ [0] = { { 378000, HFPLL, 2, 0x1C }, 950000, 1050000, 1 },
-+ [1] = { { 384000, PLL_8, 0, 0x00 }, 950000, 1050000, 1 },
-+ [2] = { { 432000, HFPLL, 2, 0x20 }, 1050000, 1050000, 2 },
-+ [3] = { { 486000, HFPLL, 2, 0x24 }, 1050000, 1050000, 2 },
-+ [4] = { { 540000, HFPLL, 2, 0x28 }, 1050000, 1050000, 2 },
-+ [5] = { { 594000, HFPLL, 1, 0x16 }, 1050000, 1050000, 2 },
-+ [6] = { { 648000, HFPLL, 1, 0x18 }, 1050000, 1050000, 4 },
-+ [7] = { { 702000, HFPLL, 1, 0x1A }, 1150000, 1150000, 4 },
-+ [8] = { { 756000, HFPLL, 1, 0x1C }, 1150000, 1150000, 4 },
-+ [9] = { { 810000, HFPLL, 1, 0x1E }, 1150000, 1150000, 4 },
-+ [10] = { { 864000, HFPLL, 1, 0x20 }, 1150000, 1150000, 4 },
-+ [11] = { { 918000, HFPLL, 1, 0x22 }, 1150000, 1150000, 5 },
-+ [12] = { { 972000, HFPLL, 1, 0x24 }, 1150000, 1150000, 5 },
-+ [13] = { { 1026000, HFPLL, 1, 0x26 }, 1150000, 1150000, 5 },
-+ [14] = { { 1080000, HFPLL, 1, 0x28 }, 1150000, 1150000, 5 },
-+ [15] = { { 1134000, HFPLL, 1, 0x2A }, 1150000, 1150000, 5 },
-+#else
- [0] = { { 384000, PLL_8, 0, 0x00 }, 950000, 1050000, 1 },
- [1] = { { 432000, HFPLL, 2, 0x20 }, 1050000, 1050000, 2 },
- [2] = { { 486000, HFPLL, 2, 0x24 }, 1050000, 1050000, 2 },
-@@ -131,11 +165,19 @@ static struct l2_level l2_freq_tbl[] __initdata = {
- [12] = { { 1026000, HFPLL, 1, 0x26 }, 1150000, 1150000, 5 },
- [13] = { { 1080000, HFPLL, 1, 0x28 }, 1150000, 1150000, 5 },
- [14] = { { 1134000, HFPLL, 1, 0x2A }, 1150000, 1150000, 5 },
-+#endif
- { }
- };
-
- static struct acpu_level tbl_slow[] __initdata = {
-+#ifdef CONFIG_LOW_CPUCLOCKS
-+ { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 875000 },
-+ { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 900000 },
-+ //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 950000 },
-+ { 1, { 384000, PLL_8, 0, 0x00 }, L2(1), 925000 },
-+#else
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(0), 950000 },
-+#endif
- { 0, { 432000, HFPLL, 2, 0x20 }, L2(5), 975000 },
- { 1, { 486000, HFPLL, 2, 0x24 }, L2(5), 975000 },
- { 0, { 540000, HFPLL, 2, 0x28 }, L2(5), 1000000 },
-@@ -157,11 +199,25 @@ static struct acpu_level tbl_slow[] __initdata = {
- { 0, { 1404000, HFPLL, 1, 0x34 }, L2(14), 1237500 },
- { 1, { 1458000, HFPLL, 1, 0x36 }, L2(14), 1237500 },
- { 1, { 1512000, HFPLL, 1, 0x38 }, L2(14), 1250000 },
-+#ifdef CONFIG_CPU_OVERCLOCK
-+ { 1, { 1620000, HFPLL, 1, 0x3C }, L2(15), 1300000 },
-+ { 1, { 1728000, HFPLL, 1, 0x40 }, L2(15), 1350000 },
-+ { 1, { 1836000, HFPLL, 1, 0x44 }, L2(15), 1400000 },
-+ { 1, { 1890000, HFPLL, 1, 0x45 }, L2(15), 1425000 },
-+ { 1, { 1944000, HFPLL, 1, 0x46 }, L2(15), 1450000 },
-+#endif
- { 0, { 0 } }
- };
-
- static struct acpu_level tbl_nom[] __initdata = {
-+#ifdef CONFIG_LOW_CPUCLOCKS
-+ { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 825000 },
-+ { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 850000 },
-+ //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 900000 },
-+ { 1, { 384000, PLL_8, 0, 0x00 }, L2(1), 875000 },
-+#else
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(0), 900000 },
-+#endif
- { 0, { 432000, HFPLL, 2, 0x20 }, L2(5), 925000 },
- { 1, { 486000, HFPLL, 2, 0x24 }, L2(5), 925000 },
- { 0, { 540000, HFPLL, 2, 0x28 }, L2(5), 950000 },
-@@ -183,11 +239,25 @@ static struct acpu_level tbl_nom[] __initdata = {
- { 0, { 1404000, HFPLL, 1, 0x34 }, L2(14), 1187500 },
- { 1, { 1458000, HFPLL, 1, 0x36 }, L2(14), 1187500 },
- { 1, { 1512000, HFPLL, 1, 0x38 }, L2(14), 1200000 },
-+#ifdef CONFIG_CPU_OVERCLOCK
-+ { 1, { 1620000, HFPLL, 1, 0x3C }, L2(15), 1250000 },
-+ { 1, { 1728000, HFPLL, 1, 0x40 }, L2(15), 1300000 },
-+ { 1, { 1836000, HFPLL, 1, 0x44 }, L2(15), 1350000 },
-+ { 1, { 1890000, HFPLL, 1, 0x45 }, L2(15), 1375000 },
-+ { 1, { 1944000, HFPLL, 1, 0x46 }, L2(15), 1400000 },
-+#endif
- { 0, { 0 } }
- };
-
- static struct acpu_level tbl_fast[] __initdata = {
-+#ifdef CONFIG_LOW_CPUCLOCKS
-+ { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 775000 },
-+ { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 800000 },
-+ //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 850000 },
-+ { 1, { 384000, PLL_8, 0, 0x00 }, L2(1), 825000 },
-+#else
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(0), 850000 },
-+#endif
- { 0, { 432000, HFPLL, 2, 0x20 }, L2(5), 875000 },
- { 1, { 486000, HFPLL, 2, 0x24 }, L2(5), 875000 },
- { 0, { 540000, HFPLL, 2, 0x28 }, L2(5), 900000 },
-@@ -209,11 +279,25 @@ static struct acpu_level tbl_fast[] __initdata = {
- { 0, { 1404000, HFPLL, 1, 0x34 }, L2(14), 1137500 },
- { 1, { 1458000, HFPLL, 1, 0x36 }, L2(14), 1137500 },
- { 1, { 1512000, HFPLL, 1, 0x38 }, L2(14), 1150000 },
-+#ifdef CONFIG_CPU_OVERCLOCK
-+ { 1, { 1620000, HFPLL, 1, 0x3C }, L2(15), 1200000 },
-+ { 1, { 1728000, HFPLL, 1, 0x40 }, L2(15), 1250000 },
-+ { 1, { 1836000, HFPLL, 1, 0x44 }, L2(15), 1300000 },
-+ { 1, { 1890000, HFPLL, 1, 0x45 }, L2(15), 1325000 },
-+ { 1, { 1944000, HFPLL, 1, 0x46 }, L2(15), 1350000 },
-+#endif
- { 0, { 0 } }
- };
-
- static struct acpu_level tbl_faster[] __initdata = {
-+#ifdef CONFIG_LOW_CPUCLOCKS
-+ { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 775000 },
-+ { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 800000 },
-+ //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 850000 },
-+ { 1, { 384000, PLL_8, 0, 0x00 }, L2(1), 825000 },
-+#else
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(0), 850000 },
-+#endif
- { 0, { 432000, HFPLL, 2, 0x20 }, L2(5), 875000 },
- { 1, { 486000, HFPLL, 2, 0x24 }, L2(5), 875000 },
- { 0, { 540000, HFPLL, 2, 0x28 }, L2(5), 900000 },
-@@ -235,6 +319,13 @@ static struct acpu_level tbl_faster[] __initdata = {
- { 0, { 1404000, HFPLL, 1, 0x34 }, L2(14), 1112500 },
- { 1, { 1458000, HFPLL, 1, 0x36 }, L2(14), 1112500 },
- { 1, { 1512000, HFPLL, 1, 0x38 }, L2(14), 1125000 },
-+#ifdef CONFIG_CPU_OVERCLOCK
-+ { 1, { 1620000, HFPLL, 1, 0x3C }, L2(15), 1150000 },
-+ { 1, { 1728000, HFPLL, 1, 0x40 }, L2(15), 1200000 },
-+ { 1, { 1836000, HFPLL, 1, 0x44 }, L2(15), 1250000 },
-+ { 1, { 1890000, HFPLL, 1, 0x45 }, L2(15), 1275000 },
-+ { 1, { 1944000, HFPLL, 1, 0x46 }, L2(15), 1300000 },
-+#endif
- { 0, { 0 } }
- };
-
-diff --git a/arch/arm/mach-msm/acpuclock-krait.c b/arch/arm/mach-msm/acpuclock-krait.c
-index e3a3f54..97f6f39 100644
---- a/arch/arm/mach-msm/acpuclock-krait.c
-+++ b/arch/arm/mach-msm/acpuclock-krait.c
-@@ -45,6 +45,12 @@
- #define PRI_SRC_SEL_HFPLL 1
- #define PRI_SRC_SEL_HFPLL_DIV2 2
-
-+#ifdef CONFIG_LOW_CPUCLOCKS
-+#define FREQ_TABLE_SIZE 39
-+#else
-+#define FREQ_TABLE_SIZE 35
-+#endif
-+
- static DEFINE_MUTEX(driver_lock);
- static DEFINE_SPINLOCK(l2_lock);
-
-@@ -913,7 +919,7 @@ static void __init bus_init(const struct l2_level *l2_level)
- }
-
- #ifdef CONFIG_CPU_FREQ_MSM
--static struct cpufreq_frequency_table freq_table[NR_CPUS][35];
-+static struct cpufreq_frequency_table freq_table[NR_CPUS][FREQ_TABLE_SIZE];
-
- static void __init cpufreq_table_init(void)
- {
-diff --git a/arch/arm/mach-msm/msm_dcvs.c b/arch/arm/mach-msm/msm_dcvs.c
-index 1a919fc..1d5e289 100644
---- a/arch/arm/mach-msm/msm_dcvs.c
-+++ b/arch/arm/mach-msm/msm_dcvs.c
-@@ -146,7 +146,12 @@ static struct dcvs_core core_list[CORES_MAX];
-
- static struct kobject *cores_kobj;
-
-+#ifdef CONFIG_CPU_OVERCLOCK
-+#define DCVS_MAX_NUM_FREQS 20
-+#else
- #define DCVS_MAX_NUM_FREQS 15
-+#endif
-+
- static struct msm_dcvs_freq_entry cpu_freq_tbl[DCVS_MAX_NUM_FREQS];
- static unsigned num_cpu_freqs;
- static struct msm_dcvs_platform_data *dcvs_pdata;
---
-2.10.2
-
-
-From f498c327190b1a30c25010e0ba3600470fc9251b Mon Sep 17 00:00:00 2001
-From: anarkia1976
-Date: Wed, 5 Feb 2014 07:15:12 +0100
-Subject: [PATCH 2/4] msm: cpu: overclock: added ultra low (81Mhz) cpu clock
- frequencies
-
----
- arch/arm/mach-msm/acpuclock-8064.c | 4 ++++
- arch/arm/mach-msm/acpuclock-krait.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-msm/acpuclock-8064.c b/arch/arm/mach-msm/acpuclock-8064.c
-index f40edd3..ba8fe72 100644
---- a/arch/arm/mach-msm/acpuclock-8064.c
-+++ b/arch/arm/mach-msm/acpuclock-8064.c
-@@ -171,6 +171,7 @@ static struct l2_level l2_freq_tbl[] __initdata = {
-
- static struct acpu_level tbl_slow[] __initdata = {
- #ifdef CONFIG_LOW_CPUCLOCKS
-+ { 1, { 81000, HFPLL, 2, 0x06 }, L2(0), 750000 },
- { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 875000 },
- { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 900000 },
- //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 950000 },
-@@ -211,6 +212,7 @@ static struct acpu_level tbl_slow[] __initdata = {
-
- static struct acpu_level tbl_nom[] __initdata = {
- #ifdef CONFIG_LOW_CPUCLOCKS
-+ { 1, { 81000, HFPLL, 2, 0x06 }, L2(0), 750000 },
- { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 825000 },
- { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 850000 },
- //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 900000 },
-@@ -251,6 +253,7 @@ static struct acpu_level tbl_nom[] __initdata = {
-
- static struct acpu_level tbl_fast[] __initdata = {
- #ifdef CONFIG_LOW_CPUCLOCKS
-+ { 1, { 81000, HFPLL, 2, 0x06 }, L2(0), 750000 },
- { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 775000 },
- { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 800000 },
- //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 850000 },
-@@ -291,6 +294,7 @@ static struct acpu_level tbl_fast[] __initdata = {
-
- static struct acpu_level tbl_faster[] __initdata = {
- #ifdef CONFIG_LOW_CPUCLOCKS
-+ { 1, { 81000, HFPLL, 2, 0x06 }, L2(0), 750000 },
- { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 775000 },
- { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 800000 },
- //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 850000 },
-diff --git a/arch/arm/mach-msm/acpuclock-krait.c b/arch/arm/mach-msm/acpuclock-krait.c
-index 97f6f39..695b709 100644
---- a/arch/arm/mach-msm/acpuclock-krait.c
-+++ b/arch/arm/mach-msm/acpuclock-krait.c
-@@ -46,7 +46,7 @@
- #define PRI_SRC_SEL_HFPLL_DIV2 2
-
- #ifdef CONFIG_LOW_CPUCLOCKS
--#define FREQ_TABLE_SIZE 39
-+#define FREQ_TABLE_SIZE 40
- #else
- #define FREQ_TABLE_SIZE 35
- #endif
---
-2.10.2
-
-
-From 0eb77b9339850d3a7a9854197f2d02756270e5af Mon Sep 17 00:00:00 2001
-From: anarkia1976
-Date: Sun, 12 Jan 2014 21:12:55 +0100
-Subject: [PATCH 3/4] ak_mako_defconfig: enable LOW_CPU and CPU_OVERCLOCK
-
----
- arch/arm/configs/cyanogen_mako_defconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/configs/cyanogen_mako_defconfig b/arch/arm/configs/cyanogen_mako_defconfig
-index 316b320..1059cb6 100644
---- a/arch/arm/configs/cyanogen_mako_defconfig
-+++ b/arch/arm/configs/cyanogen_mako_defconfig
-@@ -451,6 +451,8 @@ CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
- # CONFIG_MSM_IPC_ROUTER_SECURITY is not set
- # CONFIG_MSM_DALRPC is not set
- # CONFIG_MSM_CPU_FREQ_SET_MIN_MAX is not set
-+CONFIG_LOW_CPUCLOCKS=y
-+CONFIG_CPU_OVERCLOCK=y
- CONFIG_MSM_AVS_HW=y
- # CONFIG_MSM_HW3D is not set
- CONFIG_AMSS_7X25_VERSION_2009=y
---
-2.10.2
-
-
-From cc891d49f60d6d0ad4d570c14711db9a568b49e5 Mon Sep 17 00:00:00 2001
-From: anarkia1976
-Date: Wed, 5 Feb 2014 07:12:48 +0100
-Subject: [PATCH 4/4] msm: cpu: overclock: use higher bus speed at lower CPU
- freqs
-
-Thanks to @bedalus and @mrg666
-
-Bedalus suggested that if lower CPU frequencies can offer higher bus
-speed,
-GPU use during games wouldn't require higher CPU frequency.
-My testing demonstrated 4C drop in CPU temp during 3DMark benchmark.
-Still needs to be tested for everyday use.
----
- arch/arm/mach-msm/acpuclock-8064.c | 172 +++++++++++++++++++------------------
- 1 file changed, 88 insertions(+), 84 deletions(-)
-
-diff --git a/arch/arm/mach-msm/acpuclock-8064.c b/arch/arm/mach-msm/acpuclock-8064.c
-index ba8fe72..611776e 100644
---- a/arch/arm/mach-msm/acpuclock-8064.c
-+++ b/arch/arm/mach-msm/acpuclock-8064.c
-@@ -131,6 +131,14 @@ static struct msm_bus_scale_pdata bus_scale_data __initdata = {
- .name = "acpuclk-8064",
- };
-
-+#ifdef CONFIG_LOW_CPUCLOCKS
-+#define L2_BW_MID 6
-+#define L2_BW_HIGH 15
-+#else
-+#define L2_BW_MID 5
-+#define L2_BW_HIGH 14
-+#endif
-+
- static struct l2_level l2_freq_tbl[] __initdata = {
- #ifdef CONFIG_LOW_CPUCLOCKS
- [0] = { { 378000, HFPLL, 2, 0x1C }, 950000, 1050000, 1 },
-@@ -174,32 +182,31 @@ static struct acpu_level tbl_slow[] __initdata = {
- { 1, { 81000, HFPLL, 2, 0x06 }, L2(0), 750000 },
- { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 875000 },
- { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 900000 },
-- //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 950000 },
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(1), 925000 },
- #else
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(0), 950000 },
- #endif
-- { 0, { 432000, HFPLL, 2, 0x20 }, L2(5), 975000 },
-- { 1, { 486000, HFPLL, 2, 0x24 }, L2(5), 975000 },
-- { 0, { 540000, HFPLL, 2, 0x28 }, L2(5), 1000000 },
-- { 1, { 594000, HFPLL, 1, 0x16 }, L2(5), 1000000 },
-- { 0, { 648000, HFPLL, 1, 0x18 }, L2(5), 1025000 },
-- { 1, { 702000, HFPLL, 1, 0x1A }, L2(5), 1025000 },
-- { 0, { 756000, HFPLL, 1, 0x1C }, L2(5), 1075000 },
-- { 1, { 810000, HFPLL, 1, 0x1E }, L2(5), 1075000 },
-- { 0, { 864000, HFPLL, 1, 0x20 }, L2(5), 1100000 },
-- { 1, { 918000, HFPLL, 1, 0x22 }, L2(5), 1100000 },
-- { 0, { 972000, HFPLL, 1, 0x24 }, L2(5), 1125000 },
-- { 1, { 1026000, HFPLL, 1, 0x26 }, L2(5), 1125000 },
-- { 0, { 1080000, HFPLL, 1, 0x28 }, L2(14), 1175000 },
-- { 1, { 1134000, HFPLL, 1, 0x2A }, L2(14), 1175000 },
-- { 0, { 1188000, HFPLL, 1, 0x2C }, L2(14), 1200000 },
-- { 1, { 1242000, HFPLL, 1, 0x2E }, L2(14), 1200000 },
-- { 0, { 1296000, HFPLL, 1, 0x30 }, L2(14), 1225000 },
-- { 1, { 1350000, HFPLL, 1, 0x32 }, L2(14), 1225000 },
-- { 0, { 1404000, HFPLL, 1, 0x34 }, L2(14), 1237500 },
-- { 1, { 1458000, HFPLL, 1, 0x36 }, L2(14), 1237500 },
-- { 1, { 1512000, HFPLL, 1, 0x38 }, L2(14), 1250000 },
-+ { 0, { 432000, HFPLL, 2, 0x20 }, L2(L2_BW_MID), 975000 },
-+ { 1, { 486000, HFPLL, 2, 0x24 }, L2(L2_BW_MID), 975000 },
-+ { 0, { 540000, HFPLL, 2, 0x28 }, L2(L2_BW_MID), 1000000 },
-+ { 1, { 594000, HFPLL, 1, 0x16 }, L2(L2_BW_MID), 1000000 },
-+ { 0, { 648000, HFPLL, 1, 0x18 }, L2(L2_BW_MID), 1025000 },
-+ { 1, { 702000, HFPLL, 1, 0x1A }, L2(L2_BW_HIGH), 1025000 },
-+ { 0, { 756000, HFPLL, 1, 0x1C }, L2(L2_BW_HIGH), 1075000 },
-+ { 1, { 810000, HFPLL, 1, 0x1E }, L2(L2_BW_HIGH), 1075000 },
-+ { 0, { 864000, HFPLL, 1, 0x20 }, L2(L2_BW_HIGH), 1100000 },
-+ { 1, { 918000, HFPLL, 1, 0x22 }, L2(L2_BW_HIGH), 1100000 },
-+ { 0, { 972000, HFPLL, 1, 0x24 }, L2(L2_BW_HIGH), 1125000 },
-+ { 1, { 1026000, HFPLL, 1, 0x26 }, L2(L2_BW_HIGH), 1125000 },
-+ { 0, { 1080000, HFPLL, 1, 0x28 }, L2(L2_BW_HIGH), 1175000 },
-+ { 1, { 1134000, HFPLL, 1, 0x2A }, L2(L2_BW_HIGH), 1175000 },
-+ { 0, { 1188000, HFPLL, 1, 0x2C }, L2(L2_BW_HIGH), 1200000 },
-+ { 1, { 1242000, HFPLL, 1, 0x2E }, L2(L2_BW_HIGH), 1200000 },
-+ { 0, { 1296000, HFPLL, 1, 0x30 }, L2(L2_BW_HIGH), 1225000 },
-+ { 1, { 1350000, HFPLL, 1, 0x32 }, L2(L2_BW_HIGH), 1225000 },
-+ { 0, { 1404000, HFPLL, 1, 0x34 }, L2(L2_BW_HIGH), 1237500 },
-+ { 1, { 1458000, HFPLL, 1, 0x36 }, L2(L2_BW_HIGH), 1237500 },
-+ { 1, { 1512000, HFPLL, 1, 0x38 }, L2(L2_BW_HIGH), 1250000 },
- #ifdef CONFIG_CPU_OVERCLOCK
- { 1, { 1620000, HFPLL, 1, 0x3C }, L2(15), 1300000 },
- { 1, { 1728000, HFPLL, 1, 0x40 }, L2(15), 1350000 },
-@@ -215,32 +222,31 @@ static struct acpu_level tbl_nom[] __initdata = {
- { 1, { 81000, HFPLL, 2, 0x06 }, L2(0), 750000 },
- { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 825000 },
- { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 850000 },
-- //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 900000 },
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(1), 875000 },
- #else
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(0), 900000 },
- #endif
-- { 0, { 432000, HFPLL, 2, 0x20 }, L2(5), 925000 },
-- { 1, { 486000, HFPLL, 2, 0x24 }, L2(5), 925000 },
-- { 0, { 540000, HFPLL, 2, 0x28 }, L2(5), 950000 },
-- { 1, { 594000, HFPLL, 1, 0x16 }, L2(5), 950000 },
-- { 0, { 648000, HFPLL, 1, 0x18 }, L2(5), 975000 },
-- { 1, { 702000, HFPLL, 1, 0x1A }, L2(5), 975000 },
-- { 0, { 756000, HFPLL, 1, 0x1C }, L2(5), 1025000 },
-- { 1, { 810000, HFPLL, 1, 0x1E }, L2(5), 1025000 },
-- { 0, { 864000, HFPLL, 1, 0x20 }, L2(5), 1050000 },
-- { 1, { 918000, HFPLL, 1, 0x22 }, L2(5), 1050000 },
-- { 0, { 972000, HFPLL, 1, 0x24 }, L2(5), 1075000 },
-- { 1, { 1026000, HFPLL, 1, 0x26 }, L2(5), 1075000 },
-- { 0, { 1080000, HFPLL, 1, 0x28 }, L2(14), 1125000 },
-- { 1, { 1134000, HFPLL, 1, 0x2A }, L2(14), 1125000 },
-- { 0, { 1188000, HFPLL, 1, 0x2C }, L2(14), 1150000 },
-- { 1, { 1242000, HFPLL, 1, 0x2E }, L2(14), 1150000 },
-- { 0, { 1296000, HFPLL, 1, 0x30 }, L2(14), 1175000 },
-- { 1, { 1350000, HFPLL, 1, 0x32 }, L2(14), 1175000 },
-- { 0, { 1404000, HFPLL, 1, 0x34 }, L2(14), 1187500 },
-- { 1, { 1458000, HFPLL, 1, 0x36 }, L2(14), 1187500 },
-- { 1, { 1512000, HFPLL, 1, 0x38 }, L2(14), 1200000 },
-+ { 0, { 432000, HFPLL, 2, 0x20 }, L2(L2_BW_MID), 925000 },
-+ { 1, { 486000, HFPLL, 2, 0x24 }, L2(L2_BW_MID), 925000 },
-+ { 0, { 540000, HFPLL, 2, 0x28 }, L2(L2_BW_MID), 950000 },
-+ { 1, { 594000, HFPLL, 1, 0x16 }, L2(L2_BW_MID), 950000 },
-+ { 0, { 648000, HFPLL, 1, 0x18 }, L2(L2_BW_MID), 975000 },
-+ { 1, { 702000, HFPLL, 1, 0x1A }, L2(L2_BW_HIGH), 975000 },
-+ { 0, { 756000, HFPLL, 1, 0x1C }, L2(L2_BW_HIGH), 1025000 },
-+ { 1, { 810000, HFPLL, 1, 0x1E }, L2(L2_BW_HIGH), 1025000 },
-+ { 0, { 864000, HFPLL, 1, 0x20 }, L2(L2_BW_HIGH), 1050000 },
-+ { 1, { 918000, HFPLL, 1, 0x22 }, L2(L2_BW_HIGH), 1050000 },
-+ { 0, { 972000, HFPLL, 1, 0x24 }, L2(L2_BW_HIGH), 1075000 },
-+ { 1, { 1026000, HFPLL, 1, 0x26 }, L2(L2_BW_HIGH), 1075000 },
-+ { 0, { 1080000, HFPLL, 1, 0x28 }, L2(L2_BW_HIGH), 1125000 },
-+ { 1, { 1134000, HFPLL, 1, 0x2A }, L2(L2_BW_HIGH), 1125000 },
-+ { 0, { 1188000, HFPLL, 1, 0x2C }, L2(L2_BW_HIGH), 1150000 },
-+ { 1, { 1242000, HFPLL, 1, 0x2E }, L2(L2_BW_HIGH), 1150000 },
-+ { 0, { 1296000, HFPLL, 1, 0x30 }, L2(L2_BW_HIGH), 1175000 },
-+ { 1, { 1350000, HFPLL, 1, 0x32 }, L2(L2_BW_HIGH), 1175000 },
-+ { 0, { 1404000, HFPLL, 1, 0x34 }, L2(L2_BW_HIGH), 1187500 },
-+ { 1, { 1458000, HFPLL, 1, 0x36 }, L2(L2_BW_HIGH), 1187500 },
-+ { 1, { 1512000, HFPLL, 1, 0x38 }, L2(L2_BW_HIGH), 1200000 },
- #ifdef CONFIG_CPU_OVERCLOCK
- { 1, { 1620000, HFPLL, 1, 0x3C }, L2(15), 1250000 },
- { 1, { 1728000, HFPLL, 1, 0x40 }, L2(15), 1300000 },
-@@ -256,32 +262,31 @@ static struct acpu_level tbl_fast[] __initdata = {
- { 1, { 81000, HFPLL, 2, 0x06 }, L2(0), 750000 },
- { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 775000 },
- { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 800000 },
-- //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 850000 },
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(1), 825000 },
- #else
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(0), 850000 },
- #endif
-- { 0, { 432000, HFPLL, 2, 0x20 }, L2(5), 875000 },
-- { 1, { 486000, HFPLL, 2, 0x24 }, L2(5), 875000 },
-- { 0, { 540000, HFPLL, 2, 0x28 }, L2(5), 900000 },
-- { 1, { 594000, HFPLL, 1, 0x16 }, L2(5), 900000 },
-- { 0, { 648000, HFPLL, 1, 0x18 }, L2(5), 925000 },
-- { 1, { 702000, HFPLL, 1, 0x1A }, L2(5), 925000 },
-- { 0, { 756000, HFPLL, 1, 0x1C }, L2(5), 975000 },
-- { 1, { 810000, HFPLL, 1, 0x1E }, L2(5), 975000 },
-- { 0, { 864000, HFPLL, 1, 0x20 }, L2(5), 1000000 },
-- { 1, { 918000, HFPLL, 1, 0x22 }, L2(5), 1000000 },
-- { 0, { 972000, HFPLL, 1, 0x24 }, L2(5), 1025000 },
-- { 1, { 1026000, HFPLL, 1, 0x26 }, L2(5), 1025000 },
-- { 0, { 1080000, HFPLL, 1, 0x28 }, L2(14), 1075000 },
-- { 1, { 1134000, HFPLL, 1, 0x2A }, L2(14), 1075000 },
-- { 0, { 1188000, HFPLL, 1, 0x2C }, L2(14), 1100000 },
-- { 1, { 1242000, HFPLL, 1, 0x2E }, L2(14), 1100000 },
-- { 0, { 1296000, HFPLL, 1, 0x30 }, L2(14), 1125000 },
-- { 1, { 1350000, HFPLL, 1, 0x32 }, L2(14), 1125000 },
-- { 0, { 1404000, HFPLL, 1, 0x34 }, L2(14), 1137500 },
-- { 1, { 1458000, HFPLL, 1, 0x36 }, L2(14), 1137500 },
-- { 1, { 1512000, HFPLL, 1, 0x38 }, L2(14), 1150000 },
-+ { 0, { 432000, HFPLL, 2, 0x20 }, L2(L2_BW_MID), 875000 },
-+ { 1, { 486000, HFPLL, 2, 0x24 }, L2(L2_BW_MID), 875000 },
-+ { 0, { 540000, HFPLL, 2, 0x28 }, L2(L2_BW_MID), 900000 },
-+ { 1, { 594000, HFPLL, 1, 0x16 }, L2(L2_BW_MID), 900000 },
-+ { 0, { 648000, HFPLL, 1, 0x18 }, L2(L2_BW_MID), 925000 },
-+ { 1, { 702000, HFPLL, 1, 0x1A }, L2(L2_BW_HIGH), 925000 },
-+ { 0, { 756000, HFPLL, 1, 0x1C }, L2(L2_BW_HIGH), 975000 },
-+ { 1, { 810000, HFPLL, 1, 0x1E }, L2(L2_BW_HIGH), 975000 },
-+ { 0, { 864000, HFPLL, 1, 0x20 }, L2(L2_BW_HIGH), 1000000 },
-+ { 1, { 918000, HFPLL, 1, 0x22 }, L2(L2_BW_HIGH), 1000000 },
-+ { 0, { 972000, HFPLL, 1, 0x24 }, L2(L2_BW_HIGH), 1025000 },
-+ { 1, { 1026000, HFPLL, 1, 0x26 }, L2(L2_BW_HIGH), 1025000 },
-+ { 0, { 1080000, HFPLL, 1, 0x28 }, L2(L2_BW_HIGH), 1075000 },
-+ { 1, { 1134000, HFPLL, 1, 0x2A }, L2(L2_BW_HIGH), 1075000 },
-+ { 0, { 1188000, HFPLL, 1, 0x2C }, L2(L2_BW_HIGH), 1100000 },
-+ { 1, { 1242000, HFPLL, 1, 0x2E }, L2(L2_BW_HIGH), 1100000 },
-+ { 0, { 1296000, HFPLL, 1, 0x30 }, L2(L2_BW_HIGH), 1125000 },
-+ { 1, { 1350000, HFPLL, 1, 0x32 }, L2(L2_BW_HIGH), 1125000 },
-+ { 0, { 1404000, HFPLL, 1, 0x34 }, L2(L2_BW_HIGH), 1137500 },
-+ { 1, { 1458000, HFPLL, 1, 0x36 }, L2(L2_BW_HIGH), 1137500 },
-+ { 1, { 1512000, HFPLL, 1, 0x38 }, L2(L2_BW_HIGH), 1150000 },
- #ifdef CONFIG_CPU_OVERCLOCK
- { 1, { 1620000, HFPLL, 1, 0x3C }, L2(15), 1200000 },
- { 1, { 1728000, HFPLL, 1, 0x40 }, L2(15), 1250000 },
-@@ -297,28 +302,27 @@ static struct acpu_level tbl_faster[] __initdata = {
- { 1, { 81000, HFPLL, 2, 0x06 }, L2(0), 750000 },
- { 1, { 162000, HFPLL, 2, 0x0C }, L2(0), 775000 },
- { 1, { 270000, HFPLL, 2, 0x14 }, L2(0), 800000 },
-- //{ 1, { 378000, HFPLL, 2, 0x1C }, L2(0), 850000 },
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(1), 825000 },
- #else
- { 1, { 384000, PLL_8, 0, 0x00 }, L2(0), 850000 },
- #endif
-- { 0, { 432000, HFPLL, 2, 0x20 }, L2(5), 875000 },
-- { 1, { 486000, HFPLL, 2, 0x24 }, L2(5), 875000 },
-- { 0, { 540000, HFPLL, 2, 0x28 }, L2(5), 900000 },
-- { 1, { 594000, HFPLL, 1, 0x16 }, L2(5), 900000 },
-- { 0, { 648000, HFPLL, 1, 0x18 }, L2(5), 925000 },
-- { 1, { 702000, HFPLL, 1, 0x1A }, L2(5), 925000 },
-- { 0, { 756000, HFPLL, 1, 0x1C }, L2(5), 962500 },
-- { 1, { 810000, HFPLL, 1, 0x1E }, L2(5), 962500 },
-- { 0, { 864000, HFPLL, 1, 0x20 }, L2(5), 975000 },
-- { 1, { 918000, HFPLL, 1, 0x22 }, L2(5), 975000 },
-- { 0, { 972000, HFPLL, 1, 0x24 }, L2(5), 1000000 },
-- { 1, { 1026000, HFPLL, 1, 0x26 }, L2(5), 1000000 },
-- { 0, { 1080000, HFPLL, 1, 0x28 }, L2(14), 1050000 },
-- { 1, { 1134000, HFPLL, 1, 0x2A }, L2(14), 1050000 },
-- { 0, { 1188000, HFPLL, 1, 0x2C }, L2(14), 1075000 },
-- { 1, { 1242000, HFPLL, 1, 0x2E }, L2(14), 1075000 },
-- { 0, { 1296000, HFPLL, 1, 0x30 }, L2(14), 1100000 },
-+ { 0, { 432000, HFPLL, 2, 0x20 }, L2(L2_BW_MID), 875000 },
-+ { 1, { 486000, HFPLL, 2, 0x24 }, L2(L2_BW_MID), 875000 },
-+ { 0, { 540000, HFPLL, 2, 0x28 }, L2(L2_BW_MID), 900000 },
-+ { 1, { 594000, HFPLL, 1, 0x16 }, L2(L2_BW_MID), 900000 },
-+ { 0, { 648000, HFPLL, 1, 0x18 }, L2(L2_BW_MID), 925000 },
-+ { 1, { 702000, HFPLL, 1, 0x1A }, L2(L2_BW_HIGH), 925000 },
-+ { 0, { 756000, HFPLL, 1, 0x1C }, L2(L2_BW_HIGH), 962500 },
-+ { 1, { 810000, HFPLL, 1, 0x1E }, L2(L2_BW_HIGH), 962500 },
-+ { 0, { 864000, HFPLL, 1, 0x20 }, L2(L2_BW_HIGH), 975000 },
-+ { 1, { 918000, HFPLL, 1, 0x22 }, L2(L2_BW_HIGH), 975000 },
-+ { 0, { 972000, HFPLL, 1, 0x24 }, L2(L2_BW_HIGH), 1000000 },
-+ { 1, { 1026000, HFPLL, 1, 0x26 }, L2(L2_BW_HIGH), 1000000 },
-+ { 0, { 1080000, HFPLL, 1, 0x28 }, L2(L2_BW_HIGH), 1050000 },
-+ { 1, { 1134000, HFPLL, 1, 0x2A }, L2(L2_BW_HIGH), 1050000 },
-+ { 0, { 1188000, HFPLL, 1, 0x2C }, L2(L2_BW_HIGH), 1075000 },
-+ { 1, { 1242000, HFPLL, 1, 0x2E }, L2(L2_BW_HIGH), 1075000 },
-+ { 0, { 1296000, HFPLL, 1, 0x30 }, L2(L2_BW_HIGH), 1100000 },
- { 1, { 1350000, HFPLL, 1, 0x32 }, L2(14), 1100000 },
- { 0, { 1404000, HFPLL, 1, 0x34 }, L2(14), 1112500 },
- { 1, { 1458000, HFPLL, 1, 0x36 }, L2(14), 1112500 },
---
-2.10.2
-
diff --git a/Patches/CyanogenMod-14.1/android_kernel_moto_shamu/0001-OverUnderClock.patch b/Patches/CyanogenMod-14.1/android_kernel_moto_shamu/0001-OverUnderClock.patch
deleted file mode 100644
index 4fc7dec2..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_moto_shamu/0001-OverUnderClock.patch
+++ /dev/null
@@ -1,834 +0,0 @@
-From ebb9cfb12fea35189ba206f56925e499a4963896 Mon Sep 17 00:00:00 2001
-From: hellsgod
-Date: Wed, 22 Apr 2015 22:50:47 +0200
-Subject: [PATCH 1/6] dts: Add some lower frequencies down to 35mhz
-
-credits: XileForce, Imoseyon
----
- arch/arm/boot/dts/qcom/apq8084.dtsi | 51 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 51 insertions(+)
-
-diff --git a/arch/arm/boot/dts/qcom/apq8084.dtsi b/arch/arm/boot/dts/qcom/apq8084.dtsi
-index 51de8be..1e782d6 100644
---- a/arch/arm/boot/dts/qcom/apq8084.dtsi
-+++ b/arch/arm/boot/dts/qcom/apq8084.dtsi
-@@ -1127,6 +1127,9 @@
- /* 2.7GHz RC1 */
- qcom,speed2-pvs0-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 720000 37 >,
-+ < 223200000 790000 56 >,
- < 300000000 810000 76 >,
- < 345600000 820000 88 >,
- < 422400000 830000 109 >,
-@@ -1162,6 +1165,9 @@
-
- qcom,speed2-pvs1-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 710000 37 >,
-+ < 223200000 780000 56 >,
- < 300000000 800000 76 >,
- < 345600000 810000 88 >,
- < 422400000 820000 109 >,
-@@ -1197,6 +1203,9 @@
-
- qcom,speed2-pvs2-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 700000 37 >,
-+ < 223200000 770000 56 >,
- < 300000000 790000 76 >,
- < 345600000 800000 88 >,
- < 422400000 810000 109 >,
-@@ -1232,6 +1241,9 @@
-
- qcom,speed2-pvs3-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 690000 37 >,
-+ < 223200000 760000 56 >,
- < 300000000 780000 76 >,
- < 345600000 790000 88 >,
- < 422400000 800000 109 >,
-@@ -1267,6 +1279,9 @@
-
- qcom,speed2-pvs4-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 680000 37 >,
-+ < 223200000 750000 56 >,
- < 300000000 770000 76 >,
- < 345600000 780000 88 >,
- < 422400000 790000 109 >,
-@@ -1302,6 +1317,9 @@
-
- qcom,speed2-pvs5-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 670000 37 >,
-+ < 223200000 740000 56 >,
- < 300000000 760000 76 >,
- < 345600000 770000 88 >,
- < 422400000 780000 109 >,
-@@ -1337,6 +1355,9 @@
-
- qcom,speed2-pvs6-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 660000 37 >,
-+ < 223200000 730000 56 >,
- < 300000000 750000 76 >,
- < 345600000 760000 88 >,
- < 422400000 770000 109 >,
-@@ -1372,6 +1393,9 @@
-
- qcom,speed2-pvs7-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 650000 37 >,
-+ < 223200000 720000 56 >,
- < 300000000 740000 76 >,
- < 345600000 750000 88 >,
- < 422400000 760000 109 >,
-@@ -1407,6 +1431,9 @@
-
- qcom,speed2-pvs8-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 640000 37 >,
-+ < 223200000 710000 56 >,
- < 300000000 730000 76 >,
- < 345600000 740000 88 >,
- < 422400000 750000 109 >,
-@@ -1442,6 +1469,9 @@
-
- qcom,speed2-pvs9-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 630000 37 >,
-+ < 223200000 700000 56 >,
- < 300000000 720000 76 >,
- < 345600000 730000 88 >,
- < 422400000 740000 109 >,
-@@ -1477,6 +1507,9 @@
-
- qcom,speed2-pvs10-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 620000 37 >,
-+ < 223200000 690000 56 >,
- < 300000000 710000 76 >,
- < 345600000 720000 88 >,
- < 422400000 730000 109 >,
-@@ -1512,6 +1545,9 @@
-
- qcom,speed2-pvs11-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 610000 37 >,
-+ < 223200000 680000 56 >,
- < 300000000 700000 76 >,
- < 345600000 710000 88 >,
- < 422400000 720000 109 >,
-@@ -1547,6 +1583,9 @@
-
- qcom,speed2-pvs12-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 600000 37 >,
-+ < 223200000 670000 56 >,
- < 300000000 690000 76 >,
- < 345600000 700000 88 >,
- < 422400000 710000 109 >,
-@@ -1582,6 +1621,9 @@
-
- qcom,speed2-pvs13-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 590000 37 >,
-+ < 223200000 660000 56 >,
- < 300000000 680000 76 >,
- < 345600000 690000 88 >,
- < 422400000 700000 109 >,
-@@ -1617,6 +1659,9 @@
-
- qcom,speed2-pvs14-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 580000 37 >,
-+ < 223200000 650000 56 >,
- < 300000000 670000 76 >,
- < 345600000 680000 88 >,
- < 422400000 690000 109 >,
-@@ -1652,6 +1697,9 @@
-
- qcom,speed2-pvs15-bin-v1 =
- < 0 0 0 >,
-+ < 35800000 500000 17 >,
-+ < 98300000 570000 37 >,
-+ < 223200000 640000 56 >,
- < 300000000 660000 76 >,
- < 345600000 670000 88 >,
- < 422400000 680000 109 >,
-@@ -4297,6 +4345,9 @@
- reg = <0 4>;
- compatible = "qcom,msm-cpufreq";
- qcom,cpufreq-table =
-+ < 35800 35800 762 >,
-+ < 98300 98300 762 >,
-+ < 223200 223200 762 >,
- < 300000 300000 1144 >,
- < 422400 422400 2288 >,
- < 652800 499200 3051 >,
---
-2.9.3
-
-
-From 143adae138c68fbcd53fa8dbc644ef4a0850879c Mon Sep 17 00:00:00 2001
-From: bhb27
-Date: Thu, 25 Feb 2016 14:46:26 -0800
-Subject: [PATCH 2/6] qcom:apq8084: OC to 2880 MHz
-
----
- arch/arm/boot/dts/qcom/apq8084.dtsi | 198 ++++++++++++++++++++++++++++++------
- 1 file changed, 165 insertions(+), 33 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/apq8084.dtsi b/arch/arm/boot/dts/qcom/apq8084.dtsi
-index 1e782d6..c419bc3 100644
---- a/arch/arm/boot/dts/qcom/apq8084.dtsi
-+++ b/arch/arm/boot/dts/qcom/apq8084.dtsi
-@@ -1161,7 +1161,11 @@
- < 2419200000 1105000 777 >,
- < 2496000000 1120000 813 >,
- < 2572800000 1135000 849 >,
-- < 2649600000 1150000 886 >;
-+ < 2649600000 1150000 886 >,
-+ < 2688000000 1160000 917 >,
-+ < 2764800000 1170000 952 >,
-+ < 2841600000 1185000 980 >,
-+ < 2880000000 1195000 1003 >;
-
- qcom,speed2-pvs1-bin-v1 =
- < 0 0 0 >,
-@@ -1199,7 +1203,11 @@
- < 2419200000 1095000 777 >,
- < 2496000000 1110000 813 >,
- < 2572800000 1125000 849 >,
-- < 2649600000 1140000 886 >;
-+ < 2649600000 1140000 886 >,
-+ < 2688000000 1150000 917 >,
-+ < 2764800000 1160000 952 >,
-+ < 2841600000 1175000 980 >,
-+ < 2880000000 1185000 1003 >;
-
- qcom,speed2-pvs2-bin-v1 =
- < 0 0 0 >,
-@@ -1237,7 +1245,11 @@
- < 2419200000 1085000 777 >,
- < 2496000000 1100000 813 >,
- < 2572800000 1115000 849 >,
-- < 2649600000 1130000 886 >;
-+ < 2649600000 1130000 886 >,
-+ < 2688000000 1140000 917 >,
-+ < 2764800000 1150000 952 >,
-+ < 2841600000 1165000 980 >,
-+ < 2880000000 1175000 1003 >;
-
- qcom,speed2-pvs3-bin-v1 =
- < 0 0 0 >,
-@@ -1275,7 +1287,11 @@
- < 2419200000 1075000 777 >,
- < 2496000000 1090000 813 >,
- < 2572800000 1105000 849 >,
-- < 2649600000 1120000 886 >;
-+ < 2649600000 1120000 886 >,
-+ < 2688000000 1130000 917 >,
-+ < 2764800000 1140000 952 >,
-+ < 2841600000 1155000 980 >,
-+ < 2880000000 1165000 1003 >;
-
- qcom,speed2-pvs4-bin-v1 =
- < 0 0 0 >,
-@@ -1313,7 +1329,11 @@
- < 2419200000 1065000 777 >,
- < 2496000000 1080000 813 >,
- < 2572800000 1095000 849 >,
-- < 2649600000 1110000 886 >;
-+ < 2649600000 1110000 886 >,
-+ < 2688000000 1120000 917 >,
-+ < 2764800000 1130000 952 >,
-+ < 2841600000 1145000 980 >,
-+ < 2880000000 1155000 1003 >;
-
- qcom,speed2-pvs5-bin-v1 =
- < 0 0 0 >,
-@@ -1351,7 +1371,11 @@
- < 2419200000 1055000 777 >,
- < 2496000000 1070000 813 >,
- < 2572800000 1085000 849 >,
-- < 2649600000 1100000 886 >;
-+ < 2649600000 1100000 886 >,
-+ < 2688000000 1110000 917 >,
-+ < 2764800000 1120000 952 >,
-+ < 2841600000 1135000 980 >,
-+ < 2880000000 1145000 1003 >;
-
- qcom,speed2-pvs6-bin-v1 =
- < 0 0 0 >,
-@@ -1389,7 +1413,11 @@
- < 2419200000 1045000 777 >,
- < 2496000000 1060000 813 >,
- < 2572800000 1075000 849 >,
-- < 2649600000 1090000 886 >;
-+ < 2649600000 1090000 886 >,
-+ < 2688000000 1100000 917 >,
-+ < 2764800000 1110000 952 >,
-+ < 2841600000 1125000 980 >,
-+ < 2880000000 1135000 1003 >;
-
- qcom,speed2-pvs7-bin-v1 =
- < 0 0 0 >,
-@@ -1427,7 +1455,11 @@
- < 2419200000 1035000 777 >,
- < 2496000000 1050000 813 >,
- < 2572800000 1065000 849 >,
-- < 2649600000 1080000 886 >;
-+ < 2649600000 1080000 886 >,
-+ < 2688000000 1090000 917 >,
-+ < 2764800000 1100000 952 >,
-+ < 2841600000 1115000 980 >,
-+ < 2880000000 1125000 1003 >;
-
- qcom,speed2-pvs8-bin-v1 =
- < 0 0 0 >,
-@@ -1465,7 +1497,11 @@
- < 2419200000 1025000 777 >,
- < 2496000000 1040000 813 >,
- < 2572800000 1055000 849 >,
-- < 2649600000 1070000 886 >;
-+ < 2649600000 1070000 886 >,
-+ < 2688000000 1080000 917 >,
-+ < 2764800000 1090000 952 >,
-+ < 2841600000 1105000 980 >,
-+ < 2880000000 1115000 1003 >;
-
- qcom,speed2-pvs9-bin-v1 =
- < 0 0 0 >,
-@@ -1503,7 +1539,11 @@
- < 2419200000 1015000 777 >,
- < 2496000000 1030000 813 >,
- < 2572800000 1045000 849 >,
-- < 2649600000 1060000 886 >;
-+ < 2649600000 1060000 886 >,
-+ < 2688000000 1070000 917 >,
-+ < 2764800000 1090000 952 >,
-+ < 2841600000 1105000 980 >,
-+ < 2880000000 1115000 1003 >;
-
- qcom,speed2-pvs10-bin-v1 =
- < 0 0 0 >,
-@@ -1541,7 +1581,11 @@
- < 2419200000 1005000 777 >,
- < 2496000000 1020000 813 >,
- < 2572800000 1035000 849 >,
-- < 2649600000 1050000 886 >;
-+ < 2649600000 1050000 886 >,
-+ < 2688000000 1060000 917 >,
-+ < 2764800000 1080000 952 >,
-+ < 2841600000 1095000 980 >,
-+ < 2880000000 1105000 1003 >;
-
- qcom,speed2-pvs11-bin-v1 =
- < 0 0 0 >,
-@@ -1579,7 +1623,11 @@
- < 2419200000 995000 777 >,
- < 2496000000 1010000 813 >,
- < 2572800000 1025000 849 >,
-- < 2649600000 1040000 886 >;
-+ < 2649600000 1040000 886 >,
-+ < 2688000000 1050000 917 >,
-+ < 2764800000 1060000 952 >,
-+ < 2841600000 1075000 980 >,
-+ < 2880000000 1085000 1003 >;
-
- qcom,speed2-pvs12-bin-v1 =
- < 0 0 0 >,
-@@ -1617,7 +1665,11 @@
- < 2419200000 985000 777 >,
- < 2496000000 1000000 813 >,
- < 2572800000 1015000 849 >,
-- < 2649600000 1030000 886 >;
-+ < 2649600000 1030000 886 >,
-+ < 2688000000 1040000 917 >,
-+ < 2764800000 1050000 952 >,
-+ < 2841600000 1065000 980 >,
-+ < 2880000000 1075000 1003 >;
-
- qcom,speed2-pvs13-bin-v1 =
- < 0 0 0 >,
-@@ -1655,7 +1707,11 @@
- < 2419200000 975000 777 >,
- < 2496000000 990000 813 >,
- < 2572800000 1005000 849 >,
-- < 2649600000 1020000 886 >;
-+ < 2649600000 1020000 886 >,
-+ < 2688000000 1030000 917 >,
-+ < 2764800000 1040000 952 >,
-+ < 2841600000 1055000 980 >,
-+ < 2880000000 1065000 1003 >;
-
- qcom,speed2-pvs14-bin-v1 =
- < 0 0 0 >,
-@@ -1693,7 +1749,11 @@
- < 2419200000 965000 777 >,
- < 2496000000 980000 813 >,
- < 2572800000 995000 849 >,
-- < 2649600000 1010000 886 >;
-+ < 2649600000 1010000 886 >,
-+ < 2688000000 1020000 917 >,
-+ < 2764800000 1030000 952 >,
-+ < 2841600000 1045000 980 >,
-+ < 2880000000 1055000 1003 >;
-
- qcom,speed2-pvs15-bin-v1 =
- < 0 0 0 >,
-@@ -1731,7 +1791,11 @@
- < 2419200000 955000 777 >,
- < 2496000000 970000 813 >,
- < 2572800000 985000 849 >,
-- < 2649600000 1000000 886 >;
-+ < 2649600000 1000000 886 >,
-+ < 2688000000 1010000 917 >,
-+ < 2764800000 1020000 952 >,
-+ < 2841600000 1035000 980 >,
-+ < 2880000000 1045000 1003 >;
-
- /* 2.7GHz RC0 */
- qcom,speed2-pvs0-bin-v0 =
-@@ -1767,7 +1831,11 @@
- < 2419200000 1105000 777 >,
- < 2496000000 1120000 813 >,
- < 2572800000 1135000 849 >,
-- < 2649600000 1150000 886 >;
-+ < 2649600000 1150000 886 >,
-+ < 2688000000 1160000 917 >,
-+ < 2764800000 1170000 952 >,
-+ < 2841600000 1185000 980 >,
-+ < 2880000000 1195000 1003 >;
-
- qcom,speed2-pvs1-bin-v0 =
- < 0 0 0 >,
-@@ -1802,7 +1870,11 @@
- < 2419200000 1095000 777 >,
- < 2496000000 1110000 813 >,
- < 2572800000 1125000 849 >,
-- < 2649600000 1140000 886 >;
-+ < 2649600000 1140000 886 >,
-+ < 2688000000 1150000 917 >,
-+ < 2764800000 1160000 952 >,
-+ < 2841600000 1185000 980 >,
-+ < 2880000000 1195000 1003 >;
-
- qcom,speed2-pvs2-bin-v0 =
- < 0 0 0 >,
-@@ -1837,7 +1909,11 @@
- < 2419200000 1085000 777 >,
- < 2496000000 1100000 813 >,
- < 2572800000 1115000 849 >,
-- < 2649600000 1130000 886 >;
-+ < 2649600000 1130000 886 >,
-+ < 2688000000 1140000 917 >,
-+ < 2764800000 1150000 952 >,
-+ < 2841600000 1165000 980 >,
-+ < 2880000000 1175000 1003 >;
-
- qcom,speed2-pvs3-bin-v0 =
- < 0 0 0 >,
-@@ -1872,7 +1948,11 @@
- < 2419200000 1075000 777 >,
- < 2496000000 1090000 813 >,
- < 2572800000 1105000 849 >,
-- < 2649600000 1120000 886 >;
-+ < 2649600000 1120000 886 >,
-+ < 2688000000 1130000 917 >,
-+ < 2764800000 1140000 952 >,
-+ < 2841600000 1165000 980 >,
-+ < 2880000000 1175000 1003 >;
-
- qcom,speed2-pvs4-bin-v0 =
- < 0 0 0 >,
-@@ -1907,7 +1987,11 @@
- < 2419200000 1065000 777 >,
- < 2496000000 1080000 813 >,
- < 2572800000 1095000 849 >,
-- < 2649600000 1110000 886 >;
-+ < 2649600000 1110000 886 >,
-+ < 2688000000 1120000 917 >,
-+ < 2764800000 1130000 952 >,
-+ < 2841600000 1145000 980 >,
-+ < 2880000000 1155000 1003 >;
-
- qcom,speed2-pvs5-bin-v0 =
- < 0 0 0 >,
-@@ -1942,7 +2026,11 @@
- < 2419200000 1055000 777 >,
- < 2496000000 1070000 813 >,
- < 2572800000 1085000 849 >,
-- < 2649600000 1100000 886 >;
-+ < 2649600000 1100000 886 >,
-+ < 2688000000 1110000 917 >,
-+ < 2764800000 1120000 952 >,
-+ < 2841600000 1135000 980 >,
-+ < 2880000000 1145000 1003 >;
-
- qcom,speed2-pvs6-bin-v0 =
- < 0 0 0 >,
-@@ -1977,7 +2065,11 @@
- < 2419200000 1045000 777 >,
- < 2496000000 1060000 813 >,
- < 2572800000 1075000 849 >,
-- < 2649600000 1090000 886 >;
-+ < 2649600000 1090000 886 >,
-+ < 2688000000 1100000 917 >,
-+ < 2764800000 1110000 952 >,
-+ < 2841600000 1125000 980 >,
-+ < 2880000000 1135000 1003 >;
-
- qcom,speed2-pvs7-bin-v0 =
- < 0 0 0 >,
-@@ -2012,7 +2104,11 @@
- < 2419200000 1035000 777 >,
- < 2496000000 1050000 813 >,
- < 2572800000 1065000 849 >,
-- < 2649600000 1080000 886 >;
-+ < 2649600000 1080000 886 >,
-+ < 2688000000 1090000 917 >,
-+ < 2764800000 1100000 952 >,
-+ < 2841600000 1115000 980 >,
-+ < 2880000000 1125000 1003 >;
-
- qcom,speed2-pvs8-bin-v0 =
- < 0 0 0 >,
-@@ -2047,7 +2143,11 @@
- < 2419200000 1025000 777 >,
- < 2496000000 1040000 813 >,
- < 2572800000 1055000 849 >,
-- < 2649600000 1070000 886 >;
-+ < 2649600000 1070000 886 >,
-+ < 2688000000 1080000 917 >,
-+ < 2764800000 1090000 952 >,
-+ < 2841600000 1105000 980 >,
-+ < 2880000000 1115000 1003 >;
-
- qcom,speed2-pvs9-bin-v0 =
- < 0 0 0 >,
-@@ -2082,7 +2182,11 @@
- < 2419200000 1015000 777 >,
- < 2496000000 1030000 813 >,
- < 2572800000 1045000 849 >,
-- < 2649600000 1060000 886 >;
-+ < 2649600000 1060000 886 >,
-+ < 2688000000 1070000 917 >,
-+ < 2764800000 1080000 952 >,
-+ < 2841600000 1095000 980 >,
-+ < 2880000000 1105000 1003 >;
-
- qcom,speed2-pvs10-bin-v0 =
- < 0 0 0 >,
-@@ -2117,7 +2221,11 @@
- < 2419200000 1005000 777 >,
- < 2496000000 1020000 813 >,
- < 2572800000 1035000 849 >,
-- < 2649600000 1050000 886 >;
-+ < 2649600000 1050000 886 >,
-+ < 2688000000 1060000 917 >,
-+ < 2764800000 1070000 952 >,
-+ < 2841600000 1085000 980 >,
-+ < 2880000000 1095000 1003 >;
-
- qcom,speed2-pvs11-bin-v0 =
- < 0 0 0 >,
-@@ -2152,7 +2260,11 @@
- < 2419200000 995000 777 >,
- < 2496000000 1010000 813 >,
- < 2572800000 1025000 849 >,
-- < 2649600000 1040000 886 >;
-+ < 2649600000 1040000 886 >,
-+ < 2688000000 1050000 917 >,
-+ < 2764800000 1060000 952 >,
-+ < 2841600000 1075000 980 >,
-+ < 2880000000 1085000 1003 >;
-
- qcom,speed2-pvs12-bin-v0 =
- < 0 0 0 >,
-@@ -2187,7 +2299,11 @@
- < 2419200000 985000 777 >,
- < 2496000000 1000000 813 >,
- < 2572800000 1015000 849 >,
-- < 2649600000 1030000 886 >;
-+ < 2649600000 1030000 886 >,
-+ < 2688000000 1040000 917 >,
-+ < 2764800000 1050000 952 >,
-+ < 2841600000 1065000 980 >,
-+ < 2880000000 1075000 1003 >;
-
- qcom,speed2-pvs13-bin-v0 =
- < 0 0 0 >,
-@@ -2222,7 +2338,11 @@
- < 2419200000 975000 777 >,
- < 2496000000 990000 813 >,
- < 2572800000 1005000 849 >,
-- < 2649600000 1020000 886 >;
-+ < 2649600000 1020000 886 >,
-+ < 2688000000 1030000 917 >,
-+ < 2764800000 1040000 952 >,
-+ < 2841600000 1055000 980 >,
-+ < 2880000000 1065000 1003 >;
-
- qcom,speed2-pvs14-bin-v0 =
- < 0 0 0 >,
-@@ -2257,7 +2377,11 @@
- < 2419200000 965000 777 >,
- < 2496000000 980000 813 >,
- < 2572800000 995000 849 >,
-- < 2649600000 1010000 886 >;
-+ < 2649600000 1010000 886 >,
-+ < 2688000000 1020000 917 >,
-+ < 2764800000 1030000 952 >,
-+ < 2841600000 1045000 980 >,
-+ < 2880000000 1055000 1003 >;
-
- qcom,speed2-pvs15-bin-v0 =
- < 0 0 0 >,
-@@ -2292,7 +2416,11 @@
- < 2419200000 955000 777 >,
- < 2496000000 970000 813 >,
- < 2572800000 985000 849 >,
-- < 2649600000 1000000 886 >;
-+ < 2649600000 1000000 886 >,
-+ < 2688000000 1010000 917 >,
-+ < 2764800000 1020000 952 >,
-+ < 2841600000 1035000 980 >,
-+ < 2880000000 1045000 1003 >;
-
- /* 2.5GHz RC1 */
- qcom,speed1-pvs0-bin-v1 =
-@@ -4365,7 +4493,11 @@
- < 2457600 1728000 16250 >,
- < 2496000 1728000 16250 >,
- < 2572800 1728000 16250 >,
-- < 2649600 1728000 16250 >;
-+ < 2649600 1728000 16250 >,
-+ < 2688000 1728000 16250 >, /* overclock */
-+ < 2764800 1728000 16250 >,
-+ < 2841600 1728000 16250 >,
-+ < 2880000 1728000 16250 >;
- };
-
- usb_otg: usb@f9a55000 {
---
-2.9.3
-
-
-From aeca3d3b8d3177ddf8aab303b54f5ef3a1d0ce05 Mon Sep 17 00:00:00 2001
-From: XileForce
-Date: Mon, 11 May 2015 21:43:20 -0700
-Subject: [PATCH 3/6] APQ8084: 2457600 Is Not A Real Frequency. Replace It With
- 2419200 2457600 does not exist in our voltage/current tables. Thus its
- voltage cant be adjusted, nor am I sure what voltage it actually uses since
- it isnt defined anywhere. Let's replace that with the existing, but currently
- unused, 2419200 step.
-
----
- arch/arm/boot/dts/qcom/apq8084.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/qcom/apq8084.dtsi b/arch/arm/boot/dts/qcom/apq8084.dtsi
-index c419bc3..1fe7174 100644
---- a/arch/arm/boot/dts/qcom/apq8084.dtsi
-+++ b/arch/arm/boot/dts/qcom/apq8084.dtsi
-@@ -4490,7 +4490,7 @@
- < 1728000 1651200 12145 >,
- < 1958400 1728000 16250 >,
- < 2265600 1728000 16250 >,
-- < 2457600 1728000 16250 >,
-+ < 2419200 1728000 16250 >,
- < 2496000 1728000 16250 >,
- < 2572800 1728000 16250 >,
- < 2649600 1728000 16250 >,
---
-2.9.3
-
-
-From 591d576aba39ec8ecb3c4c564577490e451d8839 Mon Sep 17 00:00:00 2001
-From: Felipe Leon
-Date: Sat, 17 Dec 2016 03:30:45 -0800
-Subject: [PATCH 4/6] apq8084: DTB Fix qcom,bcl table
-
----
- arch/arm/boot/dts/qcom/apq8084.dtsi | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/apq8084.dtsi b/arch/arm/boot/dts/qcom/apq8084.dtsi
-index 1fe7174..a5f2a26 100644
---- a/arch/arm/boot/dts/qcom/apq8084.dtsi
-+++ b/arch/arm/boot/dts/qcom/apq8084.dtsi
-@@ -5030,9 +5030,9 @@
- qcom,ibat-monitor {
- high-threshold-uamp = <3000000>;
- low-threshold-uamp = <1000000>;
-- mitigation-freq-khz = <1958400>;
-- mitigation-gpu-freq-khz = <389000>;
-- max-gpu-freq-khz = <600000>;
-+ mitigation-freq-khz = <2880000>;
-+ mitigation-gpu-freq-khz = <350000>;
-+ max-gpu-freq-khz = <800000>;
- ibat-channel = <0x15>;
- adc-interval-usec = <3900>;
- uv-to-ua-numerator = <2>;
---
-2.9.3
-
-
-From 170faa65e72f696aaa6a60cc9653c530c2225d32 Mon Sep 17 00:00:00 2001
-From: Felipe de Leon
-Date: Sat, 17 Dec 2016 04:04:13 -0800
-Subject: [PATCH 5/6] boot: dtsi: Adds the current values for the cores in uA
- for under and overclock
-
-Current value based on calculos made using the stock values
-orginal commit
-bhb27/android_kernel_motorola_apq8084@0e332d0
-bhb27/android_kernel_motorola_apq8084@9d21c12
----
- arch/arm/boot/dts/qcom/apq8084.dtsi | 36 ++++++++++++++++++++++++++++--------
- 1 file changed, 28 insertions(+), 8 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/apq8084.dtsi b/arch/arm/boot/dts/qcom/apq8084.dtsi
-index a5f2a26..8b264bd 100644
---- a/arch/arm/boot/dts/qcom/apq8084.dtsi
-+++ b/arch/arm/boot/dts/qcom/apq8084.dtsi
-@@ -38,7 +38,8 @@
- reg = <0x0>;
- // The currents(uA) correspond to the frequencies in the
- // frequency table.
-- current = < 71000 //300000 kHz
-+ current = < 64000 //268800 kHz underclock
-+ 71000 //300000 kHz
- 83000 //422400 kHz
- 97000 //652800 kHz
- 106000 //729600 kHz
-@@ -55,7 +56,11 @@
- 405000 //2457600 kHz
- 405000 //2496000 kHz
- 413000 //2572800 kHz
-- 414000>; //2649600 kHz
-+ 414000 //2649600 kHz
-+ 420000 //2688000 kHz overclock
-+ 432000 //2764800 kHz
-+ 444000 //2841600 kHz
-+ 450000>; //2880000 kHz
- };
-
- CPU1: cpu@1 {
-@@ -64,7 +69,8 @@
- reg = <0x1>;
- // The currents(uA) correspond to the frequencies in the
- // frequency table.
-- current = < 40470 //300000 kHz
-+ current = < 36260 //268800 kHz underclock
-+ 40470 //300000 kHz
- 47309 //422400 kHz
- 55289 //652800 kHz
- 60419 //729600 kHz
-@@ -81,7 +87,11 @@
- 230849 //2457600 kHz
- 230849 //2496000 kHz
- 235409 //2572800 kHz
-- 235979>; //2649600 kHz
-+ 414000 //2649600 kHz
-+ 420000 //2688000 kHz overclock
-+ 432000 //2764800 kHz
-+ 444000 //2841600 kHz
-+ 450000>; //2880000 kHz
- };
-
- CPU2: cpu@2 {
-@@ -90,7 +100,8 @@
- reg = <0x2>;
- // The currents(uA) correspond to the frequencies in the
- // frequency table.
-- current = < 46860 //300000 kHz
-+ current = < 41980 //268800 kHz underclock
-+ 46860 //300000 kHz
- 54780 //422400 kHz
- 64020 //652800 kHz
- 69960 //729600 kHz
-@@ -107,7 +118,11 @@
- 267300 //2457600 kHz
- 267300 //2496000 kHz
- 272580 //2572800 kHz
-- 273240>; //2649600 kHz
-+ 414000 //2649600 kHz
-+ 420000 //2688000 kHz overclock
-+ 432000 //2764800 kHz
-+ 444000 //2841600 kHz
-+ 450000>; //2880000 kHz
- };
-
- CPU3: cpu@3 {
-@@ -116,7 +131,8 @@
- reg = <0x3>;
- // The currents(uA) correspond to the frequencies in the
- // frequency table.
-- current = < 53960 //300000 kHz
-+ current = < 48340 //268800 kHz underclock
-+ 53960 //300000 kHz
- 63080 //422400 kHz
- 73720 //652800 kHz
- 80560 //729600 kHz
-@@ -133,7 +149,11 @@
- 307800 //2457600 kHz
- 307800 //2496000 kHz
- 313880 //2572800 kHz
-- 314640>; //2649600 kHz
-+ 414000 //2649600 kHz
-+ 420000 //2688000 kHz overclock
-+ 432000 //2764800 kHz
-+ 444000 //2841600 kHz
-+ 450000>; //2880000 kHz
- };
- };
- memory {
---
-2.9.3
-
-
-From c170f85350b5bf5148283a85f27504496d063852 Mon Sep 17 00:00:00 2001
-From: hellsgod
-Date: Tue, 23 Jun 2015 08:42:24 +0200
-Subject: [PATCH 6/6] arm/dt: shamu: Prevent BCL driver messing around with
- cores
-
-credits to neobuddy for the heads up!
----
- arch/arm/boot/dts/qcom/apq8084.dtsi | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/qcom/apq8084.dtsi b/arch/arm/boot/dts/qcom/apq8084.dtsi
-index 8b264bd..26f95e4 100644
---- a/arch/arm/boot/dts/qcom/apq8084.dtsi
-+++ b/arch/arm/boot/dts/qcom/apq8084.dtsi
-@@ -5046,7 +5046,6 @@
- qcom,bcl-enable;
- qcom,ibat-vadc = <&pma8084_vadc>;
- qcom,ibat-threshold-adc_tm = <&pma8084_adc_tm>;
-- qcom,bcl-hotplug-list = <&CPU2 &CPU3>;
- qcom,ibat-monitor {
- high-threshold-uamp = <3000000>;
- low-threshold-uamp = <1000000>;
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_kernel_motorola_msm8992/0001-OverUnderClock.patch b/Patches/CyanogenMod-14.1/android_kernel_motorola_msm8992/0001-OverUnderClock.patch
deleted file mode 100644
index 40914170..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_motorola_msm8992/0001-OverUnderClock.patch
+++ /dev/null
@@ -1,484 +0,0 @@
-From 28793d3021e480bba68fe8b76d9848a6b8aee5d5 Mon Sep 17 00:00:00 2001
-From: flar2
-Date: Tue, 3 Nov 2015 21:21:34 -0500
-Subject: [PATCH 1/3] msm8992 initial overclocking
-
----
- arch/arm/boot/dts/qcom/msm8992-regulator.dtsi | 30 ++++++++++++--------
- arch/arm/boot/dts/qcom/msm8992.dtsi | 40 +++++++++++++++++++-------
- drivers/clk/qcom/clock-cpu-8994.c | 8 +++---
- drivers/cpufreq/qcom-cpufreq.c | 41 +++++++++++++++++++++++++++
- 4 files changed, 93 insertions(+), 26 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-index d5f6860..23b23ba 100644
---- a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-@@ -605,7 +605,7 @@
- regulator-name = "apc0_corner";
- qcom,cpr-fuse-corners = <4>;
- regulator-min-microvolt = <1>;
-- regulator-max-microvolt = <10>;
-+ regulator-max-microvolt = <12>;
-
- qcom,cpr-voltage-ceiling = <900000 900000 1000000 1180000>;
- qcom,cpr-voltage-floor = <640000 700000 800000 850000>;
-@@ -669,15 +669,15 @@
- qcom,cpr-init-voltage-ref = <900000 900000 1000000 1230000>;
- qcom,cpr-init-voltage-step = <10000>;
-
-- qcom,cpr-corner-map = <1 1 2 2 3 3 4 4 4 4>;
-+ qcom,cpr-corner-map = <1 1 2 2 3 3 4 4 4 4 4 4>;
- qcom,cpr-voltage-ceiling-override =
- <0xFFFFFFFF 0 800000 800000 900000 900000
- 1000000 1000000 1115000 1115000
-- 1180000 1180000>;
-+ 1180000 1180000 1180000 1180000>;
- qcom,cpr-voltage-floor-override =
- <0xFFFFFFFF 0 640000 655000 700000 735000
- 800000 835000 850000 875000
-- 950000 1000000>;
-+ 950000 1000000 1000000 1000000>;
- qcom,cpr-fuse-version-map =
- <0 0xffffffff 0 0 0 0 0>,
- <0 0xffffffff 1 0 0 0 0>,
-@@ -759,10 +759,12 @@
- <7 864000000>,
- <8 960000000>,
- <9 1248000000>,
-- <10 1440000000>;
-+ <10 1440000000>,
-+ <11 1536000000>,
-+ <12 1632000000>;
- qcom,cpr-speed-bin-max-corners =
- <0 0 2 4 6 9>,
-- <1 0 2 4 6 10>;
-+ <1 0 2 4 6 12>;
- qcom,cpr-enable;
- };
-
-@@ -774,7 +776,7 @@
- regulator-name = "apc1_corner";
- qcom,cpr-fuse-corners = <4>;
- regulator-min-microvolt = <1>;
-- regulator-max-microvolt = <15>;
-+ regulator-max-microvolt = <17>;
-
- qcom,cpr-voltage-ceiling = <900000 900000 1000000 1180000>;
- qcom,cpr-voltage-floor = <640000 640000 745000 850000>;
-@@ -841,17 +843,19 @@
- qcom,cpr-init-voltage-ref = <900000 900000 1000000 1230000>;
- qcom,cpr-init-voltage-step = <10000>;
-
-- qcom,cpr-corner-map = <1 2 2 2 2 3 3 3 4 4 4 4 4 4 4>;
-+ qcom,cpr-corner-map = <1 2 2 2 2 3 3 3 4 4 4 4 4 4 4 4 4>;
- qcom,cpr-voltage-ceiling-override =
- <0xFFFFFFFF 0 900000 900000 900000 900000
- 900000 1000000 1000000 1000000
- 1115000 1115000 1115000 1115000
-- 1115000 1115000 1180000>;
-+ 1115000 1115000 1180000 1180000
-+ 1180000>;
- qcom,cpr-voltage-floor-override =
- <0xFFFFFFFF 0 640000 640000 665000 690000
- 735000 745000 770000 785000
- 850000 860000 880000 900000
-- 920000 935000 1000000>;
-+ 920000 935000 1000000 1000000
-+ 1000000>;
- qcom,cpr-fuse-version-map =
- <0xffffffff 0xffffffff 0 4 4 4 4>,
- <0xffffffff 0xffffffff 1 4 4 4 4>,
-@@ -908,9 +912,11 @@
- <12 1536000000>,
- <13 1632000000>,
- <14 1689600000>,
-- <15 1824000000>;
-+ <15 1824000000>,
-+ <16 1958400000>,
-+ <17 2016000000>;
- qcom,cpr-speed-bin-max-corners =
-- <0xFFFFFFFF 0 1 5 8 15>;
-+ <0xFFFFFFFF 0 1 5 8 17>;
- qcom,cpr-enable;
- };
-
-diff --git a/arch/arm/boot/dts/qcom/msm8992.dtsi b/arch/arm/boot/dts/qcom/msm8992.dtsi
-index 5ba420c..8892b56 100644
---- a/arch/arm/boot/dts/qcom/msm8992.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992.dtsi
-@@ -852,7 +852,9 @@
- < 787200 3509 >,
- < 864000 4173 >,
- < 960000 5271 >,
-- < 1440000 7102 >;
-+ < 1440000 7102 >,
-+ < 1536000 7102 >,
-+ < 1632000 7102 >;
- cpu-to-dev-map-4 =
- < 384000 1525 >,
- < 633600 2288 >,
-@@ -860,16 +862,22 @@
- < 864000 4173 >,
- < 960000 5271 >,
- < 1344000 5928 >,
-- < 1824000 7102 >;
-+ < 1824000 7102 >,
-+ < 1958400 7102 >,
-+ < 2016000 7102 >;
- };
-
- mincpubw-cpufreq {
- target-dev = <&mincpubw>;
- cpu-to-dev-map-0 =
-- < 1440000 1525 >;
-+ < 1440000 1525 >,
-+ < 1536000 1525 >,
-+ < 1632000 1525 >;
- cpu-to-dev-map-4 =
- < 1689600 1525 >,
-- < 1824000 5928 >;
-+ < 1824000 1525 >,
-+ < 1958400 1525 >,
-+ < 2016000 5928 >;
- };
-
- cci-cpufreq {
-@@ -880,7 +888,9 @@
- < 787200 384000 >,
- < 864000 556800 >,
- < 960000 729600 >,
-- < 1440000 787200 >;
-+ < 1440000 787200 >,
-+ < 1536000 787200 >,
-+ < 1632000 787200 >;
- cpu-to-dev-map-4 =
- < 384000 134400 >,
- < 480000 300000 >,
-@@ -888,7 +898,9 @@
- < 768000 556800 >,
- < 960000 600000 >,
- < 1440000 729600 >,
-- < 1824000 787200 >;
-+ < 1824000 787200 >,
-+ < 1958400 787200 >,
-+ < 2016000 787200 >;
- };
- };
-
-@@ -915,7 +927,9 @@
- < 864000 >,
- < 960000 >,
- < 1248000 >,
-- < 1440000 >;
-+ < 1440000 >,
-+ < 1536000 >,
-+ < 1632000 >;
-
- qcom,cpufreq-table-4 =
- < 384000 >,
-@@ -930,7 +944,9 @@
- < 1536000 >,
- < 1632000 >,
- < 1689600 >,
-- < 1824000 >;
-+ < 1824000 >,
-+ < 1958400 >,
-+ < 2016000 >;
-
- };
-
-@@ -968,7 +984,9 @@
- < 864000000 7>,
- < 960000000 8>,
- < 1248000000 9>,
-- < 1440000000 10>;
-+ < 1440000000 10>,
-+ < 1536000000 11>,
-+ < 1632000000 12>;
- qcom,a57-speedbin0-v0 =
- < 0 0>,
- < 384000000 5>,
-@@ -983,7 +1001,9 @@
- < 1536000000 12>,
- < 1632000000 13>,
- < 1689600000 14>,
-- < 1824000000 15>;
-+ < 1824000000 15>,
-+ < 1958400000 16>,
-+ < 2016000000 17>;
- qcom,cci-speedbin0-v0 =
- < 0 0>,
- < 134400000 2>,
-diff --git a/drivers/clk/qcom/clock-cpu-8994.c b/drivers/clk/qcom/clock-cpu-8994.c
-index 6eb346b..de3d72f 100644
---- a/drivers/clk/qcom/clock-cpu-8994.c
-+++ b/drivers/clk/qcom/clock-cpu-8994.c
-@@ -191,13 +191,13 @@ static struct pll_clk a57_pll0 = {
- .test_ctl_lo_val = 0x00010000,
- },
- .min_rate = 1209600000,
-- .max_rate = 1996800000,
-+ .max_rate = 2073600000,
- .base = &vbases[C1_PLL_BASE],
- .c = {
- .parent = &xo_ao.c,
- .dbg_name = "a57_pll0",
- .ops = &clk_ops_variable_rate_pll,
-- VDD_DIG_FMAX_MAP2(LOW, 1593600000, NOMINAL, 1996800000),
-+ VDD_DIG_FMAX_MAP2(LOW, 1593600000, NOMINAL, 2073600000),
- CLK_INIT(a57_pll0.c),
- },
- };
-@@ -229,13 +229,13 @@ static struct pll_clk a57_pll1 = {
- /* Necessary since we'll be setting a rate before handoff on V1 */
- .src_rate = 19200000,
- .min_rate = 1209600000,
-- .max_rate = 1996800000,
-+ .max_rate = 2073600000,
- .base = &vbases[C1_PLL_BASE],
- .c = {
- .parent = &xo_ao.c,
- .dbg_name = "a57_pll1",
- .ops = &clk_ops_variable_rate_pll,
-- VDD_DIG_FMAX_MAP2(LOW, 1593600000, NOMINAL, 1996800000),
-+ VDD_DIG_FMAX_MAP2(LOW, 1593600000, NOMINAL, 2073600000),
- CLK_INIT(a57_pll1.c),
- },
- };
-diff --git a/drivers/cpufreq/qcom-cpufreq.c b/drivers/cpufreq/qcom-cpufreq.c
-index e30b0cb..dd3a589 100644
---- a/drivers/cpufreq/qcom-cpufreq.c
-+++ b/drivers/cpufreq/qcom-cpufreq.c
-@@ -31,6 +31,40 @@
-
- static DEFINE_MUTEX(l2bw_lock);
-
-+static unsigned long arg_cpu_max_a53 = 1440000;
-+
-+static int __init cpufreq_read_cpu_max_a53(char *cpu_max_a53)
-+{
-+ unsigned long ui_khz;
-+ int ret;
-+
-+ ret = kstrtoul(cpu_max_a53, 0, &ui_khz);
-+ if (ret)
-+ return -EINVAL;
-+
-+ arg_cpu_max_a53 = ui_khz;
-+ printk("cpu_max_a53=%lu\n", arg_cpu_max_a53);
-+ return ret;
-+}
-+__setup("cpu_max_a53=", cpufreq_read_cpu_max_a53);
-+
-+static unsigned long arg_cpu_max_a57 = 1824000;
-+
-+static int __init cpufreq_read_cpu_max_a57(char *cpu_max_a57)
-+{
-+ unsigned long ui_khz;
-+ int ret;
-+
-+ ret = kstrtoul(cpu_max_a57, 0, &ui_khz);
-+ if (ret)
-+ return -EINVAL;
-+
-+ arg_cpu_max_a57 = ui_khz;
-+ printk("cpu_max_a57=%lu\n", arg_cpu_max_a57);
-+ return ret;
-+}
-+__setup("cpu_max_a57=", cpufreq_read_cpu_max_a57);
-+
- static struct clk *cpu_clk[NR_CPUS];
- static struct clk *l2_clk;
- static DEFINE_PER_CPU(struct cpufreq_frequency_table *, freq_table);
-@@ -364,6 +398,13 @@ static struct cpufreq_frequency_table *cpufreq_parse_dt(struct device *dev,
- if (i > 0 && f <= ftbl[i-1].frequency)
- break;
-
-+ //Custom max freq
-+ if ((cpu < 4 && f > arg_cpu_max_a53) ||
-+ (cpu >= 4 && f > arg_cpu_max_a57)) {
-+ nf = i;
-+ break;
-+ }
-+
- ftbl[i].driver_data = i;
- ftbl[i].frequency = f;
- }
---
-2.9.3
-
-
-From 9dfe99b9f8eead920f7cdefdb2ae7b1cea776d9b Mon Sep 17 00:00:00 2001
-From: dirtyhank
-Date: Thu, 14 Jan 2016 12:56:07 +0100
-Subject: [PATCH 2/3] CPU underclocking
-
- Based on underclocking to Nexus 6P by anarkia1976
----
- arch/arm/boot/dts/qcom/msm8992-regulator.dtsi | 6 +++---
- arch/arm/boot/dts/qcom/msm8992.dtsi | 14 +++++++++++---
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-index 23b23ba..1ef9eb3 100644
---- a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-@@ -750,7 +750,7 @@
- qcom,cpr-voltage-scaling-factor-max = <0 0 2000 2000>;
- qcom,cpr-quot-adjust-scaling-factor-max = <0 2000 2000 2000>;
- qcom,cpr-corner-frequency-map =
-- <1 300000000>,
-+ <1 302400000>,
- <2 384000000>,
- <3 460800000>,
- <4 600000000>,
-@@ -898,8 +898,8 @@
- qcom,cpr-voltage-scaling-factor-max = <0 0 2000 2000>;
- qcom,cpr-quot-adjust-scaling-factor-max = <0 0 2000 2000>;
- qcom,cpr-corner-frequency-map =
-- <1 300000000>, /* SVS Fmin for "SVS2" */
-- <2 300000000>,
-+ <1 302400000>, /* SVS Fmin for "SVS2" */
-+ <2 302400000>,
- <3 384000000>,
- <4 480000000>,
- <5 633600000>,
-diff --git a/arch/arm/boot/dts/qcom/msm8992.dtsi b/arch/arm/boot/dts/qcom/msm8992.dtsi
-index 8892b56..f6a39cd 100644
---- a/arch/arm/boot/dts/qcom/msm8992.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992.dtsi
-@@ -796,7 +796,7 @@
- governor = "cpufreq";
- freq-tbl-khz =
- < 134400 >,
-- < 300000 >,
-+ < 302400 >,
- < 384000 >,
- < 556800 >,
- < 600000 >,
-@@ -856,7 +856,8 @@
- < 1536000 7102 >,
- < 1632000 7102 >;
- cpu-to-dev-map-4 =
-- < 384000 1525 >,
-+ < 302400 1525 >,
-+ < 384000 1525 >,
- < 633600 2288 >,
- < 768000 3509 >,
- < 864000 4173 >,
-@@ -883,6 +884,7 @@
- cci-cpufreq {
- target-dev = <&cci_cache>;
- cpu-to-dev-map-0 =
-+ < 302400 134400 >,
- < 384000 134400 >,
- < 600000 300000 >,
- < 787200 384000 >,
-@@ -892,6 +894,7 @@
- < 1536000 787200 >,
- < 1632000 787200 >;
- cpu-to-dev-map-4 =
-+ < 302400 134400 >,
- < 384000 134400 >,
- < 480000 300000 >,
- < 633600 384000 >,
-@@ -919,6 +922,7 @@
- qcom,governor-per-policy;
-
- qcom,cpufreq-table-0 =
-+ < 302400 >,
- < 384000 >,
- < 460800 >,
- < 600000 >,
-@@ -932,6 +936,7 @@
- < 1632000 >;
-
- qcom,cpufreq-table-4 =
-+ < 302400 >,
- < 384000 >,
- < 480000 >,
- < 633600 >,
-@@ -966,6 +971,7 @@
- vdd-dig-supply = <&pm8994_s2_corner_ao>;
- qcom,a53-speedbin0-v0 =
- < 0 0>,
-+ < 302400000 1>,
- < 384000000 2>,
- < 460800000 3>,
- < 600000000 4>,
-@@ -976,6 +982,7 @@
- < 1248000000 9>;
- qcom,a53-speedbin1-v0 =
- < 0 0>,
-+ < 302400000 1>,
- < 384000000 2>,
- < 460800000 3>,
- < 600000000 4>,
-@@ -989,6 +996,7 @@
- < 1632000000 12>;
- qcom,a57-speedbin0-v0 =
- < 0 0>,
-+ < 302400000 5>,
- < 384000000 5>,
- < 480000000 5>,
- < 633600000 5>,
-@@ -1007,7 +1015,7 @@
- qcom,cci-speedbin0-v0 =
- < 0 0>,
- < 134400000 2>,
-- < 300000000 4>,
-+ < 302400000 4>,
- < 384000000 6>,
- < 556800000 6>,
- < 600000000 8>,
---
-2.9.3
-
-
-From b7e24657fb125b77bb5d9a39493040e1234c7c83 Mon Sep 17 00:00:00 2001
-From: flar2
-Date: Mon, 21 Nov 2016 21:40:09 -0500
-Subject: [PATCH 3/3] msm8992: bump oc voltages
-
----
- arch/arm/boot/dts/qcom/msm8992-regulator.dtsi | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-index 1ef9eb3..d2a875b 100644
---- a/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992-regulator.dtsi
-@@ -673,11 +673,11 @@
- qcom,cpr-voltage-ceiling-override =
- <0xFFFFFFFF 0 800000 800000 900000 900000
- 1000000 1000000 1115000 1115000
-- 1180000 1180000 1180000 1180000>;
-+ 1180000 1180000 1180000 1200000>;
- qcom,cpr-voltage-floor-override =
- <0xFFFFFFFF 0 640000 655000 700000 735000
- 800000 835000 850000 875000
-- 950000 1000000 1000000 1000000>;
-+ 950000 1000000 1000000 1100000>;
- qcom,cpr-fuse-version-map =
- <0 0xffffffff 0 0 0 0 0>,
- <0 0xffffffff 1 0 0 0 0>,
-@@ -849,13 +849,13 @@
- 900000 1000000 1000000 1000000
- 1115000 1115000 1115000 1115000
- 1115000 1115000 1180000 1180000
-- 1180000>;
-+ 1200000>;
- qcom,cpr-voltage-floor-override =
- <0xFFFFFFFF 0 640000 640000 665000 690000
- 735000 745000 770000 785000
- 850000 860000 880000 900000
- 920000 935000 1000000 1000000
-- 1000000>;
-+ 1100000>;
- qcom,cpr-fuse-version-map =
- <0xffffffff 0xffffffff 0 4 4 4 4>,
- <0xffffffff 0xffffffff 1 4 4 4 4>,
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_kernel_motorola_msm8992/0002-MMC_Tweak.patch b/Patches/CyanogenMod-14.1/android_kernel_motorola_msm8992/0002-MMC_Tweak.patch
deleted file mode 100644
index 0c6fc863..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_motorola_msm8992/0002-MMC_Tweak.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f24f2dec25043cf7e6ef0f80a65dde45f2f131dd Mon Sep 17 00:00:00 2001
-From: franciscofranco
-Date: Wed, 20 Jan 2016 01:45:39 +0000
-Subject: [PATCH] IKSWM-6057: dts: mmc: remove wakeup on idle flag
-
-Remove the wakeup-on-idle flag can improve the mmc
-performance(verified with iozone). No current drain
-and other system performance impact.
-
-Change-Id: Ia90cdfb66569b5ee3713d2c9785a2b7a9d24760e
-Signed-off-by: Lianwei Wang
-Reviewed-on: http://gerrit.mot.com/785887
-SLTApproved: Slta Waiver
-SME-Granted: SME Approvals Granted
-Tested-by: Jira Key
-Reviewed-by: Zhi-Ming Yuan
-Submit-Approved: Jira Key
-Signed-off-by: franciscofranco
----
- arch/arm/boot/dts/qcom/msm8992.dtsi | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/qcom/msm8992.dtsi b/arch/arm/boot/dts/qcom/msm8992.dtsi
-index 5dedecb..dc70365 100644
---- a/arch/arm/boot/dts/qcom/msm8992.dtsi
-+++ b/arch/arm/boot/dts/qcom/msm8992.dtsi
-@@ -1706,7 +1706,6 @@
- qcom,cpu-dma-latency-us = <301 70>;
- qcom,cpu-affinity = "affine_cores";
- qcom,cpu-affinity-mask = <0x0f 0xf0>;
-- qcom,wakeup-on-idle;
-
- qcom,msm-bus,name = "sdhc1";
- qcom,msm-bus,num-cases = <9>;
-@@ -1746,7 +1745,6 @@
- qcom,cpu-dma-latency-us = <301 70>;
- qcom,cpu-affinity = "affine_cores";
- qcom,cpu-affinity-mask = <0x0f 0xf0>;
-- qcom,wakeup-on-idle;
-
- qcom,msm-bus,name = "sdhc2";
- qcom,msm-bus,num-cases = <8>;
diff --git a/Patches/CyanogenMod-14.1/android_kernel_motorola_msm8992/0004-Enable_Overclock.patch b/Patches/CyanogenMod-14.1/android_kernel_motorola_msm8992/0004-Enable_Overclock.patch
deleted file mode 100644
index 17b6cdd1..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_motorola_msm8992/0004-Enable_Overclock.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 87a5b2ff5c53d13f937bdcb20ab462e4aaa61e3b Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Fri, 18 Nov 2016 12:38:14 -0500
-Subject: [PATCH] Enable overclock by default
-
-Change-Id: Idc640d7f58271892ae91678de847d9d1fcc4b281
----
- drivers/cpufreq/qcom-cpufreq.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/cpufreq/qcom-cpufreq.c b/drivers/cpufreq/qcom-cpufreq.c
-index dd3a589..4cc8680 100644
---- a/drivers/cpufreq/qcom-cpufreq.c
-+++ b/drivers/cpufreq/qcom-cpufreq.c
-@@ -31,7 +31,7 @@
-
- static DEFINE_MUTEX(l2bw_lock);
-
--static unsigned long arg_cpu_max_a53 = 1440000;
-+static unsigned long arg_cpu_max_a53 = 1632000;
-
- static int __init cpufreq_read_cpu_max_a53(char *cpu_max_a53)
- {
-@@ -48,7 +48,7 @@ static int __init cpufreq_read_cpu_max_a53(char *cpu_max_a53)
- }
- __setup("cpu_max_a53=", cpufreq_read_cpu_max_a53);
-
--static unsigned long arg_cpu_max_a57 = 1824000;
-+static unsigned long arg_cpu_max_a57 = 2016000;
-
- static int __init cpufreq_read_cpu_max_a57(char *cpu_max_a57)
- {
---
-2.9.3
-
diff --git a/Patches/CyanogenMod-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch b/Patches/CyanogenMod-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch
deleted file mode 100644
index 4a8dbfc7..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch
+++ /dev/null
@@ -1,1369 +0,0 @@
-From 4868289ebd16ed32f1c8d85db7029b87ea24406c Mon Sep 17 00:00:00 2001
-From: savoca
-Date: Tue, 15 Jul 2014 17:12:39 +0000
-Subject: [PATCH 1/9] msm8974pro: dts: cpufreq: introduce 268MHz clock
-
----
- arch/arm/boot/dts/msm8974pro.dtsi | 46 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
-
-diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
-index ded56d8..56ec557 100644
---- a/arch/arm/boot/dts/msm8974pro.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro.dtsi
-@@ -91,6 +91,7 @@
- qcom,clock-krait@f9016000 {
- qcom,speed1-pvs0-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 74 >,
- < 345600000 775000 85 >,
- < 422400000 775000 104 >,
-@@ -122,6 +123,7 @@
-
- qcom,speed1-pvs1-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 74 >,
- < 345600000 775000 85 >,
- < 422400000 775000 104 >,
-@@ -153,6 +155,7 @@
-
- qcom,speed1-pvs2-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 74 >,
- < 345600000 750000 85 >,
- < 422400000 750000 104 >,
-@@ -184,6 +187,7 @@
-
- qcom,speed1-pvs3-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 74 >,
- < 345600000 750000 85 >,
- < 422400000 750000 104 >,
-@@ -215,6 +219,7 @@
-
- qcom,speed1-pvs4-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 74 >,
- < 345600000 750000 85 >,
- < 422400000 750000 104 >,
-@@ -246,6 +251,7 @@
-
- qcom,speed1-pvs5-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 720000 68 >,
- < 300000000 725000 74 >,
- < 345600000 725000 85 >,
- < 422400000 725000 104 >,
-@@ -277,6 +283,7 @@
-
- qcom,speed1-pvs6-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 720000 68 >,
- < 300000000 725000 74 >,
- < 345600000 725000 85 >,
- < 422400000 725000 104 >,
-@@ -308,6 +315,7 @@
-
- qcom,speed3-pvs0-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -342,6 +350,7 @@
-
- qcom,speed3-pvs1-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -376,6 +385,7 @@
-
- qcom,speed3-pvs2-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -410,6 +420,7 @@
-
- qcom,speed3-pvs3-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -444,6 +455,7 @@
-
- qcom,speed3-pvs4-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -478,6 +490,7 @@
-
- qcom,speed3-pvs5-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 106 >,
-@@ -512,6 +525,7 @@
-
- qcom,speed3-pvs6-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 106 >,
-@@ -546,6 +560,7 @@
-
- qcom,speed1-pvs0-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 810000 87 >,
- < 422400000 820000 108 >,
-@@ -577,6 +592,7 @@
-
- qcom,speed1-pvs1-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 810000 108 >,
-@@ -608,6 +624,7 @@
-
- qcom,speed1-pvs2-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 108 >,
-@@ -639,6 +656,7 @@
-
- qcom,speed1-pvs3-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 108 >,
-@@ -670,6 +688,7 @@
-
- qcom,speed1-pvs4-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 108 >,
-@@ -701,6 +720,7 @@
-
- qcom,speed1-pvs5-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 108 >,
-@@ -732,6 +752,7 @@
-
- qcom,speed1-pvs6-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -763,6 +784,7 @@
-
- qcom,speed1-pvs7-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -794,6 +816,7 @@
-
- qcom,speed1-pvs8-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -825,6 +848,7 @@
-
- qcom,speed1-pvs9-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -856,6 +880,7 @@
-
- qcom,speed1-pvs10-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -887,6 +912,7 @@
-
- qcom,speed1-pvs11-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -918,6 +944,7 @@
-
- qcom,speed1-pvs12-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -949,6 +976,7 @@
-
- qcom,speed1-pvs13-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -980,6 +1008,7 @@
-
- qcom,speed1-pvs14-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 108 >,
-@@ -1011,6 +1040,7 @@
-
- qcom,speed1-pvs15-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 108 >,
-@@ -1042,6 +1072,7 @@
-
- qcom,speed3-pvs0-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1076,6 +1107,7 @@
-
- qcom,speed3-pvs1-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1110,6 +1142,7 @@
-
- qcom,speed3-pvs2-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1144,6 +1177,7 @@
-
- qcom,speed3-pvs3-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1178,6 +1212,7 @@
-
- qcom,speed3-pvs4-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1212,6 +1247,7 @@
-
- qcom,speed3-pvs5-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1246,6 +1282,7 @@
-
- qcom,speed3-pvs6-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1280,6 +1317,7 @@
-
- qcom,speed3-pvs7-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1314,6 +1352,7 @@
-
- qcom,speed3-pvs8-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1348,6 +1387,7 @@
-
- qcom,speed3-pvs9-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1382,6 +1422,7 @@
-
- qcom,speed3-pvs10-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1416,6 +1457,7 @@
-
- qcom,speed3-pvs11-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1450,6 +1492,7 @@
-
- qcom,speed3-pvs12-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1484,6 +1527,7 @@
-
- qcom,speed3-pvs13-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1518,6 +1562,7 @@
-
- qcom,speed3-pvs14-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 106 >,
-@@ -1552,6 +1597,7 @@
-
- qcom,speed3-pvs15-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 106 >,
---
-2.10.2
-
-
-From 4f8754a25b6c3d84b2b47f44a6f662349689b018 Mon Sep 17 00:00:00 2001
-From: anarkia1976
-Date: Mon, 22 Sep 2014 06:27:11 +0200
-Subject: [PATCH 2/9] msm8974pro: dts: cpufreq: added qcom cpufreq reference
- table
-
----
- arch/arm/boot/dts/msm8974pro.dtsi | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
-index 56ec557..edaf44e 100644
---- a/arch/arm/boot/dts/msm8974pro.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro.dtsi
-@@ -1631,6 +1631,30 @@
- < 2457600000 970000 802 >;
- };
-
-+ qcom,msm-cpufreq@0 {
-+ reg = <0 4>;
-+ compatible = "qcom,msm-cpufreq";
-+ qcom,cpufreq-table =
-+ < 268800 /* 75 MHz */ >,
-+ < 300000 /* 75 MHz */ >,
-+ < 422400 /* 150 MHz */ >,
-+ < 652800 /* 200 MHz */ >,
-+ < 729600 /* 307 MHz */ >,
-+ < 883200 /* 307 MHz */ >,
-+ < 960000 /* 460 MHz */ >,
-+ < 1036800 /* 460 MHz */ >,
-+ < 1190400 /* 460 MHz */ >,
-+ < 1267200 /* 614 MHz */ >,
-+ < 1497600 /* 614 MHz */ >,
-+ < 1574400 /* 800 MHz */ >,
-+ < 1728000 /* 800 MHz */ >,
-+ < 1958400 /* 931 MHz */ >,
-+ < 2265600 /* 931 MHz */ >,
-+ < 2342400 /* 931 MHz */ >,
-+ < 2419200 /* 931 MHz */ >,
-+ < 2457600 /* 931 MHz */ >;
-+ };
-+
- i2c@f9928000 { /* BLSP-1 QUP-6 */
- cell-index = <3>;
- compatible = "qcom,i2c-qup";
---
-2.10.2
-
-
-From a0ad4e60da9fd1a1fff7c96c60c3fa4cb38ebebd Mon Sep 17 00:00:00 2001
-From: anarkia1976
-Date: Wed, 24 Sep 2014 17:45:31 +0200
-Subject: [PATCH 3/9] msm8974pro: dts: cpu overclocking to 2880Ghz
-
-Conflicts:
- arch/arm/boot/dts/msm8974pro-pma8084-regulator.dtsi
----
- arch/arm/boot/dts/msm8974pro-pm8941.dtsi | 8 +--
- arch/arm/boot/dts/msm8974pro.dtsi | 120 ++++++++++++++++++++++++-------
- 2 files changed, 100 insertions(+), 28 deletions(-)
-
-diff --git a/arch/arm/boot/dts/msm8974pro-pm8941.dtsi b/arch/arm/boot/dts/msm8974pro-pm8941.dtsi
-index b502078..79729ea 100644
---- a/arch/arm/boot/dts/msm8974pro-pm8941.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro-pm8941.dtsi
-@@ -39,22 +39,22 @@
- };
-
- &krait0_vreg {
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,ldo-delta-voltage = <12500>;
- };
-
- &krait1_vreg {
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,ldo-delta-voltage = <12500>;
- };
-
- &krait2_vreg {
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,ldo-delta-voltage = <12500>;
- };
-
- &krait3_vreg {
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,ldo-delta-voltage = <12500>;
- };
-
-diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
-index edaf44e..9d59eaf 100644
---- a/arch/arm/boot/dts/msm8974pro.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro.dtsi
-@@ -346,7 +346,10 @@
- < 2265600000 1065000 700 >,
- < 2342400000 1080000 734 >,
- < 2419200000 1095000 769 >,
-- < 2457600000 1100000 785 >;
-+ < 2457600000 1100000 785 >,
-+ < 2572800000 1120000 827 >,
-+ < 2726400000 1180000 900 >,
-+ < 2880000000 1210000 937 >;
-
- qcom,speed3-pvs1-bin-v0 =
- < 0 0 0 >,
-@@ -381,7 +384,10 @@
- < 2265600000 1040000 700 >,
- < 2342400000 1055000 734 >,
- < 2419200000 1070000 769 >,
-- < 2457600000 1075000 785 >;
-+ < 2457600000 1075000 785 >,
-+ < 2572800000 1120000 827 >,
-+ < 2726400000 1180000 900 >,
-+ < 2880000000 1210000 937 >;
-
- qcom,speed3-pvs2-bin-v0 =
- < 0 0 0 >,
-@@ -416,7 +422,10 @@
- < 2265600000 1015000 700 >,
- < 2342400000 1030000 734 >,
- < 2419200000 1045000 769 >,
-- < 2457600000 1050000 785 >;
-+ < 2457600000 1050000 785 >,
-+ < 2572800000 1100000 827 >,
-+ < 2726400000 1170000 900 >,
-+ < 2880000000 1200000 937 >;
-
- qcom,speed3-pvs3-bin-v0 =
- < 0 0 0 >,
-@@ -451,7 +460,10 @@
- < 2265600000 990000 700 >,
- < 2342400000 1005000 734 >,
- < 2419200000 1020000 769 >,
-- < 2457600000 1025000 785 >;
-+ < 2457600000 1025000 785 >,
-+ < 2572800000 1090000 827 >,
-+ < 2726400000 1160000 900 >,
-+ < 2880000000 1190000 937 >;
-
- qcom,speed3-pvs4-bin-v0 =
- < 0 0 0 >,
-@@ -486,7 +498,10 @@
- < 2265600000 965000 700 >,
- < 2342400000 980000 734 >,
- < 2419200000 995000 769 >,
-- < 2457600000 1000000 785 >;
-+ < 2457600000 1000000 785 >,
-+ < 2572800000 1050000 827 >,
-+ < 2726400000 1150000 900 >,
-+ < 2880000000 1180000 937 >;
-
- qcom,speed3-pvs5-bin-v0 =
- < 0 0 0 >,
-@@ -521,7 +536,10 @@
- < 2265600000 940000 700 >,
- < 2342400000 955000 734 >,
- < 2419200000 970000 769 >,
-- < 2457600000 975000 785 >;
-+ < 2457600000 975000 785 >,
-+ < 2572800000 1000000 827 >,
-+ < 2726400000 1150000 900 >,
-+ < 2880000000 1170000 937 >;
-
- qcom,speed3-pvs6-bin-v0 =
- < 0 0 0 >,
-@@ -556,7 +574,10 @@
- < 2265600000 915000 700 >,
- < 2342400000 930000 734 >,
- < 2419200000 945000 769 >,
-- < 2457600000 950000 785 >;
-+ < 2457600000 950000 785 >,
-+ < 2572800000 985000 827 >,
-+ < 2726400000 1130000 900 >,
-+ < 2880000000 1150000 937 >;
-
- qcom,speed1-pvs0-bin-v1 =
- < 0 0 0 >,
-@@ -1103,7 +1124,10 @@
- < 2265600000 1085000 716 >,
- < 2342400000 1100000 751 >,
- < 2419200000 1115000 786 >,
-- < 2457600000 1120000 802 >;
-+ < 2457600000 1120000 802 >,
-+ < 2572800000 1150000 827 >,
-+ < 2726400000 1200000 900 >,
-+ < 2880000000 1240000 937 >;
-
- qcom,speed3-pvs1-bin-v1 =
- < 0 0 0 >,
-@@ -1138,7 +1162,10 @@
- < 2265600000 1075000 716 >,
- < 2342400000 1090000 751 >,
- < 2419200000 1105000 786 >,
-- < 2457600000 1110000 802 >;
-+ < 2457600000 1110000 802 >,
-+ < 2572800000 1140000 827 >,
-+ < 2726400000 1190000 900 >,
-+ < 2880000000 1220000 937 >;
-
- qcom,speed3-pvs2-bin-v1 =
- < 0 0 0 >,
-@@ -1173,7 +1200,10 @@
- < 2265600000 1065000 716 >,
- < 2342400000 1080000 751 >,
- < 2419200000 1095000 786 >,
-- < 2457600000 1100000 802 >;
-+ < 2457600000 1100000 802 >,
-+ < 2572800000 1120000 827 >,
-+ < 2726400000 1160000 900 >,
-+ < 2880000000 1190000 937 >;
-
- qcom,speed3-pvs3-bin-v1 =
- < 0 0 0 >,
-@@ -1208,7 +1238,10 @@
- < 2265600000 1055000 716 >,
- < 2342400000 1070000 751 >,
- < 2419200000 1085000 786 >,
-- < 2457600000 1090000 802 >;
-+ < 2457600000 1090000 802 >,
-+ < 2572800000 1120000 827 >,
-+ < 2726400000 1150000 900 >,
-+ < 2880000000 1180000 937 >;
-
- qcom,speed3-pvs4-bin-v1 =
- < 0 0 0 >,
-@@ -1243,7 +1276,10 @@
- < 2265600000 1045000 716 >,
- < 2342400000 1060000 751 >,
- < 2419200000 1075000 786 >,
-- < 2457600000 1080000 802 >;
-+ < 2457600000 1080000 802 >,
-+ < 2572800000 1110000 827 >,
-+ < 2726400000 1140000 900 >,
-+ < 2880000000 1170000 937 >;
-
- qcom,speed3-pvs5-bin-v1 =
- < 0 0 0 >,
-@@ -1278,7 +1314,10 @@
- < 2265600000 1035000 716 >,
- < 2342400000 1050000 751 >,
- < 2419200000 1065000 786 >,
-- < 2457600000 1070000 802 >;
-+ < 2457600000 1070000 802 >,
-+ < 2572800000 1100000 827 >,
-+ < 2726400000 1130000 900 >,
-+ < 2880000000 1160000 937 >;
-
- qcom,speed3-pvs6-bin-v1 =
- < 0 0 0 >,
-@@ -1313,7 +1352,10 @@
- < 2265600000 1025000 716 >,
- < 2342400000 1040000 751 >,
- < 2419200000 1055000 786 >,
-- < 2457600000 1060000 802 >;
-+ < 2457600000 1060000 802 >,
-+ < 2572800000 1090000 827 >,
-+ < 2726400000 1120000 900 >,
-+ < 2880000000 1150000 937 >;
-
- qcom,speed3-pvs7-bin-v1 =
- < 0 0 0 >,
-@@ -1348,7 +1390,10 @@
- < 2265600000 1015000 716 >,
- < 2342400000 1030000 751 >,
- < 2419200000 1045000 786 >,
-- < 2457600000 1050000 802 >;
-+ < 2457600000 1050000 802 >,
-+ < 2572800000 1080000 827 >,
-+ < 2726400000 1110000 900 >,
-+ < 2880000000 1140000 937 >;
-
- qcom,speed3-pvs8-bin-v1 =
- < 0 0 0 >,
-@@ -1383,7 +1428,10 @@
- < 2265600000 1005000 716 >,
- < 2342400000 1020000 751 >,
- < 2419200000 1035000 786 >,
-- < 2457600000 1040000 802 >;
-+ < 2457600000 1040000 802 >,
-+ < 2572800000 1070000 827 >,
-+ < 2726400000 1100000 900 >,
-+ < 2880000000 1130000 937 >;
-
- qcom,speed3-pvs9-bin-v1 =
- < 0 0 0 >,
-@@ -1418,7 +1466,10 @@
- < 2265600000 995000 716 >,
- < 2342400000 1010000 751 >,
- < 2419200000 1025000 786 >,
-- < 2457600000 1030000 802 >;
-+ < 2457600000 1030000 802 >,
-+ < 2572800000 1060000 827 >,
-+ < 2726400000 1090000 900 >,
-+ < 2880000000 1120000 937 >;
-
- qcom,speed3-pvs10-bin-v1 =
- < 0 0 0 >,
-@@ -1453,7 +1504,10 @@
- < 2265600000 985000 716 >,
- < 2342400000 1000000 751 >,
- < 2419200000 1015000 786 >,
-- < 2457600000 1020000 802 >;
-+ < 2457600000 1020000 802 >,
-+ < 2572800000 1050000 827 >,
-+ < 2726400000 1080000 900 >,
-+ < 2880000000 1110000 937 >;
-
- qcom,speed3-pvs11-bin-v1 =
- < 0 0 0 >,
-@@ -1488,7 +1542,10 @@
- < 2265600000 975000 716 >,
- < 2342400000 990000 751 >,
- < 2419200000 1005000 786 >,
-- < 2457600000 1010000 802 >;
-+ < 2457600000 1010000 802 >,
-+ < 2572800000 1040000 827 >,
-+ < 2726400000 1070000 900 >,
-+ < 2880000000 1100000 937 >;
-
- qcom,speed3-pvs12-bin-v1 =
- < 0 0 0 >,
-@@ -1523,7 +1580,10 @@
- < 2265600000 965000 716 >,
- < 2342400000 980000 751 >,
- < 2419200000 995000 786 >,
-- < 2457600000 1000000 802 >;
-+ < 2457600000 1000000 802 >,
-+ < 2572800000 1040000 827 >,
-+ < 2726400000 1060000 900 >,
-+ < 2880000000 1090000 937 >;
-
- qcom,speed3-pvs13-bin-v1 =
- < 0 0 0 >,
-@@ -1558,7 +1618,10 @@
- < 2265600000 955000 716 >,
- < 2342400000 970000 751 >,
- < 2419200000 985000 786 >,
-- < 2457600000 990000 802 >;
-+ < 2457600000 990000 802 >,
-+ < 2572800000 1020000 827 >,
-+ < 2726400000 1040000 900 >,
-+ < 2880000000 1070000 937 >;
-
- qcom,speed3-pvs14-bin-v1 =
- < 0 0 0 >,
-@@ -1593,7 +1656,10 @@
- < 2265600000 945000 716 >,
- < 2342400000 960000 751 >,
- < 2419200000 975000 786 >,
-- < 2457600000 980000 802 >;
-+ < 2457600000 980000 802 >,
-+ < 2572800000 1010000 827 >,
-+ < 2726400000 1030000 900 >,
-+ < 2880000000 1060000 937 >;
-
- qcom,speed3-pvs15-bin-v1 =
- < 0 0 0 >,
-@@ -1628,7 +1694,10 @@
- < 2265600000 935000 716 >,
- < 2342400000 950000 751 >,
- < 2419200000 965000 786 >,
-- < 2457600000 970000 802 >;
-+ < 2457600000 970000 802 >,
-+ < 2572800000 1000000 827 >,
-+ < 2726400000 1020000 900 >,
-+ < 2880000000 1050000 937 >;
- };
-
- qcom,msm-cpufreq@0 {
-@@ -1652,7 +1721,10 @@
- < 2265600 /* 931 MHz */ >,
- < 2342400 /* 931 MHz */ >,
- < 2419200 /* 931 MHz */ >,
-- < 2457600 /* 931 MHz */ >;
-+ < 2457600 /* 931 MHz */ >,
-+ < 2572800 /* 931 MHz */ >,
-+ < 2726400 /* 931 MHz */ >,
-+ < 2880000 /* 931 MHz */ >;
- };
-
- i2c@f9928000 { /* BLSP-1 QUP-6 */
---
-2.10.2
-
-
-From 79da7e38c37f157c196a4cdb35415720f319b9b9 Mon Sep 17 00:00:00 2001
-From: "stefano.villa1976@gmail.com"
-Date: Sat, 21 Feb 2015 01:24:45 -0700
-Subject: [PATCH 4/9] msm8974pro: dts: cpufreq: enable low steps for CPU
- frequencies
-
----
- arch/arm/boot/dts/msm8974pro.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
-index 9d59eaf..a3c6552 100644
---- a/arch/arm/boot/dts/msm8974pro.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro.dtsi
-@@ -1706,9 +1706,13 @@
- qcom,cpufreq-table =
- < 268800 /* 75 MHz */ >,
- < 300000 /* 75 MHz */ >,
-+ < 345600 /* 75 MHz */ >,
- < 422400 /* 150 MHz */ >,
-+ < 499200 /* 150 MHz */ >,
-+ < 576000 /* 150 MHz */ >,
- < 652800 /* 200 MHz */ >,
- < 729600 /* 307 MHz */ >,
-+ < 806400 /* 307 MHz */ >,
- < 883200 /* 307 MHz */ >,
- < 960000 /* 460 MHz */ >,
- < 1036800 /* 460 MHz */ >,
---
-2.10.2
-
-
-From e87bbd0e60f847c832e2e7f04f83a2c50e81ff7f Mon Sep 17 00:00:00 2001
-From: "stefano.villa1976@gmail.com"
-Date: Sat, 21 Feb 2015 05:22:56 -0700
-Subject: [PATCH 5/9] msm8974pro: dts: cpufreq: enable middle steps for CPU
- frequencies
-
----
- arch/arm/boot/dts/msm8974pro.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
-index a3c6552..d8073bc 100644
---- a/arch/arm/boot/dts/msm8974pro.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro.dtsi
-@@ -1716,10 +1716,14 @@
- < 883200 /* 307 MHz */ >,
- < 960000 /* 460 MHz */ >,
- < 1036800 /* 460 MHz */ >,
-+ < 1113600 /* 460 MHz */ >,
- < 1190400 /* 460 MHz */ >,
- < 1267200 /* 614 MHz */ >,
-+ < 1344000 /* 614 MHz */ >,
-+ < 1420800 /* 614 MHz */ >,
- < 1497600 /* 614 MHz */ >,
- < 1574400 /* 800 MHz */ >,
-+ < 1651200 /* 800 MHz */ >,
- < 1728000 /* 800 MHz */ >,
- < 1958400 /* 931 MHz */ >,
- < 2265600 /* 931 MHz */ >,
---
-2.10.2
-
-
-From a4518d0fbd58d59538b1b094e5b5b99ae9ed9938 Mon Sep 17 00:00:00 2001
-From: nikhil18
-Date: Sat, 19 Dec 2015 18:44:44 +0530
-Subject: [PATCH 6/9] add more cpu overclock frequencies
-
----
- arch/arm/boot/dts/msm8974.dtsi | 3 +-
- arch/arm/boot/dts/msm8974pro.dtsi | 214 +++++++++++++++++++++++++-------------
- 2 files changed, 145 insertions(+), 72 deletions(-)
-
-diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
-index 80907a3..949d47e 100644
---- a/arch/arm/boot/dts/msm8974.dtsi
-+++ b/arch/arm/boot/dts/msm8974.dtsi
-@@ -1484,7 +1484,8 @@
- < 3509 /* 460 MHz */ >,
- < 4684 /* 614 MHz */ >,
- < 6103 /* 800 MHz */ >,
-- < 7102 /* 931 MHz */ >;
-+ < 7102 /* 931 MHz */ >,
-+ < 7674 /* 1006 MHz */ >;
- };
-
- qcom,kraitbw-l2pm {
-diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
-index d8073bc..1ef99df 100644
---- a/arch/arm/boot/dts/msm8974pro.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro.dtsi
-@@ -347,9 +347,12 @@
- < 2342400000 1080000 734 >,
- < 2419200000 1095000 769 >,
- < 2457600000 1100000 785 >,
-- < 2572800000 1120000 827 >,
-- < 2726400000 1180000 900 >,
-- < 2880000000 1210000 937 >;
-+ < 2572800000 1145000 827 >,
-+ < 2649600000 1185000 866 >,
-+ < 2726400000 1205000 900 >,
-+ < 2803200000 1215000 937 >,
-+ < 2880000000 1235000 937 >,
-+ < 2956800000 1250000 937 >;
-
- qcom,speed3-pvs1-bin-v0 =
- < 0 0 0 >,
-@@ -385,9 +388,12 @@
- < 2342400000 1055000 734 >,
- < 2419200000 1070000 769 >,
- < 2457600000 1075000 785 >,
-- < 2572800000 1120000 827 >,
-- < 2726400000 1180000 900 >,
-- < 2880000000 1210000 937 >;
-+ < 2572800000 1145000 827 >,
-+ < 2649600000 1175000 866 >,
-+ < 2726400000 1205000 900 >,
-+ < 2803200000 1215000 937 >,
-+ < 2880000000 1235000 937 >,
-+ < 2956800000 1250000 937 >;
-
- qcom,speed3-pvs2-bin-v0 =
- < 0 0 0 >,
-@@ -423,9 +429,12 @@
- < 2342400000 1030000 734 >,
- < 2419200000 1045000 769 >,
- < 2457600000 1050000 785 >,
-- < 2572800000 1100000 827 >,
-- < 2726400000 1170000 900 >,
-- < 2880000000 1200000 937 >;
-+ < 2572800000 1125000 827 >,
-+ < 2649600000 1165000 866 >,
-+ < 2726400000 1195000 900 >,
-+ < 2803200000 1205000 937 >,
-+ < 2880000000 1225000 937 >,
-+ < 2956800000 1240000 937 >;
-
- qcom,speed3-pvs3-bin-v0 =
- < 0 0 0 >,
-@@ -461,9 +470,13 @@
- < 2342400000 1005000 734 >,
- < 2419200000 1020000 769 >,
- < 2457600000 1025000 785 >,
-- < 2572800000 1090000 827 >,
-- < 2726400000 1160000 900 >,
-- < 2880000000 1190000 937 >;
-+ < 2572800000 1115000 827 >,
-+ < 2649600000 1155000 866 >,
-+ < 2726400000 1185000 900 >,
-+ < 2803200000 1195000 937 >,
-+ < 2880000000 1215000 937 >,
-+ < 2956800000 1230000 937 >;
-+
-
- qcom,speed3-pvs4-bin-v0 =
- < 0 0 0 >,
-@@ -499,9 +512,12 @@
- < 2342400000 980000 734 >,
- < 2419200000 995000 769 >,
- < 2457600000 1000000 785 >,
-- < 2572800000 1050000 827 >,
-- < 2726400000 1150000 900 >,
-- < 2880000000 1180000 937 >;
-+ < 2572800000 1075000 827 >,
-+ < 2649600000 1155000 866 >,
-+ < 2726400000 1175000 900 >,
-+ < 2803200000 1185000 937 >,
-+ < 2880000000 1205000 937 >,
-+ < 2956800000 1220000 937 >;
-
- qcom,speed3-pvs5-bin-v0 =
- < 0 0 0 >,
-@@ -537,9 +553,12 @@
- < 2342400000 955000 734 >,
- < 2419200000 970000 769 >,
- < 2457600000 975000 785 >,
-- < 2572800000 1000000 827 >,
-- < 2726400000 1150000 900 >,
-- < 2880000000 1170000 937 >;
-+ < 2572800000 1025000 827 >,
-+ < 2649600000 1145000 866 >,
-+ < 2726400000 1175000 900 >,
-+ < 2803200000 1185000 937 >,
-+ < 2880000000 1195000 937 >,
-+ < 2956800000 1210000 937 >;
-
- qcom,speed3-pvs6-bin-v0 =
- < 0 0 0 >,
-@@ -575,9 +594,12 @@
- < 2342400000 930000 734 >,
- < 2419200000 945000 769 >,
- < 2457600000 950000 785 >,
-- < 2572800000 985000 827 >,
-- < 2726400000 1130000 900 >,
-- < 2880000000 1150000 937 >;
-+ < 2572800000 1010000 827 >,
-+ < 2649600000 1135000 866 >,
-+ < 2726400000 1155000 900 >,
-+ < 2803200000 1165000 937 >,
-+ < 2880000000 1175000 937 >,
-+ < 2956800000 1200000 937 >;
-
- qcom,speed1-pvs0-bin-v1 =
- < 0 0 0 >,
-@@ -1125,9 +1147,12 @@
- < 2342400000 1100000 751 >,
- < 2419200000 1115000 786 >,
- < 2457600000 1120000 802 >,
-- < 2572800000 1150000 827 >,
-- < 2726400000 1200000 900 >,
-- < 2880000000 1240000 937 >;
-+ < 2572800000 1175000 827 >,
-+ < 2649600000 1200000 866 >,
-+ < 2726400000 1225000 900 >,
-+ < 2803200000 1245000 937 >,
-+ < 2880000000 1265000 937 >,
-+ < 2956800000 1280000 937 >;
-
- qcom,speed3-pvs1-bin-v1 =
- < 0 0 0 >,
-@@ -1163,9 +1188,12 @@
- < 2342400000 1090000 751 >,
- < 2419200000 1105000 786 >,
- < 2457600000 1110000 802 >,
-- < 2572800000 1140000 827 >,
-- < 2726400000 1190000 900 >,
-- < 2880000000 1220000 937 >;
-+ < 2572800000 1165000 827 >,
-+ < 2649600000 1190000 866 >,
-+ < 2726400000 1215000 900 >,
-+ < 2803200000 1225000 937 >,
-+ < 2880000000 1245000 937 >,
-+ < 2956800000 1260000 937 >;
-
- qcom,speed3-pvs2-bin-v1 =
- < 0 0 0 >,
-@@ -1201,9 +1229,12 @@
- < 2342400000 1080000 751 >,
- < 2419200000 1095000 786 >,
- < 2457600000 1100000 802 >,
-- < 2572800000 1120000 827 >,
-- < 2726400000 1160000 900 >,
-- < 2880000000 1190000 937 >;
-+ < 2572800000 1145000 827 >,
-+ < 2649600000 1160000 866 >,
-+ < 2726400000 1185000 900 >,
-+ < 2803200000 1205000 937 >,
-+ < 2880000000 1215000 937 >,
-+ < 2956800000 1240000 937 >;
-
- qcom,speed3-pvs3-bin-v1 =
- < 0 0 0 >,
-@@ -1239,9 +1270,12 @@
- < 2342400000 1070000 751 >,
- < 2419200000 1085000 786 >,
- < 2457600000 1090000 802 >,
-- < 2572800000 1120000 827 >,
-- < 2726400000 1150000 900 >,
-- < 2880000000 1180000 937 >;
-+ < 2572800000 1145000 827 >,
-+ < 2649600000 1160000 866 >,
-+ < 2726400000 1175000 900 >,
-+ < 2803200000 1195000 937 >,
-+ < 2880000000 1205000 937 >,
-+ < 2956800000 1220000 937 >;
-
- qcom,speed3-pvs4-bin-v1 =
- < 0 0 0 >,
-@@ -1277,9 +1311,12 @@
- < 2342400000 1060000 751 >,
- < 2419200000 1075000 786 >,
- < 2457600000 1080000 802 >,
-- < 2572800000 1110000 827 >,
-- < 2726400000 1140000 900 >,
-- < 2880000000 1170000 937 >;
-+ < 2572800000 1135000 827 >,
-+ < 2649600000 1150000 866 >,
-+ < 2726400000 1165000 900 >,
-+ < 2803200000 1185000 937 >,
-+ < 2880000000 1195000 937 >,
-+ < 2956800000 1210000 937 >;
-
- qcom,speed3-pvs5-bin-v1 =
- < 0 0 0 >,
-@@ -1315,9 +1352,12 @@
- < 2342400000 1050000 751 >,
- < 2419200000 1065000 786 >,
- < 2457600000 1070000 802 >,
-- < 2572800000 1100000 827 >,
-- < 2726400000 1130000 900 >,
-- < 2880000000 1160000 937 >;
-+ < 2572800000 1125000 827 >,
-+ < 2649600000 1140000 866 >,
-+ < 2726400000 1155000 900 >,
-+ < 2803200000 1175000 937 >,
-+ < 2880000000 1185000 937 >,
-+ < 2956800000 1200000 937 >;
-
- qcom,speed3-pvs6-bin-v1 =
- < 0 0 0 >,
-@@ -1353,9 +1393,12 @@
- < 2342400000 1040000 751 >,
- < 2419200000 1055000 786 >,
- < 2457600000 1060000 802 >,
-- < 2572800000 1090000 827 >,
-- < 2726400000 1120000 900 >,
-- < 2880000000 1150000 937 >;
-+ < 2572800000 1115000 827 >,
-+ < 2649600000 1130000 866 >,
-+ < 2726400000 1145000 900 >,
-+ < 2803200000 1165000 937 >,
-+ < 2880000000 1175000 937 >,
-+ < 2956800000 1190000 937 >;
-
- qcom,speed3-pvs7-bin-v1 =
- < 0 0 0 >,
-@@ -1391,9 +1434,12 @@
- < 2342400000 1030000 751 >,
- < 2419200000 1045000 786 >,
- < 2457600000 1050000 802 >,
-- < 2572800000 1080000 827 >,
-- < 2726400000 1110000 900 >,
-- < 2880000000 1140000 937 >;
-+ < 2572800000 1105000 827 >,
-+ < 2649600000 1120000 866 >,
-+ < 2726400000 1135000 900 >,
-+ < 2803200000 1155000 937 >,
-+ < 2880000000 1165000 937 >,
-+ < 2956800000 1180000 937 >;
-
- qcom,speed3-pvs8-bin-v1 =
- < 0 0 0 >,
-@@ -1429,9 +1475,12 @@
- < 2342400000 1020000 751 >,
- < 2419200000 1035000 786 >,
- < 2457600000 1040000 802 >,
-- < 2572800000 1070000 827 >,
-- < 2726400000 1100000 900 >,
-- < 2880000000 1130000 937 >;
-+ < 2572800000 1095000 827 >,
-+ < 2649600000 1110000 866 >,
-+ < 2726400000 1125000 900 >,
-+ < 2803200000 1145000 937 >,
-+ < 2880000000 1155000 937 >,
-+ < 2956800000 1170000 937 >;
-
- qcom,speed3-pvs9-bin-v1 =
- < 0 0 0 >,
-@@ -1467,9 +1516,12 @@
- < 2342400000 1010000 751 >,
- < 2419200000 1025000 786 >,
- < 2457600000 1030000 802 >,
-- < 2572800000 1060000 827 >,
-- < 2726400000 1090000 900 >,
-- < 2880000000 1120000 937 >;
-+ < 2572800000 1085000 827 >,
-+ < 2649600000 1100000 866 >,
-+ < 2726400000 1115000 900 >,
-+ < 2803200000 1135000 937 >,
-+ < 2880000000 1145000 937 >,
-+ < 2956800000 1160000 937 >;
-
- qcom,speed3-pvs10-bin-v1 =
- < 0 0 0 >,
-@@ -1505,9 +1557,12 @@
- < 2342400000 1000000 751 >,
- < 2419200000 1015000 786 >,
- < 2457600000 1020000 802 >,
-- < 2572800000 1050000 827 >,
-- < 2726400000 1080000 900 >,
-- < 2880000000 1110000 937 >;
-+ < 2572800000 1075000 827 >,
-+ < 2649600000 1090000 866 >,
-+ < 2726400000 1105000 900 >,
-+ < 2803200000 1125000 937 >,
-+ < 2880000000 1135000 937 >,
-+ < 2956800000 1150000 937 >;
-
- qcom,speed3-pvs11-bin-v1 =
- < 0 0 0 >,
-@@ -1543,9 +1598,12 @@
- < 2342400000 990000 751 >,
- < 2419200000 1005000 786 >,
- < 2457600000 1010000 802 >,
-- < 2572800000 1040000 827 >,
-- < 2726400000 1070000 900 >,
-- < 2880000000 1100000 937 >;
-+ < 2572800000 1065000 827 >,
-+ < 2649600000 1080000 866 >,
-+ < 2726400000 1095000 900 >,
-+ < 2803200000 1115000 937 >,
-+ < 2880000000 1125000 937 >,
-+ < 2956800000 1140000 937 >;
-
- qcom,speed3-pvs12-bin-v1 =
- < 0 0 0 >,
-@@ -1581,9 +1639,12 @@
- < 2342400000 980000 751 >,
- < 2419200000 995000 786 >,
- < 2457600000 1000000 802 >,
-- < 2572800000 1040000 827 >,
-- < 2726400000 1060000 900 >,
-- < 2880000000 1090000 937 >;
-+ < 2572800000 1065000 827 >,
-+ < 2649600000 1075000 866 >,
-+ < 2726400000 1085000 900 >,
-+ < 2803200000 1105000 937 >,
-+ < 2880000000 1115000 937 >,
-+ < 2956800000 1130000 937 >;
-
- qcom,speed3-pvs13-bin-v1 =
- < 0 0 0 >,
-@@ -1619,9 +1680,12 @@
- < 2342400000 970000 751 >,
- < 2419200000 985000 786 >,
- < 2457600000 990000 802 >,
-- < 2572800000 1020000 827 >,
-- < 2726400000 1040000 900 >,
-- < 2880000000 1070000 937 >;
-+ < 2572800000 1045000 827 >,
-+ < 2649600000 1055000 866 >,
-+ < 2726400000 1065000 900 >,
-+ < 2803200000 1085000 937 >,
-+ < 2880000000 1095000 937 >,
-+ < 2956800000 1110000 937 >;
-
- qcom,speed3-pvs14-bin-v1 =
- < 0 0 0 >,
-@@ -1657,9 +1721,12 @@
- < 2342400000 960000 751 >,
- < 2419200000 975000 786 >,
- < 2457600000 980000 802 >,
-- < 2572800000 1010000 827 >,
-- < 2726400000 1030000 900 >,
-- < 2880000000 1060000 937 >;
-+ < 2572800000 1035000 827 >,
-+ < 2649600000 1045000 866 >,
-+ < 2726400000 1055000 900 >,
-+ < 2803200000 1075000 937 >,
-+ < 2880000000 1085000 937 >,
-+ < 2956800000 1100000 937 >;
-
- qcom,speed3-pvs15-bin-v1 =
- < 0 0 0 >,
-@@ -1695,16 +1762,19 @@
- < 2342400000 950000 751 >,
- < 2419200000 965000 786 >,
- < 2457600000 970000 802 >,
-- < 2572800000 1000000 827 >,
-- < 2726400000 1020000 900 >,
-- < 2880000000 1050000 937 >;
-+ < 2572800000 1025000 827 >,
-+ < 2649600000 1035000 866 >,
-+ < 2726400000 1045000 900 >,
-+ < 2803200000 1065000 937 >,
-+ < 2880000000 1075000 937 >,
-+ < 2956800000 1090000 937 >;
- };
-
- qcom,msm-cpufreq@0 {
- reg = <0 4>;
- compatible = "qcom,msm-cpufreq";
- qcom,cpufreq-table =
-- < 268800 /* 75 MHz */ >,
-+ < 268800 /* 50 MHz */ >,
- < 300000 /* 75 MHz */ >,
- < 345600 /* 75 MHz */ >,
- < 422400 /* 150 MHz */ >,
-@@ -1725,13 +1795,15 @@
- < 1574400 /* 800 MHz */ >,
- < 1651200 /* 800 MHz */ >,
- < 1728000 /* 800 MHz */ >,
-- < 1958400 /* 931 MHz */ >,
-+ < 1958400 /* 800 MHz */ >,
- < 2265600 /* 931 MHz */ >,
- < 2342400 /* 931 MHz */ >,
- < 2419200 /* 931 MHz */ >,
- < 2457600 /* 931 MHz */ >,
- < 2572800 /* 931 MHz */ >,
-+ < 2649600 /* 931 MHz */ >,
- < 2726400 /* 931 MHz */ >,
-+ < 2803200 /* 931 MHz */ >,
- < 2880000 /* 931 MHz */ >;
- };
-
---
-2.10.2
-
-
-From 2b75e5bcb9f3f8a72e6d2df812a7e06c52b525ae Mon Sep 17 00:00:00 2001
-From: Evisceration
-Date: Mon, 8 Dec 2014 01:22:03 +0100
-Subject: [PATCH 7/9] dts: fix incorrect frequency
-
- * causes core 0 to be stuck at 2265 MHz
-
-Change-Id: I8d60596ca12255290d0f673666227ad28ea5514f
----
- arch/arm/boot/dts/msm8974-v2.dtsi | 2 +-
- arch/arm/boot/dts/msm8974pro.dtsi | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/msm8974-v2.dtsi b/arch/arm/boot/dts/msm8974-v2.dtsi
-index 91844c3..f98f53a 100644
---- a/arch/arm/boot/dts/msm8974-v2.dtsi
-+++ b/arch/arm/boot/dts/msm8974-v2.dtsi
-@@ -123,7 +123,7 @@
- <1880000 2068000>,
- <3008000 3309000>,
- <3760000 4136000>,
-- <4468000 2457000>;
-+ <4468000 2457600>;
- qcom,dec-ocmem-ab-ib = <0 0>,
- <176000 519000>,
- <456000 519000>,
-diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
-index 1ef99df..fed5f66 100644
---- a/arch/arm/boot/dts/msm8974pro.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro.dtsi
-@@ -1967,7 +1967,7 @@
- <1880000 2068000>,
- <3008000 3309000>,
- <3760000 4136000>,
-- <4468000 2457000>;
-+ <4468000 2457600>;
- qcom,dec-ocmem-ab-ib = <0 0>,
- <176000 519000>,
- <456000 519000>,
---
-2.10.2
-
-
-From 7fd5237c0cc7487b73ce9eec61853dcd126869c5 Mon Sep 17 00:00:00 2001
-From: WedyDQ10
-Date: Sun, 11 Jan 2015 20:55:23 +0900
-Subject: [PATCH 8/9] CPU Overclock over 2.889GHz
-
----
- arch/arm/mach-msm/clock-krait-8974.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-msm/clock-krait-8974.c b/arch/arm/mach-msm/clock-krait-8974.c
-index f7ca20a..d96eb37 100644
---- a/arch/arm/mach-msm/clock-krait-8974.c
-+++ b/arch/arm/mach-msm/clock-krait-8974.c
-@@ -44,7 +44,7 @@ static int hfpll_uv[] = {
- static DEFINE_VDD_REGULATORS(vdd_hfpll, ARRAY_SIZE(hfpll_uv)/2, 2,
- hfpll_uv, NULL);
-
--static unsigned long hfpll_fmax[] = { 0, 998400000, 1996800000, 2900000000UL };
-+static unsigned long hfpll_fmax[] = { 0, 998400000, 1996800000, 3100000000UL };
-
- static struct hfpll_data hdata = {
- .mode_offset = 0x0,
-@@ -58,7 +58,7 @@ static struct hfpll_data hdata = {
- .user_val = 0x8,
- .low_vco_max_rate = 1248000000,
- .min_rate = 537600000UL,
-- .max_rate = 2900000000UL,
-+ .max_rate = 3100000000UL,
- };
-
- static struct hfpll_clk hfpll0_clk = {
---
-2.10.2
-
-
-From 4b054faec6161af8f34b3206d785b6b2e7d30bd3 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Sat, 27 Feb 2016 16:58:05 -0500
-Subject: [PATCH 9/9] Enable 2.95Ghz overclock
-
-Change-Id: I022f7581ac48f184dbf5f2a9bb3f734f8335478f
----
- arch/arm/boot/dts/msm8974pro.dtsi | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
-index fed5f66..70fac47 100644
---- a/arch/arm/boot/dts/msm8974pro.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro.dtsi
-@@ -1804,7 +1804,8 @@
- < 2649600 /* 931 MHz */ >,
- < 2726400 /* 931 MHz */ >,
- < 2803200 /* 931 MHz */ >,
-- < 2880000 /* 931 MHz */ >;
-+ < 2880000 /* 931 MHz */ >,
-+ < 2956800 /* 931 MHz */ >;
- };
-
- i2c@f9928000 { /* BLSP-1 QUP-6 */
---
-2.10.2
-
diff --git a/Patches/CyanogenMod-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock.patch b/Patches/CyanogenMod-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock.patch
deleted file mode 100644
index 4a23466b..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_oneplus_msm8974/0001-OverUnderClock.patch
+++ /dev/null
@@ -1,709 +0,0 @@
-From 0b95ae785c6f1df0e7466a1922f5f3ff858897ae Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Sat, 17 Oct 2015 20:49:57 -0400
-Subject: [PATCH] Overclocked to 2.8Ghz, underclocked to 268Mhz
-
----
- arch/arm/boot/dts/msm8974-v2.dtsi | 2 +-
- arch/arm/boot/dts/msm8974pro-pm8941.dtsi | 8 +-
- .../arm/boot/dts/msm8974pro-pma8084-regulator.dtsi | 16 +-
- arch/arm/boot/dts/msm8974pro.dtsi | 190 ++++++++++++++++++---
- 4 files changed, 179 insertions(+), 37 deletions(-)
-
-diff --git a/arch/arm/boot/dts/msm8974-v2.dtsi b/arch/arm/boot/dts/msm8974-v2.dtsi
-index dbb3bd6..40a730e 100644
---- a/arch/arm/boot/dts/msm8974-v2.dtsi
-+++ b/arch/arm/boot/dts/msm8974-v2.dtsi
-@@ -123,7 +123,7 @@
- <1880000 2068000>,
- <3008000 3309000>,
- <3760000 4136000>,
-- <4468000 2457000>;
-+ <4468000 2457600>;
- qcom,dec-ocmem-ab-ib = <0 0>,
- <176000 519000>,
- <456000 519000>,
-diff --git a/arch/arm/boot/dts/msm8974pro-pm8941.dtsi b/arch/arm/boot/dts/msm8974pro-pm8941.dtsi
-index b502078..79729ea 100644
---- a/arch/arm/boot/dts/msm8974pro-pm8941.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro-pm8941.dtsi
-@@ -39,22 +39,22 @@
- };
-
- &krait0_vreg {
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,ldo-delta-voltage = <12500>;
- };
-
- &krait1_vreg {
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,ldo-delta-voltage = <12500>;
- };
-
- &krait2_vreg {
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,ldo-delta-voltage = <12500>;
- };
-
- &krait3_vreg {
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,ldo-delta-voltage = <12500>;
- };
-
-diff --git a/arch/arm/boot/dts/msm8974pro-pma8084-regulator.dtsi b/arch/arm/boot/dts/msm8974pro-pma8084-regulator.dtsi
-index 433d466..428a520 100644
---- a/arch/arm/boot/dts/msm8974pro-pma8084-regulator.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro-pma8084-regulator.dtsi
-@@ -492,9 +492,9 @@
- <0xf908a800 0x1000>; /* APCS_ALIAS0_KPSS_MDD */
- reg-names = "acs", "mdd";
- regulator-min-microvolt = <500000>;
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,headroom-voltage = <150000>;
-- qcom,retention-voltage = <675000>;
-+ qcom,retention-voltage = <600000>;
- qcom,ldo-default-voltage = <750000>;
- qcom,ldo-threshold-voltage = <850000>;
- qcom,ldo-delta-voltage = <12500>;
-@@ -508,9 +508,9 @@
- <0xf909a800 0x1000>; /* APCS_ALIAS1_KPSS_MDD */
- reg-names = "acs", "mdd";
- regulator-min-microvolt = <500000>;
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,headroom-voltage = <150000>;
-- qcom,retention-voltage = <675000>;
-+ qcom,retention-voltage = <600000>;
- qcom,ldo-default-voltage = <750000>;
- qcom,ldo-threshold-voltage = <850000>;
- qcom,ldo-delta-voltage = <12500>;
-@@ -524,9 +524,9 @@
- <0xf90aa800 0x1000>; /* APCS_ALIAS2_KPSS_MDD */
- reg-names = "acs", "mdd";
- regulator-min-microvolt = <500000>;
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,headroom-voltage = <150000>;
-- qcom,retention-voltage = <675000>;
-+ qcom,retention-voltage = <600000>;
- qcom,ldo-default-voltage = <750000>;
- qcom,ldo-threshold-voltage = <850000>;
- qcom,ldo-delta-voltage = <12500>;
-@@ -540,9 +540,9 @@
- <0xf90ba800 0x1000>; /* APCS_ALIAS3_KPSS_MDD */
- reg-names = "acs", "mdd";
- regulator-min-microvolt = <500000>;
-- regulator-max-microvolt = <1120000>;
-+ regulator-max-microvolt = <1250000>;
- qcom,headroom-voltage = <150000>;
-- qcom,retention-voltage = <675000>;
-+ qcom,retention-voltage = <600000>;
- qcom,ldo-default-voltage = <750000>;
- qcom,ldo-threshold-voltage = <850000>;
- qcom,ldo-delta-voltage = <12500>;
-diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
-index e332793..8524180 100644
---- a/arch/arm/boot/dts/msm8974pro.dtsi
-+++ b/arch/arm/boot/dts/msm8974pro.dtsi
-@@ -91,6 +91,7 @@
- qcom,clock-krait@f9016000 {
- qcom,speed1-pvs0-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 74 >,
- < 345600000 775000 85 >,
- < 422400000 775000 104 >,
-@@ -122,6 +123,7 @@
-
- qcom,speed1-pvs1-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 74 >,
- < 345600000 775000 85 >,
- < 422400000 775000 104 >,
-@@ -153,6 +155,7 @@
-
- qcom,speed1-pvs2-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 74 >,
- < 345600000 750000 85 >,
- < 422400000 750000 104 >,
-@@ -184,6 +187,7 @@
-
- qcom,speed1-pvs3-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 74 >,
- < 345600000 750000 85 >,
- < 422400000 750000 104 >,
-@@ -215,6 +219,7 @@
-
- qcom,speed1-pvs4-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 74 >,
- < 345600000 750000 85 >,
- < 422400000 750000 104 >,
-@@ -246,6 +251,7 @@
-
- qcom,speed1-pvs5-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 720000 68 >,
- < 300000000 725000 74 >,
- < 345600000 725000 85 >,
- < 422400000 725000 104 >,
-@@ -277,6 +283,7 @@
-
- qcom,speed1-pvs6-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 720000 68 >,
- < 300000000 725000 74 >,
- < 345600000 725000 85 >,
- < 422400000 725000 104 >,
-@@ -308,6 +315,7 @@
-
- qcom,speed3-pvs0-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -338,10 +346,14 @@
- < 2265600000 1065000 700 >,
- < 2342400000 1080000 734 >,
- < 2419200000 1095000 769 >,
-- < 2457600000 1100000 785 >;
-+ < 2457600000 1100000 785 >,
-+ < 2572800000 1145000 827 >,
-+ < 2726400000 1205000 900 >,
-+ < 2880000000 1235000 937 >;
-
- qcom,speed3-pvs1-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -372,10 +384,14 @@
- < 2265600000 1040000 700 >,
- < 2342400000 1055000 734 >,
- < 2419200000 1070000 769 >,
-- < 2457600000 1075000 785 >;
-+ < 2457600000 1075000 785 >,
-+ < 2572800000 1145000 827 >,
-+ < 2726400000 1205000 900 >,
-+ < 2880000000 1235000 937 >;
-
- qcom,speed3-pvs2-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -406,10 +422,14 @@
- < 2265600000 1015000 700 >,
- < 2342400000 1030000 734 >,
- < 2419200000 1045000 769 >,
-- < 2457600000 1050000 785 >;
-+ < 2457600000 1050000 785 >,
-+ < 2572800000 1125000 827 >,
-+ < 2726400000 1195000 900 >,
-+ < 2880000000 1225000 937 >;
-
- qcom,speed3-pvs3-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -440,10 +460,14 @@
- < 2265600000 990000 700 >,
- < 2342400000 1005000 734 >,
- < 2419200000 1020000 769 >,
-- < 2457600000 1025000 785 >;
-+ < 2457600000 1025000 785 >,
-+ < 2572800000 1115000 827 >,
-+ < 2726400000 1185000 900 >,
-+ < 2880000000 1215000 937 >;
-
- qcom,speed3-pvs4-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -474,10 +498,14 @@
- < 2265600000 965000 700 >,
- < 2342400000 980000 734 >,
- < 2419200000 995000 769 >,
-- < 2457600000 1000000 785 >;
-+ < 2457600000 1000000 785 >,
-+ < 2572800000 1075000 827 >,
-+ < 2726400000 1175000 900 >,
-+ < 2880000000 1205000 937 >;
-
- qcom,speed3-pvs5-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 106 >,
-@@ -508,10 +536,14 @@
- < 2265600000 940000 700 >,
- < 2342400000 955000 734 >,
- < 2419200000 970000 769 >,
-- < 2457600000 975000 785 >;
-+ < 2457600000 975000 785 >,
-+ < 2572800000 1025000 827 >,
-+ < 2726400000 1175000 900 >,
-+ < 2880000000 1195000 937 >;
-
- qcom,speed3-pvs6-bin-v0 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 106 >,
-@@ -542,10 +574,14 @@
- < 2265600000 915000 700 >,
- < 2342400000 930000 734 >,
- < 2419200000 945000 769 >,
-- < 2457600000 950000 785 >;
-+ < 2457600000 950000 785 >,
-+ < 2572800000 1010000 827 >,
-+ < 2726400000 1155000 900 >,
-+ < 2880000000 1175000 937 >;
-
- qcom,speed1-pvs0-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 810000 87 >,
- < 422400000 820000 108 >,
-@@ -577,6 +613,7 @@
-
- qcom,speed1-pvs1-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 810000 108 >,
-@@ -608,6 +645,7 @@
-
- qcom,speed1-pvs2-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 108 >,
-@@ -639,6 +677,7 @@
-
- qcom,speed1-pvs3-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 108 >,
-@@ -670,6 +709,7 @@
-
- qcom,speed1-pvs4-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 108 >,
-@@ -701,6 +741,7 @@
-
- qcom,speed1-pvs5-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 108 >,
-@@ -732,6 +773,7 @@
-
- qcom,speed1-pvs6-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -763,6 +805,7 @@
-
- qcom,speed1-pvs7-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -794,6 +837,7 @@
-
- qcom,speed1-pvs8-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -825,6 +869,7 @@
-
- qcom,speed1-pvs9-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -856,6 +901,7 @@
-
- qcom,speed1-pvs10-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -887,6 +933,7 @@
-
- qcom,speed1-pvs11-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -918,6 +965,7 @@
-
- qcom,speed1-pvs12-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -949,6 +997,7 @@
-
- qcom,speed1-pvs13-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 108 >,
-@@ -980,6 +1029,7 @@
-
- qcom,speed1-pvs14-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 108 >,
-@@ -1011,6 +1061,7 @@
-
- qcom,speed1-pvs15-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 108 >,
-@@ -1042,6 +1093,7 @@
-
- qcom,speed3-pvs0-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1072,10 +1124,14 @@
- < 2265600000 1085000 716 >,
- < 2342400000 1100000 751 >,
- < 2419200000 1115000 786 >,
-- < 2457600000 1120000 802 >;
-+ < 2457600000 1120000 802 >,
-+ < 2572800000 1175000 827 >,
-+ < 2726400000 1225000 900 >,
-+ < 2880000000 1265000 937 >;
-
- qcom,speed3-pvs1-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1106,10 +1162,14 @@
- < 2265600000 1075000 716 >,
- < 2342400000 1090000 751 >,
- < 2419200000 1105000 786 >,
-- < 2457600000 1110000 802 >;
-+ < 2457600000 1110000 802 >,
-+ < 2572800000 1165000 827 >,
-+ < 2726400000 1215000 900 >,
-+ < 2880000000 1245000 937 >;
-
- qcom,speed3-pvs2-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1140,10 +1200,14 @@
- < 2265600000 1065000 716 >,
- < 2342400000 1080000 751 >,
- < 2419200000 1095000 786 >,
-- < 2457600000 1100000 802 >;
-+ < 2457600000 1100000 802 >,
-+ < 2572800000 1145000 827 >,
-+ < 2726400000 1185000 900 >,
-+ < 2880000000 1215000 937 >;
-
- qcom,speed3-pvs3-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1174,10 +1238,14 @@
- < 2265600000 1055000 716 >,
- < 2342400000 1070000 751 >,
- < 2419200000 1085000 786 >,
-- < 2457600000 1090000 802 >;
-+ < 2457600000 1090000 802 >,
-+ < 2572800000 1145000 827 >,
-+ < 2726400000 1175000 900 >,
-+ < 2880000000 1205000 937 >;
-
- qcom,speed3-pvs4-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1208,10 +1276,14 @@
- < 2265600000 1045000 716 >,
- < 2342400000 1060000 751 >,
- < 2419200000 1075000 786 >,
-- < 2457600000 1080000 802 >;
-+ < 2457600000 1080000 802 >,
-+ < 2572800000 1135000 827 >,
-+ < 2726400000 1165000 900 >,
-+ < 2880000000 1195000 937 >;
-
- qcom,speed3-pvs5-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 795000 68 >,
- < 300000000 800000 76 >,
- < 345600000 800000 87 >,
- < 422400000 800000 106 >,
-@@ -1242,10 +1314,14 @@
- < 2265600000 1035000 716 >,
- < 2342400000 1050000 751 >,
- < 2419200000 1065000 786 >,
-- < 2457600000 1070000 802 >;
-+ < 2457600000 1070000 802 >,
-+ < 2572800000 1125000 827 >,
-+ < 2726400000 1155000 900 >,
-+ < 2880000000 1185000 937 >;
-
- qcom,speed3-pvs6-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1276,10 +1352,14 @@
- < 2265600000 1025000 716 >,
- < 2342400000 1040000 751 >,
- < 2419200000 1055000 786 >,
-- < 2457600000 1060000 802 >;
-+ < 2457600000 1060000 802 >,
-+ < 2572800000 1115000 827 >,
-+ < 2726400000 1145000 900 >,
-+ < 2880000000 1175000 937 >;
-
- qcom,speed3-pvs7-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1310,10 +1390,14 @@
- < 2265600000 1015000 716 >,
- < 2342400000 1030000 751 >,
- < 2419200000 1045000 786 >,
-- < 2457600000 1050000 802 >;
-+ < 2457600000 1050000 802 >,
-+ < 2572800000 1105000 827 >,
-+ < 2726400000 1135000 900 >,
-+ < 2880000000 1165000 937 >;
-
- qcom,speed3-pvs8-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1344,10 +1428,14 @@
- < 2265600000 1005000 716 >,
- < 2342400000 1020000 751 >,
- < 2419200000 1035000 786 >,
-- < 2457600000 1040000 802 >;
-+ < 2457600000 1040000 802 >,
-+ < 2572800000 1095000 827 >,
-+ < 2726400000 1125000 900 >,
-+ < 2880000000 1155000 937 >;
-
- qcom,speed3-pvs9-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1378,10 +1466,14 @@
- < 2265600000 995000 716 >,
- < 2342400000 1010000 751 >,
- < 2419200000 1025000 786 >,
-- < 2457600000 1030000 802 >;
-+ < 2457600000 1030000 802 >,
-+ < 2572800000 1085000 827 >,
-+ < 2726400000 1115000 900 >,
-+ < 2880000000 1145000 937 >;
-
- qcom,speed3-pvs10-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1412,10 +1504,14 @@
- < 2265600000 985000 716 >,
- < 2342400000 1000000 751 >,
- < 2419200000 1015000 786 >,
-- < 2457600000 1020000 802 >;
-+ < 2457600000 1020000 802 >,
-+ < 2572800000 1075000 827 >,
-+ < 2726400000 1105000 900 >,
-+ < 2880000000 1135000 937 >;
-
- qcom,speed3-pvs11-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1446,10 +1542,14 @@
- < 2265600000 975000 716 >,
- < 2342400000 990000 751 >,
- < 2419200000 1005000 786 >,
-- < 2457600000 1010000 802 >;
-+ < 2457600000 1010000 802 >,
-+ < 2572800000 1065000 827 >,
-+ < 2726400000 1095000 900 >,
-+ < 2880000000 1125000 937 >;
-
- qcom,speed3-pvs12-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1480,10 +1580,14 @@
- < 2265600000 965000 716 >,
- < 2342400000 980000 751 >,
- < 2419200000 995000 786 >,
-- < 2457600000 1000000 802 >;
-+ < 2457600000 1000000 802 >,
-+ < 2572800000 1065000 827 >,
-+ < 2726400000 1085000 900 >,
-+ < 2880000000 1115000 937 >;
-
- qcom,speed3-pvs13-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 770000 68 >,
- < 300000000 775000 76 >,
- < 345600000 775000 87 >,
- < 422400000 775000 106 >,
-@@ -1514,10 +1618,14 @@
- < 2265600000 955000 716 >,
- < 2342400000 970000 751 >,
- < 2419200000 985000 786 >,
-- < 2457600000 990000 802 >;
-+ < 2457600000 990000 802 >,
-+ < 2572800000 1045000 827 >,
-+ < 2726400000 1065000 900 >,
-+ < 2880000000 1095000 937 >;
-
- qcom,speed3-pvs14-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 106 >,
-@@ -1548,10 +1656,14 @@
- < 2265600000 945000 716 >,
- < 2342400000 960000 751 >,
- < 2419200000 975000 786 >,
-- < 2457600000 980000 802 >;
-+ < 2457600000 980000 802 >,
-+ < 2572800000 1035000 827 >,
-+ < 2726400000 1055000 900 >,
-+ < 2880000000 1085000 937 >;
-
- qcom,speed3-pvs15-bin-v1 =
- < 0 0 0 >,
-+ < 268800000 745000 68 >,
- < 300000000 750000 76 >,
- < 345600000 750000 87 >,
- < 422400000 750000 106 >,
-@@ -1582,9 +1694,39 @@
- < 2265600000 935000 716 >,
- < 2342400000 950000 751 >,
- < 2419200000 965000 786 >,
-- < 2457600000 970000 802 >;
-+ < 2457600000 970000 802 >,
-+ < 2572800000 1025000 827 >,
-+ < 2726400000 1045000 900 >,
-+ < 2880000000 1075000 937 >;
- };
-
-+ qcom,msm-cpufreq@0 {
-+ reg = <0 4>;
-+ compatible = "qcom,msm-cpufreq";
-+ qcom,cpufreq-table =
-+ < 268800 /* 75 MHz */ >,
-+ < 300000 /* 75 MHz */ >,
-+ < 422400 /* 150 MHz */ >,
-+ < 652800 /* 200 MHz */ >,
-+ < 729600 /* 307 MHz */ >,
-+ < 883200 /* 307 MHz */ >,
-+ < 960000 /* 460 MHz */ >,
-+ < 1036800 /* 460 MHz */ >,
-+ < 1190400 /* 460 MHz */ >,
-+ < 1267200 /* 614 MHz */ >,
-+ < 1497600 /* 614 MHz */ >,
-+ < 1574400 /* 800 MHz */ >,
-+ < 1728000 /* 800 MHz */ >,
-+ < 1958400 /* 931 MHz */ >,
-+ < 2265600 /* 931 MHz */ >,
-+ < 2342400 /* 931 MHz */ >,
-+ < 2419200 /* 931 MHz */ >,
-+ < 2457600 /* 931 MHz */ >,
-+ < 2572800 /* 931 MHz */ >,
-+ < 2726400 /* 931 MHz */ >,
-+ < 2880000 /* 931 MHz */ >;
-+ };
-+
- i2c@f9928000 { /* BLSP-1 QUP-6 */
- cell-index = <3>;
- compatible = "qcom,i2c-qup";
-@@ -1745,7 +1887,7 @@
- <1880000 2068000>,
- <3008000 3309000>,
- <3760000 4136000>,
-- <4468000 2457000>;
-+ <4468000 2457600>;
- qcom,dec-ocmem-ab-ib = <0 0>,
- <176000 519000>,
- <456000 519000>,
---
-2.10.2
-
diff --git a/Patches/CyanogenMod-14.1/android_kernel_oneplus_msm8974/0002-Enable_Diag.patch b/Patches/CyanogenMod-14.1/android_kernel_oneplus_msm8974/0002-Enable_Diag.patch
deleted file mode 100644
index 53c5d08c..00000000
--- a/Patches/CyanogenMod-14.1/android_kernel_oneplus_msm8974/0002-Enable_Diag.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 94d13624a7710818698d5787a7bcd7f8a272762b Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Sat, 17 Oct 2015 20:50:31 -0400
-Subject: [PATCH] Update defconfig
-
----
- arch/arm/configs/cyanogenmod_bacon_defconfig | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/arm/configs/cyanogenmod_bacon_defconfig b/arch/arm/configs/cyanogenmod_bacon_defconfig
-index 33ceebd..8cb1936 100644
---- a/arch/arm/configs/cyanogenmod_bacon_defconfig
-+++ b/arch/arm/configs/cyanogenmod_bacon_defconfig
-@@ -591,3 +591,6 @@ CONFIG_CRYPTO_TWOFISH=y
- CONFIG_CRYPTO_DEV_QCRYPTO=y
- CONFIG_CRYPTO_DEV_QCE=y
- CONFIG_CRYPTO_DEV_QCEDEV=y
-+
-+CONFIG_DIAG_CHAR=y
-+CONFIG_DIAG_OVER_USB=y
---
-2.10.2
-
diff --git a/Patches/CyanogenMod-14.1/android_packages_apps_CMParts/0001-Remove_Analytics.patch b/Patches/CyanogenMod-14.1/android_packages_apps_CMParts/0001-Remove_Analytics.patch
deleted file mode 100644
index b1b4b871..00000000
--- a/Patches/CyanogenMod-14.1/android_packages_apps_CMParts/0001-Remove_Analytics.patch
+++ /dev/null
@@ -1,1068 +0,0 @@
-From 3b221ea04b84cf9df2098598c0d4979446b0c914 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Fri, 23 Dec 2016 23:09:33 -0500
-Subject: [PATCH] Remove stats
-
-Change-Id: I13313c99c3a839f6ae53d5d87a9999da23fb1103
----
- AndroidManifest.xml | 25 --
- proguard.flags | 1 -
- res/values/config.xml | 5 -
- res/values/strings.xml | 22 --
- res/xml/anonymous_stats.xml | 32 ---
- res/xml/parts_catalog.xml | 5 -
- res/xml/preview_data.xml | 52 ----
- res/xml/privacy_settings.xml | 8 -
- .../cmparts/cmstats/AnonymousStats.java | 101 -------
- .../cyanogenmod/cmparts/cmstats/PreviewData.java | 49 ----
- .../cmparts/cmstats/ReportingService.java | 106 --------
- .../cmparts/cmstats/ReportingServiceManager.java | 123 ---------
- .../cmparts/cmstats/StatsUploadJobService.java | 291 ---------------------
- src/org/cyanogenmod/cmparts/cmstats/Utilities.java | 102 --------
- 14 files changed, 922 deletions(-)
- delete mode 100644 res/xml/anonymous_stats.xml
- delete mode 100644 res/xml/preview_data.xml
- delete mode 100644 src/org/cyanogenmod/cmparts/cmstats/AnonymousStats.java
- delete mode 100644 src/org/cyanogenmod/cmparts/cmstats/PreviewData.java
- delete mode 100644 src/org/cyanogenmod/cmparts/cmstats/ReportingService.java
- delete mode 100644 src/org/cyanogenmod/cmparts/cmstats/ReportingServiceManager.java
- delete mode 100644 src/org/cyanogenmod/cmparts/cmstats/StatsUploadJobService.java
- delete mode 100644 src/org/cyanogenmod/cmparts/cmstats/Utilities.java
-
-diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 1bdf33d..ceec90e 100644
---- a/AndroidManifest.xml
-+++ b/AndroidManifest.xml
-@@ -179,31 +179,6 @@
- android:value="status_bar_settings" />
-
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-
-
-
--
-- https://stats.cyanogenmod.org/submit
-- https://shopvac.cyngn.com/community/heartbeat
-- https://account.cyngn.com/api/v1/community/heartbeat_token
--
-
- true
-
-diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 0557279..cfcf049 100644
---- a/res/values/strings.xml
-+++ b/res/values/strings.xml
-@@ -483,28 +483,6 @@
- Total commits: %2$s
- Last update: %3$s]]>
-
--
--
-- CyanogenMod statistics
-- Help make CyanogenMod better by opting into anonymous statistics reporting
-- About
-- Opting into CyanogenMod Statistics will allow non-personal data to be submitted to the
-- developers of CyanogenMod to track unique installations across devices. The information submitted includes an unique identifier,
-- which does not compromise your privacy or personal data. The data is submitted during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.
-- Enable reporting
-- Preview data
-- View stats
-- Learn more
--
--
-- Unique ID
-- Device
-- Version
-- Country
-- Carrier
-- Stats collection
-- When enabled, allows metrics collection
--
-
- Auto-rotate screen
- Rotation settings
-diff --git a/res/xml/anonymous_stats.xml b/res/xml/anonymous_stats.xml
-deleted file mode 100644
-index b29885c..0000000
---- a/res/xml/anonymous_stats.xml
-+++ /dev/null
-@@ -1,32 +0,0 @@
--
--
--
--
--
--
--
--
--
--
-diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
-index 07329d9..649e808 100644
---- a/res/xml/parts_catalog.xml
-+++ b/res/xml/parts_catalog.xml
-@@ -73,11 +73,6 @@
- android:fragment="org.cyanogenmod.cmparts.statusbar.StatusBarSettings"
- cm:xmlRes="@xml/status_bar_settings" />
-
--
--
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
-index 5ae923a..45df2a1 100644
---- a/res/xml/privacy_settings.xml
-+++ b/res/xml/privacy_settings.xml
-@@ -36,12 +36,4 @@
- android:targetClass="com.android.settings.applications.ProtectedAppsActivity" />
-