テキスト比較

2 つのテキスト ファイルの違いを見つける

Real-time diff
Unified diff
Collapse lines
Highlight change
Syntax highlighting
ツール
Diffchecker Desktop icon
Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Nexus 7 - Nexus 4 DTS

Created Diff never expires
171 removals
Lines
Total
Removed
Words
Total
Removed
To continue using this feature, upgrade to
Diffchecker logo
Diffchecker Pro
360 lines
326 additions
Lines
Total
Added
Words
Total
Added
To continue using this feature, upgrade to
Diffchecker logo
Diffchecker Pro
515 lines
// SPDX-License-Identifier: GPL-2.0
// SPDX-License-Identifier: GPL-2.0
#include "qcom-apq8064-v2.0.dtsi"
#include "qcom-apq8064-v2.0.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
/ {
/ {
model = "Asus Nexus7(flo)";
model = "LGE Nexus 4(mako)";
compatible = "asus,nexus7-flo", "qcom,apq8064";
compatible = "lge,nexus4-mako", "qcom,apq8064";


aliases {
aliases {
serial0 = &gsbi7_serial;
serial0 = &gsbi7_serial;
serial1 = &gsbi6_serial;
serial1 = &gsbi6_serial;
serial2 = &gsbi4_serial;
};
};


chosen {
chosen {
stdout-path = "serial0:115200n8";
stdout-path = "serial2:115200n8";
};
};


reserved-memory {
reserved-memory {
#address-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
#size-cells = <1>;
ranges;
ranges;


ramoops@88d00000{
ramoops@88d00000{
compatible = "ramoops";
compatible = "ramoops";
reg = <0x88d00000 0x100000>;
reg = <0x88d00000 0x100000>;
record-size = <0x00020000>;
record-size = <0x00020000>;
console-size = <0x00020000>;
console-size = <0x00020000>;
ftrace-size = <0x00020000>;
ftrace-size = <0x00020000>;
};
};
};
};


ext_3p3v: regulator-fixed@1 {
// ext_3p3v: regulator-fixed@1 {
compatible = "regulator-fixed";
// compatible = "regulator-fixed";
regulator-min-microvolt = <3300000>;
// regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
// regulator-max-microvolt = <3300000>;
regulator-name = "ext_3p3v";
// regulator-name = "ext_3p3v";
regulator-type = "voltage";
// regulator-type = "voltage";
startup-delay-us = <0>;
// startup-delay-us = <0>;
gpio = <&tlmm_pinmux 77 GPIO_ACTIVE_HIGH>;
// gpio = <&tlmm_pinmux 77 GPIO_ACTIVE_HIGH>;
enable-active-high;
// enable-active-high;
regulator-boot-on;
// regulator-boot-on;
};
// };


gpio-keys {
// gpio-keys {
compatible = "gpio-keys";
// compatible = "gpio-keys";
volume_up {
// volume_up {
label = "Volume Up";
// label = "Volume Up";
gpios = <&pm8921_gpio 4 GPIO_ACTIVE_HIGH>;
// gpios = <&pm8921_gpio 4 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_VOLUMEUP>;
// linux,code = <KEY_VOLUMEUP>;
};
// };
volume_down {
// volume_down {
label = "Volume Down";
// label = "Volume Down";
gpios = <&pm8921_gpio 38 GPIO_ACTIVE_HIGH>;
// gpios = <&pm8921_gpio 38 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_VOLUMEDOWN>;
// linux,code = <KEY_VOLUMEDOWN>;
};
// };
};
// };


soc {
soc {
pinctrl@800000 {
gsbi4_uart_pin_a: gsbi4-uart-pin-active {
rx {
pins = "gpio11";
function = "gsbi4";
drive-strength = <2>;
bias-pull-up;
};

tx {
pins = "gpio10";
function = "gsbi4";
drive-strength = <4>;
bias-disable;
Text moved from lines 252-254
};
};
};

rpm@108000 {
rpm@108000 {
regulators {
regulators {
vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
vin_lvs1_3_6-supply = <&pm8921_s4>;
vin_lvs1_3_6-supply = <&pm8921_s4>;
vin_lvs4_5_7-supply = <&pm8921_s4>;
vin_lvs4_5_7-supply = <&pm8921_s4>;

vin_lvs2-supply = <&pm8921_s1>;


vdd_l24-supply = <&pm8921_s1>;
vdd_l24-supply = <&pm8921_s1>;
vdd_l25-supply = <&pm8921_s1>;
vdd_l25-supply = <&pm8921_s1>;
vin_lvs2-supply = <&pm8921_s1>;

vdd_l26-supply = <&pm8921_s7>;
vdd_l26-supply = <&pm8921_s7>;
vdd_l27-supply = <&pm8921_s7>;
vdd_l27-supply = <&pm8921_s7>;
vdd_l28-supply = <&pm8921_s7>;
vdd_l28-supply = <&pm8921_s7>;


vdd_ncp-supply = <&pm8921_l6>;
vdd_ncp-supply = <&pm8921_l6>;


/* Buck SMPS */
/* Buck SMPS */
s1 {
s1 {
regulator-always-on;
regulator-always-on;
regulator-min-microvolt = <1225000>;
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
qcom,switch-mode-frequency = <3200000>;
qcom,switch-mode-frequency = <3200000>;
bias-pull-down;
bias-pull-down;
};
};


/* msm otg HSUSB_VDDCX */
s2 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
qcom,switch-mode-frequency = <1600000>;
bias-pull-down;
};

// usb host, pcie
s3 {
s3 {
regulator-min-microvolt = <500000>;
regulator-min-microvolt = <500000>;
regulator-max-microvolt = <1150000>;
regulator-max-microvolt = <1150000>;
qcom,switch-mode-frequency = <4800000>;
qcom,switch-mode-frequency = <4800000>;
bias-pull-down;
// soft start ?
};
};


/*
* msm_sdcc.1-sdc-vdd_io
* tabla2x-slim-CDC_VDDA_RX
* tabla2x-slim-CDC_VDDA_TX
* tabla2x-slim-CDC_VDD_CP
* tabla2x-slim-VDDIO_CDC
*/
s4 {
s4 {
regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,switch-mode-frequency = <3200000>;
qcom,switch-mode-frequency = <1600000>;
regulator-always-on;
regulator-always-on;
bias-pull-down;
};
};


s7 {
s7 {
regulator-min-microvolt = <1300000>;
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
qcom,switch-mode-frequency = <3200000>;
qcom,switch-mode-frequency = <3200000>;
};
};


/* mipi_dsi.1-dsi1_pll_vdda */
s8 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
qcom,switch-mode-frequency = <1600000>;
bias-pull-down;
};

l1 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
regulator-always-on;
bias-pull-down;
};

l2 {
l2 {
regulator-min-microvolt = <1200000>;
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-always-on;
bias-pull-down;
};
};


/* msm_otg-HSUSB_3p3 */
/* HSUSB 3p3: max 3.5v */
l3 {
l3 {
regulator-min-microvolt = <3075000>;
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
regulator-max-microvolt = <3500000>;
bias-pull-down;
bias-pull-down;
};
};


/* msm_otg-HSUSB_1p8 */
l4 {
l4 {
regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
bias-pull-down;
bias-pull-down;
};
};


/* msm_sdcc.1-sdc_vdd */
l5 {
l5 {
regulator-min-microvolt = <2950000>;
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-always-on;
bias-pull-down;
bias-pull-down;
};
};


l6 {
l6 {
regulator-min-microvolt = <2950000>;
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
bias-pull-down;
};

l7 {
regulator-min-microvolt = <1850000>;
regulator-max-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
bias-pull-down;
};
};


/* mipi_dsi.1-dsi1_avdd */
l8 {
l11 {
regulator-min-microvolt = <2800000>;
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
bias-pull-down;
bias-pull-down;
regulator-always-on;
};
};


/* pwm_power for backlight */
l9 {
l17 {
regulator-min-microvolt = <3000000>;
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-always-on;
bias-pull-down;
};
};


/* camera, qdsp6 */
l10 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <2900000>;
bias-pull-down;
};

l11 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
bias-pull-down;
};

l12 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
bias-pull-down;
};

l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};

l15 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
bias-pull-down;
};

