Commit 9fece9bd authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Shawn Guo
Browse files

ARM: imx/iomux-v3: allow pad_list to be const 



Also fix all machine files to make use of it and while at it also make
the pad lists __initconst.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent c517d838

arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "iomux-mx25.h"

#include "mx25.h"



static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {

static const iomux_v3_cfg_t eukrea_mbimxsd_pads[] __initconst = {

	/* LCD */

	MX25_PAD_LD0__LD0,

	MX25_PAD_LD1__LD1,

arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static struct mx3fb_platform_data mx3fb_pdata __initdata = { 
	.num_modes	= ARRAY_SIZE(fb_modedb),

};



static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {

static const iomux_v3_cfg_t eukrea_mbimxsd_pads[] __initconst = {

	/* LCD */

	MX35_PAD_LD0__IPU_DISPB_DAT_0,

	MX35_PAD_LD1__IPU_DISPB_DAT_1,

arch/arm/mach-imx/iomux-v3.c

+3 −2
Original line number Diff line number Diff line
@@ -56,9 +56,10 @@ int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t pad) 
	return 0;

}



int mxc_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t *pad_list, unsigned count)

int mxc_iomux_v3_setup_multiple_pads(const iomux_v3_cfg_t *pad_list,

		unsigned count)

{

	iomux_v3_cfg_t *p = pad_list;

	const iomux_v3_cfg_t *p = pad_list;

	int i;

	int ret;

arch/arm/mach-imx/iomux-v3.h

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t pad); 
 * setups mutliple pads

 * convenient way to call the above function with tables

 */

int mxc_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t *pad_list, unsigned count);

int mxc_iomux_v3_setup_multiple_pads(const iomux_v3_cfg_t *pad_list,

		unsigned count);



/*

 * Initialise the iomux controller

arch/arm/mach-imx/mach-cpuimx35.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static struct i2c_board_info eukrea_cpuimx35_i2c_devices[] = { 
	},

};



static iomux_v3_cfg_t eukrea_cpuimx35_pads[] = {

static const iomux_v3_cfg_t eukrea_cpuimx35_pads[] __initconst = {

	/* UART1 */

	MX35_PAD_CTS1__UART1_CTS,

	MX35_PAD_RTS1__UART1_RTS,

CRA Git | Maintained and supported by SUSTech CRA and CCSE