diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-05 03:34:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-05 03:34:13 +0200 |
| commit | 048c9acca90ca7da42b92745445fe008a48add88 (patch) | |
| tree | e2e551a565a7dcdca0fc398aa659231745e5a901 /arch/arm/boot/dts/exynos4210-origen.dts | |
| parent | sparc64: Do not save/restore interrupts in get_new_mmu_context() (diff) | |
| parent | serial: sunsu: add missing platform_driver_unregister() when module exit (diff) | |
| download | linux-048c9acca90ca7da42b92745445fe008a48add88.tar.xz linux-048c9acca90ca7da42b92745445fe008a48add88.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Merge sparc bug fixes that didn't make it into v3.9 into
sparc-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/exynos4210-origen.dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos4210-origen.dts | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index f2710018e84e..1b30bc8e2654 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts @@ -57,6 +57,12 @@ status = "okay"; }; + codec@13400000 { + samsung,mfc-r = <0x43000000 0x800000>; + samsung,mfc-l = <0x51000000 0x800000>; + status = "okay"; + }; + serial@13800000 { status = "okay"; }; @@ -121,4 +127,16 @@ linux,default-trigger = "heartbeat"; }; }; + + fixed-rate-clocks { + xxti { + compatible = "samsung,clock-xxti"; + clock-frequency = <0>; + }; + + xusbxti { + compatible = "samsung,clock-xusbxti"; + clock-frequency = <24000000>; + }; + }; }; |