diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 13:39:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 13:39:26 -0500 |
commit | db5b0ae00712b5176d7405e7a1dd2bfd6e8f5070 (patch) | |
tree | 4e874d81ca9037dda1007178bbc9613649d43305 /arch/arm/mach-exynos | |
parent | 6be35c700f742e911ecedd07fcc43d4439922334 (diff) | |
parent | 64507dd7028e3e0145077e73b8374bd75aea117c (diff) |
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC device tree conversions and enablement from Olof Johansson:
"Continued device tree conversion and enablement across a number of
platforms; Kirkwood, tegra, i.MX, Exynos, zynq and a couple of other
smaller series as well.
ux500 has seen continued conversion for platforms. Several platforms
have seen pinctrl-via-devicetree conversions for simpler
multiplatform. Tegra is adding data for new devices/drivers, and
Exynos has a bunch of new bindings and devices added as well.
So, pretty much the same progression in the right direction as the
last few releases."
Fix up conflicts as per Olof.
* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (185 commits)
ARM: ux500: Rename dbx500 cpufreq code to be more generic
ARM: dts: add missing ux500 device trees
ARM: ux500: Stop registering the PCM driver from platform code
ARM: ux500: Move board specific GPIO info out to subordinate DTS files
ARM: ux500: Disable the MMCI gpio-regulator by default
ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
ARM: Kirkwood: Add support LED of OpenBlocks A6
ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
ARM: kirkwood: Add support DT of second I2C bus
ARM: kirkwood: Convert mplcec4 board to pinctrl
ARM: Kirkwood: Convert km_kirkwood to pinctrl
ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
ARM: Kirkwood: Convert IX2-200 to pinctrl.
ARM: Kirkwood: Convert lsxl boards to pinctrl.
ARM: Kirkwood: Convert ib62x0 to pinctrl.
ARM: Kirkwood: Convert GoFlex Net to pinctrl.
ARM: Kirkwood: Convert dreamplug to pinctrl.
ARM: Kirkwood: Convert dockstar to pinctrl.
...
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/clock-exynos4.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-exynos/clock-exynos5.c | 21 | ||||
-rw-r--r-- | arch/arm/mach-exynos/common.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-exynos/dev-drm.c | 29 | ||||
-rw-r--r-- | arch/arm/mach-exynos/include/mach/irqs.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos4-dt.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 42 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-smdk4x12.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-smdkv310.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/pm_domains.c | 93 |
16 files changed, 168 insertions, 54 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 070c7b6d3d86..91d5b6f1d5af 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -63,6 +63,7 @@ config SOC_EXYNOS5250 | |||
63 | depends on ARCH_EXYNOS5 | 63 | depends on ARCH_EXYNOS5 |
64 | select S5P_PM if PM | 64 | select S5P_PM if PM |
65 | select S5P_SLEEP if PM | 65 | select S5P_SLEEP if PM |
66 | select S5P_DEV_MFC | ||
66 | select SAMSUNG_DMADEV | 67 | select SAMSUNG_DMADEV |
67 | help | 68 | help |
68 | Enable EXYNOS5250 SoC support | 69 | Enable EXYNOS5250 SoC support |
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 66135eedf491..b189881657ec 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile | |||
@@ -52,7 +52,6 @@ obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o | |||
52 | obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o | 52 | obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o |
53 | obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o | 53 | obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o |
54 | obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o | 54 | obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o |
55 | obj-$(CONFIG_EXYNOS_DEV_DRM) += dev-drm.o | ||
56 | obj-$(CONFIG_EXYNOS_DEV_SYSMMU) += dev-sysmmu.o | 55 | obj-$(CONFIG_EXYNOS_DEV_SYSMMU) += dev-sysmmu.o |
57 | 56 | ||
58 | obj-$(CONFIG_ARCH_EXYNOS) += setup-i2c0.o | 57 | obj-$(CONFIG_ARCH_EXYNOS) += setup-i2c0.o |
diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c index fa8a13405c94..efead60b9436 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[] = { | |||
576 | .enable = exynos4_clk_ip_peril_ctrl, | 576 | .enable = exynos4_clk_ip_peril_ctrl, |
577 | .ctrlbit = (1 << 15), | 577 | .ctrlbit = (1 << 15), |
578 | }, { | 578 | }, { |
579 | .name = "tmu_apbif", | ||
580 | .enable = exynos4_clk_ip_perir_ctrl, | ||
581 | .ctrlbit = (1 << 17), | ||
582 | }, { | ||
579 | .name = "keypad", | 583 | .name = "keypad", |
580 | .enable = exynos4_clk_ip_perir_ctrl, | 584 | .enable = exynos4_clk_ip_perir_ctrl, |
581 | .ctrlbit = (1 << 16), | 585 | .ctrlbit = (1 << 16), |
diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c index 4478757b9301..7652f5d78a56 100644 --- a/arch/arm/mach-exynos/clock-exynos5.c +++ b/arch/arm/mach-exynos/clock-exynos5.c | |||
@@ -196,6 +196,11 @@ static int exynos5_clk_ip_isp1_ctrl(struct clk *clk, int enable) | |||
196 | return s5p_gatectrl(EXYNOS5_CLKGATE_IP_ISP1, clk, enable); | 196 | return s5p_gatectrl(EXYNOS5_CLKGATE_IP_ISP1, clk, enable); |
197 | } | 197 | } |
198 | 198 | ||
199 | static int exynos5_clk_hdmiphy_ctrl(struct clk *clk, int enable) | ||
200 | { | ||
201 | return s5p_gatectrl(S5P_HDMI_PHY_CONTROL, clk, enable); | ||
202 | } | ||
203 | |||
199 | /* Core list of CMU_CPU side */ | 204 | /* Core list of CMU_CPU side */ |
200 | 205 | ||
201 | static struct clksrc_clk exynos5_clk_mout_apll = { | 206 | static struct clksrc_clk exynos5_clk_mout_apll = { |
@@ -616,6 +621,11 @@ static struct clk exynos5_init_clocks_off[] = { | |||
616 | .enable = exynos5_clk_ip_peric_ctrl, | 621 | .enable = exynos5_clk_ip_peric_ctrl, |
617 | .ctrlbit = (1 << 24), | 622 | .ctrlbit = (1 << 24), |
618 | }, { | 623 | }, { |
624 | .name = "tmu_apbif", | ||
625 | .parent = &exynos5_clk_aclk_66.clk, | ||
626 | .enable = exynos5_clk_ip_peris_ctrl, | ||
627 | .ctrlbit = (1 << 21), | ||
628 | }, { | ||
619 | .name = "rtc", | 629 | .name = "rtc", |
620 | .parent = &exynos5_clk_aclk_66.clk, | 630 | .parent = &exynos5_clk_aclk_66.clk, |
621 | .enable = exynos5_clk_ip_peris_ctrl, | 631 | .enable = exynos5_clk_ip_peris_ctrl, |
@@ -664,17 +674,22 @@ static struct clk exynos5_init_clocks_off[] = { | |||
664 | .ctrlbit = (1 << 25), | 674 | .ctrlbit = (1 << 25), |
665 | }, { | 675 | }, { |
666 | .name = "mfc", | 676 | .name = "mfc", |
667 | .devname = "s5p-mfc", | 677 | .devname = "s5p-mfc-v6", |
668 | .enable = exynos5_clk_ip_mfc_ctrl, | 678 | .enable = exynos5_clk_ip_mfc_ctrl, |
669 | .ctrlbit = (1 << 0), | 679 | .ctrlbit = (1 << 0), |
670 | }, { | 680 | }, { |
671 | .name = "hdmi", | 681 | .name = "hdmi", |
672 | .devname = "exynos4-hdmi", | 682 | .devname = "exynos5-hdmi", |
673 | .enable = exynos5_clk_ip_disp1_ctrl, | 683 | .enable = exynos5_clk_ip_disp1_ctrl, |
674 | .ctrlbit = (1 << 6), | 684 | .ctrlbit = (1 << 6), |
675 | }, { | 685 | }, { |
686 | .name = "hdmiphy", | ||
687 | .devname = "exynos5-hdmi", | ||
688 | .enable = exynos5_clk_hdmiphy_ctrl, | ||
689 | .ctrlbit = (1 << 0), | ||
690 | }, { | ||
676 | .name = "mixer", | 691 | .name = "mixer", |
677 | .devname = "s5p-mixer", | 692 | .devname = "exynos5-mixer", |
678 | .enable = exynos5_clk_ip_disp1_ctrl, | 693 | .enable = exynos5_clk_ip_disp1_ctrl, |
679 | .ctrlbit = (1 << 5), | 694 | .ctrlbit = (1 << 5), |
680 | }, { | 695 | }, { |
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index e05f6cca2c9b..3f257e76bfde 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
@@ -1020,11 +1020,14 @@ static int __init exynos_init_irq_eint(void) | |||
1020 | * platforms switch over to using the pinctrl driver, the wakeup | 1020 | * platforms switch over to using the pinctrl driver, the wakeup |
1021 | * interrupt support code here can be completely removed. | 1021 | * interrupt support code here can be completely removed. |
1022 | */ | 1022 | */ |
1023 | static const struct of_device_id exynos_pinctrl_ids[] = { | ||
1024 | { .compatible = "samsung,pinctrl-exynos4210", }, | ||
1025 | { .compatible = "samsung,pinctrl-exynos4x12", }, | ||
1026 | }; | ||
1023 | struct device_node *pctrl_np, *wkup_np; | 1027 | struct device_node *pctrl_np, *wkup_np; |
1024 | const char *pctrl_compat = "samsung,pinctrl-exynos4210"; | ||
1025 | const char *wkup_compat = "samsung,exynos4210-wakeup-eint"; | 1028 | const char *wkup_compat = "samsung,exynos4210-wakeup-eint"; |
1026 | 1029 | ||
1027 | for_each_compatible_node(pctrl_np, NULL, pctrl_compat) { | 1030 | for_each_matching_node(pctrl_np, exynos_pinctrl_ids) { |
1028 | if (of_device_is_available(pctrl_np)) { | 1031 | if (of_device_is_available(pctrl_np)) { |
1029 | wkup_np = of_find_compatible_node(pctrl_np, NULL, | 1032 | wkup_np = of_find_compatible_node(pctrl_np, NULL, |
1030 | wkup_compat); | 1033 | wkup_compat); |
diff --git a/arch/arm/mach-exynos/dev-drm.c b/arch/arm/mach-exynos/dev-drm.c deleted file mode 100644 index 17c9c6ecc2e0..000000000000 --- a/arch/arm/mach-exynos/dev-drm.c +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-exynos/dev-drm.c | ||
3 | * | ||
4 | * Copyright (c) 2012 Samsung Electronics Co., Ltd. | ||
5 | * http://www.samsung.com | ||
6 | * | ||
7 | * EXYNOS - core DRM device | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License as published by | ||
11 | * the Free Software Foundation; either version 2 of the License, or | ||
12 | * (at your option) any later version. | ||
13 | */ | ||
14 | |||
15 | #include <linux/kernel.h> | ||
16 | #include <linux/dma-mapping.h> | ||
17 | #include <linux/platform_device.h> | ||
18 | |||
19 | #include <plat/devs.h> | ||
20 | |||
21 | static u64 exynos_drm_dma_mask = DMA_BIT_MASK(32); | ||
22 | |||
23 | struct platform_device exynos_device_drm = { | ||
24 | .name = "exynos-drm", | ||
25 | .dev = { | ||
26 | .dma_mask = &exynos_drm_dma_mask, | ||
27 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
28 | } | ||
29 | }; | ||
diff --git a/arch/arm/mach-exynos/include/mach/irqs.h b/arch/arm/mach-exynos/include/mach/irqs.h index e0f0ae3e0cf9..1f4dc35cd4b9 100644 --- a/arch/arm/mach-exynos/include/mach/irqs.h +++ b/arch/arm/mach-exynos/include/mach/irqs.h | |||
@@ -136,6 +136,9 @@ | |||
136 | #define EXYNOS4_IRQ_TSI IRQ_SPI(115) | 136 | #define EXYNOS4_IRQ_TSI IRQ_SPI(115) |
137 | #define EXYNOS4_IRQ_SATA IRQ_SPI(116) | 137 | #define EXYNOS4_IRQ_SATA IRQ_SPI(116) |
138 | 138 | ||
139 | #define EXYNOS4_IRQ_TMU_TRIG0 COMBINER_IRQ(2, 4) | ||
140 | #define EXYNOS4_IRQ_TMU_TRIG1 COMBINER_IRQ(3, 4) | ||
141 | |||
139 | #define EXYNOS4_IRQ_SYSMMU_MDMA0_0 COMBINER_IRQ(4, 0) | 142 | #define EXYNOS4_IRQ_SYSMMU_MDMA0_0 COMBINER_IRQ(4, 0) |
140 | #define EXYNOS4_IRQ_SYSMMU_SSS_0 COMBINER_IRQ(4, 1) | 143 | #define EXYNOS4_IRQ_SYSMMU_SSS_0 COMBINER_IRQ(4, 1) |
141 | #define EXYNOS4_IRQ_SYSMMU_FIMC0_0 COMBINER_IRQ(4, 2) | 144 | #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 61b74e12d12b..1df6abbf53b8 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h | |||
@@ -89,6 +89,8 @@ | |||
89 | #define EXYNOS4_PA_TWD 0x10500600 | 89 | #define EXYNOS4_PA_TWD 0x10500600 |
90 | #define EXYNOS4_PA_L2CC 0x10502000 | 90 | #define EXYNOS4_PA_L2CC 0x10502000 |
91 | 91 | ||
92 | #define EXYNOS4_PA_TMU 0x100C0000 | ||
93 | |||
92 | #define EXYNOS4_PA_MDMA0 0x10810000 | 94 | #define EXYNOS4_PA_MDMA0 0x10810000 |
93 | #define EXYNOS4_PA_MDMA1 0x12850000 | 95 | #define EXYNOS4_PA_MDMA1 0x12850000 |
94 | #define EXYNOS4_PA_S_MDMA1 0x12840000 | 96 | #define EXYNOS4_PA_S_MDMA1 0x12840000 |
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index 6df99c06419d..92757ff817ae 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c | |||
@@ -78,6 +78,8 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = { | |||
78 | OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL), | 78 | OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL), |
79 | OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL), | 79 | OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL), |
80 | OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL), | 80 | OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL), |
81 | OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU, | ||
82 | "exynos-tmu", NULL), | ||
81 | {}, | 83 | {}, |
82 | }; | 84 | }; |
83 | 85 | ||
@@ -95,6 +97,8 @@ static void __init exynos4_dt_machine_init(void) | |||
95 | 97 | ||
96 | static char const *exynos4_dt_compat[] __initdata = { | 98 | static char const *exynos4_dt_compat[] __initdata = { |
97 | "samsung,exynos4210", | 99 | "samsung,exynos4210", |
100 | "samsung,exynos4212", | ||
101 | "samsung,exynos4412", | ||
98 | NULL | 102 | NULL |
99 | }; | 103 | }; |
100 | 104 | ||
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index f1326be80b91..929de766d490 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c | |||
@@ -12,6 +12,8 @@ | |||
12 | #include <linux/of_platform.h> | 12 | #include <linux/of_platform.h> |
13 | #include <linux/of_fdt.h> | 13 | #include <linux/of_fdt.h> |
14 | #include <linux/serial_core.h> | 14 | #include <linux/serial_core.h> |
15 | #include <linux/memblock.h> | ||
16 | #include <linux/of_fdt.h> | ||
15 | 17 | ||
16 | #include <asm/mach/arch.h> | 18 | #include <asm/mach/arch.h> |
17 | #include <asm/hardware/gic.h> | 19 | #include <asm/hardware/gic.h> |
@@ -19,6 +21,7 @@ | |||
19 | 21 | ||
20 | #include <plat/cpu.h> | 22 | #include <plat/cpu.h> |
21 | #include <plat/regs-serial.h> | 23 | #include <plat/regs-serial.h> |
24 | #include <plat/mfc.h> | ||
22 | 25 | ||
23 | #include "common.h" | 26 | #include "common.h" |
24 | 27 | ||
@@ -48,6 +51,20 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { | |||
48 | "s3c2440-i2c.0", NULL), | 51 | "s3c2440-i2c.0", NULL), |
49 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1), | 52 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1), |
50 | "s3c2440-i2c.1", NULL), | 53 | "s3c2440-i2c.1", NULL), |
54 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(2), | ||
55 | "s3c2440-i2c.2", NULL), | ||
56 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(3), | ||
57 | "s3c2440-i2c.3", NULL), | ||
58 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(4), | ||
59 | "s3c2440-i2c.4", NULL), | ||
60 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(5), | ||
61 | "s3c2440-i2c.5", NULL), | ||
62 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(6), | ||
63 | "s3c2440-i2c.6", NULL), | ||
64 | OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(7), | ||
65 | "s3c2440-i2c.7", NULL), | ||
66 | OF_DEV_AUXDATA("samsung,s3c2440-hdmiphy-i2c", EXYNOS5_PA_IIC(8), | ||
67 | "s3c2440-hdmiphy-i2c", NULL), | ||
51 | OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI0, | 68 | OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI0, |
52 | "dw_mmc.0", NULL), | 69 | "dw_mmc.0", NULL), |
53 | OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI1, | 70 | OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI1, |
@@ -62,6 +79,12 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { | |||
62 | "exynos4210-spi.1", NULL), | 79 | "exynos4210-spi.1", NULL), |
63 | OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS5_PA_SPI2, | 80 | OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS5_PA_SPI2, |
64 | "exynos4210-spi.2", NULL), | 81 | "exynos4210-spi.2", NULL), |
82 | OF_DEV_AUXDATA("samsung,exynos5-sata-ahci", 0x122F0000, | ||
83 | "exynos5-sata", NULL), | ||
84 | OF_DEV_AUXDATA("samsung,exynos5-sata-phy", 0x12170000, | ||
85 | "exynos5-sata-phy", NULL), | ||
86 | OF_DEV_AUXDATA("samsung,exynos5-sata-phy-i2c", 0x121D0000, | ||
87 | "exynos5-sata-phy-i2c", NULL), | ||
65 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL), | 88 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL), |
66 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL), | 89 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL), |
67 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL), | 90 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL), |
@@ -73,6 +96,13 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { | |||
73 | "exynos-gsc.2", NULL), | 96 | "exynos-gsc.2", NULL), |
74 | OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3, | 97 | OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3, |
75 | "exynos-gsc.3", NULL), | 98 | "exynos-gsc.3", NULL), |
99 | OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000, | ||
100 | "exynos5-hdmi", NULL), | ||
101 | OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000, | ||
102 | "exynos5-mixer", NULL), | ||
103 | OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL), | ||
104 | OF_DEV_AUXDATA("samsung,exynos5250-tmu", 0x10060000, | ||
105 | "exynos-tmu", NULL), | ||
76 | {}, | 106 | {}, |
77 | }; | 107 | }; |
78 | 108 | ||
@@ -108,6 +138,17 @@ static char const *exynos5_dt_compat[] __initdata = { | |||
108 | NULL | 138 | NULL |
109 | }; | 139 | }; |
110 | 140 | ||
141 | static void __init exynos5_reserve(void) | ||
142 | { | ||
143 | struct s5p_mfc_dt_meminfo mfc_mem; | ||
144 | |||
145 | /* Reserve memory for MFC only if it's available */ | ||
146 | mfc_mem.compatible = "samsung,mfc-v6"; | ||
147 | if (of_scan_flat_dt(s5p_fdt_find_mfc_mem, &mfc_mem)) | ||
148 | s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize, mfc_mem.loff, | ||
149 | mfc_mem.lsize); | ||
150 | } | ||
151 | |||
111 | DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") | 152 | DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") |
112 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 153 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
113 | .init_irq = exynos5_init_irq, | 154 | .init_irq = exynos5_init_irq, |
@@ -119,4 +160,5 @@ DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") | |||
119 | .timer = &exynos4_timer, | 160 | .timer = &exynos4_timer, |
120 | .dt_compat = exynos5_dt_compat, | 161 | .dt_compat = exynos5_dt_compat, |
121 | .restart = exynos5_restart, | 162 | .restart = exynos5_restart, |
163 | .reserve = exynos5_reserve, | ||
122 | MACHINE_END | 164 | MACHINE_END |
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index 69359a0c8a1c..27d4ed8b116e 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c | |||
@@ -1326,9 +1326,6 @@ static struct platform_device *nuri_devices[] __initdata = { | |||
1326 | &cam_vdda_fixed_rdev, | 1326 | &cam_vdda_fixed_rdev, |
1327 | &cam_8m_12v_fixed_rdev, | 1327 | &cam_8m_12v_fixed_rdev, |
1328 | &exynos4_bus_devfreq, | 1328 | &exynos4_bus_devfreq, |
1329 | #ifdef CONFIG_DRM_EXYNOS | ||
1330 | &exynos_device_drm, | ||
1331 | #endif | ||
1332 | }; | 1329 | }; |
1333 | 1330 | ||
1334 | static void __init nuri_map_io(void) | 1331 | static void __init nuri_map_io(void) |
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index c606080b5dfa..e6f4191cd14c 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c | |||
@@ -711,9 +711,6 @@ static struct platform_device *origen_devices[] __initdata = { | |||
711 | &s5p_device_mfc_l, | 711 | &s5p_device_mfc_l, |
712 | &s5p_device_mfc_r, | 712 | &s5p_device_mfc_r, |
713 | &s5p_device_mixer, | 713 | &s5p_device_mixer, |
714 | #ifdef CONFIG_DRM_EXYNOS | ||
715 | &exynos_device_drm, | ||
716 | #endif | ||
717 | &exynos4_device_ohci, | 714 | &exynos4_device_ohci, |
718 | &origen_device_gpiokeys, | 715 | &origen_device_gpiokeys, |
719 | &origen_lcd_hv070wsa, | 716 | &origen_lcd_hv070wsa, |
diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c index ddb92631252d..a1555a73c7af 100644 --- a/arch/arm/mach-exynos/mach-smdk4x12.c +++ b/arch/arm/mach-exynos/mach-smdk4x12.c | |||
@@ -317,9 +317,6 @@ static struct platform_device *smdk4x12_devices[] __initdata = { | |||
317 | &s5p_device_mfc, | 317 | &s5p_device_mfc, |
318 | &s5p_device_mfc_l, | 318 | &s5p_device_mfc_l, |
319 | &s5p_device_mfc_r, | 319 | &s5p_device_mfc_r, |
320 | #ifdef CONFIG_DRM_EXYNOS | ||
321 | &exynos_device_drm, | ||
322 | #endif | ||
323 | &samsung_device_keypad, | 320 | &samsung_device_keypad, |
324 | }; | 321 | }; |
325 | 322 | ||
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index 8dd6a1e8030d..063cb94b934d 100644 --- a/arch/arm/mach-exynos/mach-smdkv310.c +++ b/arch/arm/mach-exynos/mach-smdkv310.c | |||
@@ -300,9 +300,6 @@ static struct platform_device *smdkv310_devices[] __initdata = { | |||
300 | &s5p_device_fimc_md, | 300 | &s5p_device_fimc_md, |
301 | &s5p_device_g2d, | 301 | &s5p_device_g2d, |
302 | &s5p_device_jpeg, | 302 | &s5p_device_jpeg, |
303 | #ifdef CONFIG_DRM_EXYNOS | ||
304 | &exynos_device_drm, | ||
305 | #endif | ||
306 | &exynos4_device_ac97, | 303 | &exynos4_device_ac97, |
307 | &exynos4_device_i2s0, | 304 | &exynos4_device_i2s0, |
308 | &exynos4_device_ohci, | 305 | &exynos4_device_ohci, |
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index 2d6bc83d5c99..9e3340f18950 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c | |||
@@ -1080,9 +1080,6 @@ static struct platform_device *universal_devices[] __initdata = { | |||
1080 | &s5p_device_onenand, | 1080 | &s5p_device_onenand, |
1081 | &s5p_device_fimd0, | 1081 | &s5p_device_fimd0, |
1082 | &s5p_device_jpeg, | 1082 | &s5p_device_jpeg, |
1083 | #ifdef CONFIG_DRM_EXYNOS | ||
1084 | &exynos_device_drm, | ||
1085 | #endif | ||
1086 | &s3c_device_usb_hsotg, | 1083 | &s3c_device_usb_hsotg, |
1087 | &s5p_device_mfc, | 1084 | &s5p_device_mfc, |
1088 | &s5p_device_mfc_l, | 1085 | &s5p_device_mfc_l, |
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index c0bc83a7663e..9f1351de52f7 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c | |||
@@ -19,6 +19,8 @@ | |||
19 | #include <linux/pm_domain.h> | 19 | #include <linux/pm_domain.h> |
20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
21 | #include <linux/of_address.h> | 21 | #include <linux/of_address.h> |
22 | #include <linux/of_platform.h> | ||
23 | #include <linux/sched.h> | ||
22 | 24 | ||
23 | #include <mach/regs-pmu.h> | 25 | #include <mach/regs-pmu.h> |
24 | #include <plat/devs.h> | 26 | #include <plat/devs.h> |
@@ -83,12 +85,88 @@ static struct exynos_pm_domain PD = { \ | |||
83 | } | 85 | } |
84 | 86 | ||
85 | #ifdef CONFIG_OF | 87 | #ifdef CONFIG_OF |
88 | static void exynos_add_device_to_domain(struct exynos_pm_domain *pd, | ||
89 | struct device *dev) | ||
90 | { | ||
91 | int ret; | ||
92 | |||
93 | dev_dbg(dev, "adding to power domain %s\n", pd->pd.name); | ||
94 | |||
95 | while (1) { | ||
96 | ret = pm_genpd_add_device(&pd->pd, dev); | ||
97 | if (ret != -EAGAIN) | ||
98 | break; | ||
99 | cond_resched(); | ||
100 | } | ||
101 | |||
102 | pm_genpd_dev_need_restore(dev, true); | ||
103 | } | ||
104 | |||
105 | static void exynos_remove_device_from_domain(struct device *dev) | ||
106 | { | ||
107 | struct generic_pm_domain *genpd = dev_to_genpd(dev); | ||
108 | int ret; | ||
109 | |||
110 | dev_dbg(dev, "removing from power domain %s\n", genpd->name); | ||
111 | |||
112 | while (1) { | ||
113 | ret = pm_genpd_remove_device(genpd, dev); | ||
114 | if (ret != -EAGAIN) | ||
115 | break; | ||
116 | cond_resched(); | ||
117 | } | ||
118 | } | ||
119 | |||
120 | static void exynos_read_domain_from_dt(struct device *dev) | ||
121 | { | ||
122 | struct platform_device *pd_pdev; | ||
123 | struct exynos_pm_domain *pd; | ||
124 | struct device_node *node; | ||
125 | |||
126 | node = of_parse_phandle(dev->of_node, "samsung,power-domain", 0); | ||
127 | if (!node) | ||
128 | return; | ||
129 | pd_pdev = of_find_device_by_node(node); | ||
130 | if (!pd_pdev) | ||
131 | return; | ||
132 | pd = platform_get_drvdata(pd_pdev); | ||
133 | exynos_add_device_to_domain(pd, dev); | ||
134 | } | ||
135 | |||
136 | static int exynos_pm_notifier_call(struct notifier_block *nb, | ||
137 | unsigned long event, void *data) | ||
138 | { | ||
139 | struct device *dev = data; | ||
140 | |||
141 | switch (event) { | ||
142 | case BUS_NOTIFY_BIND_DRIVER: | ||
143 | if (dev->of_node) | ||
144 | exynos_read_domain_from_dt(dev); | ||
145 | |||
146 | break; | ||
147 | |||
148 | case BUS_NOTIFY_UNBOUND_DRIVER: | ||
149 | exynos_remove_device_from_domain(dev); | ||
150 | |||
151 | break; | ||
152 | } | ||
153 | return NOTIFY_DONE; | ||
154 | } | ||
155 | |||
156 | static struct notifier_block platform_nb = { | ||
157 | .notifier_call = exynos_pm_notifier_call, | ||
158 | }; | ||
159 | |||
86 | static __init int exynos_pm_dt_parse_domains(void) | 160 | static __init int exynos_pm_dt_parse_domains(void) |
87 | { | 161 | { |
162 | struct platform_device *pdev; | ||
88 | struct device_node *np; | 163 | struct device_node *np; |
89 | 164 | ||
90 | for_each_compatible_node(np, NULL, "samsung,exynos4210-pd") { | 165 | for_each_compatible_node(np, NULL, "samsung,exynos4210-pd") { |
91 | struct exynos_pm_domain *pd; | 166 | struct exynos_pm_domain *pd; |
167 | int on; | ||
168 | |||
169 | pdev = of_find_device_by_node(np); | ||
92 | 170 | ||
93 | pd = kzalloc(sizeof(*pd), GFP_KERNEL); | 171 | pd = kzalloc(sizeof(*pd), GFP_KERNEL); |
94 | if (!pd) { | 172 | if (!pd) { |
@@ -97,15 +175,22 @@ static __init int exynos_pm_dt_parse_domains(void) | |||
97 | return -ENOMEM; | 175 | return -ENOMEM; |
98 | } | 176 | } |
99 | 177 | ||
100 | if (of_get_property(np, "samsung,exynos4210-pd-off", NULL)) | 178 | pd->pd.name = kstrdup(np->name, GFP_KERNEL); |
101 | pd->is_off = true; | 179 | pd->name = pd->pd.name; |
102 | pd->name = np->name; | ||
103 | pd->base = of_iomap(np, 0); | 180 | pd->base = of_iomap(np, 0); |
104 | pd->pd.power_off = exynos_pd_power_off; | 181 | pd->pd.power_off = exynos_pd_power_off; |
105 | pd->pd.power_on = exynos_pd_power_on; | 182 | pd->pd.power_on = exynos_pd_power_on; |
106 | pd->pd.of_node = np; | 183 | pd->pd.of_node = np; |
107 | pm_genpd_init(&pd->pd, NULL, false); | 184 | |
185 | platform_set_drvdata(pdev, pd); | ||
186 | |||
187 | on = __raw_readl(pd->base + 0x4) & S5P_INT_LOCAL_PWR_EN; | ||
188 | |||
189 | pm_genpd_init(&pd->pd, NULL, !on); | ||
108 | } | 190 | } |
191 | |||
192 | bus_register_notifier(&platform_bus_type, &platform_nb); | ||
193 | |||
109 | return 0; | 194 | return 0; |
110 | } | 195 | } |
111 | #else | 196 | #else |