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

Commit 89f6dfac authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge commit '702b691e' into next/dt 



Merging in Samsung fixes for 3.15-rc to avoid an annoying context conflict
with new DT code.

* commit '702b691e':
  ARM: dts: Remove g2d_pd node for exynos5420
  ARM: dts: Remove mau_pd node for exynos5420
  ARM: exynos_defconfig: enable HS-I2C to fix for mmc partition mount
  ARM: dts: disable MDMA1 node for exynos5420
  ARM: EXYNOS: fix the secondary CPU boot of exynos4212

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8b1b57e8 702b691e

arch/arm/boot/dts/exynos5420-arndale-octa.dts

+0 −12
Original line number Diff line number Diff line
@@ -364,16 +364,4 @@ 
			gpio-key,wakeup;

		};

	};



	amba {

		mdma1: mdma@11C10000 {

			/*

			 * MDMA1 can support both secure and non-secure

			 * AXI transactions. When this is enabled in the kernel

			 * for boards that run in secure mode, we are getting

			 * imprecise external aborts causing the kernel to oops.

			 */

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/exynos5420.dtsi

+7 −11
Original line number Diff line number Diff line
@@ -219,16 +219,6 @@ 
		reg = <0x100440C0 0x20>;

	};



	mau_pd: power-domain@100440E0 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x100440E0 0x20>;

	};



	g2d_pd: power-domain@10044100 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10044100 0x20>;

	};



	msc_pd: power-domain@10044120 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10044120 0x20>;
@@ -336,6 +326,13 @@ 
			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <1>;

			/*

			 * MDMA1 can support both secure and non-secure

			 * AXI transactions. When this is enabled in the kernel

			 * for boards that run in secure mode, we are getting

			 * imprecise external aborts causing the kernel to oops.

			 */

			status = "disabled";

		};

	};
@@ -730,6 +727,5 @@ 
		interrupts = <0 112 0>;

		clocks = <&clock 471>;

		clock-names = "secss";

		samsung,power-domain = <&g2d_pd>;

	};

};

arch/arm/configs/exynos_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=y 
CONFIG_I2C=y

CONFIG_I2C_MUX=y

CONFIG_I2C_ARB_GPIO_CHALLENGE=y

CONFIG_I2C_EXYNOS5=y

CONFIG_I2C_S3C2410=y

CONFIG_DEBUG_GPIO=y

# CONFIG_HWMON is not set

arch/arm/mach-exynos/firmware.c

+14 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 


#include <mach/map.h>



#include <plat/cpu.h>



#include "smc.h"



static int exynos_do_idle(void)
@@ -28,13 +30,24 @@ static int exynos_do_idle(void) 


static int exynos_cpu_boot(int cpu)

{

	/*

	 * The second parameter of SMC_CMD_CPU1BOOT command means CPU id.

	 * But, Exynos4212 has only one secondary CPU so second parameter

	 * isn't used for informing secure firmware about CPU id.

	 */

	if (soc_is_exynos4212())

		cpu = 0;



	exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0);

	return 0;

}



static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr)

{

	void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c + 4*cpu;

	void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c;



	if (!soc_is_exynos4212())

		boot_reg += 4*cpu;



	__raw_writel(boot_addr, boot_reg);

	return 0;