diff options
author | Tom Cherry <tcherry@nvidia.com> | 2012-06-07 22:47:04 -0700 |
---|---|---|
committer | Tom Cherry <tcherry@nvidia.com> | 2012-06-07 22:47:04 -0700 |
commit | 94596e0f2e5485acce0d6eef11799c5c35610cd5 (patch) | |
tree | 8b53e2a7700aad78e278288f5aed6d95f514bc23 /include | |
parent | 7ca2a5f1d750b580f5093c2c6895772b32d30f66 (diff) | |
parent | b17f01f41b5cd2a49e48b87fb51d59c181819d89 (diff) |
Merge remote branch 'origin/android-tegra-nv-3.1' into HEAD
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/cpuquiet.h | 53 | ||||
-rw-r--r-- | include/linux/platform_data/tegra_usb.h | 2 |
2 files changed, 55 insertions, 0 deletions
diff --git a/include/linux/cpuquiet.h b/include/linux/cpuquiet.h new file mode 100644 index 000000000000..8459af7aad74 --- /dev/null +++ b/include/linux/cpuquiet.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2012 NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef _LINUX_CPUONLINE_H +#define _LINUX_CPUONLINE_H + +#include <linux/sysfs.h> +#include <linux/kobject.h> + +#define CPUQUIET_NAME_LEN 16 + +struct cpuquiet_governor { + char name[CPUQUIET_NAME_LEN]; + struct list_head governor_list; + int (*start) (void); + void (*stop) (void); + int (*store_active) (unsigned int cpu, bool active); + struct module *owner; +}; + +struct cpuquiet_driver { + char name[CPUQUIET_NAME_LEN]; + int (*quiesence_cpu) (unsigned int cpunumber); + int (*wake_cpu) (unsigned int cpunumber); +}; + +extern int cpuquiet_register_governor(struct cpuquiet_governor *gov); +extern void cpuquiet_unregister_governor(struct cpuquiet_governor *gov); +extern int cpuquiet_quiesence_cpu(unsigned int cpunumber); +extern int cpuquiet_wake_cpu(unsigned int cpunumber); +extern int cpuquiet_register_driver(struct cpuquiet_driver *drv); +extern void cpuquiet_unregister_driver(struct cpuquiet_driver *drv); +extern int cpuquiet_add_group(struct attribute_group *attrs); +extern void cpuquiet_remove_group(struct attribute_group *attrs); +int cpuquiet_kobject_init(struct kobject *kobj, struct kobj_type *type, + char *name); +extern unsigned int nr_cluster_ids; +#endif diff --git a/include/linux/platform_data/tegra_usb.h b/include/linux/platform_data/tegra_usb.h index 911175086977..97472714e8e6 100644 --- a/include/linux/platform_data/tegra_usb.h +++ b/include/linux/platform_data/tegra_usb.h @@ -47,6 +47,7 @@ struct tegra_utmi_config { u8 xcvr_lsfslew; u8 xcvr_lsrslew; signed char xcvr_setup_offset; + u8 xcvr_use_lsb; u8 xcvr_use_fuses; }; @@ -119,6 +120,7 @@ struct tegra_usb_host_mode_data { struct tegra_usb_platform_data { bool port_otg; bool has_hostpc; + bool builtin_host_disabled; enum tegra_usb_phy_interface phy_intf; enum tegra_usb_operation_mode op_mode; |