Deleted Added
full compact
16a17
> #include <dt-bindings/gpio/gpio.h>
42c43
< gpio = <&gpk0 2 0>;
---
> gpio = <&gpk0 2 GPIO_ACTIVE_HIGH>;
51c52
< gpio = <&gpl0 3 0>;
---
> gpio = <&gpl0 3 GPIO_ACTIVE_HIGH>;
60c61
< gpio = <&gpk1 1 0>;
---
> gpio = <&gpk1 1 GPIO_ACTIVE_HIGH>;
69c70
< gpio = <&gpe2 1 0>;
---
> gpio = <&gpe2 1 GPIO_ACTIVE_HIGH>;
78c79
< gpio = <&gpe2 5 0>;
---
> gpio = <&gpe2 5 GPIO_ACTIVE_HIGH>;
87c88
< gpio = <&gpe2 2 0>;
---
> gpio = <&gpe2 2 GPIO_ACTIVE_HIGH>;
92,127d92
< hsotg@12480000 {
< vusb_d-supply = <&vusb_reg>;
< vusb_a-supply = <&vusbdac_reg>;
< dr_mode = "peripheral";
< status = "okay";
< };
<
< sdhci_emmc: sdhci@12510000 {
< bus-width = <8>;
< non-removable;
< pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>;
< pinctrl-names = "default";
< vmmc-supply = <&vemmc_reg>;
< status = "okay";
< };
<
< exynos-usbphy@125B0000 {
< status = "okay";
< };
<
< serial@13800000 {
< status = "okay";
< };
<
< serial@13810000 {
< status = "okay";
< };
<
< serial@13820000 {
< status = "okay";
< };
<
< serial@13830000 {
< status = "okay";
< };
<
132c97
< gpios = <&gpx2 1 1>;
---
> gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;
139c104
< gpios = <&gpx2 0 1>;
---
> gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;
146c111
< gpios = <&gpx2 7 1>;
---
> gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
154c119
< gpios = <&gpx3 5 1>;
---
> gpios = <&gpx3 5 GPIO_ACTIVE_LOW>;
161,167c126,130
< i2c@13890000 {
< samsung,i2c-sda-delay = <100>;
< samsung,i2c-slave-addr = <0x10>;
< samsung,i2c-max-bus-freq = <400000>;
< pinctrl-0 = <&i2c3_bus>;
< pinctrl-names = "default";
< status = "okay";
---
> fixed-rate-clocks {
> xxti {
> compatible = "samsung,clock-xxti";
> clock-frequency = <0>;
> };
169,177c132,134
< mms114-touchscreen@48 {
< compatible = "melfas,mms114";
< reg = <0x48>;
< interrupt-parent = <&gpx0>;
< interrupts = <4 2>;
< x-size = <720>;
< y-size = <1280>;
< avdd-supply = <&tsp_reg>;
< vdd-supply = <&tsp_reg>;
---
> xusbxti {
> compatible = "samsung,clock-xusbxti";
> clock-frequency = <24000000>;
181,185c138,153
< i2c@138B0000 {
< samsung,i2c-sda-delay = <100>;
< samsung,i2c-slave-addr = <0x10>;
< samsung,i2c-max-bus-freq = <100000>;
< pinctrl-0 = <&i2c5_bus>;
---
> thermal-zones {
> cpu_thermal: cpu-thermal {
> cooling-maps {
> map0 {
> /* Corresponds to 800MHz at freq_table */
> cooling-device = <&cpu0 2 2>;
> };
> map1 {
> /* Corresponds to 200MHz at freq_table */
> cooling-device = <&cpu0 4 4>;
> };
> };
> };
> };
>
> camera {
186a155
> pinctrl-0 = <>;
189,190c158,164
< max8997_pmic@66 {
< compatible = "maxim,max8997-pmic";
---
> fimc_0: fimc@11800000 {
> status = "okay";
> assigned-clocks = <&clock CLK_MOUT_FIMC0>,
> <&clock CLK_SCLK_FIMC0>;
> assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> assigned-clock-rates = <0>, <160000000>;
> };
192c166,172
< reg = <0x66>;
---
> fimc_1: fimc@11810000 {
> status = "okay";
> assigned-clocks = <&clock CLK_MOUT_FIMC1>,
> <&clock CLK_SCLK_FIMC1>;
> assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> assigned-clock-rates = <0>, <160000000>;
> };
194,196c174,180
< max8997,pmic-buck1-uses-gpio-dvs;
< max8997,pmic-buck2-uses-gpio-dvs;
< max8997,pmic-buck5-uses-gpio-dvs;
---
> fimc_2: fimc@11820000 {
> status = "okay";
> assigned-clocks = <&clock CLK_MOUT_FIMC2>,
> <&clock CLK_SCLK_FIMC2>;
> assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> assigned-clock-rates = <0>, <160000000>;
> };
198,199c182,190
< max8997,pmic-ignore-gpiodvs-side-effect;
< max8997,pmic-buck125-default-dvs-idx = <0>;
---
> fimc_3: fimc@11830000 {
> status = "okay";
> assigned-clocks = <&clock CLK_MOUT_FIMC3>,
> <&clock CLK_SCLK_FIMC3>;
> assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
> assigned-clock-rates = <0>, <160000000>;
> };
> };
> };
201,203c192,194
< max8997,pmic-buck125-dvs-gpios = <&gpx0 5 0>,
< <&gpx0 6 0>,
< <&gpl0 0 0>;
---
> &cpu0 {
> cpu0-supply = <&varm_breg>;
> };
205,208c196,200
< max8997,pmic-buck1-dvs-voltage = <1350000>, <1300000>,
< <1250000>, <1200000>,
< <1150000>, <1100000>,
< <1000000>, <950000>;
---
> &dsi_0 {
> vddcore-supply = <&vusb_reg>;
> vddio-supply = <&vmipi_reg>;
> samsung,pll-clock-frequency = <24000000>;
> status = "okay";
210,213c202,204
< max8997,pmic-buck2-dvs-voltage = <1100000>, <1000000>,
< <950000>, <900000>,
< <1100000>, <1000000>,
< <950000>, <900000>;
---
> ports {
> #address-cells = <1>;
> #size-cells = <0>;
215,218c206,207
< max8997,pmic-buck5-dvs-voltage = <1200000>, <1200000>,
< <1200000>, <1200000>,
< <1200000>, <1200000>,
< <1200000>, <1200000>;
---
> port@1 {
> reg = <1>;
220,226c209,215
< regulators {
< valive_reg: LDO2 {
< regulator-name = "VALIVE_1.1V_C210";
< regulator-min-microvolt = <1100000>;
< regulator-max-microvolt = <1100000>;
< regulator-always-on;
< };
---
> dsi_out: endpoint {
> remote-endpoint = <&dsi_in>;
> samsung,burst-clock-frequency = <500000000>;
> samsung,esc-clock-frequency = <20000000>;
> };
> };
> };
228,232c217,229
< vusb_reg: LDO3 {
< regulator-name = "VUSB_1.1V_C210";
< regulator-min-microvolt = <1100000>;
< regulator-max-microvolt = <1100000>;
< };
---
> panel@0 {
> reg = <0>;
> compatible = "samsung,s6e8aa0";
> vdd3-supply = <&vcclcd_reg>;
> vci-supply = <&vlcd_reg>;
> reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>;
> power-on-delay= <50>;
> reset-delay = <100>;
> init-delay = <100>;
> flip-horizontal;
> flip-vertical;
> panel-width-mm = <58>;
> panel-height-mm = <103>;
234,238c231,243
< vmipi_reg: LDO4 {
< regulator-name = "VMIPI_1.8V";
< regulator-min-microvolt = <1800000>;
< regulator-max-microvolt = <1800000>;
< };
---
> display-timings {
> timing-0 {
> clock-frequency = <57153600>;
> hactive = <720>;
> vactive = <1280>;
> hfront-porch = <5>;
> hback-porch = <5>;
> hsync-len = <5>;
> vfront-porch = <13>;
> vback-porch = <1>;
> vsync-len = <2>;
> };
> };
240,245c245,251
< vpda_reg: LDO6 {
< regulator-name = "VCC_1.8V_PDA";
< regulator-min-microvolt = <1800000>;
< regulator-max-microvolt = <1800000>;
< regulator-always-on;
< };
---
> port {
> dsi_in: endpoint {
> remote-endpoint = <&dsi_out>;
> };
> };
> };
> };
247,251c253,256
< vcam_reg: LDO7 {
< regulator-name = "CAM_ISP_1.8V";
< regulator-min-microvolt = <1800000>;
< regulator-max-microvolt = <1800000>;
< };
---
> &exynos_usbphy {
> status = "okay";
> vbus-supply = <&safe1_sreg>;
> };
253,257c258,260
< vusbdac_reg: LDO8 {
< regulator-name = "VUSB/VDAC_3.3V_C210";
< regulator-min-microvolt = <3300000>;
< regulator-max-microvolt = <3300000>;
< };
---
> &fimd {
> status = "okay";
> };
259,264c262,267
< vccpda_reg: LDO9 {
< regulator-name = "VCC_2.8V_PDA";
< regulator-min-microvolt = <2800000>;
< regulator-max-microvolt = <2800000>;
< regulator-always-on;
< };
---
> &hsotg {
> vusb_d-supply = <&vusb_reg>;
> vusb_a-supply = <&vusbdac_reg>;
> dr_mode = "peripheral";
> status = "okay";
> };
266,271c269,275
< vpll_reg: LDO10 {
< regulator-name = "VPLL_1.1V_C210";
< regulator-min-microvolt = <1100000>;
< regulator-max-microvolt = <1100000>;
< regulator-always-on;
< };
---
> &i2c_3 {
> samsung,i2c-sda-delay = <100>;
> samsung,i2c-slave-addr = <0x10>;
> samsung,i2c-max-bus-freq = <400000>;
> pinctrl-0 = <&i2c3_bus>;
> pinctrl-names = "default";
> status = "okay";
273,277c277,287
< vtcam_reg: LDO12 {
< regulator-name = "VT_CAM_1.8V";
< regulator-min-microvolt = <1800000>;
< regulator-max-microvolt = <1800000>;
< };
---
> mms114-touchscreen@48 {
> compatible = "melfas,mms114";
> reg = <0x48>;
> interrupt-parent = <&gpx0>;
> interrupts = <4 2>;
> x-size = <720>;
> y-size = <1280>;
> avdd-supply = <&tsp_reg>;
> vdd-supply = <&tsp_reg>;
> };
> };
279,283c289,295
< vcclcd_reg: LDO13 {
< regulator-name = "VCC_3.3V_LCD";
< regulator-min-microvolt = <3300000>;
< regulator-max-microvolt = <3300000>;
< };
---
> &i2c_5 {
> samsung,i2c-sda-delay = <100>;
> samsung,i2c-slave-addr = <0x10>;
> samsung,i2c-max-bus-freq = <100000>;
> pinctrl-0 = <&i2c5_bus>;
> pinctrl-names = "default";
> status = "okay";
285,289c297,298
< vlcd_reg: LDO15 {
< regulator-name = "VLCD_2.2V";
< regulator-min-microvolt = <2200000>;
< regulator-max-microvolt = <2200000>;
< };
---
> max8997_pmic@66 {
> compatible = "maxim,max8997-pmic";
291,295c300
< camsensor_reg: LDO16 {
< regulator-name = "CAM_SENSOR_IO_1.8V";
< regulator-min-microvolt = <1800000>;
< regulator-max-microvolt = <1800000>;
< };
---
> reg = <0x66>;
297,302c302,304
< vddq_reg: LDO21 {
< regulator-name = "VDDQ_M1M2_1.2V";
< regulator-min-microvolt = <1200000>;
< regulator-max-microvolt = <1200000>;
< regulator-always-on;
< };
---
> max8997,pmic-buck1-uses-gpio-dvs;
> max8997,pmic-buck2-uses-gpio-dvs;
> max8997,pmic-buck5-uses-gpio-dvs;
304,314c306,307
< varm_breg: BUCK1 {
< /*
< * HACK: The real name is VARM_1.2V_C210,
< * but exynos-cpufreq does not support
< * DT-based regulator lookup yet.
< */
< regulator-name = "vdd_arm";
< regulator-min-microvolt = <900000>;
< regulator-max-microvolt = <1350000>;
< regulator-always-on;
< };
---
> max8997,pmic-ignore-gpiodvs-side-effect;
> max8997,pmic-buck125-default-dvs-idx = <0>;
316,321c309,311
< vint_breg: BUCK2 {
< regulator-name = "VINT_1.1V_C210";
< regulator-min-microvolt = <900000>;
< regulator-max-microvolt = <1100000>;
< regulator-always-on;
< };
---
> max8997,pmic-buck125-dvs-gpios = <&gpx0 5 GPIO_ACTIVE_HIGH>,
> <&gpx0 6 GPIO_ACTIVE_HIGH>,
> <&gpl0 0 GPIO_ACTIVE_HIGH>;
323,327c313,316
< camisp_breg: BUCK4 {
< regulator-name = "CAM_ISP_CORE_1.2V";
< regulator-min-microvolt = <1200000>;
< regulator-max-microvolt = <1200000>;
< };
---
> max8997,pmic-buck1-dvs-voltage = <1350000>, <1300000>,
> <1250000>, <1200000>,
> <1150000>, <1100000>,
> <1000000>, <950000>;
329,334c318,321
< vmem_breg: BUCK5 {
< regulator-name = "VMEM_1.2V_C210";
< regulator-min-microvolt = <1200000>;
< regulator-max-microvolt = <1200000>;
< regulator-always-on;
< };
---
> max8997,pmic-buck2-dvs-voltage = <1100000>, <1000000>,
> <950000>, <900000>,
> <1100000>, <1000000>,
> <950000>, <900000>;
336,341c323,326
< vccsub_breg: BUCK7 {
< regulator-name = "VCC_SUB_2.0V";
< regulator-min-microvolt = <2000000>;
< regulator-max-microvolt = <2000000>;
< regulator-always-on;
< };
---
> max8997,pmic-buck5-dvs-voltage = <1200000>, <1200000>,
> <1200000>, <1200000>,
> <1200000>, <1200000>,
> <1200000>, <1200000>;
343,346c328,334
< safe1_sreg: ESAFEOUT1 {
< regulator-name = "SAFEOUT1";
< regulator-always-on;
< };
---
> regulators {
> valive_reg: LDO2 {
> regulator-name = "VALIVE_1.1V_C210";
> regulator-min-microvolt = <1100000>;
> regulator-max-microvolt = <1100000>;
> regulator-always-on;
> };
348,351c336,339
< safe2_sreg: ESAFEOUT2 {
< regulator-name = "SAFEOUT2";
< regulator-boot-on;
< };
---
> vusb_reg: LDO3 {
> regulator-name = "VUSB_1.1V_C210";
> regulator-min-microvolt = <1100000>;
> regulator-max-microvolt = <1100000>;
353,354d340
< };
< };
356,360c342,346
< fixed-rate-clocks {
< xxti {
< compatible = "samsung,clock-xxti";
< clock-frequency = <0>;
< };
---
> vmipi_reg: LDO4 {
> regulator-name = "VMIPI_1.8V";
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> };
362,366c348,353
< xusbxti {
< compatible = "samsung,clock-xusbxti";
< clock-frequency = <24000000>;
< };
< };
---
> vpda_reg: LDO6 {
> regulator-name = "VCC_1.8V_PDA";
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> regulator-always-on;
> };
368,372c355,359
< dsi_0: dsi@11C80000 {
< vddcore-supply = <&vusb_reg>;
< vddio-supply = <&vmipi_reg>;
< samsung,pll-clock-frequency = <24000000>;
< status = "okay";
---
> vcam_reg: LDO7 {
> regulator-name = "CAM_ISP_1.8V";
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> };
374,376c361,365
< ports {
< #address-cells = <1>;
< #size-cells = <0>;
---
> vusbdac_reg: LDO8 {
> regulator-name = "VUSB/VDAC_3.3V_C210";
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
> };
378,379c367,372
< port@1 {
< reg = <1>;
---
> vccpda_reg: LDO9 {
> regulator-name = "VCC_2.8V_PDA";
> regulator-min-microvolt = <2800000>;
> regulator-max-microvolt = <2800000>;
> regulator-always-on;
> };
381,385c374,378
< dsi_out: endpoint {
< remote-endpoint = <&dsi_in>;
< samsung,burst-clock-frequency = <500000000>;
< samsung,esc-clock-frequency = <20000000>;
< };
---
> vpll_reg: LDO10 {
> regulator-name = "VPLL_1.1V_C210";
> regulator-min-microvolt = <1100000>;
> regulator-max-microvolt = <1100000>;
> regulator-always-on;
387d379
< };
389,401c381,385
< panel@0 {
< reg = <0>;
< compatible = "samsung,s6e8aa0";
< vdd3-supply = <&vcclcd_reg>;
< vci-supply = <&vlcd_reg>;
< reset-gpios = <&gpy4 5 0>;
< power-on-delay= <50>;
< reset-delay = <100>;
< init-delay = <100>;
< flip-horizontal;
< flip-vertical;
< panel-width-mm = <58>;
< panel-height-mm = <103>;
---
> vtcam_reg: LDO12 {
> regulator-name = "VT_CAM_1.8V";
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> };
403,414c387,390
< display-timings {
< timing-0 {
< clock-frequency = <57153600>;
< hactive = <720>;
< vactive = <1280>;
< hfront-porch = <5>;
< hback-porch = <5>;
< hsync-len = <5>;
< vfront-porch = <13>;
< vback-porch = <1>;
< vsync-len = <2>;
< };
---
> vcclcd_reg: LDO13 {
> regulator-name = "VCC_3.3V_LCD";
> regulator-min-microvolt = <3300000>;
> regulator-max-microvolt = <3300000>;
417,420c393,396
< port {
< dsi_in: endpoint {
< remote-endpoint = <&dsi_out>;
< };
---
> vlcd_reg: LDO15 {
> regulator-name = "VLCD_2.2V";
> regulator-min-microvolt = <2200000>;
> regulator-max-microvolt = <2200000>;
422,423d397
< };
< };
425,427c399,403
< fimd@11c00000 {
< status = "okay";
< };
---
> camsensor_reg: LDO16 {
> regulator-name = "CAM_SENSOR_IO_1.8V";
> regulator-min-microvolt = <1800000>;
> regulator-max-microvolt = <1800000>;
> };
429,432c405,410
< camera {
< pinctrl-names = "default";
< pinctrl-0 = <>;
< status = "okay";
---
> vddq_reg: LDO21 {
> regulator-name = "VDDQ_M1M2_1.2V";
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> regulator-always-on;
> };
434,440c412,422
< fimc_0: fimc@11800000 {
< status = "okay";
< assigned-clocks = <&clock CLK_MOUT_FIMC0>,
< <&clock CLK_SCLK_FIMC0>;
< assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
< assigned-clock-rates = <0>, <160000000>;
< };
---
> varm_breg: BUCK1 {
> /*
> * HACK: The real name is VARM_1.2V_C210,
> * but exynos-cpufreq does not support
> * DT-based regulator lookup yet.
> */
> regulator-name = "vdd_arm";
> regulator-min-microvolt = <900000>;
> regulator-max-microvolt = <1350000>;
> regulator-always-on;
> };
442,448c424,429
< fimc_1: fimc@11810000 {
< status = "okay";
< assigned-clocks = <&clock CLK_MOUT_FIMC1>,
< <&clock CLK_SCLK_FIMC1>;
< assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
< assigned-clock-rates = <0>, <160000000>;
< };
---
> vint_breg: BUCK2 {
> regulator-name = "VINT_1.1V_C210";
> regulator-min-microvolt = <900000>;
> regulator-max-microvolt = <1100000>;
> regulator-always-on;
> };
450,456c431,435
< fimc_2: fimc@11820000 {
< status = "okay";
< assigned-clocks = <&clock CLK_MOUT_FIMC2>,
< <&clock CLK_SCLK_FIMC2>;
< assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
< assigned-clock-rates = <0>, <160000000>;
< };
---
> camisp_breg: BUCK4 {
> regulator-name = "CAM_ISP_CORE_1.2V";
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> };
458,463c437,458
< fimc_3: fimc@11830000 {
< status = "okay";
< assigned-clocks = <&clock CLK_MOUT_FIMC3>,
< <&clock CLK_SCLK_FIMC3>;
< assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
< assigned-clock-rates = <0>, <160000000>;
---
> vmem_breg: BUCK5 {
> regulator-name = "VMEM_1.2V_C210";
> regulator-min-microvolt = <1200000>;
> regulator-max-microvolt = <1200000>;
> regulator-always-on;
> };
>
> vccsub_breg: BUCK7 {
> regulator-name = "VCC_SUB_2.0V";
> regulator-min-microvolt = <2000000>;
> regulator-max-microvolt = <2000000>;
> regulator-always-on;
> };
>
> safe1_sreg: ESAFEOUT1 {
> regulator-name = "SAFEOUT1";
> };
>
> safe2_sreg: ESAFEOUT2 {
> regulator-name = "SAFEOUT2";
> regulator-boot-on;
> };
466a462,490
>
> &sdhci_0 {
> bus-width = <8>;
> non-removable;
> pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>;
> pinctrl-names = "default";
> vmmc-supply = <&vemmc_reg>;
> status = "okay";
> };
>
> &serial_0 {
> status = "okay";
> };
>
> &serial_1 {
> status = "okay";
> };
>
> &serial_2 {
> status = "okay";
> };
>
> &serial_3 {
> status = "okay";
> };
>
> &tmu {
> status = "okay";
> };