[PATCH v2 1/2] rockchip: Add SoC detection helper

[PATCH v2 1/2] rockchip: Add SoC detection helper

[Jagan Teki]

Rockchip SoC's has a new revision chip for rk3288, rk3308
based SoCs.

RK3288 has a new revision chip called RK3288W which is relevantly
similar but different hclk_vio clock and working ohci host.

Add common rockchip SoC detection helper to support this rk3288w
detection.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- new patch

 arch/arm/include/asm/arch-rockchip/cpu.h | 49 ++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/cpu.h

diff --git a/arch/arm/include/asm/arch-rockchip/cpu.h b/arch/arm/include/asm/arch-rockchip/cpu.h
new file mode 100644
index 0000000000..d0d22e4967
--- /dev/null
+++ b/arch/arm/include/asm/arch-rockchip/cpu.h
@@ -0,0 +1,49 @@
+/* SPDX-License-Identifier: GPL-2.0+  */
+/*
+ * Rockchip Electronics Co., Ltd.
+ */
+
+#ifndef __ASM_ARCH_CPU_H
+#define __ASM_ARCH_CPU_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
-- 
2.25.1

[PATCH v2 1/2] rockchip: Add SoC detection helper

[Jagan Teki]

Rockchip SoC's has a new revision chip for rk3288, rk3308
based SoCs.

RK3288 has a new revision chip called RK3288W which is relevantly
similar but different hclk_vio clock and working ohci host.

Add common rockchip SoC detection helper to support this rk3288w
detection.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- new patch

 arch/arm/include/asm/arch-rockchip/cpu.h | 49 ++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/cpu.h

diff --git a/arch/arm/include/asm/arch-rockchip/cpu.h b/arch/arm/include/asm/arch-rockchip/cpu.h
new file mode 100644
index 0000000000..d0d22e4967
--- /dev/null
+++ b/arch/arm/include/asm/arch-rockchip/cpu.h
@@ -0,0 +1,49 @@
+/* SPDX-License-Identifier: GPL-2.0+  */
+/*
+ * Rockchip Electronics Co., Ltd.
+ */
+
+#ifndef __ASM_ARCH_CPU_H
+#define __ASM_ARCH_CPU_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
-- 
2.25.1

[PATCH v2 2/2] rockchip: rk3288: Add OF board setup

[Jagan Teki]

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.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- use soc detection helper
- add cru compatible change for rk3288w

 arch/arm/mach-rockchip/Kconfig         |  1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c | 33 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index b1008a5058..822d8d4e9c 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -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
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 804abe8a1b..9c873d2b6a 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -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.h>
 #include <asm/arch-rockchip/cru.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/grf_rk3288.h>
@@ -115,6 +116,38 @@ int rk_board_late_init(void)
 	return rk3288_board_late_init();
 }
 
