scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-31 10:28:06 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ipq807x: fix compile error due to badly rebased patch

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-11-18 18:50:54 +01:00
parent 90868338c7
commit 4c7ee4bf6d
1 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
patches/0051-ipq807x-add-hfcl-ion4xe-i.patch
View File

@@ -1,4 +1,4 @@
From 0d552e892a9e3d467a23d1d2bcec73bc788adfd3 Mon Sep 17 00:00:00 2001 From a0e1c6853dabbc3bae674e1644f2de67d565fadb Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org> From: John Crispin <john@phrozen.org>
Date: Thu, 18 Nov 2021 10:44:40 +0100 Date: Thu, 18 Nov 2021 10:44:40 +0100
Subject: [PATCH] ipq807x: add hfcl ion4xe/i Subject: [PATCH] ipq807x: add hfcl ion4xe/i
@@ -9,14 +9,14 @@ Signed-off-by: John Crispin <john@phrozen.org>
.../ipq807x/base-files/etc/board.d/02_network | 5 + .../ipq807x/base-files/etc/board.d/02_network | 5 +
.../etc/hotplug.d/firmware/10-ath11k-caldata | 2 + .../etc/hotplug.d/firmware/10-ath11k-caldata | 2 +
.../base-files/lib/upgrade/platform.sh | 4 + .../base-files/lib/upgrade/platform.sh | 4 +
target/linux/ipq807x/config-4.4 | 5 +- target/linux/ipq807x/config-4.4 | 2 +-
.../arm/boot/dts/qcom-ipq6018-hfcl-ion4xe.dts | 18 + .../arm/boot/dts/qcom-ipq6018-hfcl-ion4xe.dts | 18 +
.../arm/boot/dts/qcom-ipq6018-hfcl-ion4xi.dts | 18 + .../arm/boot/dts/qcom-ipq6018-hfcl-ion4xi.dts | 18 +
.../boot/dts/qcom/qcom-ipq6018-cp01-hfcl.dtsi | 478 ++++++++++++++++++ .../boot/dts/qcom/qcom-ipq6018-cp01-hfcl.dtsi | 478 ++++++++++++++++++
.../dts/qcom/qcom-ipq6018-hfcl-ion4xe.dts | 155 ++++++ .../dts/qcom/qcom-ipq6018-hfcl-ion4xe.dts | 155 ++++++
.../dts/qcom/qcom-ipq6018-hfcl-ion4xi.dts | 156 ++++++ .../dts/qcom/qcom-ipq6018-hfcl-ion4xi.dts | 156 ++++++
target/linux/ipq807x/image/ipq60xx.mk | 18 + target/linux/ipq807x/image/ipq60xx.mk | 18 +
11 files changed, 861 insertions(+), 3 deletions(-) 11 files changed, 860 insertions(+), 1 deletion(-)
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-hfcl-ion4xe.dts create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-hfcl-ion4xe.dts
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-hfcl-ion4xi.dts create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-hfcl-ion4xi.dts
create mode 100644 target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-cp01-hfcl.dtsi create mode 100644 target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-cp01-hfcl.dtsi
@@ -40,7 +40,7 @@ index 1f1797b0c6..ab19fd0532 100755
board_config_flush board_config_flush
diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network
index b337a3517c..d370a3e49a 100755 index 9d7dd4e61e..89db0cc5a4 100755
--- a/target/linux/ipq807x/base-files/etc/board.d/02_network --- a/target/linux/ipq807x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq807x/base-files/etc/board.d/02_network +++ b/target/linux/ipq807x/base-files/etc/board.d/02_network
@@ -12,6 +12,11 @@ qcom_setup_interfaces() @@ -12,6 +12,11 @@ qcom_setup_interfaces()
@@ -56,10 +56,10 @@ index b337a3517c..d370a3e49a 100755
tplink,ex227|\ tplink,ex227|\
tplink,ex447) tplink,ex447)
diff --git a/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata diff --git a/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
index b235c32ad5..3fa8388c5e 100755 index 1788908ab0..ba7991759e 100755
--- a/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata --- a/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
+++ b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata +++ b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
@@ -58,6 +58,8 @@ case "$FIRMWARE" in @@ -57,6 +57,8 @@ case "$FIRMWARE" in
cig,wf188|\ cig,wf188|\
cig,wf188n|\ cig,wf188n|\
edgecore,eap101|\ edgecore,eap101|\
@@ -91,27 +91,10 @@ index 407db099f6..ef8cce8614 100755
qcom,ipq807x-hk01|\ qcom,ipq807x-hk01|\
qcom,ipq807x-hk14|\ qcom,ipq807x-hk14|\
diff --git a/target/linux/ipq807x/config-4.4 b/target/linux/ipq807x/config-4.4 diff --git a/target/linux/ipq807x/config-4.4 b/target/linux/ipq807x/config-4.4
index 951420cd2a..cef3f951b6 100644 index 1b4b95b968..cef3f951b6 100644
--- a/target/linux/ipq807x/config-4.4 --- a/target/linux/ipq807x/config-4.4
+++ b/target/linux/ipq807x/config-4.4 +++ b/target/linux/ipq807x/config-4.4
@@ -363,7 +363,6 @@ CONFIG_KPSS_XCC=y @@ -638,7 +638,7 @@ CONFIG_SND_PCM=y
# CONFIG_KRAIT_CLOCKS is not set
# CONFIG_KRAIT_L2_ACCESSORS is not set
CONFIG_LEDS_IPQ=y
-CONFIG_LEDS_PWM=y
CONFIG_LEDS_TLC591XX=y
# CONFIG_LEDS_PCA9956B is not set
CONFIG_LIBFDT=y
@@ -550,7 +549,7 @@ CONFIG_PSTORE_RAM=y
# CONFIG_PSTORE_CONSOLE is not set
# CONFIG_PSTORE_PMSG is not set
CONFIG_PWM=y
-CONFIG_PWM_IPQ4019=y
+# CONFIG_PWM_IPQ4019 is not set
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM_SYSFS=y
CONFIG_QCOM_ADM=y
@@ -639,7 +638,7 @@ CONFIG_SND_PCM=y
CONFIG_SND_SOC=y CONFIG_SND_SOC=y
# CONFIG_SND_SOC_APQ8016_SBC is not set # CONFIG_SND_SOC_APQ8016_SBC is not set
CONFIG_SND_SOC_I2C_AND_SPI=y CONFIG_SND_SOC_I2C_AND_SPI=y