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

Commit 3d9b448b authored by Kumar Gala's avatar Kumar Gala
Browse files

ARM: qcom: Merge scm and scm boot code together 



Put all scm related code into a single file as a first step in cleaning
up the scm interface to just expose functional behavior insteam of making
direct scm calls.

Signed-off-by: default avatarKumar Gala <galak@codeaurora.org>
parent c517d838

arch/arm/mach-qcom/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y			:= board.o

obj-$(CONFIG_SMP)	+= platsmp.o

obj-$(CONFIG_QCOM_SCM)	+= scm.o scm-boot.o

obj-$(CONFIG_QCOM_SCM)	+= scm.o



CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)

arch/arm/mach-qcom/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include <asm/smp_plat.h>



#include "scm-boot.h"

#include "scm.h"



#define VDD_SC1_ARRAY_CLAMP_GFS_CTL	0x35a0

#define SCSS_CPU1CORE_RESET		0x2d80

arch/arm/mach-qcom/scm-boot.c

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * 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.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

 * 02110-1301, USA.

 */



#include <linux/module.h>

#include <linux/slab.h>



#include "scm.h"

#include "scm-boot.h"



/*

 * Set the cold/warm boot address for one of the CPU cores.

 */

int scm_set_boot_addr(u32 addr, int flags)

{

	struct {

		__le32 flags;

		__le32 addr;

	} cmd;



	cmd.addr = cpu_to_le32(addr);

	cmd.flags = cpu_to_le32(flags);

	return scm_call(SCM_SVC_BOOT, SCM_BOOT_ADDR,

			&cmd, sizeof(cmd), NULL, 0);

}

EXPORT_SYMBOL(scm_set_boot_addr);

arch/arm/mach-qcom/scm-boot.h

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * 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 __MACH_SCM_BOOT_H

#define __MACH_SCM_BOOT_H



#define SCM_BOOT_ADDR			0x1

#define SCM_FLAG_COLDBOOT_CPU1		0x01

#define SCM_FLAG_COLDBOOT_CPU2		0x08

#define SCM_FLAG_COLDBOOT_CPU3		0x20

#define SCM_FLAG_WARMBOOT_CPU0		0x04

#define SCM_FLAG_WARMBOOT_CPU1		0x02

#define SCM_FLAG_WARMBOOT_CPU2		0x10

#define SCM_FLAG_WARMBOOT_CPU3		0x40



int scm_set_boot_addr(u32 addr, int flags);



#endif

arch/arm/mach-qcom/scm.c

+17 −0
Original line number Diff line number Diff line
@@ -324,3 +324,20 @@ u32 scm_get_version(void) 
	return version;

}

EXPORT_SYMBOL(scm_get_version);



/*

 * Set the cold/warm boot address for one of the CPU cores.

 */

int scm_set_boot_addr(u32 addr, int flags)

{

	struct {

		__le32 flags;

		__le32 addr;

	} cmd;



	cmd.addr = cpu_to_le32(addr);

	cmd.flags = cpu_to_le32(flags);

	return scm_call(SCM_SVC_BOOT, SCM_BOOT_ADDR,

			&cmd, sizeof(cmd), NULL, 0);

}

EXPORT_SYMBOL(scm_set_boot_addr);