rockchip: Add rk3288 SoC detection helper
Subsystems (3)
PATCH v3 1/2 rockchip: Add rk3288 SoC detection helper
Rockchip SoC's has a new revision chip for rk3288 SoCs.
RK3288 has a new revision chip called RK3288W which is similar but different hclk_vio clock and fixed OHCI host.
Add common Rockchip SoC detection helper to support this rk3288w detection.
---
Changes for v3:
- add rk3288 cpu spec header
.../include/asm/arch-rockchip/cpu_rk3288.h | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 arch/arm/include/asm/arch-rockchip/cpu_rk3288.h
arch/arm/include/asm/arch-rockchip/cpu_rk3288.h new file +49 -0
@@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Rockchip Electronics Co., Ltd. +*/ + +#ifndef __ASM_ARCH_CPU_RK3288_H +#define __ASM_ARCH_CPU_RK3288_H + +#include <asm/io.h> + +#define ROCKCHIP_CPU_MASK 0xffff0000 +#define ROCKCHIP_CPU_RK3288 0x32880000 + +#define ROCKCHIP_SOC_MASK (ROCKCHIP_CPU_MASK | 0xff) +#define ROCKCHIP_SOC_RK3288 (ROCKCHIP_CPU_RK3288 | 0x00) +#define ROCKCHIP_SOC_RK3288W (ROCKCHIP_CPU_RK3288 | 0x01) + +#define RK3288_HDMI_PHYS 0xff980000 +#define HDMI_CONFIG0_ID 0x4 +#define RK3288W_HDMI_REVID 0x1a + +static inline int rockchip_soc_id (void ) +{ +u8 reg; + +#if defined(CONFIG_ROCKCHIP_RK3288 ) + reg =readb (RK3288_HDMI_PHYS +HDMI_CONFIG0_ID ); +if (reg ==RK3288W_HDMI_REVID ) +return ROCKCHIP_SOC_RK3288W ; +else +return ROCKCHIP_SOC_RK3288 ; +#else +return 0 ; +#endif +} + +#define ROCKCHIP_SOC (id,ID ) \ +static inline bool soc_is_##id(void) \ +{ \ + int soc_id = rockchip_soc_id(); \ + if (soc_id) \ + return ((soc_id & ROCKCHIP_SOC_MASK) == ROCKCHIP_SOC_ ##ID); \ + return false; \ +} + +ROCKCHIP_SOC(rk3288, RK3288) +ROCKCHIP_SOC(rk3288w, RK3288W) + +#endif /* __ASM_ARCH_CPU_RK3288_H */
Signature · 1 line
2.25.1
PATCH v3 2/2 rockchip: rk3288: Add OF board setup
The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like hclk_vio in cru and usb host0 ohci.
Linux clock driver already handle this via rockchip,rk3288w-cru compatible.
USB ohci host can enable via dts for rk3288w based boards.
So, add fdt board setup code to update cru compatible with rk3288w-cru compatible if the SOC revision is RK3288W.
---
Changes for v3:
- use struct bd_info
- drop ifdef OF_BOARD_SETUP since it select by default
arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/rk3288/rk3288.c | 30 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+)
arch/arm/mach-rockchip/Kconfig +1 -0
@@ -99,6 +99,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 +30 -0
@@ -13,6 +13,7 @@#include <asm/io.h> #include <asm/arch-rockchip/bootrom.h> #include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cpu_rk3288.h> #include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/hardware.h> #include <asm/arch-rockchip/grf_rk3288.h>
@@ -115,6 +116,35 @@ int rk_board_late_init(void)return rk3288_board_late_init (); } +static int ft_rk3288w_setup (void *blob) +{ +const char *path; +int offs, ret; + + path ="/clock-controller@ff760000" ; + offs =fdt_path_offset (blob, path); +if (offs <0 ) { +debug ("failed to found fdt path %s\n" , path); +return offs; + } + + ret =fdt_setprop_string (blob, offs,"compatible" ,"rockchip,rk3288w-cru" ); +if (ret) { +printf ("failed to set rk3288w-cru compatible (ret=%d)\n" , ret); +return ret; + } + +return ret; +} + +int ft_board_setup (void *blob,struct bd_info *bd) +{ +if (soc_is_rk3288w ()) +return ft_rk3288w_setup (blob); + +return 0 ; +} +static int do_clock (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {
Signature · 1 line
2.25.1
Re: [PATCH v3 2/2] rockchip: rk3288: Add OF board setup
Quoted 6 lines · Jagan Teki
The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like
hclk_vioin cru and usb host0 ohci.Linux clock driver already handle this via rockchip,rk3288w-cru compatible.
Quoted 6 lines
USB ohci host can enable via dts for rk3288w based boards.
So, add fdt board setup code to update cru compatible with rk3288w-cru compatible if the SOC revision is RK3288W.
Signed-off-by Jagan Teki <[email protected]>
Thanks,
- Kever
Quoted 69 lines
---
Changes for v3:
- use structbd_info
- drop ifdefOF_BOARD_SETUPsince it select by defaultarch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/rk3288/rk3288.c | 30 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+)arch/arm/mach-rockchip/Kconfig +1
-0@@ -99,6 +99,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_TPLarch/arm/mach-rockchip/rk3288/rk3288.c +30
-0@@ -13,6 +13,7 @@#include <asm/io.h> #include <asm/arch-rockchip/bootrom.h> #include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cpu_rk3288.h> #include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/hardware.h> #include <asm/arch-rockchip/grf_rk3288.h> @@ -115,6 +116,35 @@ int rk_board_late_init(void)return rk3288_board_late_init (); } +static int ft_rk3288w_setup (void *blob) +{ +const char *path; +int offs, ret; + + path ="/clock-controller@ff760000" ; + offs =fdt_path_offset (blob, path); +if (offs <0 ) { +debug ("failed to found fdt path %s\n" , path); +return offs; + } + + ret =fdt_setprop_string (blob, offs,"compatible" ,"rockchip,rk3288w-cru" ); +if (ret) { +printf ("failed to set rk3288w-cru compatible (ret=%d)\n" , ret); +return ret; + } + +return ret; +} + +int ft_board_setup (void *blob,struct bd_info *bd) +{ +if (soc_is_rk3288w ()) +return ft_rk3288w_setup (blob); + +return 0 ; +} +static int do_clock (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {
Re: [PATCH v3 2/2] rockchip: rk3288: Add OF board setup
Quoted 8 lines · Kever Yang
Quoted 6 lines · Jagan Teki
The new rk3288 revision rk3288w has some changes with respect to legacy rk3288 like
hclk_vioin cru and usb host0 ohci.Linux clock driver already handle this via rockchip,rk3288w-cru compatible.
Quoted 7 lines
Quoted 6 lines
USB ohci host can enable via dts for rk3288w based boards.
So, add fdt board setup code to update cru compatible with rk3288w-cru compatible if the SOC revision is RK3288W.
Signed-off-by Jagan Teki <[email protected]>Reviewed-by Kever Yang<[email protected]>
Applied to u-boot-rockchip master for this patch set, thanks.
Quoted 79 lines
Thanks,
- KeverQuoted 68 lines
---
Changes for v3:
- use structbd_info
- drop ifdefOF_BOARD_SETUPsince it select by defaultarch/arm/mach-rockchip/Kconfig | 1 +
arch/arm/mach-rockchip/rk3288/rk3288.c| 30 ++++++++++++++++++++++++++2 files changed, 31 insertions(+)arch/arm/mach-rockchip/Kconfig +0
-0@@ -99,6 +99,7 @@ config ROCKCHIP_RK322Xconfig
ROCKCHIP_RK3288
bool "Support Rockchip RK3288"
selectCPU_V7A
+ selectOF_BOARD_SETUP
selectSUPPORT_SPL
select SPL
selectSUPPORT_TPLarch/arm/mach-rockchip/rk3288/rk3288.c +29
-0@@ -13,6 +13,7 @@ #include <asm/io.h> #include <asm/arch-rockchip/bootrom.h> #include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cpu_rk3288.h> #include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/hardware.h> #include <asm/arch-rockchip/grf_rk3288.h>@@ -115,6 +116,35 @@ int rk_board_late_init(void) return rk3288_board_late_init(); } +static int ft_rk3288w_setup(void *blob) +{ + const char *path; + int offs, ret; + + path = "/clock-controller@ff760000"; + offs = fdt_path_offset(blob, path); + if (offs < 0) { + debug("failed to found fdt path %s\n", path); + return offs; + } + + ret = fdt_setprop_string(blob, offs, "compatible","rockchip,rk3288w-cru" ); + if (ret) { + printf("failed to set rk3288w-cru compatible (ret=%d)\n", ret); + return ret; + } + + return ret; +} + +int ft_board_setup (void *blob,struct bd_info *bd) +{ + if (soc_is_rk3288w()) + return ft_rk3288w_setup(blob); + + return 0; +} + static int do_clock(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])Quoted 1 line
{
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 9 lines · Jagan Teki
Rockchip SoC's has a new revision chip for rk3288 SoCs.
RK3288 has a new revision chip called RK3288W which is similar but different
hclk_vioclock and fixed OHCI host.Add common Rockchip SoC detection helper to support this rk3288w detection.
Signed-off-by Jagan Teki <[email protected]>
Thanks,
- Kever
Quoted 63 lines
---
Changes for v3:
- add rk3288 cpu spec header.../include/asm/arch-rockchip/cpu_rk3288.h | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+)create mode 100644
arch/arm/include/asm/arch-rockchip/cpu_rk3288.harch/arm/include/asm/arch-rockchip/cpu_rk3288.h new file +49
-0@@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Rockchip Electronics Co., Ltd. +*/ + +#ifndef __ASM_ARCH_CPU_RK3288_H +#define __ASM_ARCH_CPU_RK3288_H + +#include <asm/io.h> + +#define ROCKCHIP_CPU_MASK 0xffff0000 +#define ROCKCHIP_CPU_RK3288 0x32880000 + +#define ROCKCHIP_SOC_MASK (ROCKCHIP_CPU_MASK | 0xff) +#define ROCKCHIP_SOC_RK3288 (ROCKCHIP_CPU_RK3288 | 0x00) +#define ROCKCHIP_SOC_RK3288W (ROCKCHIP_CPU_RK3288 | 0x01) + +#define RK3288_HDMI_PHYS 0xff980000 +#define HDMI_CONFIG0_ID 0x4 +#define RK3288W_HDMI_REVID 0x1a + +static inline int rockchip_soc_id (void ) +{ +u8 reg; + +#if defined(CONFIG_ROCKCHIP_RK3288 ) + reg =readb (RK3288_HDMI_PHYS +HDMI_CONFIG0_ID ); +if (reg ==RK3288W_HDMI_REVID ) +return ROCKCHIP_SOC_RK3288W ; +else +return ROCKCHIP_SOC_RK3288 ; +#else +return 0 ; +#endif +} + +#define ROCKCHIP_SOC (id,ID ) \ +static inline bool soc_is_##id(void) \ +{ \ + int soc_id = rockchip_soc_id(); \ + if (soc_id) \ + return ((soc_id & ROCKCHIP_SOC_MASK) == ROCKCHIP_SOC_ ##ID); \ + return false; \ +} + +ROCKCHIP_SOC(rk3288, RK3288) +ROCKCHIP_SOC(rk3288w, RK3288W) + +#endif /* __ASM_ARCH_CPU_RK3288_H */