Skip to contentSkip to conversation

rockchip: rk3288: Add OF board setup

PATCH In review Jagan Teki 3 participants 8 messages Jul 2, 2020 – Jul 8, 2020

Subsystems (3)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/1 rockchip: rk3288: Add OF board setup

The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like hclk_vio and usb host0 ohci.

In order to work these on the same in Linux kernel update the compatible the root compatible with rockchip,rk3288w before booting.

So, this support during of board setup code of rk3288.

---
 arch/arm/mach-rockchip/Kconfig         |  1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index b1008a5058..822d8d4e9c 100644
@@ -98,6 +98,7 @@ config ROCKCHIP_RK322X
 config ROCKCHIP_RK3288
 	bool "Support Rockchip RK3288"
 	select CPU_V7A
+	select OF_BOARD_SETUP
 	select SUPPORT_SPL
 	select SPL
 	select SUPPORT_TPL
arch/arm/mach-rockchip/rk3288/rk3288.c +26 -0
index 804abe8a1b..8a682675e6 100644
@@ -115,6 +115,32 @@ int rk_board_late_init(void)
 	return rk3288_board_late_init();
 }
 
+#ifdef CONFIG_OF_BOARD_SETUP
+
+#define RK3288_HDMI_PHYS	0xff980000
+#define RK3288W_HDMI_REV	0x1A
+#define HDMI_CONFIG0_ID		0x04
+
+int ft_board_setup(void *blob, bd_t *bd)
+{
+	u8 config0;
+	int ret;
+
+	config0 = readb(RK3288_HDMI_PHYS + HDMI_CONFIG0_ID);
+	if (config0 == RK3288W_HDMI_REV) {
+		ret = fdt_setprop_string(blob, 0,
+					 "compatible", "rockchip,rk3288w");
+		if (ret < 0) {
+			printf("failed to set rk3288w compatible (ret=%d)\n",
+			       ret);
+			return ret;
+		}
+	}
+
+	return 0;
+}
+#endif
+
 static int do_clock(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
 {
Signature · 1 line
2.25.1
#1 lore raw
Quoted 40 lines · Jagan Teki

The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like hclk_vio and usb host0 ohci.

In order to work these on the same in Linux kernel update the compatible the root compatible with rockchip,rk3288w before booting.

So, this support during of board setup code of rk3288.

---
  arch/arm/mach-rockchip/Kconfig         |  1 +
  arch/arm/mach-rockchip/rk3288/rk3288.c | 26 ++++++++++++++++++++++++++
  2 files changed, 27 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index b1008a5058..822d8d4e9c 100644
@@ -98,6 +98,7 @@ config ROCKCHIP_RK322X
  config ROCKCHIP_RK3288
  	bool "Support Rockchip RK3288"
  	select CPU_V7A
+	select OF_BOARD_SETUP
  	select SUPPORT_SPL
  	select SPL
  	select SUPPORT_TPL
arch/arm/mach-rockchip/rk3288/rk3288.c +5 -0
index 804abe8a1b..8a682675e6 100644
@@ -115,6 +115,32 @@ int rk_board_late_init(void)
  	return rk3288_board_late_init();
  }
 
+#ifdef CONFIG_OF_BOARD_SETUP
+
+#define RK3288_HDMI_PHYS	0xff980000
+#define RK3288W_HDMI_REV	0x1A
+#define HDMI_CONFIG0_ID		0x04

arch/arm/mach-rockchip/rk3288/rk3288.c int rk_board_late_init(void) · line 132

Quoted 10 lines
arch/arm/mach-rockchip/rk3288/rk3288.c +10 -0
+
+int ft_board_setup(void *blob, bd_t *bd)
+{
+	u8 config0;
+	int ret;
+
+	config0 = readb(RK3288_HDMI_PHYS + HDMI_CONFIG0_ID);
+	if (config0 == RK3288W_HDMI_REV) {
+		ret = fdt_setprop_string(blob, 0,
+					 "compatible", "rockchip,rk3288w");

Does this end up replacing the entire top-level compatible property? i.e. from:

	compatible = "vendor,board\0rockchip,rk3288";

to just:

	compatible = "rockchip,rk3288w";

If so, that's a bit of a problem for various drivers that care about the actual board compatible rather than the SoC.

Robin.

Quoted 15 lines
arch/arm/mach-rockchip/rk3288/rk3288.c +11 -0
+		if (ret < 0) {
+			printf("failed to set rk3288w compatible (ret=%d)\n",
+			       ret);
+			return ret;
+		}
+	}
+
+	return 0;
+}
+#endif
+
  static int do_clock(struct cmd_tbl *cmdtp, int flag, int argc,
  		    char *const argv[])
  {
author
#2 lore raw
Quoted 56 lines · Robin Murphy
Quoted 40 lines · Jagan Teki

The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like hclk_vio and usb host0 ohci.

In order to work these on the same in Linux kernel update the compatible the root compatible with rockchip,rk3288w before booting.

So, this support during of board setup code of rk3288.

---
  arch/arm/mach-rockchip/Kconfig         |  1 +
  arch/arm/mach-rockchip/rk3288/rk3288.c | 26 ++++++++++++++++++++++++++
  2 files changed, 27 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index b1008a5058..822d8d4e9c 100644
@@ -98,6 +98,7 @@ config ROCKCHIP_RK322X
  config ROCKCHIP_RK3288
      bool "Support Rockchip RK3288"
      select CPU_V7A
+     select OF_BOARD_SETUP
      select SUPPORT_SPL
      select SPL
      select SUPPORT_TPL
arch/arm/mach-rockchip/rk3288/rk3288.c +5 -0
index 804abe8a1b..8a682675e6 100644
@@ -115,6 +115,32 @@ int rk_board_late_init(void)
      return rk3288_board_late_init();
  }
 
+#ifdef CONFIG_OF_BOARD_SETUP
+
+#define RK3288_HDMI_PHYS     0xff980000
+#define RK3288W_HDMI_REV     0x1A
+#define HDMI_CONFIG0_ID              0x04

arch/arm/mach-rockchip/rk3288/rk3288.c int rk_board_late_init(void) · line 132

Quoted 10 lines
arch/arm/mach-rockchip/rk3288/rk3288.c +10 -0
+
+int ft_board_setup(void *blob, bd_t *bd)
+{
+     u8 config0;
+     int ret;
+
+     config0 = readb(RK3288_HDMI_PHYS + HDMI_CONFIG0_ID);
+     if (config0 == RK3288W_HDMI_REV) {
+             ret = fdt_setprop_string(blob, 0,
+                                      "compatible", "rockchip,rk3288w");

Does this end up replacing the entire top-level compatible property? i.e. from:

Quoted 8 lines
        compatible = "vendor,board\0rockchip,rk3288";

to just:

        compatible = "rockchip,rk3288w";

If so, that's a bit of a problem for various drivers that care about the actual board compatible rather than the SoC.

Yes, It looks replacing the entire compatible. I think the root compatible is mostly untouchable because of this reason.

But, if we skip the root compatible and trying to replace individual nodes for W revision then it requires extra registration code on in the Linux drivers like Linux clock driver is registering the clock with rockchip,rk3288-cru but updating this compatible with rockchip,rk3288w-cru will require another registration code. Having common rockchip,rk3288w can be possible to check any code in the tree.

Jagan.

#3 lore raw
Quoted 69 lines · Jagan Teki
Quoted 56 lines · Robin Murphy
Quoted 40 lines · Jagan Teki

The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like hclk_vio and usb host0 ohci.

In order to work these on the same in Linux kernel update the compatible the root compatible with rockchip,rk3288w before booting.

So, this support during of board setup code of rk3288.

---
   arch/arm/mach-rockchip/Kconfig         |  1 +
   arch/arm/mach-rockchip/rk3288/rk3288.c | 26 ++++++++++++++++++++++++++
   2 files changed, 27 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index b1008a5058..822d8d4e9c 100644
@@ -98,6 +98,7 @@ config ROCKCHIP_RK322X
   config ROCKCHIP_RK3288
       bool "Support Rockchip RK3288"
       select CPU_V7A
+     select OF_BOARD_SETUP
       select SUPPORT_SPL
       select SPL
       select SUPPORT_TPL
arch/arm/mach-rockchip/rk3288/rk3288.c +5 -0
index 804abe8a1b..8a682675e6 100644
@@ -115,6 +115,32 @@ int rk_board_late_init(void)
       return rk3288_board_late_init();
   }
 
+#ifdef CONFIG_OF_BOARD_SETUP
+
+#define RK3288_HDMI_PHYS     0xff980000
+#define RK3288W_HDMI_REV     0x1A
+#define HDMI_CONFIG0_ID              0x04

arch/arm/mach-rockchip/rk3288/rk3288.c int rk_board_late_init(void) · line 132

Quoted 10 lines
arch/arm/mach-rockchip/rk3288/rk3288.c +10 -0
+
+int ft_board_setup(void *blob, bd_t *bd)
+{
+     u8 config0;
+     int ret;
+
+     config0 = readb(RK3288_HDMI_PHYS + HDMI_CONFIG0_ID);
+     if (config0 == RK3288W_HDMI_REV) {
+             ret = fdt_setprop_string(blob, 0,
+                                      "compatible", "rockchip,rk3288w");

Does this end up replacing the entire top-level compatible property? i.e. from:

Quoted 8 lines
         compatible = "vendor,board\0rockchip,rk3288";

to just:

         compatible = "rockchip,rk3288w";

If so, that's a bit of a problem for various drivers that care about the actual board compatible rather than the SoC.

Yes, It looks replacing the entire compatible. I think the root compatible is mostly untouchable because of this reason.

Quoted 6 lines

But, if we skip the root compatible and trying to replace individual nodes for W revision then it requires extra registration code on in the Linux drivers like Linux clock driver is registering the clock with rockchip,rk3288-cru but updating this compatible with rockchip,rk3288w-cru will require another registration code. Having common rockchip,rk3288w can be possible to check any code in the tree.

Right, it's definitely reasonable to update the top-level SoC compatible, we just need to be prepared to deal with a whole string list here. It looks like libfdt doesn't offer any nice helpers for inserting/removing/updating in string lists, but given that the SoC should be the last entry here we might be able to cheat a bit - just get the whole raw property, check that the final characters are exactly "rockchip,rk3288", and if so append a "w" to the end and write it back.

Robin.

author
#4 lore raw
Quoted 78 lines · Robin Murphy
Quoted 69 lines · Jagan Teki
Quoted 56 lines · Robin Murphy
Quoted 40 lines · Jagan Teki

The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like hclk_vio and usb host0 ohci.

In order to work these on the same in Linux kernel update the compatible the root compatible with rockchip,rk3288w before booting.

So, this support during of board setup code of rk3288.

---
   arch/arm/mach-rockchip/Kconfig         |  1 +
   arch/arm/mach-rockchip/rk3288/rk3288.c | 26 ++++++++++++++++++++++++++
   2 files changed, 27 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index b1008a5058..822d8d4e9c 100644
@@ -98,6 +98,7 @@ config ROCKCHIP_RK322X
   config ROCKCHIP_RK3288
       bool "Support Rockchip RK3288"
       select CPU_V7A
+     select OF_BOARD_SETUP
       select SUPPORT_SPL
       select SPL
       select SUPPORT_TPL
arch/arm/mach-rockchip/rk3288/rk3288.c +5 -0
index 804abe8a1b..8a682675e6 100644
@@ -115,6 +115,32 @@ int rk_board_late_init(void)
       return rk3288_board_late_init();
   }
 
+#ifdef CONFIG_OF_BOARD_SETUP
+
+#define RK3288_HDMI_PHYS     0xff980000
+#define RK3288W_HDMI_REV     0x1A
+#define HDMI_CONFIG0_ID              0x04

arch/arm/mach-rockchip/rk3288/rk3288.c int rk_board_late_init(void) · line 132

Quoted 10 lines
arch/arm/mach-rockchip/rk3288/rk3288.c +10 -0
+
+int ft_board_setup(void *blob, bd_t *bd)
+{
+     u8 config0;
+     int ret;
+
+     config0 = readb(RK3288_HDMI_PHYS + HDMI_CONFIG0_ID);
+     if (config0 == RK3288W_HDMI_REV) {
+             ret = fdt_setprop_string(blob, 0,
+                                      "compatible", "rockchip,rk3288w");

Does this end up replacing the entire top-level compatible property? i.e. from:

Quoted 8 lines
         compatible = "vendor,board\0rockchip,rk3288";

to just:

         compatible = "rockchip,rk3288w";

If so, that's a bit of a problem for various drivers that care about the actual board compatible rather than the SoC.

Yes, It looks replacing the entire compatible. I think the root compatible is mostly untouchable because of this reason.

Quoted 6 lines

But, if we skip the root compatible and trying to replace individual nodes for W revision then it requires extra registration code on in the Linux drivers like Linux clock driver is registering the clock with rockchip,rk3288-cru but updating this compatible with rockchip,rk3288w-cru will require another registration code. Having common rockchip,rk3288w can be possible to check any code in the tree.

Quoted 7 lines

Right, it's definitely reasonable to update the top-level SoC compatible, we just need to be prepared to deal with a whole string list here. It looks like libfdt doesn't offer any nice helpers for inserting/removing/updating in string lists, but given that the SoC should be the last entry here we might be able to cheat a bit - just get the whole raw property, check that the final characters are exactly "rockchip,rk3288", and if so append a "w" to the end and write it back.

Look like exiting fdt helper does print the compatible up to \0 instead of whole root compatible, at least I have checked with fdt_getpro and fdt_get_property.

author
#5 lore raw
Quoted 88 lines · Jagan Teki
Quoted 78 lines · Robin Murphy
Quoted 69 lines · Jagan Teki
Quoted 56 lines · Robin Murphy
Quoted 40 lines · Jagan Teki

The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like hclk_vio and usb host0 ohci.

In order to work these on the same in Linux kernel update the compatible the root compatible with rockchip,rk3288w before booting.

So, this support during of board setup code of rk3288.

---
   arch/arm/mach-rockchip/Kconfig         |  1 +
   arch/arm/mach-rockchip/rk3288/rk3288.c | 26 ++++++++++++++++++++++++++
   2 files changed, 27 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index b1008a5058..822d8d4e9c 100644
@@ -98,6 +98,7 @@ config ROCKCHIP_RK322X
   config ROCKCHIP_RK3288
       bool "Support Rockchip RK3288"
       select CPU_V7A
+     select OF_BOARD_SETUP
       select SUPPORT_SPL
       select SPL
       select SUPPORT_TPL
arch/arm/mach-rockchip/rk3288/rk3288.c +5 -0
index 804abe8a1b..8a682675e6 100644
@@ -115,6 +115,32 @@ int rk_board_late_init(void)
       return rk3288_board_late_init();
   }
 
+#ifdef CONFIG_OF_BOARD_SETUP
+
+#define RK3288_HDMI_PHYS     0xff980000
+#define RK3288W_HDMI_REV     0x1A
+#define HDMI_CONFIG0_ID              0x04

arch/arm/mach-rockchip/rk3288/rk3288.c int rk_board_late_init(void) · line 132

Quoted 10 lines
arch/arm/mach-rockchip/rk3288/rk3288.c +10 -0
+
+int ft_board_setup(void *blob, bd_t *bd)
+{
+     u8 config0;
+     int ret;
+
+     config0 = readb(RK3288_HDMI_PHYS + HDMI_CONFIG0_ID);
+     if (config0 == RK3288W_HDMI_REV) {
+             ret = fdt_setprop_string(blob, 0,
+                                      "compatible", "rockchip,rk3288w");

Does this end up replacing the entire top-level compatible property? i.e. from:

Quoted 8 lines
         compatible = "vendor,board\0rockchip,rk3288";

to just:

         compatible = "rockchip,rk3288w";

If so, that's a bit of a problem for various drivers that care about the actual board compatible rather than the SoC.

Yes, It looks replacing the entire compatible. I think the root compatible is mostly untouchable because of this reason.

Quoted 6 lines

But, if we skip the root compatible and trying to replace individual nodes for W revision then it requires extra registration code on in the Linux drivers like Linux clock driver is registering the clock with rockchip,rk3288-cru but updating this compatible with rockchip,rk3288w-cru will require another registration code. Having common rockchip,rk3288w can be possible to check any code in the tree.

Quoted 7 lines

Right, it's definitely reasonable to update the top-level SoC compatible, we just need to be prepared to deal with a whole string list here. It looks like libfdt doesn't offer any nice helpers for inserting/removing/updating in string lists, but given that the SoC should be the last entry here we might be able to cheat a bit - just get the whole raw property, check that the final characters are exactly "rockchip,rk3288", and if so append a "w" to the end and write it back.

Quoted 3 lines

Look like exiting fdt helper does print the compatible up to \0 instead of whole root compatible, at least I have checked with fdt_getpro and fdt_get_property.

Look like we didn't have any requirement to change the root compatible at this point since disabling ohci driver for legacy rk3288 revision chips of no use.

Jagan.

Reviewed-by on v1 1/1
#6 lore raw
In reply to Jagan Teki
Quoted 10 lines · Jagan Teki

The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like hclk_vio and usb host0 ohci.

In order to work these on the same in Linux kernel update the compatible the root compatible with rockchip,rk3288w before booting.

So, this support during of board setup code of rk3288.

Thanks,
- Kever

Quoted 54 lines
---
  arch/arm/mach-rockchip/Kconfig         |  1 +
  arch/arm/mach-rockchip/rk3288/rk3288.c | 26 ++++++++++++++++++++++++++
  2 files changed, 27 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index b1008a5058..822d8d4e9c 100644
@@ -98,6 +98,7 @@ config ROCKCHIP_RK322X
  config ROCKCHIP_RK3288
  	bool "Support Rockchip RK3288"
  	select CPU_V7A
+	select OF_BOARD_SETUP
  	select SUPPORT_SPL
  	select SPL
  	select SUPPORT_TPL
arch/arm/mach-rockchip/rk3288/rk3288.c +26 -0
index 804abe8a1b..8a682675e6 100644
@@ -115,6 +115,32 @@ int rk_board_late_init(void)
  	return rk3288_board_late_init();
  }
 
+#ifdef CONFIG_OF_BOARD_SETUP
+
+#define RK3288_HDMI_PHYS	0xff980000
+#define RK3288W_HDMI_REV	0x1A
+#define HDMI_CONFIG0_ID		0x04
+
+int ft_board_setup(void *blob, bd_t *bd)
+{
+	u8 config0;
+	int ret;
+
+	config0 = readb(RK3288_HDMI_PHYS + HDMI_CONFIG0_ID);
+	if (config0 == RK3288W_HDMI_REV) {
+		ret = fdt_setprop_string(blob, 0,
+					 "compatible", "rockchip,rk3288w");
+		if (ret < 0) {
+			printf("failed to set rk3288w compatible (ret=%d)\n",
+			       ret);
+			return ret;
+		}
+	}
+
+	return 0;
+}
+#endif
+
  static int do_clock(struct cmd_tbl *cmdtp, int flag, int argc,
  		    char *const argv[])
  {
author
#7 lore raw
Quoted 10 lines · Kever Yang
Quoted 7 lines · Jagan Teki

The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like hclk_vio and usb host0 ohci.

In order to work these on the same in Linux kernel update the compatible the root compatible with rockchip,rk3288w before booting.

Quoted 5 lines
Quoted 3 lines

So, this support during of board setup code of rk3288.

Added v2 for this. please have a look

Jagan.