shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: Remove swiotlb=1

Browse Source 
Which is no longer needed after commit
b67a8b29df ("arm64: mm: only initialize swiotlb when necessary").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If1afd62f81b37f81cfdfc9bb4ef95e753b2006c4
This commit is contained in:
Tao Huang
2021-03-02 17:15:30 +08:00
parent 1eb4d925e2
commit c060abdb52
34 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/rockchip/px30-android.dtsi
View File

@@ -6,7 +6,7 @@
/ {
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff160000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0";
bootargs = "earlycon=uart8250,mmio32,0xff160000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0";
};
fiq-debugger {

2
arch/arm64/boot/dts/rockchip/px30-robot.dtsi
View File

@@ -9,7 +9,7 @@
compatible = "rockchip,linux", "rockchip,px30-robot";
chosen {
bootargs = "swiotlb=1 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootwait";
bootargs = "console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootwait";
};
fiq-debugger {

2
arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts
View File

@@ -12,7 +12,7 @@
compatible = "rockchip,rk1808-evb-v10", "rockchip,rk1808";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait swiotlb=1 kpti=0 snd_aloop.index=7";
bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait kpti=0 snd_aloop.index=7";
};
vad-sound {

2
arch/arm64/boot/dts/rockchip/rk1808-evb-x4-second.dts
View File

@@ -12,7 +12,7 @@
compatible = "rockchip,rk1808-evb-x4", "rockchip,rk1808";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 dump_initrd init=/init swiotlb=1 kpti=0";
bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 dump_initrd init=/init kpti=0";
};
};

2
arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts
View File

@@ -12,7 +12,7 @@
compatible = "rockchip,rk1808-evb-x4", "rockchip,rk1808";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 dump_initrd init=/init swiotlb=1 kpti=0";
bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 dump_initrd init=/init kpti=0";
};
};

2
arch/arm64/boot/dts/rockchip/rk3308-ai-va-v10.dts
View File

