Commit a52d35c9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-cleanup' of... 

Merge tag 'samsung-cleanup' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

Merge "Samsung cleanup for v3.16" from Kukjin Kim:

- use a common macro v7_exit_coherency_flush macro instead of local function
- cleanup mach-exynos/Makefile and remove inclusion plat/cpu.h in mach-exynos
- migrate exynos macros from plat-samsung to mach-exynos
- cleanup s3c24xx debug macro/earlyprintk to remove arch dependency
- fixed compilation error for cpufreq due to moving header in this branch
  : use of_machine_is_compatible() instead of soc_is_exynos...()

Note that based on tags/samsung-clk and tags/samsung-fixes.

* tag 'samsung-cleanup' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  cpufreq: exynos: Fix the compile error
  ARM: S3C24XX: move debug-macro.S into the common space
  ARM: S3C24XX: use generic DEBUG_UART_PHY/_VIRT in debug macro
  ARM: S3C24XX: trim down debug uart handling
  ARM: compressed/head.S: remove s3c24xx special case
  ARM: EXYNOS: Remove unnecessary inclusion of cpu.h
  ARM: EXYNOS: Migrate Exynos specific macros from plat to mach
  ARM: EXYNOS: Remove exynos_subsys registration
  ARM: EXYNOS: Remove duplicate lines in Makefile
  ARM: EXYNOS: use v7_exit_coherency_flush macro for cache disabling
  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 708cec66 be1f7c8d

arch/arm/Kconfig.debug

+52 −2
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ choice 
	config DEBUG_S3C_UART0

		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		bool "Use S3C UART 0 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -637,6 +638,7 @@ choice 
	config DEBUG_S3C_UART1

		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		bool "Use S3C UART 1 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -649,6 +651,7 @@ choice 
	config DEBUG_S3C_UART2

		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		bool "Use S3C UART 2 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -670,6 +673,33 @@ choice 
		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_S3C2410_UART0

		depends on ARCH_S3C24XX

		select DEBUG_S3C2410_UART

		bool "Use S3C2410/S3C2412 UART 0 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 0. The port must have been initialised

		  by the boot-loader before use.



	config DEBUG_S3C2410_UART1

		depends on ARCH_S3C24XX

		select DEBUG_S3C2410_UART

		bool "Use S3C2410/S3C2412 UART 1 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 1. The port must have been initialised

		  by the boot-loader before use.



	config DEBUG_S3C2410_UART2

		depends on ARCH_S3C24XX

		select DEBUG_S3C2410_UART

		bool "Use S3C2410/S3C2412 UART 2 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 2. The port must have been initialised

		  by the boot-loader before use.



	config DEBUG_SOCFPGA_UART

		depends on ARCH_SOCFPGA

		bool "Use SOCFPGA UART for low-level debug"
@@ -921,6 +951,13 @@ endchoice 
config DEBUG_EXYNOS_UART

	bool



config DEBUG_S3C2410_UART

	bool

	select DEBUG_S3C24XX_UART



config DEBUG_S3C24XX_UART

	bool



config DEBUG_OMAP2PLUS_UART

	bool

	depends on ARCH_OMAP2PLUS
@@ -973,6 +1010,7 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX6SL_UART

	default "debug/msm.S" if DEBUG_MSM_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART

	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1

	default "debug/sti.S" if DEBUG_STI_UART

	default "debug/tegra.S" if DEBUG_TEGRA_UART
@@ -1029,6 +1067,12 @@ config DEBUG_UART_PHYS 
	default 0x40090000 if ARCH_LPC32XX

	default 0x40100000 if DEBUG_PXA_UART1

	default 0x42000000 if ARCH_GEMINI

	default 0x50000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \

				DEBUG_S3C2410_UART0)

	default 0x50004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \

				DEBUG_S3C2410_UART1)

	default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \

				DEBUG_S3C2410_UART2)

	default 0x7c0003f8 if FOOTBRIDGE

	default 0x80070000 if DEBUG_IMX23_UART

	default 0x80074000 if DEBUG_IMX28_UART
@@ -1058,7 +1102,7 @@ config DEBUG_UART_PHYS 
	default 0xfffff700 if ARCH_IOP33X

	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

		DEBUG_LL_UART_EFM32 || \

		DEBUG_UART_8250 || DEBUG_UART_PL01X

		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART



config DEBUG_UART_VIRT

	hex "Virtual base address of debug UART"
@@ -1075,6 +1119,12 @@ config DEBUG_UART_VIRT 
	default 0xf2100000 if DEBUG_PXA_UART1

	default 0xf4090000 if ARCH_LPC32XX

	default 0xf4200000 if ARCH_GEMINI

	default 0xf7000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \

				DEBUG_S3C2410_UART0)

	default 0xf7004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \

				DEBUG_S3C2410_UART1)

	default 0xf7008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \

				DEBUG_S3C2410_UART2)

	default 0xf7fc9000 if DEBUG_BERLIN_UART

	default 0xf8009000 if DEBUG_VEXPRESS_UART0_CA9

	default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
@@ -1116,7 +1166,7 @@ config DEBUG_UART_VIRT 
	default 0xff003000 if DEBUG_U300_UART

	default DEBUG_UART_PHYS if !MMU

	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

		DEBUG_UART_8250 || DEBUG_UART_PL01X

		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART



config DEBUG_UART_8250_SHIFT

	int "Register offset shift for the 8250 debug UART"

arch/arm/boot/compressed/head.S

+0 −5
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ 
		add	\rb, \rb, #0x00010000	@ Ser1

#endif

		.endm

#elif defined(CONFIG_ARCH_S3C24XX)

		.macro loadsp, rb, tmp

		mov	\rb, #0x50000000

		add	\rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT

		.endm

#else

		.macro	loadsp,	rb, tmp

		addruart \rb, \tmp

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE