Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical

From Kukjin Kim:
Samsung non-critical 2nd fixes for v3.14
- Correct HSMMC1 card detection type for s3c6410-mini6410
- Fix different key mapping backslash and search key for exynos5250-snow
- Fix definitions of div_mmc_pre4 divider for CLK_SET_RATE_PARENT
- Fix clock provider for mshc on exynos4412
- Fix definitions of mshc dt nodes for exynos4x12
- use mshc controller for eMMC for exynos4412-trats2

* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Use MSHC controller for eMMC memory for exynos4412-trats2
  ARM: dts: Fix definition of MSHC device tree nodes for exynos4x12
  ARM: dts: add clock provider for mshc node for Exynos4412 SOC
  clk: samsung: exynos4: Fix definition of div_mmc_pre4 divider
  ARM: dts: Fix exynos5250-snow's search key to be L_META
  ARM: dts: Add the missing "\" key in non-US keyboards for exynos5250-snow
  ARM: S3C64XX: Correct card detect type for HSMMC1 for MINI6410

Signed-off-by: Olof Johansson <olof@lixom.net>

8 files changed, 45 insertions, 21 deletions

diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 46c678ee119c..8aad5f72ced7 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -38,9 +38,7 @@
                 };
         };
 
-        mshc@12550000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
+        mmc@12550000 {
                 pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
                 pinctrl-names = "default";
                 vmmc-supply = <&ldo20_reg &buck8_reg>;
@@ -49,7 +47,6 @@
                 num-slots = <1>;
                 supports-highspeed;
                 broken-cd;
-                fifo-depth = <0x80>;
                 card-detect-delay = <200>;
                 samsung,dw-mshc-ciu-div = <3>;
                 samsung,dw-mshc-sdr-timing = <2 3>;
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 95201559c3ad..6bc053924e9e 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -122,9 +122,7 @@
                 status = "okay";
         };
 
-        mshc@12550000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
+        mmc@12550000 {
                 pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
                 pinctrl-names = "default";
                 status = "okay";
@@ -132,7 +130,6 @@
                 num-slots = <1>;
                 supports-highspeed;
                 broken-cd;
-                fifo-depth = <0x80>;
                 card-detect-delay = <200>;
                 samsung,dw-mshc-ciu-div = <3>;
                 samsung,dw-mshc-sdr-timing = <2 3>;
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index fb7b9ae5f399..890ad275cb85 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -442,13 +442,25 @@
                 };
         };
 
-        sdhci@12510000 {
-                bus-width = <8>;
+        mmc@12550000 {
+                num-slots = <1>;
+                supports-highspeed;
+                broken-cd;
                 non-removable;
-                pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>;
-                pinctrl-names = "default";
+                card-detect-delay = <200>;
                 vmmc-supply = <&vemmc_reg>;
+                clock-frequency = <400000000>;
+                samsung,dw-mshc-ciu-div = <0>;
+                samsung,dw-mshc-sdr-timing = <2 3>;
+                samsung,dw-mshc-ddr-timing = <1 2>;
+                pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
+                pinctrl-names = "default";
                 status = "okay";
+
+                slot@0 {
+                        reg = <0>;
+                        bus-width = <8>;
+                };
         };
 
         serial@13800000 {
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index e743e677a9e2..85812bd95a86 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -61,11 +61,4 @@
                 };
         };
 
-        mshc@12550000 {
-                compatible = "samsung,exynos4412-dw-mshc";
-                reg = <0x12550000 0x1000>;
-                interrupts = <0 77 0>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-        };
 };
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index ad531fe6ab95..1917c829e64e 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -28,6 +28,7 @@
                 pinctrl3 = &pinctrl_3;
                 fimc-lite0 = &fimc_lite_0;
                 fimc-lite1 = &fimc_lite_1;
+                mshc0 = &mshc_0;
         };
 
         pd_isp: isp-power-domain@10023CA0 {
@@ -176,4 +177,16 @@
                         };
                 };
         };
+
+        mshc_0: mmc@12550000 {
+                compatible = "samsung,exynos4412-dw-mshc";
+                reg = <0x12550000 0x1000>;
+                interrupts = <0 77 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                fifo-depth = <0x80>;
+                clocks = <&clock 301>, <&clock 149>;
+                clock-names = "biu", "ciu";
+                status = "disabled";
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index fd711e245e8d..c65f52a6dcea 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 */
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index 58d46a3d7b78..97ae4703cb78 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -36,7 +36,9 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <linux/platform_data/mmc-sdhci-s3c.h>
 #include <plat/regs-serial.h>
+#include <plat/sdhci.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
 
 #include <video/platform_lcd.h>
@@ -214,6 +216,13 @@ static struct platform_device mini6410_lcd_powerdev = {
         .dev.platform_data      = &mini6410_lcd_power_data,
 };
 
+static struct s3c_sdhci_platdata mini6410_hsmmc1_pdata = {
+        .max_width              = 4,
+        .cd_type                = S3C_SDHCI_CD_GPIO,
+        .ext_cd_gpio            = S3C64XX_GPN(10),
+        .ext_cd_gpio_invert     = true,
+};
+
 static struct platform_device *mini6410_devices[] __initdata = {
         &mini6410_device_eth,
         &s3c_device_hsmmc0,
@@ -321,6 +330,7 @@ static void __init mini6410_machine_init(void)
 
         s3c_nand_set_platdata(&mini6410_nand_info);
         s3c_fb_set_platdata(&mini6410_lcd_pdata[features.lcd_index]);
+        s3c_sdhci1_set_platdata(&mini6410_hsmmc1_pdata);
         s3c24xx_ts_set_platdata(NULL);
 
         /* configure nCS1 width to 16 bits */
diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c
index ad5ff50c5f28..d967571d305e 100644
--- a/drivers/clk/samsung/clk-exynos4.c
+++ b/drivers/clk/samsung/clk-exynos4.c
@@ -530,7 +530,8 @@ static struct samsung_div_clock exynos4_div_clks[] __initdata = {
         DIV(sclk_i2s1, "sclk_i2s1", "sclk_audio1", DIV_PERIL5, 0, 6),
         DIV(sclk_i2s2, "sclk_i2s2", "sclk_audio2", DIV_PERIL5, 8, 6),
         DIV(none, "div_mmc4", "mout_mmc4", DIV_FSYS3, 0, 4),
-        DIV(none, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8),
+        DIV_F(none, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8,
+                        CLK_SET_RATE_PARENT, 0),
         DIV(none, "div_uart0", "mout_uart0", DIV_PERIL0, 0, 4),
         DIV(none, "div_uart1", "mout_uart1", DIV_PERIL0, 4, 4),
         DIV(none, "div_uart2", "mout_uart2", DIV_PERIL0, 8, 4),