From 1808ff54deae49399b171d51450d23f914e7d667 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 26 Nov 2019 18:09:11 +0800 Subject: [PATCH] Revert "ipq40xx: add p2w-r619ac 128M NAND support ( Needs Opboot 1.0.9 128M ver )" This reverts commit 176f1241396881888591ff8f211ffbd67c9de481. --- .../boot/dts/qcom-ipq4019-p2w-r619ac-128m.dts | 18 --- .../arm/boot/dts/qcom-ipq4019-p2w-r619ac.dts | 12 -- ...19-r619ac.dtsi => qcom-ipq4019-r619ac.dts} | 103 ++++++------------ target/linux/ipq40xx/image/Makefile | 16 +-- 4 files changed, 33 insertions(+), 116 deletions(-) delete mode 100644 target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-p2w-r619ac-128m.dts delete mode 100644 target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-p2w-r619ac.dts rename target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/{qcom-ipq4019-r619ac.dtsi => qcom-ipq4019-r619ac.dts} (78%) diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-p2w-r619ac-128m.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-p2w-r619ac-128m.dts deleted file mode 100644 index b51378a7e..000000000 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-p2w-r619ac-128m.dts +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "qcom-ipq4019-r619ac.dtsi" - -/ { - model = "P&W R619AC 128M"; - compatible = "p2w,r619ac-128m"; - - chosen { - bootargs-append = " root=/dev/ubiblock0_1 rootfstype=squashfs"; - }; -}; - -&rootfs_part1 { - reg = <0x0 0x8000000>; -}; - -/delete-node/ &rootfs_part2; diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-p2w-r619ac.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-p2w-r619ac.dts deleted file mode 100644 index 31010dd17..000000000 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-p2w-r619ac.dts +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "qcom-ipq4019-r619ac.dtsi" - -/ { - model = "P&W R619AC"; - compatible = "p2w,r619ac"; - - chosen { - bootargs-append = " root=/dev/ubiblock0_1 rootfstype=squashfs"; - }; -}; diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-r619ac.dts similarity index 78% rename from target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi rename to target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-r619ac.dts index 99993852a..51b0e05ed 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-r619ac.dts @@ -6,6 +6,9 @@ #include / { + model = "P&W R619AC"; + compatible = "p2w,r619ac"; + aliases { led-boot = &led_sys; led-failsafe = &led_sys; @@ -14,6 +17,10 @@ label-mac-device = &gmac0; }; + chosen { + bootargs-append = " root=/dev/ubiblock0_1 rootfstype=squashfs"; + }; + soc { rng@22000 { status = "okay"; @@ -80,8 +87,6 @@ leds { compatible = "gpio-leds"; - pinctrl-0 = <&led_pins>; - pinctrl-names = "default"; led_sys: sys { label = "r619ac:blue:sys"; @@ -130,50 +135,8 @@ #size-cells = <1>; partition@0 { - label = "SBL1"; - reg = <0x0 0x40000>; - read-only; - }; - - partition@40000 { - label = "MIBIB"; - reg = <0x40000 0x20000>; - read-only; - }; - - partition@60000 { - label = "QSEE"; - reg = <0x60000 0x60000>; - read-only; - }; - - partition@c0000 { - label = "CDT"; - reg = <0xc0000 0x10000>; - read-only; - }; - - partition@d0000 { - label = "DDRPARAMS"; - reg = <0xd0000 0x10000>; - read-only; - }; - - partition@e0000 { - label = "APPSBLENV"; - reg = <0xe0000 0x10000>; - read-only; - }; - - partition@f0000 { - label = "APPSBL"; - reg = <0xf0000 0x80000>; - read-only; - }; - - partition@1 { label = "Bootloader"; - reg = <0x0 0x170000>; + reg = <0 0x170000>; }; partition@170000 { @@ -208,12 +171,12 @@ #address-cells = <1>; #size-cells = <1>; - rootfs_part1: partition@0 { + partition@0 { label = "rootfs"; reg = <0x0 0x4000000>; }; - rootfs_part2: partition@4000000 { + partition@4000000 { label = "unused1"; reg = <0x4000000 0x4000000>; }; @@ -221,6 +184,20 @@ }; }; +&pcie0 { + status = "okay"; + perst-gpio = <&tlmm 4 GPIO_ACTIVE_LOW>; + wake-gpio = <&tlmm 40 GPIO_ACTIVE_HIGH>; + + /* Free slot for use */ + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + }; +}; + &qpic_bam { status = "okay"; }; @@ -228,6 +205,7 @@ &sdhci { pinctrl-0 = <&sd_0_pins>; pinctrl-names = "default"; + cd-gpios = <&tlmm 22 GPIO_ACTIVE_LOW>; vqmmc-supply = <&vqmmc>; status = "okay"; }; @@ -259,6 +237,12 @@ function = "sdio"; drive-strength = <16>; }; + + mux_3 { + pins = "gpio32"; + function = "gpio"; + output-low; + }; }; serial_0_pins: serial0-pinmux { @@ -268,29 +252,6 @@ bias-disable; }; }; - - led_pins: led_pinmux { - mux { - pins = "gpio32", "gpio39", "gpio50"; - function = "gpio"; - bias-pull-up; - output-low; - }; - - mux_1 { - pins = "gpio52"; - function = "gpio"; - bias-pull-up; - output-high; - }; - - mux_2 { - pins = "gpio61"; - function = "gpio"; - bias-pull-down; - output-high; - }; - }; }; &usb3_ss_phy { @@ -317,4 +278,4 @@ &wifi1 { status = "okay"; qcom,ath10k-calibration-variant = "R619AC"; -}; +}; \ No newline at end of file diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 1c0c1b730..3e623d929 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -89,7 +89,7 @@ define Device/asus_rt-ac58u KERNEL_INITRAMFS := $$(KERNEL) | uImage none KERNEL_INITRAMFS_SUFFIX := -factory.trx IMAGES := sysupgrade.bin - DEVICE_PACKAGES := kmod-usb-ledtrig-usbport -kmod-ath10k-ct -ath10k-firmware-qca4019-ct kmod-ath10k ath10k-firmware-qca4019 + DEVICE_PACKAGES := kmod-usb-ledtrig-usbport endef TARGET_DEVICES += asus_rt-ac58u @@ -291,20 +291,6 @@ define Device/p2w_r619ac endef TARGET_DEVICES += p2w_r619ac -define Device/p2w_r619ac-128m - $(call Device/FitzImage) - $(call Device/UbiFit) - DEVICE_VENDOR := P&W - DEVICE_MODEL := R619AC - DEVICE_VARIANT := 128M - DEVICE_DTS := qcom-ipq4019-p2w-r619ac-128m - DEVICE_DTS_CONFIG := config@10 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_PACKAGES := ipq-wifi-p2w_r619ac -endef -TARGET_DEVICES += p2w_r619ac-128m - define Device/qcom_ap-dk04.1-c1 $(call Device/FitImage) $(call Device/UbiFit) -- GitLab