Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # On branch android-tegra-nv-2.6.39
- # Changed but not updated:
- # (use "git add <file>..." to update what will be committed)
- # (use "git checkout -- <file>..." to discard changes in working directory)
- #
- # modified: arch/arm/mach-tegra/Kconfig
- # modified: arch/arm/mach-tegra/Makefile
- # modified: arch/arm/mach-tegra/include/mach/latency_allowance.h
- # modified: arch/arm/mach-tegra/include/mach/sdhci.h
- # modified: include/linux/netdevice.h
- #
- # Untracked files:
- # (use "git add <file>..." to include in what will be committed)
- #
- # arch/arm/configs/tegra_smba1002_android_defconfig
- # arch/arm/mach-tegra/board-smba1002-aes.c
- # arch/arm/mach-tegra/board-smba1002-audio.c
- # arch/arm/mach-tegra/board-smba1002-audio.c-bak
- # arch/arm/mach-tegra/board-smba1002-bootinfo.c
- # arch/arm/mach-tegra/board-smba1002-bt.c
- # arch/arm/mach-tegra/board-smba1002-camera.c
- # arch/arm/mach-tegra/board-smba1002-clocks.c
- # arch/arm/mach-tegra/board-smba1002-clocks.c.bak
- # arch/arm/mach-tegra/board-smba1002-gps.c
- # arch/arm/mach-tegra/board-smba1002-gpu.c
- # arch/arm/mach-tegra/board-smba1002-gsm.c
- # arch/arm/mach-tegra/board-smba1002-i2c.c
- # arch/arm/mach-tegra/board-smba1002-keyboard.c
- # arch/arm/mach-tegra/board-smba1002-memory.c
- # arch/arm/mach-tegra/board-smba1002-nand.c
- # arch/arm/mach-tegra/board-smba1002-pinmux.c
- # arch/arm/mach-tegra/board-smba1002-pm-bluetooth.c
- # arch/arm/mach-tegra/board-smba1002-pm-camera.c
- # arch/arm/mach-tegra/board-smba1002-power.c
- # arch/arm/mach-tegra/board-smba1002-sdhci.c
- # arch/arm/mach-tegra/board-smba1002-sensors.c
- # arch/arm/mach-tegra/board-smba1002-spi.c
- # arch/arm/mach-tegra/board-smba1002-touch.c
- # arch/arm/mach-tegra/board-smba1002-uart.c
- # arch/arm/mach-tegra/board-smba1002-usb.c
- # arch/arm/mach-tegra/board-smba1002-wake.c
- # arch/arm/mach-tegra/board-smba1002-wdt.c
- # arch/arm/mach-tegra/board-smba1002-wlan.c
- # arch/arm/mach-tegra/board-smba1002.c
- # arch/arm/mach-tegra/board-smba1002.h
- # arch/arm/mach-tegra/include/mach/shuttle_audio.h
- # arch/arm/mach-tegra/include/mach/smba1002_audio.h
- # include/linux/gpio_shortlong_key.h
- # include/linux/input/egalax.h
- # include/linux/input/it7260.h
- # include/linux/mfd/nvec.h
- # include/linux/power/nvec_power.h
- # include/linux/power/tps6586x_battery.h
- # include/linux/regulator/virtual_adj.h
- # include/linux/smp_lock.h
- # include/sound/alc5624.h
- diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
- index 48b1692..189466f 100644
- --- a/arch/arm/mach-tegra/Kconfig
- +++ b/arch/arm/mach-tegra/Kconfig
- @@ -64,6 +64,13 @@ config MACH_ADAM
- help
- Support for all TabletPCs based on the ADAM design.
- +config MACH_SMBA1002
- + bool "Malata smba1002"
- + depends on ARCH_TEGRA_2x_SOC
- + select MACH_HAS_SND_SOC_TEGRA_ALC5623 if SND_SOC
- + help
- + Support for the Malata smba1002
- +
- config MACH_HARMONY
- bool "Harmony board"
- depends on ARCH_TEGRA_2x_SOC
- diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
- index 2ee82c3..ffd1448 100644
- --- a/arch/arm/mach-tegra/Makefile
- +++ b/arch/arm/mach-tegra/Makefile
- @@ -113,6 +113,40 @@ obj-${CONFIG_MACH_SEABOARD} += board-seaboard-pinmux.o
- obj-${CONFIG_MACH_TRIMSLICE} += board-trimslice.o
- obj-${CONFIG_MACH_TRIMSLICE} += board-trimslice-pinmux.o
- +# smba1002 arch drivers
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-aes.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-audio.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-bootinfo.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-bt.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-camera.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-clocks.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-gps.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-gpu.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-gsm.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-i2c.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-keyboard.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-memory.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-nand.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-pinmux.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-power.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-sdhci.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-sensors.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-spi.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-touch.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-uart.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-usb.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-wake.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-wdt.o
- +#obj-${CONFIG_MACH_SMBA1002} += board-smba1002-wlan.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002.o
- +# smba1002 power management drivers
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-pm-bluetooth.o
- +obj-${CONFIG_MACH_SMBA1002} += board-smba1002-pm-camera.o
- +#obj-${CONFIG_MACH_SMBA1002} += board-smba1002-pm-gps.o
- +#obj-${CONFIG_MACH_SMBA1002} += board-smba1002-pm-gsm.o
- +#obj-${CONFIG_MACH_SMBA1002} += board-smba1002-pm-wlan.o
- +
- +
- obj-${CONFIG_MACH_VENTANA} += board-ventana.o
- obj-${CONFIG_MACH_VENTANA} += board-ventana-pinmux.o
- obj-${CONFIG_MACH_VENTANA} += board-ventana-sdhci.o
- diff --git a/arch/arm/mach-tegra/include/mach/latency_allowance.h b/arch/arm/mach-tegra/include/mach/latency_allowance.h
- index f0d27f0..fae2896 100644
- --- a/arch/arm/mach-tegra/include/mach/latency_allowance.h
- +++ b/arch/arm/mach-tegra/include/mach/latency_allowance.h
- @@ -104,7 +104,7 @@ static inline int tegra_enable_latency_scaling(enum tegra_la_id id,
- static inline void tegra_disable_latency_scaling(enum tegra_la_id id)
- {
- - return 0;
- + return;
- }
- #else
- int tegra_set_latency_allowance(enum tegra_la_id id,
- diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/arch/arm/mach-tegra/include/mach/sdhci.h
- index 8e9dcc4..1c9e6bc 100644
- --- a/arch/arm/mach-tegra/include/mach/sdhci.h
- +++ b/arch/arm/mach-tegra/include/mach/sdhci.h
- @@ -24,8 +24,8 @@ struct tegra_sdhci_platform_data {
- int cd_gpio;
- int wp_gpio;
- int power_gpio;
- - int is_8bit;
- - int has_no_vreg; /* 1=No voltage regulator */
- + int is_8bit:1;
- + int has_no_vreg:1; /* 1=No voltage regulator */
- struct mmc_platform_data mmc_data;
- };
- diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
- index 66b22bf..0e9cdc1 100644
- --- a/include/linux/netdevice.h
- +++ b/include/linux/netdevice.h
- @@ -556,7 +556,7 @@ struct netdev_queue {
- struct Qdisc *qdisc;
- unsigned long state;
- struct Qdisc *qdisc_sleeping;
- -#ifdef CONFIG_RPS
- +#if defined(CONFIG_RPS) || defined(CONFIG_XPS)
- struct kobject kobj;
- #endif
- #if defined(CONFIG_XPS) && defined(CONFIG_NUMA)
- @@ -571,6 +571,12 @@ struct netdev_queue {
- * please use this field instead of dev->trans_start
- */
- unsigned long trans_start;
- +
- + /*
- + * Number of TX timeouts for this queue
- + * (/sys/class/net/DEV/Q/trans_timeout)
- + */
- + unsigned long trans_timeout;
- } ____cacheline_aligned_in_smp;
- static inline int netdev_queue_numa_node_read(const struct netdev_queue *q)
- @@ -1208,8 +1214,10 @@ struct net_device {
- unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */
- -#ifdef CONFIG_RPS
- +#if defined(CONFIG_RPS) || defined(CONFIG_XPS)
- +#ifdef CONFIG_SYSFS
- struct kset *queues_kset;
- +#endif
- struct netdev_rx_queue *_rx;
Advertisement
Add Comment
Please, Sign In to add comment