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

Commit ea74d716 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: iomap: Add fsm9010 support"

parents aa66eaae 71050823

arch/arm/mach-msm/include/mach/board.h

+1 −0
Original line number Diff line number Diff line
@@ -630,6 +630,7 @@ void msm_map_fsm9xxx_io(void); 
void msm_map_fsm9900_io(void);

void fsm9900_init_gpiomux(void);

void fsm9900_rf_init_gpiomux(void);

void msm_map_fsm9010_io(void);

void msm_map_8974_io(void);

void msm_map_8084_io(void);

void msm_map_mdm9630_io(void);

arch/arm/mach-msm/include/mach/msm_iomap-fsm9010.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef __ASM_ARCH_MSM_IOMAP_FSM9010_H

#define __ASM_ARCH_MSM_IOMAP_FSM9010_H



/* Physical base address and size of peripherals.

 * Ordered by the virtual base addresses they will be mapped at.

 *

 * If you add or remove entries here, you'll want to edit the

 * io desc array in arch/arm/mach-msm/io.c to reflect your

 * changes.

 *

 */



#define FSM9010_APCS_GCC_PHYS	0xF9011000

#define FSM9010_APCS_GCC_SIZE	SZ_4K



#define FSM9010_MPM2_PSHOLD_PHYS	0xFC4AB000

#define FSM9010_MPM2_PSHOLD_SIZE	SZ_4K



#ifdef CONFIG_DEBUG_FSM9010_UART

#define MSM_DEBUG_UART_BASE	IOMEM(0xFA71F000)

#define MSM_DEBUG_UART_PHYS	0xF991F000

#endif



#endif

arch/arm/mach-msm/include/mach/msm_iomap.h

+1 −0
Original line number Diff line number Diff line
@@ -97,5 +97,6 @@ 
#include "msm_iomap-9630.h"

#include "msm_iomap-zirc.h"

#include "msm_iomap-fsm9900.h"

#include "msm_iomap-fsm9010.h"



#endif

arch/arm/mach-msm/io.c

+16 −0
Original line number Diff line number Diff line
@@ -91,6 +91,22 @@ void __init msm_map_fsm9900_io(void) 
}

#endif /* CONFIG_ARCH_FSM9900 */



#ifdef CONFIG_ARCH_FSM9010

static struct map_desc fsm9010_io_desc[] __initdata = {

	MSM_CHIP_DEVICE(APCS_GCC, FSM9010),

	MSM_CHIP_DEVICE(MPM2_PSHOLD, FSM9010),

#ifdef CONFIG_DEBUG_FSM9010_UART

	MSM_DEVICE(DEBUG_UART),

#endif

};



void __init msm_map_fsm9010_io(void)

{

	iotable_init(fsm9010_io_desc, ARRAY_SIZE(fsm9010_io_desc));

}

#endif /* CONFIG_ARCH_FSM9010 */





#ifdef CONFIG_ARCH_MDM9630

static struct map_desc mdm9630_io_desc[] __initdata = {

	MSM_CHIP_DEVICE(TLMM, MDM9630),