+#if defined(CONFIG_OF_BOARD_SETUP)
+
+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, bd_t *bd)
+{
+	if (soc_is_rk3288w())
+		return ft_rk3288w_setup(blob);
+
+	return 0;
+}
+#endif
+
 static int do_clock(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
 {
-- 
2.25.1

[PATCH v2 2/2] rockchip: rk3288: Add OF board setup

[Jagan Teki]

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.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- use soc detection helper
- add cru compatible change for rk3288w

 arch/arm/mach-rockchip/Kconfig         |  1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c | 33 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index b1008a5058..822d8d4e9c 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -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
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 804abe8a1b..9c873d2b6a 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -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.h>
 #include <asm/arch-rockchip/cru.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/grf_rk3288.h>
@@ -115,6 +116,38 @@ int rk_board_late_init(void)
 	return rk3288_board_late_init();
 }
 
+#if defined(CONFIG_OF_BOARD_SETUP)
+
+static int ft_rk3288w_setup(void *blob)
+{
+	const char *path;
+	int offs, ret;
+
+	path = "/clock-controller at 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, bd_t *bd)
+{
+	if (soc_is_rk3288w())
+		return ft_rk3288w_setup(blob);
+
+	return 0;
+}
+#endif
+
 static int do_clock(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
 {
-- 
2.25.1

Re: [PATCH v2 1/2] rockchip: Add SoC detection helper

[Kever Yang]

Hi Jagan,


     This is all for rk3288, please just put it into rk3288.c instead of 
make a new cpu.h.


Thanks,

- Kever

On 2020/7/4 下午5:15, Jagan Teki wrote:
> Rockchip SoC's has a new revision chip for rk3288, rk3308
> based SoCs.
>
> RK3288 has a new revision chip called RK3288W which is relevantly
> similar but different hclk_vio clock and working ohci host.
>
> Add common rockchip SoC detection helper to support this rk3288w
> detection.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v2:
> - new patch
>
>   arch/arm/include/asm/arch-rockchip/cpu.h | 49 ++++++++++++++++++++++++
>   1 file changed, 49 insertions(+)
>   create mode 100644 arch/arm/include/asm/arch-rockchip/cpu.h
>
> diff --git a/arch/arm/include/asm/arch-rockchip/cpu.h b/arch/arm/include/asm/arch-rockchip/cpu.h
> new file mode 100644
> index 0000000000..d0d22e4967
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-rockchip/cpu.h
> @@ -0,0 +1,49 @@
> +/* SPDX-License-Identifier: GPL-2.0+  */
> +/*
> + * Rockchip Electronics Co., Ltd.
> + */
> +
> +#ifndef __ASM_ARCH_CPU_H
> +#define __ASM_ARCH_CPU_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

[PATCH v2 1/2] rockchip: Add SoC detection helper

[Kever Yang]

Hi Jagan,


 ??? This is all for rk3288, please just put it into rk3288.c instead of 
make a new cpu.h.


Thanks,

- Kever

On 2020/7/4 ??5:15, Jagan Teki wrote:
> Rockchip SoC's has a new revision chip for rk3288, rk3308
> based SoCs.
>
> RK3288 has a new revision chip called RK3288W which is relevantly
> similar but different hclk_vio clock and working ohci host.
>
> Add common rockchip SoC detection helper to support this rk3288w
> detection.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v2:
> - new patch
>
>   arch/arm/include/asm/arch-rockchip/cpu.h | 49 ++++++++++++++++++++++++
>   1 file changed, 49 insertions(+)
>   create mode 100644 arch/arm/include/asm/arch-rockchip/cpu.h
>
> diff --git a/arch/arm/include/asm/arch-rockchip/cpu.h b/arch/arm/include/asm/arch-rockchip/cpu.h
> new file mode 100644
> index 0000000000..d0d22e4967
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-rockchip/cpu.h
> @@ -0,0 +1,49 @@
> +/* SPDX-License-Identifier: GPL-2.0+  */
> +/*
> + * Rockchip Electronics Co., Ltd.
> + */
> +
> +#ifndef __ASM_ARCH_CPU_H
> +#define __ASM_ARCH_CPU_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

Re: [PATCH v2 1/2] rockchip: Add SoC detection helper

[Jagan Teki]

On Wed, Jul 8, 2020 at 3:43 PM Kever Yang <kever.yang@rock-chips.com> wrote:
>
> Hi Jagan,
>
>
>      This is all for rk3288, please just put it into rk3288.c instead of
> make a new cpu.h.

Yes, I have used cpu.h since rk3308 also has revision, if not to
consider than I will move to rk3288 specific.

Jagan.

[PATCH v2 1/2] rockchip: Add SoC detection helper

[Jagan Teki]

On Wed, Jul 8, 2020 at 3:43 PM Kever Yang <kever.yang@rock-chips.com> wrote:
>
> Hi Jagan,
>
>
>      This is all for rk3288, please just put it into rk3288.c instead of
> make a new cpu.h.

Yes, I have used cpu.h since rk3308 also has revision, if not to
consider than I will move to rk3288 specific.

Jagan.

Re: [PATCH v2 1/2] rockchip: Add SoC detection helper

[Kever Yang]

On 2020/7/8 下午6:29, Jagan Teki wrote:
> On Wed, Jul 8, 2020 at 3:43 PM Kever Yang <kever.yang@rock-chips.com> wrote:
>> Hi Jagan,
>>
>>
>>       This is all for rk3288, please just put it into rk3288.c instead of
>> make a new cpu.h.
> Yes, I have used cpu.h since rk3308 also has revision, if not to
> consider than I will move to rk3288 specific.

Please do it, thanks.


Kever

>
> Jagan.
>
>

[PATCH v2 1/2] rockchip: Add SoC detection helper

[Kever Yang]

On 2020/7/8 ??6:29, Jagan Teki wrote:
> On Wed, Jul 8, 2020 at 3:43 PM Kever Yang <kever.yang@rock-chips.com> wrote:
>> Hi Jagan,
>>
>>
>>       This is all for rk3288, please just put it into rk3288.c instead of
>> make a new cpu.h.
> Yes, I have used cpu.h since rk3308 also has revision, if not to
> consider than I will move to rk3288 specific.

Please do it, thanks.


Kever

>
> Jagan.
>
>