Commit Graph

177 Commits

Author SHA1 Message Date
Tianling Shen
48cdd20013
rockchip: nanopi r4s: fix typo error
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit ec04bb231f)
2021-08-17 19:46:48 +08:00
Tianling Shen
f7d3024a08
rockchip: add Motorcomm PHY driver
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 83ce2ba131)
2021-08-13 03:23:40 +08:00
Tianling Shen
c251e97ffb
rockchip: add NanoPi R2C support
This board is a fork of NanoPi R2S, with the native NIC changed.

Hardware
--------
RockChip RK3328 ARM64 (4 cores)
1GB DDR4 RAM
2x 1000 Base-T
3 LEDs (LAN / WAN / SYS)
1 Button (Reset)
Micro-SD slot
USB 2.0 Port

Installation
------------
Uncompress the OpenWrt sysupgrade and write it to a micro SD card using
dd.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit d9cb05957d)
2021-08-13 03:23:36 +08:00
Tianling Shen
370a4e1cb4
generic/rockchip: refresh kernel patches
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit ee6815b64c)
2021-08-13 03:23:06 +08:00
Tianling Shen
4262a83d1d
arm-trusted-firmware-rockchip-vendor: rework multiple devices building
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-08-12 23:54:14 +08:00
AmadeusGhost
33e772ad39 Merge Official Source 2021-08-11 12:08:20 +08:00
David Bauer
1c9a9f7c7a treewide: add various missing config symbols
Fixes commit 91a52f22a1 ("treewide: backport support for nvmem on non platform devices")

Signed-off-by: David Bauer <mail@david-bauer.net>
2021-08-10 20:22:59 +02:00
Tianling Shen
ffad2f5a30
uboot-rockchip: use rkbin for nanopi r4s
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit a2759b1be2)
2021-08-08 20:23:13 +08:00
AmadeusGhost
48712a0a60 Merge Official Source 2021-07-24 12:15:23 +08:00
Rui Salvaterra
f7ab41acc9 linux/rockchip: update the USB 3.0 controller node patch
This has been added in Linux 5.10.51 [1], but it's broken/incomplete. Update our
patch and refresh the remaining patches.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.51&id=421aff50af5e4cdc56b3ac8d6b670e09697bc8ac

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
2021-07-20 18:38:23 +01:00
AmadeusGhost
1bb251a7e9 Merge Official Source 2021-07-20 12:18:13 +08:00
Rui Salvaterra
a395cd00d2 kernel: bump 5.10 to 5.10.51
No deleted or manually refreshed patches.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
2021-07-20 04:11:05 +01:00
Tianling Shen
8ec83daf55
rockchip: fix merge conflict
Remove duplicated patches.

Fixes: c3b76adcb0 ("Merge Official Source")

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-06-14 21:33:06 +08:00
Tianling Shen
c3b76adcb0
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-06-14 21:17:25 +08:00
Rui Salvaterra
677813c776 kernel: bump 5.10 to 5.10.43
No deleted or manually refreshed patches.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
2021-06-14 01:36:36 +02:00
Tianling Shen
d0c9b218df
rockchip: make at24 eeprom driver built-in
This is required by NanoPi R4S.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-06-14 01:57:25 +08:00
Tianling Shen
0aa1b14d14
rockchip: nanopi r4s: read mac address from eeprom
NanoPi R4S has a unique MAC address for the ethernet on board. As the
PCIe NIC doesn't have, just reuse this MAC and flipp the LA bit for it.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 99adbe5ffd)
2021-06-12 01:12:18 +08:00
Tianling Shen
b721579842 rockchip: add NanoPi R4S support
Hardware
--------
RockChip RK3399 ARM64 (6 cores)
4GB LPDDR4 RAM
2x 1000 Base-T
3 LEDs (LAN / WAN / SYS)
1 Button (Reset)
Micro-SD slot
2x USB 3.0 Port

Installation
------------
Uncompress the OpenWrt sysupgrade and write it to a micro SD card using
dd.

=====================================
NOTICE FOR USERS WHO USE 1GB VERSION:
     BY NOW IT IS NOT SUPPORTED
====================================

[initialed target]
Co-developed-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Marty Jones <mj8263788@gmail.com>
[fixed bootscript]
Co-developed-by: Jayantajit Gogoi <jayanta.gogoi525@gmail.com>
Signed-off-by: Jayantajit Gogoi <jayanta.gogoi525@gmail.com>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-06-10 10:34:44 +02:00
AmadeusGhost
a89af5a513 Merge Official Source 2021-06-07 00:12:51 +08:00
Adrian Schmutzler
6f648ed7e6 treewide: remove "+" sign for increment with macaddr_add
Many people appear to use an unneeded "+" prefix for the increment
when calculating a MAC address with macaddr_add. Since this is not
required and used inconsistently [*], just remove it.

[*] As a funny side-fact, copy-pasting has led to almost all
    hotplug.d files using the "+", while nearly all of the
    02_network files are not using it.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2021-06-05 23:54:37 +02:00
