diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 09:53:24 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 09:53:24 -0400 |
commit | 6d49d53552b60be2caaa853c814662bc4e24428e (patch) | |
tree | 0cb814af7646e30022d8024fcbf7d8cacdb98f5b /arch/arm/boot/dts/exynos5250-smdk5250.dts | |
parent | a551204badbea5119a84ee4f03faefce9f2c0543 (diff) | |
parent | 380c3a545f7de096c0f84344ba70ea4cfd1a059f (diff) |
Merge branch 'next/devel-exynos5250-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc2
* 'next/devel-exynos5250-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Add AUXDATA for i2c controllers
ARM: dts: Update device tree source files for EXYNOS5250
ARM: EXYNOS: Add device tree support for interrupt combiner
ARM: EXYNOS: Add irq_domain support for interrupt combiner
ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5
ARM: EXYNOS: update irqs for EXYNOS5250 SoC
ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll
ARM: EXYNOS: add GPC4 bank instance
ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition
ARM: EXYNOS: Modify the GIC physical address for static io-mapping
ARM: EXYNOS: Add watchdog timer clock instance
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/exynos5250-smdk5250.dts')
-rw-r--r-- | arch/arm/boot/dts/exynos5250-smdk5250.dts | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 399d17b231d2..49945cc1bc7d 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts | |||
@@ -23,4 +23,52 @@ | |||
23 | chosen { | 23 | chosen { |
24 | bootargs = "root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200"; | 24 | bootargs = "root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200"; |
25 | }; | 25 | }; |
26 | |||
27 | i2c@12C60000 { | ||
28 | samsung,i2c-sda-delay = <100>; | ||
29 | samsung,i2c-max-bus-freq = <20000>; | ||
30 | gpios = <&gpb3 0 2 3 0>, | ||
31 | <&gpb3 1 2 3 0>; | ||
32 | |||
33 | eeprom@50 { | ||
34 | compatible = "samsung,s524ad0xd1"; | ||
35 | reg = <0x50>; | ||
36 | }; | ||
37 | }; | ||
38 | |||
39 | i2c@12C70000 { | ||
40 | samsung,i2c-sda-delay = <100>; | ||
41 | samsung,i2c-max-bus-freq = <20000>; | ||
42 | gpios = <&gpb3 2 2 3 0>, | ||
43 | <&gpb3 3 2 3 0>; | ||
44 | |||
45 | eeprom@51 { | ||
46 | compatible = "samsung,s524ad0xd1"; | ||
47 | reg = <0x51>; | ||
48 | }; | ||
49 | }; | ||
50 | |||
51 | i2c@12C80000 { | ||
52 | status = "disabled"; | ||
53 | }; | ||
54 | |||
55 | i2c@12C90000 { | ||
56 | status = "disabled"; | ||
57 | }; | ||
58 | |||
59 | i2c@12CA0000 { | ||
60 | status = "disabled"; | ||
61 | }; | ||
62 | |||
63 | i2c@12CB0000 { | ||
64 | status = "disabled"; | ||
65 | }; | ||
66 | |||
67 | i2c@12CC0000 { | ||
68 | status = "disabled"; | ||
69 | }; | ||
70 | |||
71 | i2c@12CD0000 { | ||
72 | status = "disabled"; | ||
73 | }; | ||
26 | }; | 74 | }; |