From b512aa323ace317f7bea24c40569daffc09e8ac7 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Wed, 29 Nov 2023 20:06:17 +0800 Subject: [PATCH 1/6] update led pinctrl Signed-off-by: Ken Wang --- linux/stable/0025-radxa-s0/0001-arm64-dts-add-radxa-s0.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/stable/0025-radxa-s0/0001-arm64-dts-add-radxa-s0.patch b/linux/stable/0025-radxa-s0/0001-arm64-dts-add-radxa-s0.patch index e8cb5dd1..98c64fac 100644 --- a/linux/stable/0025-radxa-s0/0001-arm64-dts-add-radxa-s0.patch +++ b/linux/stable/0025-radxa-s0/0001-arm64-dts-add-radxa-s0.patch @@ -342,7 +342,7 @@ index 0000000000..f07543e072 + + leds { + green_led_gio: green-led-gpio { -+ rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; ++ rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + From 08daca116e7be0f6e6ca5e6e255ca70a72d22b12 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Wed, 29 Nov 2023 20:08:46 +0800 Subject: [PATCH 2/6] add 2 patch for rock s0 1.Enable i2s_8ch_0 and modify uart0-pinctrl 2.Rename rock s0 Signed-off-by: Ken Wang --- ...e-i2s_8ch_0-and-modify-uart0-pinctrl.patch | 45 +++++++++++++++++++ .../0003-rename-radxa-s0-to-rock-s0.patch | 43 ++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 linux/stable/0025-radxa-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch create mode 100644 linux/stable/0025-radxa-s0/0003-rename-radxa-s0-to-rock-s0.patch diff --git a/linux/stable/0025-radxa-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch b/linux/stable/0025-radxa-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch new file mode 100644 index 00000000..5f77415f --- /dev/null +++ b/linux/stable/0025-radxa-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch @@ -0,0 +1,45 @@ +From 51361929254412cf900c6d029b5b567248b39c44 Mon Sep 17 00:00:00 2001 +From: bsp +Date: Wed, 29 Nov 2023 19:57:03 +0800 +Subject: [PATCH 1/2] enable i2s_8ch_0 and modify uart0 pinctrl + +Signed-off-by: Ken Wang + +diff --git a/arch/arm64/boot/dts/rockchip/rk3308-radxa-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-radxa-s0.dts +index ee1a1efdef..473e636445 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3308-radxa-s0.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3308-radxa-s0.dts +@@ -44,7 +44,7 @@ codec: acodec-sound { + simple-audio-card,widgets = + "Headphone", "Headphones"; + simple-audio-card,cpu { +- sound-dai = <&i2s_8ch_2>; ++ sound-dai = <&i2s_8ch_0>; + }; + simple-audio-card,codec { + sound-dai = <&acodec>; +@@ -290,10 +290,11 @@ &i2s_8ch_0 { + assigned-clock-parents = <&cru SCLK_I2S0_8CH_TX_MUX>; + rockchip,clk-trcm = <1>; + #sound-dai-cells = <0>; ++ status = "okay"; + }; + + &i2s_8ch_2 { +- status = "okay"; ++ status = "disabled"; + #sound-dai-cells = <0>; + }; + +@@ -373,6 +374,8 @@ &spi2 { + + &uart0 { + status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_xfer>; + }; + + &uart2 { +-- +2.25.1 + diff --git a/linux/stable/0025-radxa-s0/0003-rename-radxa-s0-to-rock-s0.patch b/linux/stable/0025-radxa-s0/0003-rename-radxa-s0-to-rock-s0.patch new file mode 100644 index 00000000..4713aa22 --- /dev/null +++ b/linux/stable/0025-radxa-s0/0003-rename-radxa-s0-to-rock-s0.patch @@ -0,0 +1,43 @@ +From e6a3d820081737cac09fbc19ff65b77782f7a4c6 Mon Sep 17 00:00:00 2001 +From: bsp +Date: Wed, 29 Nov 2023 20:00:57 +0800 +Subject: [PATCH 2/2] rename radxa s0 to rock s0 + +Signed-off-by: bsp + +diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile +index 457717695b..84d30b035f 100644 +--- a/arch/arm64/boot/dts/rockchip/Makefile ++++ b/arch/arm64/boot/dts/rockchip/Makefile +@@ -23,9 +23,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2-of10.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-edimm2.2.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb +-dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-radxa-s0.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-s0.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb +diff --git a/arch/arm64/boot/dts/rockchip/rk3308-radxa-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts +similarity index 99% +rename from arch/arm64/boot/dts/rockchip/rk3308-radxa-s0.dts +rename to arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts +index 473e636445..6b4bf39b95 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3308-radxa-s0.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts +@@ -9,8 +9,8 @@ + #include "rk3308.dtsi" + + / { +- model = "Radxa S0"; +- compatible = "radxa,s0", "rockchip,rk3308"; ++ model = "Radxa ROCK S0"; ++ compatible = "radxa,rock-s0", "rockchip,rk3308"; + + chosen { + stdout-path = "serial0:1500000n8"; +-- +2.25.1 + From e0d6e1f8fc8c59beacc0ff009b00537cc3830201 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Wed, 29 Nov 2023 21:03:38 +0800 Subject: [PATCH 3/6] rename radxa s0 to rock s0 Signed-off-by: Ken Wang --- .../0001-arm64-dts-add-radxa-s0.patch | 0 .../0001-linux-dts-add-radxa-s0-gpiod-label.patch | 0 .../0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch | 0 .../0003-rename-radxa-s0-to-rock-s0.patch | 0 linux/stable/fork.conf | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename linux/stable/{0025-radxa-s0 => 0025-rock-s0}/0001-arm64-dts-add-radxa-s0.patch (100%) rename linux/stable/{0025-radxa-s0 => 0025-rock-s0}/0001-linux-dts-add-radxa-s0-gpiod-label.patch (100%) rename linux/stable/{0025-radxa-s0 => 0025-rock-s0}/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch (100%) rename linux/stable/{0025-radxa-s0 => 0025-rock-s0}/0003-rename-radxa-s0-to-rock-s0.patch (100%) diff --git a/linux/stable/0025-radxa-s0/0001-arm64-dts-add-radxa-s0.patch b/linux/stable/0025-rock-s0/0001-arm64-dts-add-radxa-s0.patch similarity index 100% rename from linux/stable/0025-radxa-s0/0001-arm64-dts-add-radxa-s0.patch rename to linux/stable/0025-rock-s0/0001-arm64-dts-add-radxa-s0.patch diff --git a/linux/stable/0025-radxa-s0/0001-linux-dts-add-radxa-s0-gpiod-label.patch b/linux/stable/0025-rock-s0/0001-linux-dts-add-radxa-s0-gpiod-label.patch similarity index 100% rename from linux/stable/0025-radxa-s0/0001-linux-dts-add-radxa-s0-gpiod-label.patch rename to linux/stable/0025-rock-s0/0001-linux-dts-add-radxa-s0-gpiod-label.patch diff --git a/linux/stable/0025-radxa-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch b/linux/stable/0025-rock-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch similarity index 100% rename from linux/stable/0025-radxa-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch rename to linux/stable/0025-rock-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch diff --git a/linux/stable/0025-radxa-s0/0003-rename-radxa-s0-to-rock-s0.patch b/linux/stable/0025-rock-s0/0003-rename-radxa-s0-to-rock-s0.patch similarity index 100% rename from linux/stable/0025-radxa-s0/0003-rename-radxa-s0-to-rock-s0.patch rename to linux/stable/0025-rock-s0/0003-rename-radxa-s0-to-rock-s0.patch diff --git a/linux/stable/fork.conf b/linux/stable/fork.conf index 22d343fd..e26c00ba 100644 --- a/linux/stable/fork.conf +++ b/linux/stable/fork.conf @@ -5,7 +5,7 @@ SUPPORTED_BOARDS=("stable" #"radxa-cm3-io-stable" "radxa-cm3-sodimm-io-stable" "radxa-e25-stable" #"rock-4c-plus-stable" #"rock-pi-4b-stable" "rock-pi-4c-stable" -"radxa-s0" +"rock-s0" "rock-pi-n10" "rock-pi-e" "rock-pi-s" From 806cb4fa7a2e05cd7469661ebec0cf2b9b308c73 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Thu, 30 Nov 2023 15:01:20 +0800 Subject: [PATCH 4/6] u-boot: latest: Add rock-s0 uboot build Signed-off-by: Ken Wang --- u-boot/latest/fork.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/u-boot/latest/fork.conf b/u-boot/latest/fork.conf index 5654a349..b9a3c304 100644 --- a/u-boot/latest/fork.conf +++ b/u-boot/latest/fork.conf @@ -6,6 +6,7 @@ SUPPORTED_BOARDS=("radxa-zero" "radxa-zero-2pro" "rock-3a" "rock-3b" "rock-3c" "rock-pi-n10" #"rock-5a" "rock-5b" "radxa-nx5-io" +"rock-s0" "rock-pi-s" "rock-pi-e" "rock-4se" @@ -180,3 +181,10 @@ bsp_rock-pi-s() { RKMINILOADER="${BSP_SOC}_miniloader_" UBOOT_BASE_ADDR="0x600000" } + +bsp_rock-s0() { + BSP_SOC="rk3308" + RKBIN_DDR="${BSP_SOC}_ddr_589MHz_uart0_m0_v" + RKMINILOADER="${BSP_SOC}_miniloader_" + UBOOT_BASE_ADDR="0x600000" +} From cee7d040a53fd8aa05139b35641506fb6233da1d Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Thu, 30 Nov 2023 15:02:57 +0800 Subject: [PATCH 5/6] linux: rock s0: enable overlay support Signed-off-by: Ken Wang --- linux/stable/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/stable/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch b/linux/stable/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch index e6968674..8babc2b4 100644 --- a/linux/stable/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch +++ b/linux/stable/0100-vendor/0001-VENDOR-Add-Radxa-overlays.patch @@ -29,8 +29,8 @@ index 971b1f0ae..66aba816d 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -1,3 +1,22 @@ -+DTC_FLAGS_rk3308-radxa-s0 := -@ +DTC_FLAGS_rk3308-rock-pi-s := -@ ++DTC_FLAGS_rk3308-rock-s0 := -@ +DTC_FLAGS_rk3328-rock-pi-e := -@ +DTC_FLAGS_rk3399-rock-4c-plus := -@ +DTC_FLAGS_rk3399-rock-pi-4a-plus := -@ From 96700d07bb92001a4e6744b29fb749bddfa77ae2 Mon Sep 17 00:00:00 2001 From: Ken Wang Date: Thu, 30 Nov 2023 16:43:47 +0800 Subject: [PATCH 6/6] u-boot: latest: add bsp_rk3308 used by rock s0 and rock pi s Signed-off-by: Ken Wang --- u-boot/latest/fork.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/u-boot/latest/fork.conf b/u-boot/latest/fork.conf index b9a3c304..a17b7717 100644 --- a/u-boot/latest/fork.conf +++ b/u-boot/latest/fork.conf @@ -6,8 +6,7 @@ SUPPORTED_BOARDS=("radxa-zero" "radxa-zero-2pro" "rock-3a" "rock-3b" "rock-3c" "rock-pi-n10" #"rock-5a" "rock-5b" "radxa-nx5-io" -"rock-s0" -"rock-pi-s" +"rock-s0" "rock-pi-s" "rock-pi-e" "rock-4se" "rock-pi-4a-plus" "rock-pi-4b-plus" "rock-4c-plus" @@ -175,16 +174,17 @@ bsp_radxa-nx5-io() { bsp_rk3588s } -bsp_rock-pi-s() { +bsp_rk3308() { BSP_SOC="rk3308" RKBIN_DDR="${BSP_SOC}_ddr_589MHz_uart0_m0_v" RKMINILOADER="${BSP_SOC}_miniloader_" UBOOT_BASE_ADDR="0x600000" } +bsp_rock-pi-s() { + bsp_rk3308 +} + bsp_rock-s0() { - BSP_SOC="rk3308" - RKBIN_DDR="${BSP_SOC}_ddr_589MHz_uart0_m0_v" - RKMINILOADER="${BSP_SOC}_miniloader_" - UBOOT_BASE_ADDR="0x600000" + bsp_rk3308 }