Merge branch 'omap-for-v4.10/fixes' into omap-for-v4.11/fixes (715e82cf) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/mach-omap2/omap-headsmp.S

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@

		#include <linux/linkage.h>
		#include <linux/init.h>
		#include <asm/assembler.h>

		#include "omap44xx.h"

		@@ -66,7 +67,7 @@ wait_2: ldr r2, =AUX_CORE_BOOT0_PA @ read from AuxCoreBoot0
		cmp r0, r4
		bne wait_2
		ldr r12, =API_HYP_ENTRY
		adr r0, hyp_boot
		badr r0, hyp_boot
		smc #0
		hyp_boot:
		b omap_secondary_startup

+20 −0

Original line number	Diff line number	Diff line
		@@ -2112,11 +2112,20 @@ static struct omap_hwmod_ocp_if omap3_l4_core__i2c3 = {
		};

		/* L4 CORE -> SR1 interface */
		static struct omap_hwmod_addr_space omap3_sr1_addr_space[] = {
		{
		.pa_start = OMAP34XX_SR1_BASE,
		.pa_end = OMAP34XX_SR1_BASE + SZ_1K - 1,
		.flags = ADDR_TYPE_RT,
		},
		{ },
		};

		static struct omap_hwmod_ocp_if omap34xx_l4_core__sr1 = {
		.master = &omap3xxx_l4_core_hwmod,
		.slave = &omap34xx_sr1_hwmod,
		.clk = "sr_l4_ick",
		.addr = omap3_sr1_addr_space,
		.user = OCP_USER_MPU,
		};

		@@ -2124,15 +2133,25 @@ static struct omap_hwmod_ocp_if omap36xx_l4_core__sr1 = {
		.master = &omap3xxx_l4_core_hwmod,
		.slave = &omap36xx_sr1_hwmod,
		.clk = "sr_l4_ick",
		.addr = omap3_sr1_addr_space,
		.user = OCP_USER_MPU,
		};

		/* L4 CORE -> SR1 interface */
		static struct omap_hwmod_addr_space omap3_sr2_addr_space[] = {
		{
		.pa_start = OMAP34XX_SR2_BASE,
		.pa_end = OMAP34XX_SR2_BASE + SZ_1K - 1,
		.flags = ADDR_TYPE_RT,
		},
		{ },
		};

		static struct omap_hwmod_ocp_if omap34xx_l4_core__sr2 = {
		.master = &omap3xxx_l4_core_hwmod,
		.slave = &omap34xx_sr2_hwmod,
		.clk = "sr_l4_ick",
		.addr = omap3_sr2_addr_space,
		.user = OCP_USER_MPU,
		};

		@@ -2140,6 +2159,7 @@ static struct omap_hwmod_ocp_if omap36xx_l4_core__sr2 = {
		.master = &omap3xxx_l4_core_hwmod,
		.slave = &omap36xx_sr2_hwmod,
		.clk = "sr_l4_ick",
		.addr = omap3_sr2_addr_space,
		.user = OCP_USER_MPU,
		};