Commit Graph

134 Commits

Author SHA1 Message Date
AmadeusGhost
37243c1f1e
rockchip: add OF node for pcie eth on NanoPi R4S
This adds the OF node for the pcie ethernet adapter on the FriendlyARM
NanoPi R4S. Add the correct value for the r8168 driver LED configuration
register to match the blink behavior of the other port on the device.

Run-tested-by: zcracker
Signed-off-by: AmadeusGhost <amadeus@immortalwrt.org>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-29 13:38:02 +08:00
Tianling Shen
a4f3455276
rockchip: tweak Kconfig
Adapt for OpenWrt 21.02 branch.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-20 17:59:09 +08:00
Tianling Shen
a58947798d
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-12 02:22:36 +08:00
Hauke Mehrtens
3da861ccca kernel: bump 5.4 to 5.4.111
Refreshed all patches.

The following patches were manually changed:
* 610-netfilter_match_bypass_default_checks.patch
* 611-netfilter_match_bypass_default_table.patch
* 802-can-0002-can-rx-offload-fix-long-lines.patch
* 802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch
* 802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch
* 802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
* 802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
* 802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch

The can-dev.ko model was moved in the upstream kernel.

Compile-tested on: x86/64, armvirt/64, ath79/generic
Runtime-tested on: x86/64, armvirt/64, ath79/generic

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2021-04-11 17:35:12 +02:00
Aleksander Jan Bajkowski
1663dc7e82 kernel: move some disabled symbols to generic
Move some disabled symbols found in armvirt target to generic.

Signed-off-by: Aleksander Jan Bajkowski <A.Bajkowski@stud.elka.pw.edu.pl>
(cherry picked from commit 12e942b1fd)
2021-04-11 16:54:22 +02:00
AmadeusGhost
2401d5b4de
rockchip: orangepi-r1-plus: typo fixes
This affects nothing, just correct the format.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-08 22:48:59 +08:00
Tianling Shen
a165d67e64
Revert "rockchip: backport upstream usbdrd3 patches"
This reverts commit fb82562e45.

This is not stable yet, and has some issues when detects USB devices.

Signed-off-by: Tianling Shen <cnsztl@gmail.com>
2021-04-06 19:57:56 +08:00
Tianling Shen
fb82562e45
rockchip: backport upstream usbdrd3 patches
Link: https://lore.kernel.org/linux-rockchip/20210205114011.10381-1-jbx6244@gmail.com/
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-05 15:22:42 +08:00
Tianling Shen
bb8c2bb5b0
rockchip: nanopi-r4s: fix patch offset
Fixes: #343

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-04 14:10:37 +08:00
QiuSimons
d76dbc7aaa
rockchip: nanopi-r4s: adjust cpu-voltage table
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-04 01:41:46 +08:00
CN_SZTL
a9c065e5f3 Revert "rockchip: use LZMA compressed FIT image for NanoPi R2S"
This reverts commit 0f57324f48.
Prepare for the upcoming kernel 5.10 support.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-04-01 23:22:31 +08:00
QiuSimons
9053a3a80f
rockchip: nanopi-r4s: fix read macaddr from Ethernet
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-01 19:45:58 +08:00
AmadeusGhost
6dd803c563
rockchip: add support for OrangePi R1 Plus
Hardware Specification:
  CPU: RockChip RK3328 (4 cores)
  RAM: 1GB DDR4
  Ethernet: 2x 1000 Base-T
  Flash: SPI-NOR 16 MB (mx25l12835f)
  LED: SYS, LAN, WAN
  MicroSD Slot x 1
  Button: Reset
  USB:1x 2.0
  Serial1: 13 Pin pin-header
  Serial2: 3 Pin debug port
  Type-C: for power input
  Power Supply: DC 5V/2A

Installation:
  Write the image to SD Card with dd.

