| Message ID | 1351243746-4173-2-git-send-email-amit.daniel@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/26/12 18:29, Amit Daniel Kachhap wrote: > From: Amit Daniel Kachhap<amit.daniel@samsung.com> > > This patch adds necessary source definations needed for TMU driver and > adds devicetree node for exynos4210. > > Signed-off-by: Amit Daniel Kachhap<amit.daniel@samsung.com> > --- [...] > + .name = "tmu_apbif", > + .enable = exynos4_clk_ip_perir_ctrl, > + .ctrlbit = (1<< 17), tab instead of white spaces? I fixed them when I applied. [...] > +#define EXYNOS4_IRQ_TMU_TRIG0 COMBINER_IRQ(2, 4) > +#define EXYNOS4_IRQ_TMU_TRIG1 COMBINER_IRQ(3, 4) BTW, where are above definitions used? Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
On 29 October 2012 17:52, Kukjin Kim <kgene.kim@samsung.com> wrote: > On 10/26/12 18:29, Amit Daniel Kachhap wrote: >> >> From: Amit Daniel Kachhap<amit.daniel@samsung.com> >> >> This patch adds necessary source definations needed for TMU driver and >> adds devicetree node for exynos4210. >> >> Signed-off-by: Amit Daniel Kachhap<amit.daniel@samsung.com> >> --- > > > [...] > > >> + .name = "tmu_apbif", >> + .enable = exynos4_clk_ip_perir_ctrl, >> + .ctrlbit = (1<< 17), > > > tab instead of white spaces? > > I fixed them when I applied. Thanks Mr Kim. > > [...] > > >> +#define EXYNOS4_IRQ_TMU_TRIG0 COMBINER_IRQ(2, 4) >> +#define EXYNOS4_IRQ_TMU_TRIG1 COMBINER_IRQ(3, 4) > > > BTW, where are above definitions used? They are not used currently but might be useful for non DT support. Thanks, Amit Daniel > > Thanks. > > Best regards, > Kgene. > -- > Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, > SW Solution Development Team, Samsung Electronics Co., Ltd.
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 214c557..038de97 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -303,4 +303,11 @@ #gpio-cells = <4>; }; }; + + tmu@100C0000 { + compatible = "samsung,exynos4210-tmu"; + interrupt-parent = <&combiner>; + reg = <0x100C0000 0x100>; + interrupts = <2 4>; + }; }; diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c index fa8a134..cf121f4 100644 --- a/arch/arm/mach-exynos/clock-exynos4.c +++ b/arch/arm/mach-exynos/clock-exynos4.c @@ -576,6 +576,10 @@ static struct clk exynos4_init_clocks_off[] = { .enable = exynos4_clk_ip_peril_ctrl, .ctrlbit = (1 << 15), }, { + .name = "tmu_apbif", + .enable = exynos4_clk_ip_perir_ctrl, + .ctrlbit = (1 << 17), + }, { .name = "keypad", .enable = exynos4_clk_ip_perir_ctrl, .ctrlbit = (1 << 16), diff --git a/arch/arm/mach-exynos/include/mach/irqs.h b/arch/arm/mach-exynos/include/mach/irqs.h index 35bced6..5adacd1 100644 --- a/arch/arm/mach-exynos/include/mach/irqs.h +++ b/arch/arm/mach-exynos/include/mach/irqs.h @@ -136,6 +136,9 @@ #define EXYNOS4_IRQ_TSI IRQ_SPI(115) #define EXYNOS4_IRQ_SATA IRQ_SPI(116) +#define EXYNOS4_IRQ_TMU_TRIG0 COMBINER_IRQ(2, 4) +#define EXYNOS4_IRQ_TMU_TRIG1 COMBINER_IRQ(3, 4) + #define EXYNOS4_IRQ_SYSMMU_MDMA0_0 COMBINER_IRQ(4, 0) #define EXYNOS4_IRQ_SYSMMU_SSS_0 COMBINER_IRQ(4, 1) #define EXYNOS4_IRQ_SYSMMU_FIMC0_0 COMBINER_IRQ(4, 2) diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 8480849..772acd3 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -88,6 +88,8 @@ #define EXYNOS4_PA_TWD 0x10500600 #define EXYNOS4_PA_L2CC 0x10502000 +#define EXYNOS4_PA_TMU 0x100C0000 + #define EXYNOS4_PA_MDMA0 0x10810000 #define EXYNOS4_PA_MDMA1 0x12850000 #define EXYNOS4_PA_PDMA0 0x12680000 diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index eadf4b5..0746e5a 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c @@ -77,6 +77,8 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = { "exynos4210-spi.2", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL), + OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU, + "exynos-tmu", NULL), {}, };