Deleted Added
full compact
18a19
> #include <dt-bindings/gpio/gpio.h>
33,37c34,43
< sdhci@12530000 {
< bus-width = <4>;
< pinctrl-names = "default";
< pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
< status = "okay";
---
> fixed-rate-clocks {
> xxti {
> compatible = "samsung,clock-xxti";
> clock-frequency = <12000000>;
> };
>
> xusbxti {
> compatible = "samsung,clock-xusbxti";
> clock-frequency = <24000000>;
> };
38a45
> };
40,41c47,56
< g2d@12800000 {
< status = "okay";
---
> &i2c_0 {
> #address-cells = <1>;
> #size-cells = <0>;
> samsung,i2c-sda-delay = <100>;
> samsung,i2c-max-bus-freq = <100000>;
> status = "okay";
>
> eeprom@50 {
> compatible = "samsung,24ad0xd1";
> reg = <0x50>;
44,47c59,61
< codec@13400000 {
< samsung,mfc-r = <0x43000000 0x800000>;
< samsung,mfc-l = <0x51000000 0x800000>;
< status = "okay";
---
> eeprom@52 {
> compatible = "samsung,24ad0xd1";
> reg = <0x52>;
48a63
> };
50,51c65,77
< serial@13800000 {
< status = "okay";
---
> &keypad {
> samsung,keypad-num-rows = <2>;
> samsung,keypad-num-columns = <8>;
> linux,keypad-no-autorepeat;
> linux,keypad-wakeup;
> pinctrl-names = "default";
> pinctrl-0 = <&keypad_rows &keypad_cols>;
> status = "okay";
>
> key_1 {
> keypad,row = <0>;
> keypad,column = <3>;
> linux,code = <2>;
54,55c80,83
< serial@13810000 {
< status = "okay";
---
> key_2 {
> keypad,row = <0>;
> keypad,column = <4>;
> linux,code = <3>;
58,59c86,89
< serial@13820000 {
< status = "okay";
---
> key_3 {
> keypad,row = <0>;
> keypad,column = <5>;
> linux,code = <4>;
62,63c92,95
< serial@13830000 {
< status = "okay";
---
> key_4 {
> keypad,row = <0>;
> keypad,column = <6>;
> linux,code = <5>;
66,72c98,102
< pinctrl@11000000 {
< keypad_rows: keypad-rows {
< samsung,pins = "gpx2-0", "gpx2-1";
< samsung,pin-function = <3>;
< samsung,pin-pud = <3>;
< samsung,pin-drv = <0>;
< };
---
> key_5 {
> keypad,row = <0>;
> keypad,column = <7>;
> linux,code = <6>;
> };
74,80c104,107
< 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>;
< };
---
> key_a {
> keypad,row = <1>;
> keypad,column = <3>;
> linux,code = <30>;
83,90c110,114
< keypad@100A0000 {
< samsung,keypad-num-rows = <2>;
< samsung,keypad-num-columns = <8>;
< linux,keypad-no-autorepeat;
< linux,keypad-wakeup;
< pinctrl-names = "default";
< pinctrl-0 = <&keypad_rows &keypad_cols>;
< status = "okay";
---
> key_b {
> keypad,row = <1>;
> keypad,column = <4>;
> linux,code = <48>;
> };
92,96c116,120
< key_1 {
< keypad,row = <0>;
< keypad,column = <3>;
< linux,code = <2>;
< };
---
> key_c {
> keypad,row = <1>;
> keypad,column = <5>;
> linux,code = <46>;
> };
98,102c122,126
< key_2 {
< keypad,row = <0>;
< keypad,column = <4>;
< linux,code = <3>;
< };
---
> key_d {
> keypad,row = <1>;
> keypad,column = <6>;
> linux,code = <32>;
> };
104,108c128,133
< key_3 {
< keypad,row = <0>;
< keypad,column = <5>;
< linux,code = <4>;
< };
---
> key_e {
> keypad,row = <1>;
> keypad,column = <7>;
> linux,code = <18>;
> };
> };
110,114c135,139
< key_4 {
< keypad,row = <0>;
< keypad,column = <6>;
< linux,code = <5>;
< };
---
> &mfc {
> samsung,mfc-r = <0x43000000 0x800000>;
> samsung,mfc-l = <0x51000000 0x800000>;
> status = "okay";
> };
116,120c141,147
< key_5 {
< keypad,row = <0>;
< keypad,column = <7>;
< linux,code = <6>;
< };
---
> &pinctrl_1 {
> keypad_rows: keypad-rows {
> samsung,pins = "gpx2-0", "gpx2-1";
> samsung,pin-function = <3>;
> samsung,pin-pud = <3>;
> samsung,pin-drv = <0>;
> };
122,150c149,154
< key_a {
< keypad,row = <1>;
< keypad,column = <3>;
< linux,code = <30>;
< };
<
< key_b {
< keypad,row = <1>;
< keypad,column = <4>;
< linux,code = <48>;
< };
<
< key_c {
< keypad,row = <1>;
< keypad,column = <5>;
< linux,code = <46>;
< };
<
< key_d {
< keypad,row = <1>;
< keypad,column = <6>;
< linux,code = <32>;
< };
<
< key_e {
< keypad,row = <1>;
< keypad,column = <7>;
< linux,code = <18>;
< };
---
> 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>;
151a156
> };
153,158c158,163
< i2c@13860000 {
< #address-cells = <1>;
< #size-cells = <0>;
< samsung,i2c-sda-delay = <100>;
< samsung,i2c-max-bus-freq = <100000>;
< status = "okay";
---
> &sdhci_2 {
> bus-width = <4>;
> pinctrl-names = "default";
> pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
> status = "okay";
> };
160,163c165,167
< eeprom@50 {
< compatible = "samsung,24ad0xd1";
< reg = <0x50>;
< };
---
> &serial_0 {
> status = "okay";
> };
165,169c169,171
< eeprom@52 {
< compatible = "samsung,24ad0xd1";
< reg = <0x52>;
< };
< };
---
> &serial_1 {
> status = "okay";
> };
171,173c173,175
< spi_2: spi@13940000 {
< cs-gpios = <&gpc1 2 0>;
< status = "okay";
---
> &serial_2 {
> status = "okay";
> };
175,180c177,179
< w25x80@0 {
< #address-cells = <1>;
< #size-cells = <1>;
< compatible = "w25x80";
< reg = <0>;
< spi-max-frequency = <1000000>;
---
> &serial_3 {
> status = "okay";
> };
182,184c181,183
< controller-data {
< samsung,spi-feedback-delay = <0>;
< };
---
> &spi_2 {
> cs-gpios = <&gpc1 2 GPIO_ACTIVE_HIGH>;
> status = "okay";
186,190c185,190
< partition@0 {
< label = "U-Boot";
< reg = <0x0 0x40000>;
< read-only;
< };
---
> w25x80@0 {
> #address-cells = <1>;
> #size-cells = <1>;
> compatible = "w25x80";
> reg = <0>;
> spi-max-frequency = <1000000>;
192,195c192,193
< partition@40000 {
< label = "Kernel";
< reg = <0x40000 0xc0000>;
< };
---
> controller-data {
> samsung,spi-feedback-delay = <0>;
197d194
< };
199,202c196,199
< fixed-rate-clocks {
< xxti {
< compatible = "samsung,clock-xxti";
< clock-frequency = <12000000>;
---
> partition@0 {
> label = "U-Boot";
> reg = <0x0 0x40000>;
> read-only;
205,207c202,204
< xusbxti {
< compatible = "samsung,clock-xusbxti";
< clock-frequency = <24000000>;
---
> partition@40000 {
> label = "Kernel";
> reg = <0x40000 0xc0000>;