Merge tag 'samsung-cleanup' of... (28d250c4) · Commits · 戴 / test

Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup Samsung cleanup for v4.3 - make the following headers local watchdog-reset, onenand-core, irq-uart, backlight, ata-core, regs-usb-hsotg-phy, spi-core, nand-core, fb-core and regs-srom headers - make the following c file local s5p-dev-mfc, dev-backlight and setup-camif c file - remove keypad-core.h file - drop owner assignment in pmu.c - remove duplicated define of SLEEP_MAGIC - make exynos5420_powerdown_conf() staic * tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung : ARM: SAMSUNG: remove keypad-core header in plat-samsung ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx ARM: SAMSUNG: local onenand-core header in mach-s3c64xx ARM: SAMSUNG: local irq-uart header in mach-s3c64xx ARM: SAMSUNG: local backlight header in mach-s3c64xx ARM: SAMSUNG: local ata-core header in mach-s3c64xx ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx ARM: SAMSUNG: local spi-core header in mach-s3c24xx ARM: SAMSUNG: local nand-core header in mach-s3c24xx ARM: SAMSUNG: local fb-core header in mach-s3c24xx ARM: SAMSUNG: local regs-srom header in mach-exynos ARM: SAMSUNG: make local s5p-dev-mfc in mach-exynos ARM: SAMSUNG: make local dev-backlight in mach-s3c64xx ARM: SAMSUNG: make local setup-camif in mach-s3c24xx ARM: EXYNOS: Drop owner assignment in pmu.c ARM: EXYNOS: Remove duplicated define of SLEEP_MAGIC ARM: EXYNOS: Make local function static Signed-off-by:

Olof Johansson <olof@lixom.net>

arch/arm/mach-exynos/Kconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,11 @@ menuconfig ARCH_EXYNOS

		if ARCH_EXYNOS

		config S5P_DEV_MFC
		bool
		help
		Compile in setup memory (init) code for MFC

		config ARCH_EXYNOS3
		bool "SAMSUNG EXYNOS3"
		select ARM_CPU_SUSPEND if PM

arch/arm/mach-exynos/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,3 +23,5 @@ AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec)

		obj-$(CONFIG_EXYNOS5420_MCPM) += mcpm-exynos.o
		CFLAGS_mcpm-exynos.o += -march=armv7-a

		obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o

arch/arm/mach-exynos/common.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,12 @@ void exynos_firmware_init(void);

		/* CPU BOOT mode flag for Exynos3250 SoC bootloader */
		#define C2_STATE (1 << 3)
		/*
		* Magic values for bootloader indicating chosen low power mode.
		* See also Documentation/arm/Samsung/Bootloader-interface.txt
		*/
		#define EXYNOS_SLEEP_MAGIC 0x00000bad
		#define EXYNOS_AFTR_MAGIC 0xfcba0d10

		void exynos_set_boot_flag(unsigned int cpu, unsigned int mode);
		void exynos_clear_boot_flag(unsigned int cpu, unsigned int mode);

arch/arm/mach-exynos/firmware.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@
		#include "common.h"
		#include "smc.h"

		#define EXYNOS_SLEEP_MAGIC 0x00000bad
		#define EXYNOS_AFTR_MAGIC 0xfcba0d10
		#define EXYNOS_BOOT_ADDR 0x8
		#define EXYNOS_BOOT_FLAG 0xc

arch/arm/mach-exynos/pmu.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -698,7 +698,7 @@ static void exynos_power_off(void)
		;
		}

		void exynos5420_powerdown_conf(enum sys_powerdown mode)
		static void exynos5420_powerdown_conf(enum sys_powerdown mode)
		{
		u32 this_cluster;

		@@ -991,7 +991,6 @@ static int exynos_pmu_probe(struct platform_device *pdev)
		static struct platform_driver exynos_pmu_driver = {
		.driver = {
		.name = "exynos-pmu",
		.owner = THIS_MODULE,
		.of_match_table = exynos_pmu_of_device_ids,
		},
		.probe = exynos_pmu_probe,

Admin message