Signed-off-by: AmadeusGhost <amadeus@jmu.edu.cn>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-29 23:36:35 +08:00
Lucian Cristian
19635714dc
rockchip: add drm and lima gpu driver
Pack the drivers needed for enabling the drm and gpu driver
for rk3328 and rk3399. Fix: #304

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
[rebase commit, apply review recommendations]
Signed-off-by: AmadeusGhost <amadeus@immortalwrt.org>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-29 23:29:27 +08:00
Tianling Shen
9e0dcde6e5
rockchip: nanopi-r4s: fix read mac address
The valid mac address only exists on ETH1.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-28 21:28:25 +08:00
Tianling Shen
672f787186
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-28 11:25:14 +08:00
Hauke Mehrtens
112d1052ac kernel: Deactivate CONFIG_VFIO in generic kernel config
Instead of deactivating this in every target config, deactivate it once
in the generic kernel config. I was asked for this config option in a
x86 64 build in OpenWrt 21.02.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 7d6553c72e)
2021-03-27 16:26:56 +01:00
Tianling Shen
d12253ff2a
rockchip: nanopi-r4s: refresh latest patches accepted by upstream
Link: https://lore.kernel.org/r/20210319051627.814-2-cnsztl@gmail.com
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-22 19:57:13 +08:00
Tianling Shen
0b7eadd0f2
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-16 23:58:41 +08:00
Tianling Shen
0ee152a77b
target/rockchip: rockpi4: fix typo err
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-13 01:44:00 +08:00
Tianling Shen
e26c0c7b31
Revert "rockchip: rk3328: refresh usb3 nodes"
This reverts commit 4126a5f695.

We found some issues with the usb3 inno driver, however it's good enough
to use generic usb3 driver for R2S, so revert it here and wait for fixes.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(backported from 44cbe50f17)
2021-03-10 00:56:13 +08:00
Tianling Shen
4126a5f695
rockchip: rk3328: refresh usb3 nodes
Reference:
- e93adaa8e9

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-09 01:06:00 +08:00
Tianling Shen
08dc06016f
rockchip: introduce vendor USB3 inno driver
Reference: faa767a9d0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-09 01:05:16 +08:00
AmadeusGhost
c62f23eeac
rockchip/image: update note for pine64-bin
Signed-off-by: AmadeusGhost <amadeus@immortalwrt.org>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-08 12:23:23 +08:00
AmadeusGhost
a7f0083894
rockchip: nanopi-r2s: add dmc controller nodes
Rererred to: f9ae6e992d

Signed-off-by: AmadeusGhost <amadeus@immortalwrt.org>
[separated new files from patches, rename dtsi]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-07 17:15:42 +08:00
AmadeusGhost
d11eeb84ae
rorkchip: rk3328: introduce dmc driver from vendor
Referred to:
- a0e009a73e
- fcd9629c05

Signed-off-by: AmadeusGhost <amadeus@immortalwrt.org>
[separated new files from patches]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-07 17:15:26 +08:00
AmadeusGhost
d5ac158920
uboot-rockchip: add support for building with rockchip ddrloader
Referred to http://opensource.rock-chips.com/wiki_Boot_option#Boot_flow.

Signed-off-by: AmadeusGhost <amadeus@immortalwrt.org>
[fixed format issue]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-07 17:14:41 +08:00
Tianling Shen
b584916501
rockchip: use native mac address for NanoPi R4S
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-07 15:43:59 +08:00
CN_SZTL
aee038e773
rockchip: refresh Kconfig
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-02-21 16:00:34 +08:00
CN_SZTL
f7df3af72d
rockchip: remove urngd package for rk3399
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-02-21 15:44:12 +08:00
AmadeusGhost
0b234c70ec Merge Official Source 2021-02-15 12:05:10 +08:00
Adrian Schmutzler
598b29585e target: use SPDX license identifiers on Makefiles
Use SPDX license tags to allow machines to check licenses.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2021-02-10 15:47:18 +01:00
CN_SZTL
1db9bd9bcd
Merge Official Source
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-28 19:39:04 +08:00
Marty Jones
9c29165a4c rockchip: fix SUPPORTED_DEVICES for Radxa ROCK Pi 4
This sets SUPPORTED_DEVICES to match the compatible in the DTS.

While at it, synchronize the capitalization in DEVICE_MODEL and
DTS model.

