241 lines
5.9 KiB
Diff
241 lines
5.9 KiB
Diff
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
@@ -352,6 +352,7 @@
|
|
gpio-ranges = <&qcom_pinmux 0 0 69>;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
+ #address-cells = <0>;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
|
|
|
|
@@ -379,6 +380,7 @@
|
|
function = "pcie3_rst";
|
|
drive-strength = <12>;
|
|
bias-disable;
|
|
+ output-low;
|
|
};
|
|
};
|
|
|
|
@@ -411,12 +413,9 @@
|
|
};
|
|
|
|
nand_pins: nand_pins {
|
|
- mux {
|
|
+ disable {
|
|
pins = "gpio34", "gpio35", "gpio36",
|
|
- "gpio37", "gpio38", "gpio39",
|
|
- "gpio40", "gpio41", "gpio42",
|
|
- "gpio43", "gpio44", "gpio45",
|
|
- "gpio46", "gpio47";
|
|
+ "gpio37", "gpio38";
|
|
function = "nand";
|
|
drive-strength = <10>;
|
|
bias-disable;
|
|
@@ -424,6 +423,8 @@
|
|
|
|
pullups {
|
|
pins = "gpio39";
|
|
+ function = "nand";
|
|
+ drive-strength = <10>;
|
|
bias-pull-up;
|
|
};
|
|
|
|
@@ -431,6 +432,8 @@
|
|
pins = "gpio40", "gpio41", "gpio42",
|
|
"gpio43", "gpio44", "gpio45",
|
|
"gpio46", "gpio47";
|
|
+ function = "nand";
|
|
+ drive-strength = <10>;
|
|
bias-bus-hold;
|
|
};
|
|
};
|
|
@@ -439,6 +442,7 @@
|
|
intc: interrupt-controller@2000000 {
|
|
compatible = "qcom,msm-qgic2";
|
|
interrupt-controller;
|
|
+ #address-cells = <0>;
|
|
#interrupt-cells = <3>;
|
|
reg = <0x02000000 0x1000>,
|
|
<0x02002000 0x1000>;
|
|
@@ -468,11 +472,13 @@
|
|
acc0: clock-controller@2088000 {
|
|
compatible = "qcom,kpss-acc-v1";
|
|
reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
|
|
+ clock-output-names = "acpu0_aux";
|
|
};
|
|
|
|
acc1: clock-controller@2098000 {
|
|
compatible = "qcom,kpss-acc-v1";
|
|
reg = <0x02098000 0x1000>, <0x02008000 0x1000>;
|
|
+ clock-output-names = "acpu1_aux";
|
|
};
|
|
|
|
adm_dma: dma-controller@18300000 {
|
|
@@ -496,13 +502,13 @@
|
|
};
|
|
|
|
saw0: regulator@2089000 {
|
|
- compatible = "qcom,saw2";
|
|
+ compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
|
|
reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
|
|
regulator;
|
|
};
|
|
|
|
saw1: regulator@2099000 {
|
|
- compatible = "qcom,saw2";
|
|
+ compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
|
|
reg = <0x02099000 0x1000>, <0x02009000 0x1000>;
|
|
regulator;
|
|
};
|
|
@@ -530,7 +536,7 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- i2c@124a0000 {
|
|
+ gsbi2_i2c: i2c@124a0000 {
|
|
compatible = "qcom,i2c-qup-v1.1.1";
|
|
reg = <0x124a0000 0x1000>;
|
|
interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>;
|
|
@@ -676,9 +682,6 @@
|
|
compatible = "qcom,ipq806x-nand";
|
|
reg = <0x1ac00000 0x800>;
|
|
|
|
- pinctrl-0 = <&nand_pins>;
|
|
- pinctrl-names = "default";
|
|
-
|
|
clocks = <&gcc EBI2_CLK>,
|
|
<&gcc EBI2_AON_CLK>;
|
|
clock-names = "core", "aon";
|
|
@@ -733,10 +736,13 @@
|
|
tsens_calib_backup: calib_backup@410 {
|
|
reg = <0x410 0xb>;
|
|
};
|
|
+ speedbin_efuse: speedbin@0c0 {
|
|
+ reg = <0x0c0 0x4>;
|
|
+ };
|
|
};
|
|
|
|
gcc: clock-controller@900000 {
|
|
- compatible = "qcom,gcc-ipq8064";
|
|
+ compatible = "qcom,gcc-ipq8064", "syscon";
|
|
reg = <0x00900000 0x4000>;
|
|
#clock-cells = <1>;
|
|
#reset-cells = <1>;
|
|
@@ -768,10 +774,45 @@
|
|
clocks = <&gcc RPM_MSG_RAM_H_CLK>;
|
|
clock-names = "ram";
|
|
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+
|
|
rpmcc: clock-controller {
|
|
compatible = "qcom,rpmcc-ipq806x", "qcom,rpmcc";
|
|
#clock-cells = <1>;
|
|
};
|
|
+
|
|
+ regulators {
|
|
+ compatible = "qcom,rpm-smb208-regulators";
|
|
+
|
|
+ smb208_s1a: s1a {
|
|
+ regulator-min-microvolt = <1050000>;
|
|
+ regulator-max-microvolt = <1150000>;
|
|
+
|
|
+ qcom,switch-mode-frequency = <1200000>;
|
|
+ };
|
|
+
|
|
+ smb208_s1b: s1b {
|
|
+ regulator-min-microvolt = <1050000>;
|
|
+ regulator-max-microvolt = <1150000>;
|
|
+
|
|
+ qcom,switch-mode-frequency = <1200000>;
|
|
+ };
|
|
+
|
|
+ smb208_s2a: s2a {
|
|
+ regulator-min-microvolt = < 800000>;
|
|
+ regulator-max-microvolt = <1250000>;
|
|
+
|
|
+ qcom,switch-mode-frequency = <1200000>;
|
|
+ };
|
|
+
|
|
+ smb208_s2b: s2b {
|
|
+ regulator-min-microvolt = < 800000>;
|
|
+ regulator-max-microvolt = <1250000>;
|
|
+
|
|
+ qcom,switch-mode-frequency = <1200000>;
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
tcsr: syscon@1a400000 {
|
|
@@ -965,7 +1006,7 @@
|
|
|
|
gmac0: ethernet@37000000 {
|
|
device_type = "network";
|
|
- compatible = "qcom,ipq806x-gmac";
|
|
+ compatible = "qcom,ipq806x-gmac", "snps,dwmac";
|
|
reg = <0x37000000 0x200000>;
|
|
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
|
|
interrupt-names = "macirq";
|
|
@@ -989,7 +1030,7 @@
|
|
|
|
gmac1: ethernet@37200000 {
|
|
device_type = "network";
|
|
- compatible = "qcom,ipq806x-gmac";
|
|
+ compatible = "qcom,ipq806x-gmac", "snps,dwmac";
|
|
reg = <0x37200000 0x200000>;
|
|
interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
|
|
interrupt-names = "macirq";
|
|
@@ -1013,7 +1054,7 @@
|
|
|
|
gmac2: ethernet@37400000 {
|
|
device_type = "network";
|
|
- compatible = "qcom,ipq806x-gmac";
|
|
+ compatible = "qcom,ipq806x-gmac", "snps,dwmac";
|
|
reg = <0x37400000 0x200000>;
|
|
interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
|
|
interrupt-names = "macirq";
|
|
@@ -1037,7 +1078,7 @@
|
|
|
|
gmac3: ethernet@37600000 {
|
|
device_type = "network";
|
|
- compatible = "qcom,ipq806x-gmac";
|
|
+ compatible = "qcom,ipq806x-gmac", "snps,dwmac";
|
|
reg = <0x37600000 0x200000>;
|
|
interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
|
|
interrupt-names = "macirq";
|
|
@@ -1065,8 +1106,6 @@
|
|
clocks = <&gcc USB30_0_UTMI_CLK>;
|
|
clock-names = "ref";
|
|
#phy-cells = <0>;
|
|
-
|
|
- status = "disabled";
|
|
};
|
|
|
|
ss_phy_0: phy@100f8830 {
|
|
@@ -1075,8 +1114,6 @@
|
|
clocks = <&gcc USB30_0_MASTER_CLK>;
|
|
clock-names = "ref";
|
|
#phy-cells = <0>;
|
|
-
|
|
- status = "disabled";
|
|
};
|
|
|
|
usb3_0: usb3@100f8800 {
|
|
@@ -1176,7 +1213,7 @@
|
|
};
|
|
|
|
amba: amba {
|
|
- compatible = "simple-bus";
|
|
+ compatible = "arm,amba-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
ranges;
|
|
@@ -1195,7 +1232,6 @@
|
|
non-removable;
|
|
cap-sd-highspeed;
|
|
cap-mmc-highspeed;
|
|
- mmc-ddr-1_8v;
|
|
vmmc-supply = <&vsdcc_fixed>;
|
|
dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
|
|
dma-names = "tx", "rx";
|