@@ -13,7 +13,7 @@
compatible = "rockchip,rk3308-ai-va-v10", "rockchip,rk3308";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff0c0000 swiotlb=1 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1";
bootargs = "earlycon=uart8250,mmio32,0xff0c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1";
};
adc-keys0 {

2
arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi
View File

@@ -12,7 +12,7 @@
compatible = "rockchip,rk3308-evb", "rockchip,rk3308";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff0c0000 swiotlb=1 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1";
bootargs = "earlycon=uart8250,mmio32,0xff0c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1";
};
adc-keys0 {

2
arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
View File

@@ -11,7 +11,7 @@
compatible = "rockchip,rk3308-evb-v11", "rockchip,rk3308";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff0c0000 swiotlb=1 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1";
bootargs = "earlycon=uart8250,mmio32,0xff0c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1";
};
adc-keys {

2
arch/arm64/boot/dts/rockchip/rk3308b-evb-v10.dtsi
View File

@@ -11,7 +11,7 @@
compatible = "rockchip,rk3308b-evb-v10", "rockchip,rk3308";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff0e0000 swiotlb=1 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1";
bootargs = "earlycon=uart8250,mmio32,0xff0e0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1";
};
acodec_sound: acodec-sound {

2
arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10-linux.dts
View File

@@ -17,7 +17,7 @@
compatible = "rockchip,rk3326-evb-lp3-v10-linux", "rockchip,rk3326";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff160000 swiotlb=1 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait";
bootargs = "earlycon=uart8250,mmio32,0xff160000 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait";
};
adc-keys {

2
arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi
View File

@@ -44,7 +44,7 @@
compatible = "rockchip,linux", "rockchip,rk3326";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff160000 swiotlb=1 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootwait";
bootargs = "earlycon=uart8250,mmio32,0xff160000 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootwait";
};
fiq-debugger {

2
arch/arm64/boot/dts/rockchip/rk3328-android.dtsi
View File

@@ -6,7 +6,7 @@
/ {
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff130000 swiotlb=1 kpti=0 coherent_pool=1m";
bootargs = "earlycon=uart8250,mmio32,0xff130000 kpti=0 coherent_pool=1m";
};
fiq-debugger {

2
arch/arm64/boot/dts/rockchip/rk3368-808-evb.dts
View File

@@ -12,7 +12,7 @@
};
&chosen {
bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 androidboot.selinux=permissive init=/init kpti=0";
bootargs = "earlycon=uart8250,mmio32,0xff690000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 androidboot.selinux=permissive init=/init kpti=0";
};
&fiq_debugger {

2
arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
View File

@@ -42,7 +42,7 @@
/ {
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1 firmware_class.path=/system/vendor/firmware";
bootargs = "earlycon=uart8250,mmio32,0xff690000 firmware_class.path=/system/vendor/firmware";
};
fiq_debugger: fiq-debugger {

2
arch/arm64/boot/dts/rockchip/rk3368-p9-avb.dts
View File

@@ -31,5 +31,5 @@
};
&chosen {
bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 androidboot.selinux=permissive init=/init kpti=0";
bootargs = "earlycon=uart8250,mmio32,0xff690000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 androidboot.selinux=permissive init=/init kpti=0";
};

2
arch/arm64/boot/dts/rockchip/rk3368-px5-evb-android.dts
View File

@@ -52,7 +52,7 @@
compatible = "rockchip,px5-evb", "rockchip,px5", "rockchip,rk3368";
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff1c0000 swiotlb=1 firmware_class.path=/system/vendor/firmware";
bootargs = "earlycon=uart8250,mmio32,0xff1c0000 firmware_class.path=/system/vendor/firmware";
};
fiq_debugger: fiq-debugger {

2
arch/arm64/boot/dts/rockchip/rk3368-tablet.dts
View File

@@ -94,7 +94,7 @@
};
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0";
bootargs = "earlycon=uart8250,mmio32,0xff690000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0";
};
es8316-sound {

2
arch/arm64/boot/dts/rockchip/rk3368-xikp-avb.dts
View File

@@ -31,7 +31,7 @@
};
&chosen {
bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 androidboot.selinux=permissive init=/init kpti=0";
bootargs = "earlycon=uart8250,mmio32,0xff690000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 androidboot.selinux=permissive init=/init kpti=0";
};
&i2c3 {

2
arch/arm64/boot/dts/rockchip/rk3368a-817-tablet-bnd.dts
View File

@@ -82,7 +82,7 @@
};
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0";
bootargs = "earlycon=uart8250,mmio32,0xff690000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0";
};
rk817-sound {

2
arch/arm64/boot/dts/rockchip/rk3368a-817-tablet.dts
View File

@@ -83,7 +83,7 @@
};
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0";
bootargs = "earlycon=uart8250,mmio32,0xff690000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0";
};
rk817-sound {

2
arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
View File

@@ -49,7 +49,7 @@
compatible = "rockchip,android", "rockchip,rk3399";
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 coherent_pool=1m";
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 coherent_pool=1m";
};
cpuinfo {

2
arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts
View File

@@ -12,7 +12,7 @@
model = "Rockchip RK3399 EVB IND LPDDR4 Board edp (Android)";
compatible = "rockchip,android", "rockchip,rk3399-evb-ind-lpddr4-android", "rockchip,rk3399";
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
};
iram: sram@ff8d0000 {

2
arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts
View File

@@ -12,7 +12,7 @@
model = "Rockchip RK3399 EVB IND LPDDR4 Board edp (Android)";
compatible = "rockchip,android", "rockchip,rk3399-evb-ind-v13-lpddr4-android", "rockchip,rk3399";
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
};
iram: sram@ff8d0000 {

2
arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts
View File

@@ -54,7 +54,7 @@
compatible = "rockchip,rk3399-firefly-android", "rockchip,rk3399";
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 coherent_pool=1m";
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 coherent_pool=1m";
};
cpuinfo {

2
arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi
View File

@@ -47,7 +47,7 @@
compatible = "rockchip,linux", "rockchip,rk3399";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait coherent_pool=1m";
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait coherent_pool=1m";
};
reserved-memory {

2
arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
View File

@@ -53,7 +53,7 @@
/ {
compatible = "rockchip,rk3399-mid", "rockchip,rk3399";
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
};
adc_keys {

2
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
View File

@@ -15,7 +15,7 @@
compatible = "pine64,rockpro64", "rockchip,rk3399";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 coherent_pool=1m";
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 coherent_pool=1m";
stdout-path = "serial2:1500000n8";
};

2
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts
View File

@@ -10,7 +10,7 @@
model = "Rockchip RK3399 Excavator Board edp avb (Android)";
compatible = "rockchip,android", "rockchip,rk3399-excavator-edp-avb", "rockchip,rk3399";
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
};
ext_cam_clk: external-camera-clock {

2
arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts
View File

@@ -13,7 +13,7 @@
compatible = "rockchip,rk3399pro-npu-evb-v10", "rockchip,rk3399pro-npu";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 init=/init swiotlb=1 kpti=0";
bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 init=/init kpti=0";
};
keys: gpio-keys {

2
arch/arm64/boot/dts/rockchip/rk3568-android.dtsi
View File

@@ -6,7 +6,7 @@
/ {
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xfe660000 swiotlb=1 console=ttyFIQ0";
bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0";
};
fiq-debugger {

2
arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-spi-nor.dts
View File

@@ -12,7 +12,7 @@
compatible = "rockchip,rk3568-evb1-ddr4-v10-linux-spi-nor", "rockchip,rk3568";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xfe660000 swiotlb=1 console=ttyFIQ0 root=/dev/mtdblock3 rootfstype=squashfs rootwait";
bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 root=/dev/mtdblock3 rootfstype=squashfs rootwait";
};
};

2
arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi
View File

@@ -6,7 +6,7 @@
/ {
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xfe660000 swiotlb=1 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rw rootwait";
bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rw rootwait";
};
fiq-debugger {

2
arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10-linux-spi-nand.dts
View File

@@ -13,7 +13,7 @@
compatible = "rockchip,rk3568-nvr-demo-ddr4-v10-linux-spi-nand", "rockchip,rk3568";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xfe660000 swiotlb=1 console=ttyFIQ0 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs";
bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs";
};
};

2
arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v12-linux-spi-nand.dts
View File

@@ -13,7 +13,7 @@
compatible = "rockchip,rk3568-nvr-demo-ddr4-v12-linux-spi-nand", "rockchip,rk3568";
chosen {
bootargs = "earlycon=uart8250,mmio32,0xfe660000 swiotlb=1 console=ttyFIQ0 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs";
bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs";
};
};