l16 {
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
bias-pull-down;
};

l17 {
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
bias-pull-down;
};

l18 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
bias-pull-down;
};

l21 {
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
bias-pull-down;
};

l22 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
};

l23 {
l23 {
regulator-min-microvolt = <1800000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
bias-pull-down;
bias-pull-down;
};
};


/*
l24 {
* tabla2x-slim-CDC_VDDA_A_1P2V
regulator-min-microvolt = <750000>;
* tabla2x-slim-VDDD_CDC_D
regulator-max-microvolt = <1150000>;
*/
bias-pull-down;
};

l25 {
l25 {
regulator-min-microvolt = <1250000>;
regulator-min-microvolt = <1250000>;
regulator-max-microvolt = <1250000>;
regulator-max-microvolt = <1250000>;
regulator-always-on;
bias-pull-down;
};

// l26 {
// regulator-min-microvolt = <375000>;
// regulator-max-microvolt = <1050000>;
// bias-pull-down;
// };

l27 {
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
};

l28 {
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
bias-pull-down;
};

l29 {
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
bias-pull-down;
bias-pull-down;
};
};


lvs1 {
lvs1 {
bias-pull-down;
bias-pull-down;
};
};


lvs2 {
bias-pull-down;
};

lvs3 {
bias-pull-down;
};

