Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
1  arch/arm/mach-tegra/board-betelgeuse-pinmux.c
@@ -207,7 +207,6 @@ static struct tegra_gpio_table gpio_table[] = {
{ .gpio = BETELGEUSE_IN_S3, .enable = true },
/* { .gpio = BETELGEUSE_USB1_RESET, .enable = true },*/
{ .gpio = BETELGEUSE_HP_DETECT, .enable = true },
- { .gpio = BETELGEUSE_TEMP_ALERT, .enable = true },
{ .gpio = BETELGEUSE_NVEC_REQ, .enable = true },
{ .gpio = TEGRA_GPIO_POWERKEY, .enable = true },
{ .gpio = AKM8975_IRQ_GPIO, .enable = true },
View
11 arch/arm/mach-tegra/board-betelgeuse-power.c
@@ -45,7 +45,7 @@
#include "board-betelgeuse.h"
#include "gpio-names.h"
#include "devices.h"
-
+#include "../../../drivers/staging/nvec2/nvec.h"
#define PMC_CTRL 0x0
#define PMC_CTRL_INTR_LOW (1 << 17)
@@ -572,6 +572,12 @@ static struct platform_device *betelgeuse_power_devices[] __initdata = {
&tegra_rtc_device,
};
+static void betelgeuse_power_off(void)
+{
+ /* Power down through NvEC */
+ nvec_poweroff();
+}
+
/* Init power management unit of Tegra2 */
int __init betelgeuse_power_register_devices(void)
{
@@ -589,6 +595,9 @@ int __init betelgeuse_power_register_devices(void)
if (err < 0)
pr_warning("Unable to initialize regulator\n");
+ /* register the poweroff callback */
+ pm_power_off = betelgeuse_power_off;
+
/* And the restart callback */
tegra_setup_reboot();
View
7 arch/arm/mach-tegra/board-betelgeuse-sensors.c
@@ -81,20 +81,19 @@ static struct adt7461_platform_data betelgeuse_adt7461_pdata = {
.shutdown_local_limit = 120,
.throttling_ext_limit = 90,
.alarm_fn = tegra_throttling_enable,
+ .irq_gpio = ADT7461_IRQ_GPIO,
};
static struct i2c_board_info __initdata adt7461_device = {
I2C_BOARD_INFO("adt7461", 0x4c),
- .irq = TEGRA_GPIO_TO_IRQ(BETELGEUSE_TEMP_ALERT),
+ .irq = TEGRA_GPIO_TO_IRQ(ADT7461_IRQ_GPIO),
.platform_data = &betelgeuse_adt7461_pdata,
};
static void betelgeuse_adt7461_init(void)
{
- gpio_request(BETELGEUSE_TEMP_ALERT, "adt7461_temp_alert_irq");
- gpio_direction_input(BETELGEUSE_TEMP_ALERT);
-
+ tegra_gpio_enable(ADT7461_IRQ_GPIO);
i2c_register_board_info(4, &adt7461_device, 1);
}
View
2  arch/arm/mach-tegra/board-betelgeuse.h
@@ -91,7 +91,7 @@
#define BETELGEUSE_USB2_VBUS TEGRA_GPIO_PD3
// Sensors
-#define BETELGEUSE_TEMP_ALERT TEGRA_GPIO_PN6
+#define ADT7461_IRQ_GPIO TEGRA_GPIO_PN6
#define AKM8975_IRQ_GPIO TEGRA_GPIO_PV1
#define LSM303DHL_IRQ_GPIO TEGRA_GPIO_PV7
View
2  drivers/staging/nvec2/nvec.c
@@ -1315,7 +1315,7 @@ static int __devinit tegra_nvec_probe(struct platform_device *pdev)
nvec->i2c_regs = i2c_regs;
- i2c_clk = clk_get_sys(pdata->clock, NULL);
+ i2c_clk = clk_get_sys(pdata->clock, "i2c-div");
if (IS_ERR_OR_NULL(i2c_clk)) {
dev_err(nvec->dev, "failed to get clock tegra-i2c.2\n");
goto failed;

No commit comments for this range

Something went wrong with that request. Please try again.