ARM: EXYNOS: Remove remaining dead code after non-DT support removal (564d06b1) · Commits · 戴 / test

arch/arm/mach-exynos/Kconfig

+0 −17

Original line number	Diff line number	Diff line
		@@ -115,23 +115,6 @@ config MACH_EXYNOS5_DT
		Machine support for Samsung EXYNOS5 machine with device tree enabled.
		Select this if a fdt blob is available for the EXYNOS5 SoC based board.

		if ARCH_EXYNOS4

		comment "Configuration for HSMMC 8-bit bus width"

		config EXYNOS4_SDHCI_CH0_8BIT
		bool "Channel 0 with 8-bit bus"
		help
		Support HSMMC Channel 0 8-bit bus.
		If selected, Channel 1 is disabled.

		config EXYNOS4_SDHCI_CH2_8BIT
		bool "Channel 2 with 8-bit bus"
		help
		Support HSMMC Channel 2 8-bit bus.
		If selected, Channel 3 is disabled.
		endif

		endmenu

		endif

+1 −3

Original line number	Diff line number	Diff line
		@@ -60,8 +60,6 @@ static void exynos5_map_io(void);
		static void exynos5440_map_io(void);
		static int exynos_init(void);

		unsigned long xxti_f = 0, xusbxti_f = 0;

		static struct cpu_table cpu_ids[] __initdata = {
		{
		.idcode = EXYNOS4210_CPU_ID,
		@@ -322,7 +320,7 @@ void __init exynos_init_late(void)
		exynos_pm_late_initcall();
		}

		int __init exynos_fdt_map_chipid(unsigned long node, const char *uname,
		static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname,
		int depth, void *data)
		{
		struct map_desc iodesc;

+1 −6

Original line number	Diff line number	Diff line
		@@ -34,12 +34,7 @@ static inline void s3c_pm_debug_init_uart(void)

		static inline void s3c_pm_arch_prepare_irqs(void)
		{
		u32 eintmask = s3c_irqwake_eintmask;

		if (of_have_populated_dt())
		eintmask = exynos_get_eint_wake_mask();

		__raw_writel(eintmask, S5P_EINT_WAKEUP_MASK);
		__raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
		__raw_writel(s3c_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);
		}