diff --git a/[refs] b/[refs] index 3ffa2ca107aa..40f41e5a6fb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e233230f9c8f02d4c3a643ec5067ca21bc90ee9a +refs/heads/master: d74b96a73a99853708d6b278c2ce683657fa1ec5 diff --git a/trunk/arch/arm/mach-orion5x/d2net-setup.c b/trunk/arch/arm/mach-orion5x/d2net-setup.c index 9d4bf763f25b..0420e45f66b7 100644 --- a/trunk/arch/arm/mach-orion5x/d2net-setup.c +++ b/trunk/arch/arm/mach-orion5x/d2net-setup.c @@ -301,6 +301,8 @@ static struct orion5x_mpp_mode d2net_mpp_modes[] __initdata = { /* 24: Inhibit board power off (0 = Disabled, 1 = Enabled) */ }; +#define D2NET_GPIO_INHIBIT_POWER_OFF 24 + static void __init d2net_init(void) { /* @@ -333,6 +335,8 @@ static void __init d2net_init(void) i2c_register_board_info(0, d2net_i2c_devices, ARRAY_SIZE(d2net_i2c_devices)); + + orion_gpio_set_valid(D2NET_GPIO_INHIBIT_POWER_OFF, 1); } /* Warning: LaCie use a wrong mach-type (0x20e=526) in their bootloader. */