diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-17 04:58:08 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-17 04:58:58 +0100 |
| commit | 5046e385b4426e229a6beb4bce480762af91a6fc (patch) | |
| tree | 65b4bff2c913a18840b3c58892853d51b942ac43 /arch/arm/boot/dts/dbx5x0.dtsi | |
| parent | ARM: compile fix for DEBUG_LL=y && MMU=n (diff) | |
| parent | ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore (diff) | |
| download | linux-5046e385b4426e229a6beb4bce480762af91a6fc.tar.xz linux-5046e385b4426e229a6beb4bce480762af91a6fc.zip | |
Merge branch 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
From Kukjin Kim:
That branch fixes build error for S3C24XX/S3C64xx. And corrects dw-mshc
properties on EXYNOS5 DT and fixes IRQ mapping on Cragganmore board.
* 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
ARM: dts: correct the dw-mshc timing properties as per binding
ARM: S3C64XX: Fix build error with CONFIG_S3C_DEV_FB disabled
+ Linux 3.8-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/dbx5x0.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/dbx5x0.dtsi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 2efd9c891bc9..63f2fbcfe819 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -170,7 +170,9 @@ gpio-bank = <8>; }; - pinctrl { + pinctrl@80157000 { + // This is actually the PRCMU base address + reg = <0x80157000 0x2000>; compatible = "stericsson,nmk_pinctrl"; }; |