31,40c31,34
< g2d@10800000 {
< status = "okay";
< };
<
< pinctrl@11000000 {
< keypad_rows: keypad-rows {
< samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";
< samsung,pin-function = <3>;
< samsung,pin-pud = <3>;
< samsung,pin-drv = <0>;
---
> fixed-rate-clocks {
> xxti {
> compatible = "samsung,clock-xxti";
> clock-frequency = <0>;
43,48c37,39
< keypad_cols: keypad-cols {
< samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3",
< "gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7";
< samsung,pin-function = <3>;
< samsung,pin-pud = <0>;
< samsung,pin-drv = <0>;
---
> xusbxti {
> compatible = "samsung,clock-xusbxti";
> clock-frequency = <24000000>;
50a42
> };
52,59c44,51
< keypad@100A0000 {
< samsung,keypad-num-rows = <3>;
< samsung,keypad-num-columns = <8>;
< linux,keypad-no-autorepeat;
< linux,keypad-wakeup;
< pinctrl-0 = <&keypad_rows &keypad_cols>;
< pinctrl-names = "default";
< status = "okay";
---
> &keypad {
> samsung,keypad-num-rows = <3>;
> samsung,keypad-num-columns = <8>;
> linux,keypad-no-autorepeat;
> linux,keypad-wakeup;
> pinctrl-0 = <&keypad_rows &keypad_cols>;
> pinctrl-names = "default";
> status = "okay";
61,65c53,57
< key_1 {
< keypad,row = <1>;
< keypad,column = <3>;
< linux,code = <2>;
< };
---
> key_1 {
> keypad,row = <1>;
> keypad,column = <3>;
> linux,code = <2>;
> };
67,71c59,63
< key_2 {
< keypad,row = <1>;
< keypad,column = <4>;
< linux,code = <3>;
< };
---
> key_2 {
> keypad,row = <1>;
> keypad,column = <4>;
> linux,code = <3>;
> };
73,77c65,69
< key_3 {
< keypad,row = <1>;
< keypad,column = <5>;
< linux,code = <4>;
< };
---
> key_3 {
> keypad,row = <1>;
> keypad,column = <5>;
> linux,code = <4>;
> };
79,83c71,75
< key_4 {
< keypad,row = <1>;
< keypad,column = <6>;
< linux,code = <5>;
< };
---
> key_4 {
> keypad,row = <1>;
> keypad,column = <6>;
> linux,code = <5>;
> };
85,89c77,81
< key_5 {
< keypad,row = <1>;
< keypad,column = <7>;
< linux,code = <6>;
< };
---
> key_5 {
> keypad,row = <1>;
> keypad,column = <7>;
> linux,code = <6>;
> };
91,119c83,86
< key_A {
< keypad,row = <2>;
< keypad,column = <6>;
< linux,code = <30>;
< };
<
< key_B {
< keypad,row = <2>;
< keypad,column = <7>;
< linux,code = <48>;
< };
<
< key_C {
< keypad,row = <0>;
< keypad,column = <5>;
< linux,code = <46>;
< };
<
< key_D {
< keypad,row = <2>;
< keypad,column = <5>;
< linux,code = <32>;
< };
<
< key_E {
< keypad,row = <0>;
< keypad,column = <7>;
< linux,code = <18>;
< };
---
> key_A {
> keypad,row = <2>;
> keypad,column = <6>;
> linux,code = <30>;
122,126c89,92
< sdhci@12530000 {
< bus-width = <4>;
< pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
< pinctrl-names = "default";
< status = "okay";
---
> key_B {
> keypad,row = <2>;
> keypad,column = <7>;
> linux,code = <48>;
129,132c95,98
< codec@13400000 {
< samsung,mfc-r = <0x43000000 0x800000>;
< samsung,mfc-l = <0x51000000 0x800000>;
< status = "okay";
---
> key_C {
> keypad,row = <0>;
> keypad,column = <5>;
> linux,code = <46>;
135,136c101,104
< serial@13800000 {
< status = "okay";
---
> key_D {
> keypad,row = <2>;
> keypad,column = <5>;
> linux,code = <32>;
139,140c107,110
< serial@13810000 {
< status = "okay";
---
> key_E {
> keypad,row = <0>;
> keypad,column = <7>;
> linux,code = <18>;
141a112
> };
143,144c114,125
< serial@13820000 {
< status = "okay";
---
> &mfc {
> samsung,mfc-r = <0x43000000 0x800000>;
> samsung,mfc-l = <0x51000000 0x800000>;
> status = "okay";
> };
>
> &pinctrl_1 {
> keypad_rows: keypad-rows {
> samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";
> samsung,pin-function = <3>;
> samsung,pin-pud = <3>;
> samsung,pin-drv = <0>;
147,148c128,133
< serial@13830000 {
< status = "okay";
---
> keypad_cols: keypad-cols {
> samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3",
> "gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7";
> samsung,pin-function = <3>;
> samsung,pin-pud = <0>;
> samsung,pin-drv = <0>;
149a135
> };
151,155c137,142
< fixed-rate-clocks {
< xxti {
< compatible = "samsung,clock-xxti";
< clock-frequency = <0>;
< };
---
> &sdhci_2 {
> bus-width = <4>;
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
> pinctrl-names = "default";
> status = "okay";
> };
157,161c144,145
< xusbxti {
< compatible = "samsung,clock-xusbxti";
< clock-frequency = <24000000>;
< };
< };
---
> &serial_0 {
> status = "okay";
162a147,158
>
> &serial_1 {
> status = "okay";
> };
>
> &serial_2 {
> status = "okay";
> };
>
> &serial_3 {
> status = "okay";
> };