AmadeusGhost
2723103c49
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>
(cherry picked from commit 189844d71c)
2021-04-29 13:39:29 +08:00
Rui Salvaterra
3326b5e75c treewide: switch the timer frequency to 100 Hz
Some targets select HZ=100, others HZ=250. There's no reason to select a higher
timer frequency (and 100 Hz are available in every architecture), so change all
targets to 100 Hz.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
2021-04-21 10:31:10 +01:00
Tianling Shen
401b3d3819
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-18 21:47:29 +08:00
David Bauer
eb85ab9ab6 rockchip: use alternative CID path
Use an alternative path to access the CID of the SD card in MMC0, used
for the generation of MAC addresses. With Kernel 5.10, the device name
of the MMC controller changed, breaking MAC address generation.

The new path is compatible with Kernel 5.4 as well as Kernel 5.10.

Signed-off-by: David Bauer <mail@david-bauer.net>
2021-04-18 14:41:51 +02:00
David Bauer
4a5aece2e6 rockchip: add missing config symbols
Signed-off-by: David Bauer <mail@david-bauer.net>
2021-04-18 14:41:38 +02:00
David Bauer
1bfa3713e1 rockchip: fix kernel 5.10 built for RockPi 4
Signed-off-by: David Bauer <mail@david-bauer.net>
2021-04-18 14:41:25 +02:00
Linus Walleij
74b51b5a06 kernel: Disable CONFIG_DMA_PERNUMA_CMA by default
This CMA memory allocation option only applies to NUMA
(Non-Uniform Memory Access) systems which are seldom
the kind of systems that OpenWRT address.

It is safe to assume that any system that need this
option would turn it on locally.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-04-17 21:56:05 +02:00
AmadeusGhost
4dfd4f2e4c
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:49:24 +08:00
Tianling Shen
9951c5ad9e
Revert "rockchip: backport upstream usbdrd3 patches"
This reverts commit 1573543492.

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:58:20 +08:00
Tianling Shen
55ab7dacb6
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
2021-04-05 19:41:49 +08:00
Tianling Shen
1573543492
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:21:53 +08:00
Tianling Shen
ca20e8d945
rockchip: nanopi-r4s: fix patch offset
Fixes: #343

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-04 14:10:50 +08:00
Kevin Darbyshire-Bryant
438e88e672 kernel: bump 5.10 to 5.10.27
Use update_kernel to refresh all patches, required manual updates to:

610-netfilter_match_bypass_default_checks.patch
611-netfilter_match_bypass_default_table.patch
762-net-bridge-switchdev-Refactor-br_switchdev_fdb_notif.patch
764-net-bridge-switchdev-Send-FDB-notifications-for-host.patch

Run-tested: x86_64

Nothing screamed out but any funny business with linux bridging should
suspect this update first.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2021-04-03 21:07:22 +01:00
QiuSimons
2560b34ff8
rockchip: nanopi-r4s: adjust cpu-voltage table
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-03 15:14:11 +08:00
John Audia
ec6293febc kernel: bump 5.4 to 5.4.109
Ran update_kernel.sh in a fresh clone without any existing toolchains.

Manually rebased:
  pending-5.4/611-netfilter_match_bypass_default_table.patch

The upstream change affecting this patch is the revert of an earlier
kernel commit. Therefore, we just revert our corresponding changes
in [1].

Build system: x86_64
Build-tested: ipq806x/R7800

[1] 9b1b89229f ("kernel: bump 5.4 to 5.4.86")

Signed-off-by: John Audia <graysky@archlinux.us>
[adjust manually rebased patch, add explanation]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2021-04-02 16:45:28 +02:00
QiuSimons
0df3faa096
rockchip: nanopi-r4s: fix read macaddr from Ethernet
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-04-01 19:45:44 +08:00
AmadeusGhost
65bdd1f5a7
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:46 +08:00
Lucian Cristian
082501bff9
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:32 +08:00
Tianling Shen
f52057409a
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:30 +08:00
Tianling Shen
e658021d9e
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-28 11:25:54 +08:00
Hauke Mehrtens
ebfc94aee9 kernel: Move CONFIG_USERIO to generic config
The CONFIG_USERIO option is unset in multiple target configurations. On
the sunxi target it is activated. Move the kernel configuration option
to the generic kernel configuration.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2021-03-27 14:34:22 +01:00
Hauke Mehrtens
7d6553c72e 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.

Fixes: 87046e87e2 ("kernel: add missing kernel config symbol")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2021-03-27 14:34:00 +01:00
Tianling Shen
7c5950fef2
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:56:50 +08:00
Tianling Shen
ab869f9cd0
kernel: 5.10: refresh patches
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-22 18:55:20 +08:00
Tianling Shen
18e21aff8f
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-22 16:35:07 +08:00
Aleksander Jan Bajkowski
12e942b1fd 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>
2021-03-19 00:59:22 +01:00
Tianling Shen
2de4490a61
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-14 23:46:37 +08:00
Tianling Shen
0169fc1e45
target/rockchip: rockpi4: fix typo err
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-13 01:44:06 +08:00
Tianling Shen
1c3ba139c5
Revert "rockchip: rk3328: refresh usb3 nodes"
This reverts commit 4a59b7b85a.

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:57:36 +08:00
Tianling Shen
4a59b7b85a
rockchip: rk3328: refresh usb3 nodes
Reference:
- e93adaa8e9

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2021-03-09 01:03:31 +08:00