Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: qcom: Move common nodes to ipq8064-v.1.0.dtsi

The nodes in ipq8064-ap148.dts currently are common with
boards that we will add next. So move the common data to
ipq8064-v.1.0.dtsi.

Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

authored by

Sricharan R and committed by
Andy Gross
2e7a2c91 f14c5588

+77 -80
+3 -80
arch/arm/boot/dts/qcom-ipq8064-ap148.dts
··· 2 2 #include "qcom-ipq8064-v1.0.dtsi" 3 3 4 4 / { 5 - model = "Qualcomm IPQ8064/AP148"; 6 - compatible = "qcom,ipq8064-ap148", "qcom,ipq8064"; 7 - 8 - aliases { 9 - serial0 = &gsbi4_serial; 10 - }; 11 - 12 - chosen { 13 - stdout-path = "serial0:115200n8"; 14 - }; 15 - 16 - reserved-memory { 17 - #address-cells = <1>; 18 - #size-cells = <1>; 19 - ranges; 20 - rsvd@41200000 { 21 - reg = <0x41200000 0x300000>; 22 - no-map; 23 - }; 24 - }; 5 + model = "Qualcomm Technologies, Inc. IPQ8064/AP-148"; 6 + compatible = "qcom,ipq8064-ap148"; 25 7 26 8 soc { 27 9 pinmux@800000 { ··· 12 30 function = "gsbi4"; 13 31 bias-disable; 14 32 }; 15 - 16 - spi_pins: spi_pins { 17 - mux { 18 - pins = "gpio18", "gpio19", "gpio21"; 19 - function = "gsbi5"; 20 - drive-strength = <10>; 21 - bias-none; 22 - }; 23 - }; 24 33 }; 25 34 26 35 gsbi@16300000 { 27 - qcom,mode = <GSBI_PROT_I2C_UART>; 28 - status = "ok"; 29 - serial@16340000 { 36 + i2c@16380000 { 30 37 status = "ok"; 31 - }; 32 - 33 - i2c4: i2c@16380000 { 34 - status = "ok"; 35 - 36 38 clock-frequency = <200000>; 37 - 38 39 pinctrl-0 = <&i2c4_pins>; 39 40 pinctrl-names = "default"; 40 41 }; 41 - }; 42 - 43 - gsbi5: gsbi@1a200000 { 44 - qcom,mode = <GSBI_PROT_SPI>; 45 - status = "ok"; 46 - 47 - spi4: spi@1a280000 { 48 - status = "ok"; 49 - spi-max-frequency = <50000000>; 50 - 51 - pinctrl-0 = <&spi_pins>; 52 - pinctrl-names = "default"; 53 - 54 - cs-gpios = <&qcom_pinmux 20 0>; 55 - 56 - flash: m25p80@0 { 57 - compatible = "s25fl256s1"; 58 - #address-cells = <1>; 59 - #size-cells = <1>; 60 - spi-max-frequency = <50000000>; 61 - reg = <0>; 62 - 63 - partition@0 { 64 - label = "rootfs"; 65 - reg = <0x0 0x1000000>; 66 - }; 67 - 68 - partition@1 { 69 - label = "scratch"; 70 - reg = <0x1000000 0x1000000>; 71 - }; 72 - }; 73 - }; 74 - }; 75 - 76 - sata-phy@1b400000 { 77 - status = "ok"; 78 - }; 79 - 80 - sata@29000000 { 81 - ports-implemented = <0x1>; 82 - status = "ok"; 83 42 }; 84 43 }; 85 44 };
+65
arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 #include "qcom-ipq8064.dtsi" 3 + 4 + / { 5 + model = "Qualcomm Technologies, Inc. IPQ8064-v1.0"; 6 + 7 + aliases { 8 + serial0 = &gsbi4_serial; 9 + }; 10 + 11 + chosen { 12 + stdout-path = "serial0:115200n8"; 13 + }; 14 + 15 + soc { 16 + gsbi@16300000 { 17 + qcom,mode = <GSBI_PROT_I2C_UART>; 18 + status = "ok"; 19 + 20 + serial@16340000 { 21 + status = "ok"; 22 + }; 23 + }; 24 + 25 + gsbi5: gsbi@1a200000 { 26 + qcom,mode = <GSBI_PROT_SPI>; 27 + status = "ok"; 28 + 29 + spi4: spi@1a280000 { 30 + status = "ok"; 31 + spi-max-frequency = <50000000>; 32 + 33 + pinctrl-0 = <&spi_pins>; 34 + pinctrl-names = "default"; 35 + 36 + cs-gpios = <&qcom_pinmux 20 0>; 37 + 38 + flash: m25p80@0 { 39 + compatible = "s25fl256s1"; 40 + #address-cells = <1>; 41 + #size-cells = <1>; 42 + spi-max-frequency = <50000000>; 43 + reg = <0>; 44 + 45 + partition@0 { 46 + label = "rootfs"; 47 + reg = <0x0 0x1000000>; 48 + }; 49 + 50 + partition@1 { 51 + label = "scratch"; 52 + reg = <0x1000000 0x1000000>; 53 + }; 54 + }; 55 + }; 56 + }; 57 + 58 + sata-phy@1b400000 { 59 + status = "ok"; 60 + }; 61 + 62 + sata@29000000 { 63 + ports-implemented = <0x1>; 64 + status = "ok"; 65 + }; 66 + }; 67 + };
+9
arch/arm/boot/dts/qcom-ipq8064.dtsi
··· 144 144 bias-disable; 145 145 }; 146 146 }; 147 + 148 + spi_pins: spi_pins { 149 + mux { 150 + pins = "gpio18", "gpio19", "gpio21"; 151 + function = "gsbi5"; 152 + drive-strength = <10>; 153 + bias-none; 154 + }; 155 + }; 147 156 }; 148 157 149 158 intc: interrupt-controller@2000000 {