lvs4 {
lvs4 {
bias-pull-down;
bias-pull-down;
};
};


lvs5 {
lvs5 {
bias-pull-down;
bias-pull-down;
};
};


lvs6 {
lvs6 {
bias-pull-down;
bias-pull-down;
};
};
/*

* mipi_dsi.1-dsi1_vddio
* pil_riva-pll_vdd
*/
lvs7 {
lvs7 {
bias-pull-down;
bias-pull-down;
};
};
};
};


mdp@5100000 {
ncp {
status = "okay";
regulator-min-microvolt = <1800000>;
ports {
regulator-max-microvolt = <1800000>;
port@1 {
qcom,switch-mode-frequency = <1600000>;
mdp_dsi1_out: endpoint {
remote-endpoint = <&dsi0_in>;
};
};
};
};
};
};
};


dsi0: mdss_dsi@4700000 {
// mdp@5100000 {
status = "okay";
// status = "okay";
vdda-supply = <&pm8921_l2>;/*VDD_MIPI1 to 4*/
// ports {
vdd-supply = <&pm8921_l8>;
// port@1 {
vddio-supply = <&pm8921_lvs7>;
// mdp_dsi1_out: endpoint {
avdd-supply = <&pm8921_l11>;
// remote-endpoint = <&dsi0_in>;
vcss-supply = <&ext_3p3v>;
// };
// };
// };
// };


panel@0 {
// dsi0: mdss_dsi@4700000 {
reg = <0>;
// status = "okay";
compatible = "jdi,lt070me05000";
// vdda-supply = <&pm8921_l2>;/*VDD_MIPI1 to 4*/
// vdd-supply = <&pm8921_l8>;
// vddio-supply = <&pm8921_lvs6>;
// avdd-supply = <&pm8921_l11>;
// // vcss-supply = <&ext_3p3v>;


vddp-supply = <&pm8921_l17>;
// panel@0 {
iovcc-supply = <&pm8921_lvs7>;
// compatible = "lg,lh500wx1-sd03";
// reg = <0>;


enable-gpios = <&pm8921_gpio 36 GPIO_ACTIVE_HIGH>;
// enable-gpios = <&pm8921_gpio 42 GPIO_ACTIVE_LOW>;
reset-gpios = <&tlmm_pinmux 54 GPIO_ACTIVE_LOW>;
// //power-supply = <&vdd_lcd>;
dcdc-en-gpios = <&pm8921_gpio 23 GPIO_ACTIVE_HIGH>;
// //backlight = <&backlight>;
// };
// };


port {
// panel@0 {
panel_in: endpoint {
// reg = <0>;
remote-endpoint = <&dsi0_out>;
// compatible = "lg,lh500wx1-sd03";
};
// //compatible = "jdi,lt070me05000";
};
};
ports {
port@0 {
dsi0_in: endpoint {
remote-endpoint = <&mdp_dsi1_out>;
};
};


port@1 {
// // vddp-supply = <&pm8921_l17>;
dsi0_out: endpoint {
// // iovcc-supply = <&pm8921_lvs7>;
remote-endpoint = <&panel_in>;
data-lanes = <0 1 2 3>;
};
Text moved to lines 75-77
};
};
};


dsi-phy@4700200 {
// enable-gpios = <&pm8921_gpio 36 GPIO_ACTIVE_HIGH>;
status = "okay";
// power-supply =
vddio-supply = <&pm8921_lvs7>;/*VDD_PLL2_1 to 7*/
};


gsbi@16200000 {
// //reset-gpios = <&tlmm_pinmux 54 GPIO_ACTIVE_LOW>;
status = "okay";
// //dcdc-en-gpios = <&pm8921_gpio 23 GPIO_ACTIVE_HIGH>;
qcom,mode = <GSBI_PROT_I2C>;
i2c@16280000 {
status = "okay";
clock-frequency = <200000>;
pinctrl-0 = <&i2c3_pins>;
pinctrl-names = "default";


trackpad@10 {
// // port {
compatible = "elan,ekth3500";
// // panel_in: endpoint {
reg = <0x10>;
// // remote-endpoint = <&dsi0_out>;
interrupt-parent = <&tlmm_pinmux>;
// // };
interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
// // };
};
// };
};
// ports {
};
// port@0 {
// dsi0_in: endpoint {
// remote-endpoint = <&mdp_dsi1_out>;
// };
// };