Signed-off-by: Marty Jones <mj8263788@gmail.com>
[commit title/message facelift, move variable in armv8.mk]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2021-01-27 21:31:20 +01:00
CN_SZTL
d3dac5a848
Merge Official Source
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-24 16:40:18 +08:00
CN_SZTL
e44f55064c
rockchip: re-order patches
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-24 00:15:06 +08:00
Adrian Schmutzler
f52081bcf9 treewide: provide global default for SUPPORTED_DEVICES
The majority of our targets provide a default value for the variable
SUPPORTED_DEVICES, which is used in images to check against the
compatible on a running device:

  SUPPORTED_DEVICES := $(subst _,$(comma),$(1))

At the moment, this is implemented in the Device/Default block of
the individual targets or even subtargets. However, since we
standardized device names and compatible in the recent past, almost
all targets are following the same scheme now:

  device/image name:  vendor_model
  compatible:         vendor,model

The equal redundant definitions are a symptom of this process.

Consequently, this patch moves the definition to image.mk making it
a global default. For the few targets not using the scheme above,
SUPPORTED_DEVICES will be defined to a different value in
Device/Default anyway, overwriting the default. In other words:
This change is supposed to be cosmetic.

This can be used as a global measure to get the current compatible
with: $(firstword $(SUPPORTED_DEVICES))
(Though this is not precisely an achievement of this commit.)

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2021-01-23 12:45:21 +01:00
AmadeusGhost
5c80512024 Merge Official Source 2021-01-20 12:20:05 +08:00
David Bauer
a8a17fd223 rockchip: use stable MAC-address for NanoPi R2S
The NanoPi R2S does not have a board specific MAC address written inside
e.g. an EEPROM, hence why it is randomly generated on first boot.

The issue with that however is the lack of a driver for the PRNG.
It often results to the same MAC address used on multiple boards by
default, as urngd is not active at this early stage resulting in low
available entropy.

There is however a semi-unique identifier available to us, which is the
CID of the used SD card. It is unique to each SD card, hence we can use
it to generate the MAC address used for LAN and WAN.

Signed-off-by: David Bauer <mail@david-bauer.net>
2021-01-18 17:32:52 +01:00
CN_SZTL
b65bd6d007
Merge Official Source 2021-01-16 17:29:29 +08:00
Sungbo Eo
22061b2880 kernel: enable CONFIG_LEDS_TRIGGER_HEARTBEAT
The heartbeat trigger is used by luci-mod-system, which is installed
as a part of the standard luci package set. It seems the LED trigger
will be required quite often, so let's enable it by default.

This increases uncompressed kernel size by about 100 bytes on ath79/generic.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
2021-01-15 18:20:55 +01:00
CN_SZTL
a5d575bef9
Merge Official Source
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-11 21:00:20 +08:00
David Bauer
b1150de9e4 rockchip: add missing Kconfig symbols
When compiling with CONFIG_ALL_KMODS enabled, compilation might stall
due to unset rockchip-specific config symbols. Disable these to avoid
stalling this step.

Signed-off-by: David Bauer <mail@david-bauer.net>
2021-01-11 06:00:49 +01:00
Tianling Shen
fbe88f5790
rockchip: use vendor driver for NanoPi R4S
However, mainline driver doesn't work very well on RTL8111
devices, so let's move to vendor driver for better performance.

Signed-off-by: Tianling Shen <cnsztl@gmail.com>
2021-01-09 16:56:45 +08:00
CN_SZTL
1d99824efc
rockchip: improve support for NanoPi R4S
- enable sd ultra-high speeds
- format style

Fixes: cd7fd0c77b ("rockchip: add NanoPi R4S support")

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-09 16:46:14 +08:00
CN_SZTL
40079b5a47
rockchip: refresh upstream patch
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-08 15:41:41 +08:00
AmadeusGhost
18a097c5f7 Merge Official Source 2021-01-05 21:11:00 +08:00
AmadeusGhost
5b1717efdd rockchip: r2s: fix typo error of the image definition 2021-01-03 23:56:23 +08:00
CN_SZTL
b47dd0e4a3
rockchip: fix typo 2021-01-02 18:20:43 +08:00
CN_SZTL
bcbf8f84e3
rockchip/sunxi: kernel: adjust default coherent_pool to 2MiB
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-02 13:30:18 +08:00