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

Commit 2254c36d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'samsung/exynos-multiplatform-drivers' into late/multiplatform 



This series contains the final pieces for Exynos multiplatform support:
Most of the patches are about the exynos-combiner irqchip, which is
converted to not rely on platform provided constants.

* samsung/exynos-multiplatform-drivers:
  ARM: exynos: restore mach/regs-clock.h for exynos5
  irqchip: exynos: look up irq using irq_find_mapping
  irqchip: exynos: pass irq_base from platform
  irqchip: exynos: localize irq lookup for ATAGS
  irqchip: exynos: allocate combiner_data dynamically
  irqchip: exynos: pass max combiner number to combiner_init
  ARM: exynos: add missing properties for combiner IRQs
  clocksource: exynos_mct: remove platform header dependency
  clk: exynos: prepare for multiplatform

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 22cf644e 20adee8f

arch/arm/boot/dts/exynos4210.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
	};



	combiner:interrupt-controller@10440000 {

		samsung,combiner-nr = <16>;

		interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,

			     <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,

			     <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,

arch/arm/boot/dts/exynos4212.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,15 @@ 
		cpu-offset = <0x8000>;

	};



	interrupt-controller@10440000 {

		samsung,combiner-nr = <18>;

		interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,

			     <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,

			     <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,

			     <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,

			     <0 107 0>, <0 108 0>;

	};



	mct@10050000 {

		compatible = "samsung,exynos4412-mct";

		reg = <0x10050000 0x800>;

arch/arm/boot/dts/exynos4412.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,15 @@ 
		cpu-offset = <0x4000>;

	};



	interrupt-controller@10440000 {

		samsung,combiner-nr = <20>;

		interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,

			     <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,

			     <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,

			     <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,

			     <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;

	};



	mct@10050000 {

		compatible = "samsung,exynos4412-mct";

		reg = <0x10050000 0x800>;

arch/arm/mach-exynos/common.c

+17 −3
Original line number Diff line number Diff line
@@ -413,13 +413,26 @@ void __init exynos_init_time(void) 
	} else {

		/* todo: remove after migrating legacy E4 platforms to dt */

#ifdef CONFIG_ARCH_EXYNOS4

		exynos4_clk_init(NULL);

		exynos4_clk_init(NULL, !soc_is_exynos4210(), S5P_VA_CMU, readl(S5P_VA_CHIPID + 8) & 1);

		exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f);

#endif

		mct_init();

		mct_init(S5P_VA_SYSTIMER, EXYNOS4_IRQ_MCT_G0, EXYNOS4_IRQ_MCT_L0, EXYNOS4_IRQ_MCT_L1);

	}

}



static unsigned int max_combiner_nr(void)

{

	if (soc_is_exynos5250())

		return EXYNOS5_MAX_COMBINER_NR;

	else if (soc_is_exynos4412())

		return EXYNOS4412_MAX_COMBINER_NR;

	else if (soc_is_exynos4212())

		return EXYNOS4212_MAX_COMBINER_NR;

	else

		return EXYNOS4210_MAX_COMBINER_NR;

}





void __init exynos4_init_irq(void)

{

	unsigned int gic_bank_offset;
@@ -434,7 +447,8 @@ void __init exynos4_init_irq(void) 
#endif



	if (!of_have_populated_dt())

		combiner_init(S5P_VA_COMBINER_BASE, NULL);

		combiner_init(S5P_VA_COMBINER_BASE, NULL,

			      max_combiner_nr(), COMBINER_IRQ(0, 0));



	/*

	 * The parameters of s5p_init_irq() are for VIC init.

arch/arm/mach-exynos/common.h

+4 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include <linux/of.h>



extern void mct_init(void);

void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1);

void exynos_init_time(void);

extern unsigned long xxti_f, xusbxti_f;
@@ -27,7 +27,7 @@ void exynos5_restart(char mode, const char *cmd); 
void exynos_init_late(void);



/* ToDo: remove these after migrating legacy exynos4 platforms to dt */

void exynos4_clk_init(struct device_node *np);

void exynos4_clk_init(struct device_node *np, int is_exynos4210, void __iomem *reg_base, unsigned long xom);

void exynos4_clk_register_fixed_ext(unsigned long, unsigned long);



#ifdef CONFIG_PM_GENERIC_DOMAINS
@@ -69,7 +69,8 @@ void exynos4212_register_clocks(void); 
#endif



struct device_node;

void combiner_init(void __iomem *combiner_base, struct device_node *np);

void combiner_init(void __iomem *combiner_base, struct device_node *np,

			unsigned int max_nr, int irq_base);



extern struct smp_operations exynos_smp_ops;