// port@1 {
// dsi0_out: endpoint {
// remote-endpoint = <&panel_in>;
// data-lanes = <0 1 2 3>;
// };
// };
// };

// dsi-phy@4700200 {
// status = "okay";
// vddio-supply = <&pm8921_lvs7>;/*VDD_PLL2_1 to 7*/
// };

// gsbi@16200000 {
// status = "okay";
// qcom,mode = <GSBI_PROT_I2C>;
// i2c@16280000 {
// status = "okay";
// clock-frequency = <200000>;
// pinctrl-0 = <&i2c3_pins>;
// pinctrl-names = "default";

// trackpad@10 {
// compatible = "elan,ekth3500";
// reg = <0x10>;
// interrupt-parent = <&tlmm_pinmux>;
// interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
// };
// };
// };




gsbi@12440000 {
// gsbi@12440000 {
status = "okay";
// status = "okay";
qcom,mode = <GSBI_PROT_I2C>;
// qcom,mode = <GSBI_PROT_I2C>;


i2c@12460000 {
// i2c@12460000 {
status = "okay";
// status = "okay";
clock-frequency = <200000>;
// clock-frequency = <200000>;
pinctrl-0 = <&i2c1_pins>;
// pinctrl-0 = <&i2c1_pins>;
pinctrl-names = "default";
// pinctrl-names = "default";


eeprom@52 {
// eeprom@52 {
compatible = "atmel,24c128";
// compatible = "atmel,24c128";
reg = <0x52>;
// reg = <0x52>;
pagesize = <32>;
// pagesize = <32>;
};
// };


bq27541@55 {
// bq27541@55 {
compatible = "ti,bq27541";
// compatible = "ti,bq27541";
reg = <0x55>;
// reg = <0x55>;
};
// };


};
// };
};
// };


gsbi@16500000 {
gsbi@16300000 {
status = "ok";
status = "ok";
qcom,mode = <GSBI_PROT_I2C_UART>;
qcom,mode = <GSBI_PROT_I2C_UART>;


serial@16540000 {
serial@16340000 {
status = "ok";
status = "ok";

pinctrl-names = "default";
pinctrl-names = "default";
pinctrl-0 = <&gsbi6_uart_4pins>;
pinctrl-0 = <&gsbi4_uart_pin_a>;
};
};
};
};


gsbi@16600000 {
// gsbi@16500000 {
status = "ok";
// status = "ok";
qcom,mode = <GSBI_PROT_I2C_UART>;
// qcom,mode = <GSBI_PROT_I2C_UART>;
serial@16640000 {

status = "ok";
// serial@16540000 {
};
// status = "ok";
};

// pinctrl-names = "default";
// pinctrl-0 = <&gsbi6_uart_4pins>;
// };
// };

// gsbi@16600000 {
// status = "ok";
// qcom,mode = <GSBI_PROT_I2C_UART>;
// serial@16640000 {
// status = "ok";
// };
// };


/* OTG */
/* OTG */
usb@12500000 {
usb@12500000 {
status = "okay";
status = "okay";
dr_mode = "otg";
dr_mode = "otg";
ulpi {
ulpi {
phy {
phy {
v3p3-supply = <&pm8921_l3>;
v3p3-supply = <&pm8921_l3>;
v1p8-supply = <&pm8921_l4>;
v1p8-supply = <&pm8921_l4>;
};
};
};
};
};
};


amba {
amba {
/* eMMC */
/* eMMC */
sdcc@12400000 {
sdcc@12400000 {
status = "okay";
status = "okay";
vmmc-supply = <&pm8921_l5>;
vmmc-supply = <&pm8921_l5>;
vqmmc-supply = <&pm8921_s4>;
vqmmc-supply = <&pm8921_s4>;
};
};
};
};


imem@2a03f000 {
// imem@2a03f000 {
compatible = "syscon", "simple-mfd";
// compatible = "syscon", "simple-mfd";
reg = <0x2a03f000 0x1000>;
// reg = <0x2a03f000 0x1000>;


reboot-mode {
// reboot-mode {
compatible = "syscon-reboot-mode";
// compatible = "syscon-reboot-mode";
offset = <0x65c>;
// offset = <0x65c>;


mode-normal = <0x77665501>;
// mode-normal = <0x77665501>;
mode-bootloader = <0x77665500>;
// mode-bootloader = <0x77665500>;
mode-recovery = <0x77665502>;
// mode-recovery = <0x77665502>;
};
// };
};
// };
};
};
};
};


保存された差分