Re: [PATCH v3 09/12] arm: dts: rockchip: sync rk3288.dtsi from Linux
On 4/15/22 02:40, Kever Yang wrote:
> Hi Johan,
>
> I got build fail for phycore-rk3288 after this patch:
>
> +Error: SPL image is too large (size 0x8800 than 0x8000)
> +Error: Bad parameters for image type
Hi,
Could you disclose your bash commands for reproducing?
I've downloaded from your git on April 15th 2022.
Added missing patches and compiled.
No warning seen here.
u-boot-spl.bin size 31.9 KiB (32675 bytes) ==> 0x7FA3 so below 0x8000 ==
32768 bytes.
===
For rk3288 SPL images with OF_PLATDATA the ns16550.c and
serial_rockchip.c driver are now included due to DM_DRIVER_ALIAS fix for
SPL_OF_PLATDATA, but this config is compiled with CONFIG_SPL_OF_REAL=y.
===
Your patch for:
rockchip: fix boot_devices constants
contains a warning:
check for migrated symbols...
What does it check and is that something I can fix?
===
For patches 9,10 and 11 I'm planning a v4 with:
ec-interrupt in u-boot-.dtsi
===
The driver rk_edp.c needs too fixing to comply with current Linux DP node.
I need board maintainers with hardware for that to fix and check.
compatible ="cnm,n116bgeea2","simple-panel";
vs.
compatible = "innolux,n116bge";
==> compatible = "simple-panel";
compatible = "rockchip,rk3288-edp";
vs.
compatible = "rockchip,rk3288-dp";
ret = uclass_get_device_by_phandle(UCLASS_PANEL, dev, "rockchip,panel",
>panel);
clock-names = "clk_edp", "clk_edp_24m", "pclk_edp"; //
U-boot
ret = clk_get_by_index(dev, 1, );
vs.
clock-names = "dp", "pclk"; // Linux
ret = reset_get_by_name(dev, "dp", _rst);
vs.
reset-names = "edp"; //rk3288
reset-names = "dp"; //rk3399
===
Let me know what you prefere.
Please offload the (dt-header) patches that are ready, so that I don't
have to resend them all the time.
===
Kind regards,
Johan
===
git clone --depth 40
https://source.denx.de/u-boot/custodians/u-boot-rockchip.git
git am v3-0009-arm-dts-rockchip-sync-rk3288.dtsi-from-Linux.patch
git am v3-0010-arm-dts-rockchip-sync-rk3288-DT-boards-from-Linux.patch
git am v3-0011-arm-dts-rockchip-sync-rk3288-veyron-DT-from-Linux.patch
make CROSS_COMPILE=arm-linux-gnueabihf- phycore-rk3288_defconfig all
mkimage ???
>
> Thanks,
>
> - Kever
>
> On 2022/3/4 07:52, Johan Jonker wrote:
>> Sync rk3288.dtsi from Linux version 5.17.
>>
>> Signed-off-by: Johan Jonker
>> ---
>>
>> Changed V3:
>> change reg size
>>
>> Changed V2:
>> rename mipi_dsi0 label
>> move io_domains
>> remove hdmi_audio veyron node
>> change memory@0 reg size
>> ---
>> arch/arm/dts/rk3288-evb.dtsi | 2 +-
>> arch/arm/dts/rk3288-miqi.dtsi | 28 +-
>> arch/arm/dts/rk3288-phycore-som.dtsi | 30 +-
>> arch/arm/dts/rk3288-popmetal.dtsi | 30 +-
>> arch/arm/dts/rk3288-thermal.dtsi | 87 --
>> arch/arm/dts/rk3288-veyron-jerry.dts | 6 -
>> arch/arm/dts/rk3288-veyron.dtsi | 33 +-
>> arch/arm/dts/rk3288.dtsi | 1367 +-
>> 8 files changed, 970 insertions(+), 613 deletions(-)
>> delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi
>>
>> diff --git a/arch/arm/dts/rk3288-evb.dtsi b/arch/arm/dts/rk3288-evb.dtsi
>> index 04902c0b..72da8847 100644
>> --- a/arch/arm/dts/rk3288-evb.dtsi
>> +++ b/arch/arm/dts/rk3288-evb.dtsi
>> @@ -448,7 +448,7 @@
>> status = "okay";
>> };
>> -_dsi0 {
>> +_dsi {
>> status = "disabled";
>> rockchip,panel = <>;
>> display-timings {
>> diff --git a/arch/arm/dts/rk3288-miqi.dtsi
>> b/arch/arm/dts/rk3288-miqi.dtsi
>> index cb80cbf2..b1c286c9 100644
>> --- a/arch/arm/dts/rk3288-miqi.dtsi
>> +++ b/arch/arm/dts/rk3288-miqi.dtsi
>> @@ -18,21 +18,6 @@
>> clock-output-names = "ext_gmac";
>> };
>> - io_domains: io-domains {
>> - compatible = "rockchip,rk3288-io-voltage-domain";
>> - rockchip,grf = <>;
>> -
>> - audio-supply = <_33>;
>> - flash0-supply = <_flash>;
>> - flash1-supply = <_lan>;
>> - gpio30-supply = <_io>;
>> - gpio1830-supply = <_io>;
>> - lcdc-supply = <_io>;
>> - sdcard-supply = <_sd>;
>> - wifi-supply = <_18>;
>> - };
>> -
>> -
>> leds {
>> compatible = "gpio-leds";
>> @@ -277,6 +262,19 @@
>> status = "okay";
>> };
>> +_domains {
>> + status = "okay";
>> +
>> + audio-supply = <_33>;
>> + flash0-supply = <_flash>;
>> + flash1-supply = <_lan>;
>> + gpio30-supply = <_io>;
>> + gpio1830-supply = <_io>;
>> + lcdc-supply = <_io>;
>> + sdcard-supply = <_sd>;
>> + wifi-supply = <_18>;
>> +};
>> +
>> {
>> pcfg_output_high: pcfg-output-high {
>> output-high;
>> diff --git a/arch/arm/dts/rk3288-phycore-som.dtsi
>> b/arch/arm/dts/rk3288-phycore-som.dtsi
>> index 821525f7..8ac695c8 100644
>> --- a/arch/arm/dts/rk3288-phycore-som.dtsi
>> +++ b/arch/arm/dts/rk3288-phycore-som.dtsi
>> @@ -71,22 +71,6 @@
Re: [PATCH v3 09/12] arm: dts: rockchip: sync rk3288.dtsi from Linux
Hi Johan,
I got build fail for phycore-rk3288 after this patch:
+Error: SPL image is too large (size 0x8800 than 0x8000)
+Error: Bad parameters for image type
Thanks,
- Kever
On 2022/3/4 07:52, Johan Jonker wrote:
Sync rk3288.dtsi from Linux version 5.17.
Signed-off-by: Johan Jonker
---
Changed V3:
change reg size
Changed V2:
rename mipi_dsi0 label
move io_domains
remove hdmi_audio veyron node
change memory@0 reg size
---
arch/arm/dts/rk3288-evb.dtsi |2 +-
arch/arm/dts/rk3288-miqi.dtsi| 28 +-
arch/arm/dts/rk3288-phycore-som.dtsi | 30 +-
arch/arm/dts/rk3288-popmetal.dtsi| 30 +-
arch/arm/dts/rk3288-thermal.dtsi | 87 --
arch/arm/dts/rk3288-veyron-jerry.dts |6 -
arch/arm/dts/rk3288-veyron.dtsi | 33 +-
arch/arm/dts/rk3288.dtsi | 1367 +-
8 files changed, 970 insertions(+), 613 deletions(-)
delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi
diff --git a/arch/arm/dts/rk3288-evb.dtsi b/arch/arm/dts/rk3288-evb.dtsi
index 04902c0b..72da8847 100644
--- a/arch/arm/dts/rk3288-evb.dtsi
+++ b/arch/arm/dts/rk3288-evb.dtsi
@@ -448,7 +448,7 @@
status = "okay";
};
-_dsi0 {
+_dsi {
status = "disabled";
rockchip,panel = <>;
display-timings {
diff --git a/arch/arm/dts/rk3288-miqi.dtsi b/arch/arm/dts/rk3288-miqi.dtsi
index cb80cbf2..b1c286c9 100644
--- a/arch/arm/dts/rk3288-miqi.dtsi
+++ b/arch/arm/dts/rk3288-miqi.dtsi
@@ -18,21 +18,6 @@
clock-output-names = "ext_gmac";
};
- io_domains: io-domains {
- compatible = "rockchip,rk3288-io-voltage-domain";
- rockchip,grf = <>;
-
- audio-supply = <_33>;
- flash0-supply = <_flash>;
- flash1-supply = <_lan>;
- gpio30-supply = <_io>;
- gpio1830-supply = <_io>;
- lcdc-supply = <_io>;
- sdcard-supply = <_sd>;
- wifi-supply = <_18>;
- };
-
-
leds {
compatible = "gpio-leds";
@@ -277,6 +262,19 @@
status = "okay";
};
+_domains {
+ status = "okay";
+
+ audio-supply = <_33>;
+ flash0-supply = <_flash>;
+ flash1-supply = <_lan>;
+ gpio30-supply = <_io>;
+ gpio1830-supply = <_io>;
+ lcdc-supply = <_io>;
+ sdcard-supply = <_sd>;
+ wifi-supply = <_18>;
+};
+
{
pcfg_output_high: pcfg-output-high {
output-high;
diff --git a/arch/arm/dts/rk3288-phycore-som.dtsi
b/arch/arm/dts/rk3288-phycore-som.dtsi
index 821525f7..8ac695c8 100644
--- a/arch/arm/dts/rk3288-phycore-som.dtsi
+++ b/arch/arm/dts/rk3288-phycore-som.dtsi
@@ -71,22 +71,6 @@
clock-output-names = "ext_gmac";
};
- io_domains: io_domains {
- compatible = "rockchip,rk3288-io-voltage-domain";
-
- status = "okay";
- sdcard-supply = <_io_sd>;
- flash0-supply = <_emmc_io>;
- flash1-supply = <_misc_1v8>;
- gpio1830-supply = <_3v3_io>;
- gpio30-supply = <_3v3_io>;
- bb-supply = <_3v3_io>;
- dvp-supply = <_3v3_io>;
- lcdc-supply = <_3v3_io>;
- wifi-supply = <_3v3_io>;
- audio-supply = <_3v3_io>;
- };
-
leds: user-leds {
compatible = "gpio-leds";
pinctrl-names = "default";
@@ -197,6 +181,20 @@
ddc-i2c-bus = <>;
};
+_domains {
+ status = "okay";
+ sdcard-supply = <_io_sd>;
+ flash0-supply = <_emmc_io>;
+ flash1-supply = <_misc_1v8>;
+ gpio1830-supply = <_3v3_io>;
+ gpio30-supply = <_3v3_io>;
+ bb-supply = <_3v3_io>;
+ dvp-supply = <_3v3_io>;
+ lcdc-supply = <_3v3_io>;
+ wifi-supply = <_3v3_io>;
+ audio-supply = <_3v3_io>;
+};
+
{
status = "okay";
clock-frequency = <40>;
diff --git a/arch/arm/dts/rk3288-popmetal.dtsi
b/arch/arm/dts/rk3288-popmetal.dtsi
index 63785eb5..bcd8fded 100644
--- a/arch/arm/dts/rk3288-popmetal.dtsi
+++ b/arch/arm/dts/rk3288-popmetal.dtsi
@@ -69,22 +69,6 @@
};
};
- io_domains: io-domains {
- compatible = "rockchip,rk3288-io-voltage-domain";
- rockchip,grf = <>;
-
- audio-supply = <_33>;
- bb-supply = <_io>;
- dvp-supply = <_dvp>;
- flash0-supply = <_flash>;
- flash1-supply = <_lan>;
- gpio30-supply = <_io>;
- gpio1830-supply = <_io>;
- lcdc-supply = <_io>;
- sdcard-supply = <_sd>;
- wifi-supply = <_wl>;
- };
-
ir: ir-receiver {
compatible = "gpio-ir-receiver";
gpios = < 6 GPIO_ACTIVE_LOW>;
@@ -441,6 +425,20 @@
status = "okay";
};
+_domains {
+ status = "okay";
+
Re: [PATCH v3 09/12] arm: dts: rockchip: sync rk3288.dtsi from Linux
On 2022/3/4 07:52, Johan Jonker wrote:
Sync rk3288.dtsi from Linux version 5.17.
Signed-off-by: Johan Jonker
Reviewed-by: Kever Yang
Thanks,
- Kever
---
Changed V3:
change reg size
Changed V2:
rename mipi_dsi0 label
move io_domains
remove hdmi_audio veyron node
change memory@0 reg size
---
arch/arm/dts/rk3288-evb.dtsi |2 +-
arch/arm/dts/rk3288-miqi.dtsi| 28 +-
arch/arm/dts/rk3288-phycore-som.dtsi | 30 +-
arch/arm/dts/rk3288-popmetal.dtsi| 30 +-
arch/arm/dts/rk3288-thermal.dtsi | 87 --
arch/arm/dts/rk3288-veyron-jerry.dts |6 -
arch/arm/dts/rk3288-veyron.dtsi | 33 +-
arch/arm/dts/rk3288.dtsi | 1367 +-
8 files changed, 970 insertions(+), 613 deletions(-)
delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi
diff --git a/arch/arm/dts/rk3288-evb.dtsi b/arch/arm/dts/rk3288-evb.dtsi
index 04902c0b..72da8847 100644
--- a/arch/arm/dts/rk3288-evb.dtsi
+++ b/arch/arm/dts/rk3288-evb.dtsi
@@ -448,7 +448,7 @@
status = "okay";
};
-_dsi0 {
+_dsi {
status = "disabled";
rockchip,panel = <>;
display-timings {
diff --git a/arch/arm/dts/rk3288-miqi.dtsi b/arch/arm/dts/rk3288-miqi.dtsi
index cb80cbf2..b1c286c9 100644
--- a/arch/arm/dts/rk3288-miqi.dtsi
+++ b/arch/arm/dts/rk3288-miqi.dtsi
@@ -18,21 +18,6 @@
clock-output-names = "ext_gmac";
};
- io_domains: io-domains {
- compatible = "rockchip,rk3288-io-voltage-domain";
- rockchip,grf = <>;
-
- audio-supply = <_33>;
- flash0-supply = <_flash>;
- flash1-supply = <_lan>;
- gpio30-supply = <_io>;
- gpio1830-supply = <_io>;
- lcdc-supply = <_io>;
- sdcard-supply = <_sd>;
- wifi-supply = <_18>;
- };
-
-
leds {
compatible = "gpio-leds";
@@ -277,6 +262,19 @@
status = "okay";
};
+_domains {
+ status = "okay";
+
+ audio-supply = <_33>;
+ flash0-supply = <_flash>;
+ flash1-supply = <_lan>;
+ gpio30-supply = <_io>;
+ gpio1830-supply = <_io>;
+ lcdc-supply = <_io>;
+ sdcard-supply = <_sd>;
+ wifi-supply = <_18>;
+};
+
{
pcfg_output_high: pcfg-output-high {
output-high;
diff --git a/arch/arm/dts/rk3288-phycore-som.dtsi
b/arch/arm/dts/rk3288-phycore-som.dtsi
index 821525f7..8ac695c8 100644
--- a/arch/arm/dts/rk3288-phycore-som.dtsi
+++ b/arch/arm/dts/rk3288-phycore-som.dtsi
@@ -71,22 +71,6 @@
clock-output-names = "ext_gmac";
};
- io_domains: io_domains {
- compatible = "rockchip,rk3288-io-voltage-domain";
-
- status = "okay";
- sdcard-supply = <_io_sd>;
- flash0-supply = <_emmc_io>;
- flash1-supply = <_misc_1v8>;
- gpio1830-supply = <_3v3_io>;
- gpio30-supply = <_3v3_io>;
- bb-supply = <_3v3_io>;
- dvp-supply = <_3v3_io>;
- lcdc-supply = <_3v3_io>;
- wifi-supply = <_3v3_io>;
- audio-supply = <_3v3_io>;
- };
-
leds: user-leds {
compatible = "gpio-leds";
pinctrl-names = "default";
@@ -197,6 +181,20 @@
ddc-i2c-bus = <>;
};
+_domains {
+ status = "okay";
+ sdcard-supply = <_io_sd>;
+ flash0-supply = <_emmc_io>;
+ flash1-supply = <_misc_1v8>;
+ gpio1830-supply = <_3v3_io>;
+ gpio30-supply = <_3v3_io>;
+ bb-supply = <_3v3_io>;
+ dvp-supply = <_3v3_io>;
+ lcdc-supply = <_3v3_io>;
+ wifi-supply = <_3v3_io>;
+ audio-supply = <_3v3_io>;
+};
+
{
status = "okay";
clock-frequency = <40>;
diff --git a/arch/arm/dts/rk3288-popmetal.dtsi
b/arch/arm/dts/rk3288-popmetal.dtsi
index 63785eb5..bcd8fded 100644
--- a/arch/arm/dts/rk3288-popmetal.dtsi
+++ b/arch/arm/dts/rk3288-popmetal.dtsi
@@ -69,22 +69,6 @@
};
};
- io_domains: io-domains {
- compatible = "rockchip,rk3288-io-voltage-domain";
- rockchip,grf = <>;
-
- audio-supply = <_33>;
- bb-supply = <_io>;
- dvp-supply = <_dvp>;
- flash0-supply = <_flash>;
- flash1-supply = <_lan>;
- gpio30-supply = <_io>;
- gpio1830-supply = <_io>;
- lcdc-supply = <_io>;
- sdcard-supply = <_sd>;
- wifi-supply = <_wl>;
- };
-
ir: ir-receiver {
compatible = "gpio-ir-receiver";
gpios = < 6 GPIO_ACTIVE_LOW>;
@@ -441,6 +425,20 @@
status = "okay";
};
+_domains {
+ status = "okay";
+ audio-supply = <_33>;
+ bb-supply = <_io>;
+ dvp-supply = <_dvp>;
+ flash0-supply = <_flash>;
+ flash1-supply = <_lan>;
+
[PATCH v3 09/12] arm: dts: rockchip: sync rk3288.dtsi from Linux
Sync rk3288.dtsi from Linux version 5.17.
Signed-off-by: Johan Jonker
---
Changed V3:
change reg size
Changed V2:
rename mipi_dsi0 label
move io_domains
remove hdmi_audio veyron node
change memory@0 reg size
---
arch/arm/dts/rk3288-evb.dtsi |2 +-
arch/arm/dts/rk3288-miqi.dtsi| 28 +-
arch/arm/dts/rk3288-phycore-som.dtsi | 30 +-
arch/arm/dts/rk3288-popmetal.dtsi| 30 +-
arch/arm/dts/rk3288-thermal.dtsi | 87 --
arch/arm/dts/rk3288-veyron-jerry.dts |6 -
arch/arm/dts/rk3288-veyron.dtsi | 33 +-
arch/arm/dts/rk3288.dtsi | 1367 +-
8 files changed, 970 insertions(+), 613 deletions(-)
delete mode 100644 arch/arm/dts/rk3288-thermal.dtsi
diff --git a/arch/arm/dts/rk3288-evb.dtsi b/arch/arm/dts/rk3288-evb.dtsi
index 04902c0b..72da8847 100644
--- a/arch/arm/dts/rk3288-evb.dtsi
+++ b/arch/arm/dts/rk3288-evb.dtsi
@@ -448,7 +448,7 @@
status = "okay";
};
-_dsi0 {
+_dsi {
status = "disabled";
rockchip,panel = <>;
display-timings {
diff --git a/arch/arm/dts/rk3288-miqi.dtsi b/arch/arm/dts/rk3288-miqi.dtsi
index cb80cbf2..b1c286c9 100644
--- a/arch/arm/dts/rk3288-miqi.dtsi
+++ b/arch/arm/dts/rk3288-miqi.dtsi
@@ -18,21 +18,6 @@
clock-output-names = "ext_gmac";
};
- io_domains: io-domains {
- compatible = "rockchip,rk3288-io-voltage-domain";
- rockchip,grf = <>;
-
- audio-supply = <_33>;
- flash0-supply = <_flash>;
- flash1-supply = <_lan>;
- gpio30-supply = <_io>;
- gpio1830-supply = <_io>;
- lcdc-supply = <_io>;
- sdcard-supply = <_sd>;
- wifi-supply = <_18>;
- };
-
-
leds {
compatible = "gpio-leds";
@@ -277,6 +262,19 @@
status = "okay";
};
+_domains {
+ status = "okay";
+
+ audio-supply = <_33>;
+ flash0-supply = <_flash>;
+ flash1-supply = <_lan>;
+ gpio30-supply = <_io>;
+ gpio1830-supply = <_io>;
+ lcdc-supply = <_io>;
+ sdcard-supply = <_sd>;
+ wifi-supply = <_18>;
+};
+
{
pcfg_output_high: pcfg-output-high {
output-high;
diff --git a/arch/arm/dts/rk3288-phycore-som.dtsi
b/arch/arm/dts/rk3288-phycore-som.dtsi
index 821525f7..8ac695c8 100644
--- a/arch/arm/dts/rk3288-phycore-som.dtsi
+++ b/arch/arm/dts/rk3288-phycore-som.dtsi
@@ -71,22 +71,6 @@
clock-output-names = "ext_gmac";
};
- io_domains: io_domains {
- compatible = "rockchip,rk3288-io-voltage-domain";
-
- status = "okay";
- sdcard-supply = <_io_sd>;
- flash0-supply = <_emmc_io>;
- flash1-supply = <_misc_1v8>;
- gpio1830-supply = <_3v3_io>;
- gpio30-supply = <_3v3_io>;
- bb-supply = <_3v3_io>;
- dvp-supply = <_3v3_io>;
- lcdc-supply = <_3v3_io>;
- wifi-supply = <_3v3_io>;
- audio-supply = <_3v3_io>;
- };
-
leds: user-leds {
compatible = "gpio-leds";
pinctrl-names = "default";
@@ -197,6 +181,20 @@
ddc-i2c-bus = <>;
};
+_domains {
+ status = "okay";
+ sdcard-supply = <_io_sd>;
+ flash0-supply = <_emmc_io>;
+ flash1-supply = <_misc_1v8>;
+ gpio1830-supply = <_3v3_io>;
+ gpio30-supply = <_3v3_io>;
+ bb-supply = <_3v3_io>;
+ dvp-supply = <_3v3_io>;
+ lcdc-supply = <_3v3_io>;
+ wifi-supply = <_3v3_io>;
+ audio-supply = <_3v3_io>;
+};
+
{
status = "okay";
clock-frequency = <40>;
diff --git a/arch/arm/dts/rk3288-popmetal.dtsi
b/arch/arm/dts/rk3288-popmetal.dtsi
index 63785eb5..bcd8fded 100644
--- a/arch/arm/dts/rk3288-popmetal.dtsi
+++ b/arch/arm/dts/rk3288-popmetal.dtsi
@@ -69,22 +69,6 @@
};
};
- io_domains: io-domains {
- compatible = "rockchip,rk3288-io-voltage-domain";
- rockchip,grf = <>;
-
- audio-supply = <_33>;
- bb-supply = <_io>;
- dvp-supply = <_dvp>;
- flash0-supply = <_flash>;
- flash1-supply = <_lan>;
- gpio30-supply = <_io>;
- gpio1830-supply = <_io>;
- lcdc-supply = <_io>;
- sdcard-supply = <_sd>;
- wifi-supply = <_wl>;
- };
-
ir: ir-receiver {
compatible = "gpio-ir-receiver";
gpios = < 6 GPIO_ACTIVE_LOW>;
@@ -441,6 +425,20 @@
status = "okay";
};
+_domains {
+ status = "okay";
+ audio-supply = <_33>;
+ bb-supply = <_io>;
+ dvp-supply = <_dvp>;
+ flash0-supply = <_flash>;
+ flash1-supply = <_lan>;
+ gpio30-supply = <_io>;
+ gpio1830-supply = <_io>;
+ lcdc-supply = <_io>;
+
