Commit Graph

166 Commits

Author SHA1 Message Date
CN_SZTL
c75f41d557
Merge Mainline 2020-09-11 18:08:47 +08:00
AmadeusGhost
f803886385 target: move interchangeable patches to generic 2020-09-11 17:39:39 +08:00
John Audia
36833db556
kernel: bump 5.4 to 5.4.63
Manual merged:
 hack-5.4
  230-openwrt_lzma_options.patch (with Adrian Schmutzler's help)
 bcm27xx
  950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
 x86
  patches-5.4
	 011-tune_lzma_options.patch (with Adrian Schmutzler's help)

Remove upstreamed patches in collaboration with Ansuel Smith:
 ipq806x
  093-1-v5.8-ipq806x-PCI-qcom-Add-missing-ipq806x-clocks-in-PCIe-driver.patch
  093-2-v5.8-ipq806x-PCI-qcom-Change-duplicate-PCI-reset-to-phy-reset.patch
  093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch

All other modifications made by update_kernel.sh

Build system: x86_64
Run-tested: ipq806x (R7800)

No dmesg regressions, everything functional

Signed-off-by: John Audia <graysky@archlinux.us>
2020-09-06 19:56:39 +08:00
CN_SZTL
20c62b1558
kernel: bump 5.4 to 5.4.61
Resolve conflicted:
 - 011-kbuild-export-SUBARCH.patch
 - 701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch

Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2020-08-27 05:42:59 +08:00
Adrian Schmutzler
365347a0a4
kernel: bump 5.4 to 5.4.60
Deleted upstream patches:
  generic:
    041-genirq-affinity-Make-affinity-setting-if-activated-o.patch
  ipq806x:
    093-5-v5.8-ipq806x-PCI-qcom-Define-some-PARF-params-needed-for-ipq8064-SoC.patch
    093-6-v5.8-ipq806x-PCI-qcom-Add-support-for-tx-term-offset-for-rev-2_1_0.patch

Merged manually:
  ipq806x:
    093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch
  layerscape:
    804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch

Build-tested: ath79/generic, ipq806x, layerscape/armv7, layerscape/armv8_64b
Run-tested: ipq806x (R7800)

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-08-25 13:51:00 +08:00
Ansuel Smith
4898404a10
ipq806x: replace pci patchset with upstream version
Changes:
- Update patches
- Update dts with new binding
    Tx term offset dropped and replaced with a new compatible

Removed:
- 0071-5-PCI-qcom-Programming-the-PCIE-iATU-for-IPQ806x
    Pci init does the same exact thing (was needed in older kernel version)
- 0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B
    Rejected upstream, can't find any reason to have this. No regression with
    testing it on R7800.

Tested on R7800 (ipq8065), R7500 v2 ("ipq8064-v2")

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Tested-by: Paul Blazejowski <paulb@blazebox.homeip.net> [R7800]
[rebase and refresh]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-08-25 13:50:47 +08:00
CN_SZTL
2105d78e8a
kernel: bump 5.4 to 5.4.60
Resolve conflicted:
- 804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch

Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2020-08-22 03:33:14 +08:00
CN_SZTL
a4c3b23569
Merge Mainline 2020-08-22 02:27:01 +08:00
CN_SZTL
e9deb93962
kernel: bump 4.19 to 4.19.141
Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2020-08-22 02:23:05 +08:00
CN_SZTL
84eb37bcb3
kernel: bump 5.4 to 5.4.59
Resolve conflicted:
- 950-0163-staging-vchiq_arm-Fix-platform-device-unregistration.patch
- 950-0338-staging-vchiq_arm-Unify-the-unload-handling-of-platf.patch
- 801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch
- 805-display-0043-gpu-Move-ipu-v3-to-imx-folder.patch

Remove upstreamed:
- 950-0428-staging-vchiq_arm-Add-a-matching-unregister-call.patch
- 0800-spi-lantiq-ssc-Fix-warning-by-using-WQ_MEM_RECLAI.patch

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2020-08-20 04:30:19 +08:00
Adrian Schmutzler
25bd1050ca ipq806x: move further common nodes to the DTSI files
The moves a few additional common nodes to the common DTSI files
for qcom-ipq8064-v2.0 and qcom-ipq8065 devices.

Remove a few redundant definitions on the way.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-08-18 11:43:45 +08:00
Ansuel Smith
87e4b03f4c kernel: usb: move phy-qcom-ipq806x-usb to ipq806x modules.mk
This driver is only used by ipq806x SoCs. Move it there and drop
dependency from ipq40xx since it's not used anywere.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[rebase on changes to previous patches]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-by: Paul Blazejowski <paulb@blazebox.homeip.net> [R7800]
2020-08-14 12:08:01 +08:00
Ansuel Smith
f6d615b680 ipq806x: replace nvmem qcom patch with upstream version
- Replace nvmem qcom patch with upstream version
- Update compatible

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[refresh patches, minor commit message rewording]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-by: Paul Blazejowski <paulb@blazebox.homeip.net> [R7800]
2020-08-14 12:07:28 +08:00
Ansuel Smith
f4d6cc039e ipq806x: replace phy dwc3 patch with upstream version
- Replace dwc3 phy patch with upstream version
- Rework the dts to use the upstream bindings
- Update changed config flags
- Rename module to reflect config name

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[fix qcom,tx-deamp_3_5db typo, refresh patches, rename kmod]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-by: Paul Blazejowski <paulb@blazebox.homeip.net> [R7800]
2020-08-14 12:06:50 +08:00
AmadeusGhost
fe141dc248 ipq806x: sync upstream source code 2020-08-14 12:00:20 +08:00
CN_SZTL
76c217e8df
Merge Mainline 2020-08-12 14:49:43 +08:00
AmadeusGhost
c91eb2a930 ipq806x: remove outdated patches 2020-08-12 10:31:07 +08:00
Ansuel Smith
31cc0bb9a1
ipq806x: replace patches with upstream version
Replace all the custom patches with the backported upstream version

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[refresh patches]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-08-09 23:57:55 +08:00
Felix Fietkau
2675e744f4
kernel: unify CONFIG_GPIO_SYSFS in kernel configs
Enable it for all platforms

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2020-08-07 18:08:33 +08:00
CN_SZTL
cf410390c7
target/ipq806x: switch to kernel 5.4 2020-08-05 00:05:52 +08:00
CN_SZTL
102ed1c668
Merge Mainline 2020-07-22 17:48:51 +08:00
CN_SZTL
6049374622
kernel: bump 4.19 to 4.19.134
Resolve conflicted:
395-v5.8-net-sch_cake-Take-advantage-of-skb-hash-where-appropriate.patch
641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch

Remove upstreamed:
742-v5.5-net-sfp-add-support-for-module-quirks.patch
743-v5.5-net-sfp-add-some-quirks-for-GPON-modules.patch

Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2020-07-22 17:41:51 +08:00
CN_SZTL
7e893c7b8f
kernel: bump 4.14 to 4.14.189
Resolve conflicted:
- 818-qspi-support-layerscape.patch

Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2020-07-22 16:52:00 +08:00
CN_SZTL
efb6f74258
Merge Mainline 2020-07-18 13:43:33 +08:00
CN_SZTL
986c000372
Revert "ipq806x: fix aliases node name for Qualcomm IPQ8064/DB149"
This reverts commit 037de3e579.

Revert "ipq806x: use consistent DT labels for gsbiX_serial"

This reverts commit 9b305d8456.

Revert "ipq806x: really fix aliases node for Qualcomm IPQ8064/DB149"

This reverts commit 099c14802e.
2020-07-18 10:44:44 +08:00
CN_SZTL
dc78a80d9f
Merge Upstream 2020-07-16 20:36:17 +08:00
Adrian Schmutzler
099c14802e
ipq806x: really fix aliases node for Qualcomm IPQ8064/DB149
Having looked at this again, it appears that only gsbi2_serial
is actually enabled for this device, so the entry in the broken
aliases node was correct.

Therefore, this needs to set its own serial0 instead of inheriting
"serial0 = &gsbi4_serial;" from DTSI. Do this with the correctly
named aliases node now.

Fixes: c83f7b6d21 ("ipq806x: fix aliases node name for Qualcomm
IPQ8064/DB149")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-07-16 20:30:16 +08:00
Adrian Schmutzler
9b305d8456
ipq806x: use consistent DT labels for gsbiX_serial
Kernel uses the label gsbiX_serial, so let's adjust our labels to
this naming scheme.

This is cosmetic, and actually only already existing gsbi4_serial
has been used at all.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-07-16 20:28:41 +08:00
Adrian Schmutzler
037de3e579
ipq806x: fix aliases node name for Qualcomm IPQ8064/DB149
This device uses a node incorrectly named "alias" instead of
"aliases" since it was introduced.

Remove it without replacement, as the definitions in it don't
seem to be required anyway:

The serial0 definition has never been effective anyway and this
would be the only device deviating from the common setting
"serial0 = &gsbi4_serial;" for ipq8064. (So, maybe the wrong
node prevented us from finding out about the wrong serial
definition?)

The mdio-gpio0 alias was supposed to be removed in d2a2eb7e48
anyway, the redundant definition in the alias node was just
overlooked back then.

Fixes: 0fd202f3e5 ("ipq806x: add db149 dts files")
Fixes: d2a2eb7e48 ("ipq806x: replace caf nss-gmac driver by upstream stmmac")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-07-16 20:28:13 +08:00
AmadeusGhost
c3991c204a Merge Mainline 2020-07-12 18:15:13 +08:00
AmadeusGhost
fc4afdfaa9 ipq806x: m520: fix startup on kernel 4.19/5.4 (thx chilauhe) 2020-07-12 18:02:22 +08:00
John Audia
def5f18a6d ipq806x: compile in schedutil governor
Gives users a third option to augment ondemand and performance. Kernel
docs[1] explain differences and this PR empowers users w/ the choice to
select between the older ondemand and newer and more simplistic schedutil
should they wish to use one that is not the performance governor.

1. Documentation/admin-guide/pm/cpufreq.rst

Signed-off-by: John Audia <graysky@archlinux.us>
[fixed From: to match SoB:]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
2020-07-09 12:20:43 +08:00
Adrian Schmutzler
f196ac4e1d ipq806x: move serial0 to DTSI files
All device DTS files in the target set the serial0 property to the
same value (*). So, let's move the definitions to the DTSI files.

That's also where the kernel defines it (qcom-ipq8064-v1.0.dtsi).

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-07-07 12:34:29 +08:00
Adrian Schmutzler
8153668700 ipq806x: move stdout-path to DTSI files
All device DTS files in the target set the stdout-path to the same
value. So, let's move the definitions to the DTSI files.

That's also where the kernel defines it (qcom-ipq8064-v1.0.dtsi).

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-07-07 12:32:27 +08:00
Adrian Schmutzler
dcc841e50f ipq806x: disentangle and clean up SoC DTSI files
So far, the DTSI files on ipq806x had a linear inheritance:

  qcom-ipq8064.dtsi
  v
  qcom-ipq8064-v1.0.dtsi
  v
  qcom-ipq8064-v2.0.dtsi
  v
  qcom-ipq8065.dtsi

This poses problems when one wants to set something that is specific
to an architecture closer to the top of the tree.

In this patch, we remove the chain-like inheritance and have all
other files derived from qcom-ipq8064.dtsi (changing this name to
something more generic is not possible due to upstream use).

The removal of inheritance will require a few entries to be copied
from qcom-ipq8064-v2.0.dtsi to qcom-ipq8065.dtsi. However, it also
opens an opportunity for some clean-up:

- Many definitions can be improved by just using the innermost labels.

- Instead of disabling the CPU_SPC node for ipq8065, it is now off by
  default and enabled where needed.

- Instead of patching phy-tx0-term-offset into qcom-ipq8064.dtsi and
  then having it changed for qcom-ipq8064-v2.0/qcom-ipq8065, just have
  the appropriate settings done in the lower DTSI files directly.

- For the opp_table0 adjustments for ipq8065, just redefine what's
  changed, but don't add all the untouched properties again.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-07-07 12:30:30 +08:00
Sungbo Eo
d2a662d482 ipq806x: move common pinmux nodes to SoC DTSI
As almost same pinmux nodes are repeated in each device dts,
let's define them once in the ipq8064 dtsi and remove the rest.

* uart0_pins : Did not touch.
* i2c4_pins  : This node seems to be not used at all in dts.
               Added the most common form in the dtsi. Did not touch rpm_pins.
* spi_pins   : The common mux node is already present in the dtsi.
               Removed the duplicate nodes from dts.
* nand_pins  : Moved the entire node.
* mdio0_pins : Moved the common mux node.
* rgmii2_pins: Moved the common mux node. "pins" property is overrided in ap161.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
2020-07-07 12:29:52 +08:00
Hauke Mehrtens
b497128b5f kernel: Update kernel 5.4 to version 5.4.50
Run tested: ath79, ipq40xx
Build tested: ath79, ipq40xx

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2020-07-05 13:29:49 +08:00
John Audia
08781d0058 ipq806x: refresh config
Based on "make kernel_menuconfig CONFIG_TARGET=generic" and 5.4.49

CONFIG_LEDS_TRIGGER_DISK has been removed by the refresh and added
back manually in order to not revert f93fcf8923 ("ipq806x: enable
disk-activity LED trigger").

Signed-off-by: John Audia <graysky@archlinux.us>
[extend commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-07-04 12:08:27 +08:00
AmadeusGhost
09caf07d9a ipq806x/5.4: fix pcie probe with some bootcmd 2020-07-01 12:18:21 +08:00
AmadeusGhost
ea0f145c3e Merge Mainline 2020-06-28 18:16:21 +08:00
CN_SZTL
324d347beb
kernel: bump 4.19 to 4.19.130
Refreshed all patches.

Resolve conflicted:
* 834-ledtrig-libata.patch

Remove conflicted:
* 526-PCI-aardvark-disable-LOS-state-by-default.patch

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2020-06-26 09:03:47 +08:00
AmadeusGhost
19f408b239 ipq806x: m520: enable tca1116 chips from chilauhe 2020-06-25 22:36:19 +08:00
Adrian Schmutzler
85f984b9eb treewide: drop shebang from non-executable target files
This drops the shebang from all target files for /lib and
/etc/uci-defaults folders, as these are sourced and the shebang
is useless.

While at it, fix the executable flag on a few of these files.

This does not touch ar71xx, as this target is just used for
backporting now and applying cosmetic changes would just complicate
things.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-06-17 12:04:16 +08:00
AmadeusGhost
a006bbea67 Merge Mainline 2020-06-16 18:20:13 +08:00
CN_SZTL
ac60170397
kernel: bump 4.19 to 4.19.128
Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2020-06-12 23:14:36 +08:00
CN_SZTL
e074e65b05
kernel: bump 4.14 to 4.14.184
Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2020-06-12 18:00:37 +08:00
CN_SZTL
bef3c8f54e
Merge Mainline 2020-06-06 22:28:48 +08:00
AmadeusGhost
14f1629629 autocore: add ipq806x support
Fix https://github.com/project-openwrt/openwrt/issues/156
Fix https://github.com/project-openwrt/openwrt-kisco/issues/44
2020-06-06 18:50:38 +08:00
Thomas Albers
03d79b30ac ipq806x: enable disk-activity LED trigger
Enable the disk-activity LED trigger for ipq806x, since this SoC has an
onboard SATA controller.

Signed-off-by: Thomas Albers <thomas.gameiro@googlemail.com>
[split into separate commit]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
2020-06-04 12:19:01 +08:00
Adrian Schmutzler
124b599380 kernel: properly insert local mtd partition parsers
Between 4.19 and 5.4, the kernel moved the partition parsers into
the parsers subdirectory. This led to some necessary rebasing of
our local patches for parsers, which partially has been performed
without caring about where the code was inserted.

This commit tries to adjust our local patches so that parsers are
inserted at the "proper" positions with respect to alphabetic sorting
(if possible). Thus, the commit is cosmetic.

While this might look useless now, it will make life easier when
adding other parsers in the future or for rebasing on kernel changes.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-05-26 11:53:45 +08:00