diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-21 00:12:01 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-21 00:12:01 +0100 |
| commit | de4cf2fe3639af73a5d7d1afe2d8bf6756c7940e (patch) | |
| tree | 5ed3955a6908fa564f662666973c087e1e607a01 /arch/arm/boot/dts/exynos5250-snow.dts | |
| parent | ARM: dts: Update Samsung sysreg binding document (diff) | |
| parent | ARM: dts: Use MSHC controller for eMMC memory for exynos4412-trats2 (diff) | |
| download | linux-de4cf2fe3639af73a5d7d1afe2d8bf6756c7940e.tar.xz linux-de4cf2fe3639af73a5d7d1afe2d8bf6756c7940e.zip | |
Merge branch 'v3.14-next/fixes-samsung-2' into v3.14-next/dt-exynos-2
Diffstat (limited to 'arch/arm/boot/dts/exynos5250-snow.dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-snow.dts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index a9395c426db4..582e78d37b05 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -85,7 +85,7 @@ keypad,num-rows = <8>; keypad,num-columns = <13>; google,needs-ghost-filter; - linux,keymap = <0x0001003a /* CAPSLK */ + linux,keymap = <0x0001007d /* L_META */ 0x0002003b /* F1 */ 0x00030030 /* B */ 0x00040044 /* F10 */ @@ -130,6 +130,7 @@ 0x04060024 /* J */ 0x04080027 /* ; */ 0x04090026 /* L */ + 0x040a002b /* \ */ 0x040b001c /* ENTER */ 0x0501002c /* Z */ |