Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb6e8fb3 authored by Olof Johansson's avatar Olof Johansson
Browse files

arm/tegra: remove __initdata annotation from pinmux tables 



Instead of reshuffling what functions in the pinmux paths should be
__init and thus could keep references to __initdata, let's just remove
the annotations for now -- the tables are moving to device tree in the
next version anyway and the whole subsystem is being wired up. We will
go back and re-annotate where appropriate once things settle down.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
parent a58116f3

arch/arm/mach-tegra/board-seaboard-pinmux.c

+4 −4
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ 
		.slew_falling = TEGRA_SLEW_SLOWEST,		\

	}



static __initdata struct tegra_drive_pingroup_config seaboard_drive_pinmux[] = {

static struct tegra_drive_pingroup_config seaboard_drive_pinmux[] = {

	DEFAULT_DRIVE(SDIO1),

};



static __initdata struct tegra_pingroup_config common_pinmux[] = {

static struct tegra_pingroup_config common_pinmux[] = {

	{TEGRA_PINGROUP_ATA,   TEGRA_MUX_IDE,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_ATB,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_ATC,   TEGRA_MUX_NAND,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
@@ -147,7 +147,7 @@ static __initdata struct tegra_pingroup_config common_pinmux[] = { 
	{TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

};



static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {

static struct tegra_pingroup_config seaboard_pinmux[] = {

	{TEGRA_PINGROUP_DDC,   TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_GMD,   TEGRA_MUX_SFLASH,        TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_LPW0,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
@@ -163,7 +163,7 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = { 
	{TEGRA_PINGROUP_SPIG,  TEGRA_MUX_SPI2_ALT,      TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},

};



static __initdata struct tegra_pingroup_config ventana_pinmux[] = {

static struct tegra_pingroup_config ventana_pinmux[] = {

	{TEGRA_PINGROUP_DDC,  TEGRA_MUX_RSVD2,    TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_GMD,  TEGRA_MUX_SFLASH,   TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_LPW0, TEGRA_MUX_RSVD4,    TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

arch/arm/mach-tegra/board-trimslice-pinmux.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "board-pinmux.h"

#include "board-trimslice.h"



static __initdata struct tegra_pingroup_config trimslice_pinmux[] = {

static struct tegra_pingroup_config trimslice_pinmux[] = {

	{TEGRA_PINGROUP_ATA,   TEGRA_MUX_IDE,           TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_ATB,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,	TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_ATC,   TEGRA_MUX_NAND,          TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},