Skip to contentSkip to conversation

rk3188 uboot support

PATCH Superseded Heiko Stuebner 3 participants 45 messages Feb 3, 2017 – Feb 22, 2017

Subsystems (8)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Heiko Stuebner

author maintainer
#0 lore raw

v3 cover rk3188 uboot support

Hi,

this is meant as a status update and possible discussion for the core parts if needed.

After talking with Simon and Tom the order is now also correct with tpl -> spl -> uboot.

Status right now is:
- the full uboot still works
- the tpl/spl does start and is able to configure the ddr into a working state
- The jump spl -> bootrom -> uboot doesn't work though

On the other hand, Kever was able to make this work, booting from nand when building the image with a very ancient tool.

All newer tools (including boot_merger.c from Rockchip's uboot) do not produce working images. But it is possible to produce a working sd-boot image using the proprietary 1st-stage loader.

See the temporary mkuboot script in the last patch, which can create both types of images now (especially wrt. the needed rc4 encryption of everything).

Combining this (it does work using some special tool), it looks like there is still some minor glitch in the way we build the spl image somewhere.

Heiko Stuebner (16):
dm: allow limiting pre-reloc markings to spl or tpl
rockchip: move bootrom helper compilation to a hidden option
rockchip: mkimage: Allow encoding of loader code in spl images
rockchip: mkimage: Add support rk3188 serial
rockchip: serial: Adapt rockchip of-platdata driver for rk3188
rockchip: rk3188: Add header files for PMU and GRF
rockchip: rk3188: Add pinctrl driver
rockchip: rk3188: Add sysreset driver
rockchip: rk3188: Add rk3066/rk3188 clock bindings
rockchip: rk3188: Add clock driver
rockchip: rk3188: Add core devicetree files
rockchip: rk3188: Add core support
rockchip: rk3188: Add sdram driver
rockchip: rk3188: Add main, spl and tpl boards
rockchip: rk3188: Add Radxa Rock board
Add a temporary script that can create a bootimage for rk3188

 arch/arm/dts/Makefile                           |   1 +
 arch/arm/dts/rk3188-radxarock.dts               | 382 +++++++++
 arch/arm/dts/rk3188.dtsi                        | 601 +++++++++++++++
 arch/arm/dts/rk3xxx.dtsi                        | 417 ++++++++++
 arch/arm/include/asm/arch-rockchip/cru_rk3188.h | 191 +++++
 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h |  22 +
 arch/arm/include/asm/arch-rockchip/grf_rk3188.h | 589 ++++++++++++++
 arch/arm/include/asm/arch-rockchip/pmu_rk3188.h |  36 +
 arch/arm/mach-rockchip/Kconfig                  |  20 +
 arch/arm/mach-rockchip/Makefile                 |  14 +-
 arch/arm/mach-rockchip/rk3188-board-spl.c       | 220 ++++++
 arch/arm/mach-rockchip/rk3188-board-tpl.c       |  87 +++
 arch/arm/mach-rockchip/rk3188-board.c           |  71 ++
 arch/arm/mach-rockchip/rk3188/Kconfig           |  35 +
 arch/arm/mach-rockchip/rk3188/Makefile          |  11 +
 arch/arm/mach-rockchip/rk3188/clk_rk3188.c      |  33 +
 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c    | 985 ++++++++++++++++++++++++
 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c   |  55 ++
 board/radxa/rock/Kconfig                        |  15 +
 board/radxa/rock/MAINTAINERS                    |   6 +
 board/radxa/rock/Makefile                       |   7 +
 board/radxa/rock/rock.c                         |   7 +
 configs/rock_defconfig                          |  56 ++
 doc/driver-model/README.txt                     |   4 +
 drivers/clk/at91/pmc.c                          |   3 +-
 drivers/clk/rockchip/Makefile                   |   1 +
 drivers/clk/rockchip/clk_rk3188.c               | 523 +++++++++++++
 drivers/core/root.c                             |   2 +-
 drivers/core/util.c                             |  29 +
 drivers/pinctrl/Kconfig                         |   9 +
 drivers/pinctrl/pinctrl-uclass.c                |   3 +-
 drivers/pinctrl/rockchip/Makefile               |   1 +
 drivers/pinctrl/rockchip/pinctrl_rk3188.c       | 611 +++++++++++++++
 drivers/serial/serial_rockchip.c                |  19 +-
 drivers/sysreset/Makefile                       |   1 +
 drivers/sysreset/sysreset_rk3188.c              |  47 ++
 include/configs/rk3188_common.h                 | 125 +++
 include/configs/rock.h                          |  30 +
 include/dm/util.h                               |   2 +
 include/dt-bindings/clock/rk3066a-cru.h         |  32 +
 include/dt-bindings/clock/rk3188-cru-common.h   | 256 ++++++
 include/dt-bindings/clock/rk3188-cru.h          |  48 ++
 mkuboot                                         |  35 +
 scripts/Makefile.spl                            |   7 +-
 tools/dtoc/dtoc.py                              |   2 +
 tools/rkcommon.c                                |  34 +-
 tools/rkcommon.h                                |  22 +
 tools/rkimage.c                                 |   3 +
 tools/rksd.c                                    |   4 +
 tools/rkspi.c                                   |   4 +
 50 files changed, 5707 insertions(+), 11 deletions(-)
 create mode 100644 arch/arm/dts/rk3188-radxarock.dts
 create mode 100644 arch/arm/dts/rk3188.dtsi
 create mode 100644 arch/arm/dts/rk3xxx.dtsi
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3188.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3188.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
 create mode 100644 arch/arm/mach-rockchip/rk3188-board-spl.c
 create mode 100644 arch/arm/mach-rockchip/rk3188-board-tpl.c
 create mode 100644 arch/arm/mach-rockchip/rk3188-board.c
 create mode 100644 arch/arm/mach-rockchip/rk3188/Kconfig
 create mode 100644 arch/arm/mach-rockchip/rk3188/Makefile
 create mode 100644 arch/arm/mach-rockchip/rk3188/clk_rk3188.c
 create mode 100644 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c
 create mode 100644 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
 create mode 100644 board/radxa/rock/Kconfig
 create mode 100644 board/radxa/rock/MAINTAINERS
 create mode 100644 board/radxa/rock/Makefile
 create mode 100644 board/radxa/rock/rock.c
 create mode 100644 configs/rock_defconfig
 create mode 100644 drivers/clk/rockchip/clk_rk3188.c
 create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c
 create mode 100644 drivers/sysreset/sysreset_rk3188.c
 create mode 100644 include/configs/rk3188_common.h
 create mode 100644 include/configs/rock.h
 create mode 100644 include/dt-bindings/clock/rk3066a-cru.h
 create mode 100644 include/dt-bindings/clock/rk3188-cru-common.h
 create mode 100644 include/dt-bindings/clock/rk3188-cru.h
 create mode 100755 mkuboot
Signature · 1 line
2.11.0
author maintainer
#1 lore raw

PATCH v3 1/16 dm: allow limiting pre-reloc markings to spl or tpl

Right now the u-boot,dm-pre-reloc flag will make each marked node always appear in both spl and tpl. But systems needing an additional tpl might have special constraints for each, like the spl needing to be very tiny.

So introduce two additional flags to mark nodes for only spl or tpl environments and introduce a function dm_fdt_pre_reloc to automate the necessary checks in code instances checking for pre-relocation flags.

The behaviour of the original flag stays untouched and still marks a node for both spl and tpl.

---
 doc/driver-model/README.txt      |  4 ++++
 drivers/clk/at91/pmc.c           |  3 ++-
 drivers/core/root.c              |  2 +-
 drivers/core/util.c              | 29 +++++++++++++++++++++++++++++
 drivers/pinctrl/pinctrl-uclass.c |  3 ++-
 include/dm/util.h                |  2 ++
 scripts/Makefile.spl             |  7 ++++++-
 tools/dtoc/dtoc.py               |  2 ++
 8 files changed, 48 insertions(+), 4 deletions(-)
doc/driver-model/README.txt +4 -0
index 1b5ccec4b2..af28b43c7b 100644
@@ -825,6 +825,10 @@ drivers marked with DM_FLAG_PRE_RELOC or the device tree
 'u-boot,dm-pre-reloc' flag are initialised prior to relocation. This helps
 to reduce the driver model overhead.
 
+It is possible to limit this to specific relocation steps, by using
+the more specialized 'u-boot,dm-spl' and 'u-boot,dm-tpl' flags
+in the devicetree.
+
 Then post relocation we throw that away and re-init driver model again.
 For drivers which require some sort of continuity between pre- and
 post-relocation devices, we can provide access to the pre-relocation
drivers/clk/at91/pmc.c +2 -1
index 76ba91af81..c098efc9f7 100644
@@ -10,6 +10,7 @@
 #include <dm/device.h>
 #include <dm/lists.h>
 #include <dm/root.h>
+#include <dm/util.h>
 #include "pmc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -56,7 +57,7 @@ int at91_clk_sub_device_bind(struct udevice *dev, const char *drv_name)
 	     offset > 0;
 	     offset = fdt_next_subnode(fdt, offset)) {
 		if (pre_reloc_only &&
-		    !fdt_getprop(fdt, offset, "u-boot,dm-pre-reloc", NULL))
+		    !dm_fdt_pre_reloc(fdt, offset))
 			continue;
 		/*
 		 * If this node has "compatible" property, this is not
drivers/core/root.c +1 -1
index 9edfc1efb6..45f990ba9e 100644
@@ -205,7 +205,7 @@ int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset,
 	     offset > 0;
 	     offset = fdt_next_subnode(blob, offset)) {
 		if (pre_reloc_only &&
-		    !fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL))
+		    !dm_fdt_pre_reloc(blob, offset))
 			continue;
 		if (!fdtdec_get_is_enabled(blob, offset)) {
 			dm_dbg("   - ignoring disabled device\n");
drivers/core/util.c +29 -0
index e01dd06d28..a67434b80d 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <libfdt.h>
 #include <vsprintf.h>
 
 void dm_warn(const char *fmt, ...)
@@ -35,3 +36,31 @@ int list_count_items(struct list_head *head)
 
 	return count;
 }
+
+int dm_fdt_pre_reloc(const void *blob, int offset)
+{
+	bool dm_spl, dm_tpl;
+
+	if (fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL))
+		return 1;
+
+	dm_spl = fdt_getprop(blob, offset, "u-boot,dm-spl", NULL);
+	dm_tpl = fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL);
+
+#ifdef CONFIG_TPL_BUILD
+	if (dm_tpl)
+		return 1;
+#elif defined(CONFIG_SPL_BUILD)
+	if (dm_spl)
+		return 1;
+#else
+	/*
+	 * In regular builds individual spl and tpl handling both
+	 * count as handled pre-relocation for later second init.
+	 */
+	if (dm_spl || dm_tpl)
+		return 1;
+#endif
+
+	return 0;
+}
drivers/pinctrl/pinctrl-uclass.c +2 -1
index 02ab9b4afd..9e0122906c 100644
@@ -12,6 +12,7 @@
 #include <dm/lists.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass.h>
+#include <dm/util.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -131,7 +132,7 @@ static int pinconfig_post_bind(struct udevice *dev)
 	     offset > 0;
 	     offset = fdt_next_subnode(fdt, offset)) {
 		if (pre_reloc_only &&
-		    !fdt_getprop(fdt, offset, "u-boot,dm-pre-reloc", NULL))
+		    !dm_fdt_pre_reloc(fdt, offset))
 			continue;
 		/*
 		 * If this node has "compatible" property, this is not
include/dm/util.h +2 -0
index 15daa3d19f..38c023ce66 100644
@@ -48,4 +48,6 @@ static inline void dm_dump_devres(void)
 }
 #endif
 
+int dm_fdt_pre_reloc(const void *blob, int offset);
+
 #endif
scripts/Makefile.spl +6 -1
index c962bbca2c..60bd844e48 100644
@@ -206,8 +206,13 @@ $(obj)/$(SPL_BIN)-pad.bin: $(obj)/$(SPL_BIN)
 # 'u-boot,dm-pre-reloc' property and thus are not needed by SPL. The second
 # pass removes various unused properties from the remaining nodes.
 # The output is typically a much smaller device tree file.
+ifeq ($(CONFIG_TPL_BUILD),y)
+fdtgrep_props := -b u-boot,dm-pre-reloc -b u-boot,dm-tpl
+else
+fdtgrep_props := -b u-boot,dm-pre-reloc -b u-boot,dm-spl
+endif
 quiet_cmd_fdtgrep = FDTGREP $@
-      cmd_fdtgrep = $(objtree)/tools/fdtgrep -b u-boot,dm-pre-reloc -RT $< \
+      cmd_fdtgrep = $(objtree)/tools/fdtgrep $(fdtgrep_props) -RT $< \
 		-n /chosen -O dtb | \
 	$(objtree)/tools/fdtgrep -r -O dtb - -o $@ \
 		$(addprefix -P ,$(subst $\",,$(CONFIG_OF_SPL_REMOVE_PROPS)))
tools/dtoc/dtoc.py +2 -0
index 11050b66f7..232f8ff739 100755
@@ -30,6 +30,8 @@ PROP_IGNORE_LIST = [
     "status",
     'phandle',
     'u-boot,dm-pre-reloc',
+    'u-boot,dm-tpl',
+    'u-boot,dm-spl',
 ]
 
 # C type declarations for the tyues we support
Signature · 1 line
2.11.0
#2 lore raw

PATCH v3 1/16 dm: allow limiting pre-reloc markings to spl or tpl

Quoted 14 lines · Heiko Stuebner

Right now the u-boot,dm-pre-reloc flag will make each marked node always appear in both spl and tpl. But systems needing an additional tpl might have special constraints for each, like the spl needing to be very tiny.

So introduce two additional flags to mark nodes for only spl or tpl environments and introduce a function dm_fdt_pre_reloc to automate the necessary checks in code instances checking for pre-relocation flags.

The behaviour of the original flag stays untouched and still marks a node for both spl and tpl.

Quoted 10 lines
---
 doc/driver-model/README.txt      |  4 ++++
 drivers/clk/at91/pmc.c           |  3 ++-
 drivers/core/root.c              |  2 +-
 drivers/core/util.c              | 29 +++++++++++++++++++++++++++++
 drivers/pinctrl/pinctrl-uclass.c |  3 ++-
 include/dm/util.h                |  2 ++
 scripts/Makefile.spl             |  7 ++++++-
 tools/dtoc/dtoc.py               |  2 ++
 8 files changed, 48 insertions(+), 4 deletions(-)

s/u-boot/U-Boot

Please add a comment for dm_fdt_pre_reloc() in the header file.

Two things to consider:

- Should we drop the use of u-boot,dm-pre-reloc in Makefile.spl, and convert all users to your version? This would mean having both u-boot,dm-pre-reloc and u-boot,dm-spl in some cases, I suspect.

- Can you use #ifdef in SPL/TPL to reduce code size fractionally in dm_fdt_pre_reloc()?

Regards,
Simon

author maintainer
#3 lore raw

PATCH v3 1/16 dm: allow limiting pre-reloc markings to spl or tpl

Hi Simon,

Am Montag, 6. Februar 2017, 07:34:54 CET schrieb Simon Glass:

Quoted 31 lines · Heiko Stuebner
Quoted 16 lines

Right now the u-boot,dm-pre-reloc flag will make each marked node always appear in both spl and tpl. But systems needing an additional tpl might have special constraints for each, like the spl needing to be very tiny.

So introduce two additional flags to mark nodes for only spl or tpl environments and introduce a function dm_fdt_pre_reloc to automate the necessary checks in code instances checking for pre-relocation flags.

The behaviour of the original flag stays untouched and still marks a node for both spl and tpl.

---

Quoted 9 lines
 doc/driver-model/README.txt      |  4 ++++
 drivers/clk/at91/pmc.c           |  3 ++-
 drivers/core/root.c              |  2 +-
 drivers/core/util.c              | 29 +++++++++++++++++++++++++++++
 drivers/pinctrl/pinctrl-uclass.c |  3 ++-
 include/dm/util.h                |  2 ++
 scripts/Makefile.spl             |  7 ++++++-
 tools/dtoc/dtoc.py               |  2 ++
 8 files changed, 48 insertions(+), 4 deletions(-)

s/u-boot/U-Boot

Quoted 7 lines

Please add a comment for dm_fdt_pre_reloc() in the header file.

Two things to consider:

- Should we drop the use of u-boot,dm-pre-reloc in Makefile.spl, and convert all users to your version? This would mean having both u-boot,dm-pre-reloc and u-boot,dm-spl in some cases, I suspect.

^^ u-boot,dm-spl and u-boot,dm-tpl I guess

Dropping u-boot,dm-pre-reloc is for you to decide, as you wrote the original implementation ;-) . It will save one fdt-query but might need several iterations as I guess new boards will add new ones after we remove the old ones.

Quoted 2 lines

- Can you use #ifdef in SPL/TPL to reduce code size fractionally in dm_fdt_pre_reloc()?

Do you mean moving the
+ dm_spl = fdt_getprop(blob, offset, "u-boot,dm-spl", NULL);
+ dm_tpl = fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL);

into the existing #ifdef CONFIG_TPL_BUILD / SPL_BUILD blocks or something else?

Thanks
Heiko

#4 lore raw

PATCH v3 1/16 dm: allow limiting pre-reloc markings to spl or tpl

Hi Heiko,

Quoted 42 lines · Heiko St?bner

Hi Simon,

Am Montag, 6. Februar 2017, 07:34:54 CET schrieb Simon Glass:

Quoted 31 lines · Heiko Stuebner
Quoted 16 lines

Right now the u-boot,dm-pre-reloc flag will make each marked node always appear in both spl and tpl. But systems needing an additional tpl might have special constraints for each, like the spl needing to be very tiny.

So introduce two additional flags to mark nodes for only spl or tpl environments and introduce a function dm_fdt_pre_reloc to automate the necessary checks in code instances checking for pre-relocation flags.

The behaviour of the original flag stays untouched and still marks a node for both spl and tpl.

---

Quoted 9 lines
 doc/driver-model/README.txt      |  4 ++++
 drivers/clk/at91/pmc.c           |  3 ++-
 drivers/core/root.c              |  2 +-
 drivers/core/util.c              | 29 +++++++++++++++++++++++++++++
 drivers/pinctrl/pinctrl-uclass.c |  3 ++-
 include/dm/util.h                |  2 ++
 scripts/Makefile.spl             |  7 ++++++-
 tools/dtoc/dtoc.py               |  2 ++
 8 files changed, 48 insertions(+), 4 deletions(-)

s/u-boot/U-Boot

Quoted 7 lines

Please add a comment for dm_fdt_pre_reloc() in the header file.

Two things to consider:

- Should we drop the use of u-boot,dm-pre-reloc in Makefile.spl, and convert all users to your version? This would mean having both u-boot,dm-pre-reloc and u-boot,dm-spl in some cases, I suspect.

Quoted 6 lines

^^ u-boot,dm-spl and u-boot,dm-tpl I guess

Dropping u-boot,dm-pre-reloc is for you to decide, as you wrote the original implementation ;-) . It will save one fdt-query but might need several iterations as I guess new boards will add new ones after we remove the old ones.

Let's do it. It is more efficient and I don't expect it to cause many problems if we get it in at the start of the merge window.

Quoted 10 lines
Quoted 3 lines

- Can you use #ifdef in SPL/TPL to reduce code size fractionally in dm_fdt_pre_reloc()?

Do you mean moving the

drivers/core/util.c +2 -0
+       dm_spl = fdt_getprop(blob, offset, "u-boot,dm-spl", NULL);
+       dm_tpl = fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL);

into the existing #ifdef CONFIG_TPL_BUILD / SPL_BUILD blocks or something else?

Well I don't think it matters, but the idea is that there would then be no point in checking u-boot,dm-tpl except when CONFIG_TPL_BUILD is defined.

Regards,
Simon

author maintainer
#5 lore raw

PATCH v3 2/16 rockchip: move bootrom helper compilation to a hidden option

In reply to Heiko Stuebner

Right now the ROCKCHIP_SPL_BACK_TO_BROM option both triggers compilation of the bootrom hook-code as well as enabling the behaviour of loading the full uboot via the boot.

New added socs may always need the bootrom code, while still being able to decide between loading uboot regularly or via the bootrom separately.

So move the compilation of the bootrom code to a hidden option that gets selected by ROCKCHIP_SPL_BACK_TO_BROM, but can also be selected by other parts.

---
 arch/arm/mach-rockchip/Kconfig  | 4 ++++
 arch/arm/mach-rockchip/Makefile | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
arch/arm/mach-rockchip/Kconfig +4 -0
index 5c4a4c2291..a776df35f4 100644
@@ -37,11 +37,15 @@ config ROCKCHIP_RK3399
 config ROCKCHIP_SPL_BACK_TO_BROM
 	bool "SPL returns to bootrom"
 	default y if ROCKCHIP_RK3036
+	select ROCKCHIP_BROM_HELPER
 	help
 	  Rockchip SoCs have ability to load SPL & U-Boot binary. If enabled,
           SPL will return to the boot rom, which will then load the U-Boot
           binary to keep going on.
 
+config ROCKCHIP_BROM_HELPER
+	bool
+
 config SPL_MMC_SUPPORT
 	default y if !ROCKCHIP_SPL_BACK_TO_BROM
 
arch/arm/mach-rockchip/Makefile +1 -1
index 6e79fed485..f9ccc9bb2c 100644
@@ -7,7 +7,7 @@
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o
-obj-$(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) += save_boot_param.o
+obj-$(CONFIG_ROCKCHIP_BROM_HELPER) += save_boot_param.o
 else
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board.o
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board.o
Signature · 1 line
2.11.0
#6 lore raw

PATCH v3 2/16 rockchip: move bootrom helper compilation to a hidden option

Quoted 12 lines · Heiko Stuebner

Right now the ROCKCHIP_SPL_BACK_TO_BROM option both triggers compilation of the bootrom hook-code as well as enabling the behaviour of loading the full uboot via the boot.

New added socs may always need the bootrom code, while still being able to decide between loading uboot regularly or via the bootrom separately.

So move the compilation of the bootrom code to a hidden option that gets selected by ROCKCHIP_SPL_BACK_TO_BROM, but can also be selected by other parts.

Quoted 5 lines
---
 arch/arm/mach-rockchip/Kconfig  | 4 ++++
 arch/arm/mach-rockchip/Makefile | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

s/uboot/U-Boot/

author maintainer
#7 lore raw

PATCH v3 3/16 rockchip: mkimage: Allow encoding of loader code in spl images

In reply to Heiko Stuebner

Rockchip SoCs allow the spl code to be rc4-encoded, not only the image header, but only newer SoCs allow this encoding to be disabled.

The rk3188 is not part of those and requires its boot code to be rc4-encoded with the regular key. So add the ability to do this encoding via a setting on a per-soc basis when building spl images.

---
 tools/rkcommon.c | 33 +++++++++++++++++++++++++++++----
 tools/rkcommon.h | 22 ++++++++++++++++++++++
 tools/rkimage.c  |  3 +++
 tools/rksd.c     |  4 ++++
 tools/rkspi.c    |  4 ++++
 5 files changed, 62 insertions(+), 4 deletions(-)
tools/rkcommon.c +29 -4
index 0a072aa83c..ed9b24137a 100644
@@ -46,17 +46,19 @@ struct header0_info {
  * @imagename:		Image name(passed by "mkimage -n")
  * @spl_hdr:		Boot ROM requires a 4-bytes spl header
  * @spl_size:		Spl size(include extra 4-bytes spl header)
+ * @spl_rc4:		RC4 encode the SPL binary (same key as header)
  */
 struct spl_info {
 	const char *imagename;
 	const char *spl_hdr;
 	const uint32_t spl_size;
+	const bool spl_rc4;
 };
 
 static struct spl_info spl_infos[] = {
-	{ "rk3036", "RK30", 0x1000 },
-	{ "rk3288", "RK32", 0x8000 },
-	{ "rk3399", "RK33", 0x20000 },
+	{ "rk3036", "RK30", 0x1000, false },
+	{ "rk3288", "RK32", 0x8000, false },
+	{ "rk3399", "RK33", 0x20000, false },
 };
 
 static unsigned char rc4_key[16] = {
@@ -113,6 +115,16 @@ int rkcommon_get_spl_size(struct image_tool_params *params)
 	return info->spl_size;
 }
 
+bool rkcommon_need_rc4_spl(struct image_tool_params *params)
+{
+	struct spl_info *info = rkcommon_get_spl_info(params->imagename);
+
+	/*
+	 * info would not be NULL, because of we checked params before.
+	 */
+	return info->spl_rc4;
+}
+
 int rkcommon_set_header(void *buf, uint file_size,
 			struct image_tool_params *params)
 {
@@ -124,7 +136,7 @@ int rkcommon_set_header(void *buf, uint file_size,
 	memset(buf,  '\0', RK_INIT_OFFSET * RK_BLK_SIZE);
 	hdr = (struct header0_info *)buf;
 	hdr->signature = RK_SIGNATURE;
-	hdr->disable_rc4 = 1;
+	hdr->disable_rc4 = !rkcommon_need_rc4_spl(params);
 	hdr->init_offset = RK_INIT_OFFSET;
 
 	hdr->init_size = (file_size + RK_BLK_SIZE - 1) / RK_BLK_SIZE;
@@ -135,3 +147,16 @@ int rkcommon_set_header(void *buf, uint file_size,
 
 	return 0;
 }
+
+void rkcommon_rc4_encode_spl(void *buf, unsigned int offset, unsigned int size)
+{
+	unsigned int remaining = size;
+
+	while (remaining > 0) {
+		int step = (remaining > RK_BLK_SIZE) ? RK_BLK_SIZE : remaining;
+
+		rc4_encode(buf + offset, step, rc4_key);
+		offset += RK_BLK_SIZE;
+		remaining -= step;
+	}
+}
tools/rkcommon.h +22 -0
index c69540f5f3..b4f6f327dc 100644
@@ -55,4 +55,26 @@ int rkcommon_get_spl_size(struct image_tool_params *params);
 int rkcommon_set_header(void *buf, uint file_size,
 			struct image_tool_params *params);
 
+/**
+ * rkcommon_need_rc4_spl() - check if rc4 encoded spl is required
+ *
+ * Some socs cannot disable the rc4-encryption of the spl binary.
+ * rc4 encryption is disabled normally except on socs that cannot
+ * handle unencrypted binaries.
+ * @return true or false depending on rc4 being required.
+ */
+bool rkcommon_need_rc4_spl(struct image_tool_params *params);
+
+/**
+ * rkcommon_rc4_encode_spl() - encode the spl binary
+ *
+ * Encrypts the SPL binary using the generic rc4 key as required
+ * by some socs.
+ *
+ * @buf:	Pointer to the SPL data (header and SPL binary)
+ * @offset:	offset inside buf to start at
+ * @size:	number of bytes to encode
+ */
+void rkcommon_rc4_encode_spl(void *buf, unsigned int offset, unsigned int size);
+
 #endif
tools/rkimage.c +3 -0
index ef31cb6944..44d098c775 100644
@@ -28,6 +28,9 @@ static void rkimage_set_header(void *buf, struct stat *sbuf, int ifd,
 {
 	memcpy(buf + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params),
 	       RK_SPL_HDR_SIZE);
+
+	if (rkcommon_need_rc4_spl(params))
+		rkcommon_rc4_encode_spl(buf, 4, params->file_size);
 }
 
 static int rkimage_extract_subimage(void *buf, struct image_tool_params *params)
tools/rksd.c +4 -0
index a2baa74d31..ff2233ff2d 100644
@@ -41,6 +41,10 @@ static void rksd_set_header(void *buf,  struct stat *sbuf,  int ifd,
 
 	memcpy(buf + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params),
 	       RK_SPL_HDR_SIZE);
+
+	if (rkcommon_need_rc4_spl(params))
+		rkcommon_rc4_encode_spl(buf, RK_SPL_START - 4,
+					params->file_size - RK_SPL_START + 4);
 }
 
 static int rksd_extract_subimage(void *buf,  struct image_tool_params *params)
tools/rkspi.c +4 -0
index a0b0051d38..0271d2e817 100644
@@ -48,6 +48,10 @@ static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd,
 	memcpy(buf + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params),
 	       RK_SPL_HDR_SIZE);
 
+	if (rkcommon_need_rc4_spl(params))
+		rkcommon_rc4_encode_spl(buf, RK_SPL_START - 4,
+					params->file_size - RK_SPL_START + 4);
+
 	/*
 	 * Spread the image out so we only use the first 2KB of each 4KB
 	 * region. This is a feature of the SPI format required by the Rockchip
Signature · 1 line
2.11.0
#8 lore raw

PATCH v3 3/16 rockchip: mkimage: Allow encoding of loader code in spl images

Quoted 7 lines · Heiko Stuebner

Rockchip SoCs allow the spl code to be rc4-encoded, not only the image header, but only newer SoCs allow this encoding to be disabled.

The rk3188 is not part of those and requires its boot code to be rc4-encoded with the regular key. So add the ability to do this encoding via a setting on a per-soc basis when building spl images.

Quoted 8 lines
---
 tools/rkcommon.c | 33 +++++++++++++++++++++++++++++----
 tools/rkcommon.h | 22 ++++++++++++++++++++++
 tools/rkimage.c  |  3 +++
 tools/rksd.c     |  4 ++++
 tools/rkspi.c    |  4 ++++
 5 files changed, 62 insertions(+), 4 deletions(-)
#9 lore raw

PATCH v3 3/16 rockchip: mkimage: Allow encoding of loader code in spl images

In reply to Heiko Stuebner

Hi Heiko,

Quoted 151 lines · Heiko Stuebner

Rockchip SoCs allow the spl code to be rc4-encoded, not only the image header, but only newer SoCs allow this encoding to be disabled.

The rk3188 is not part of those and requires its boot code to be rc4-encoded with the regular key. So add the ability to do this encoding via a setting on a per-soc basis when building spl images.

---
  tools/rkcommon.c | 33 +++++++++++++++++++++++++++++----
  tools/rkcommon.h | 22 ++++++++++++++++++++++
  tools/rkimage.c  |  3 +++
  tools/rksd.c     |  4 ++++
  tools/rkspi.c    |  4 ++++
  5 files changed, 62 insertions(+), 4 deletions(-)
tools/rkcommon.c +29 -4
index 0a072aa83c..ed9b24137a 100644
@@ -46,17 +46,19 @@ struct header0_info {
   * @imagename:		Image name(passed by "mkimage -n")
   * @spl_hdr:		Boot ROM requires a 4-bytes spl header
   * @spl_size:		Spl size(include extra 4-bytes spl header)
+ * @spl_rc4:		RC4 encode the SPL binary (same key as header)
   */
  struct spl_info {
  	const char *imagename;
  	const char *spl_hdr;
  	const uint32_t spl_size;
+	const bool spl_rc4;
  };
 
  static struct spl_info spl_infos[] = {
-	{ "rk3036", "RK30", 0x1000 },
-	{ "rk3288", "RK32", 0x8000 },
-	{ "rk3399", "RK33", 0x20000 },
+	{ "rk3036", "RK30", 0x1000, false },
+	{ "rk3288", "RK32", 0x8000, false },
+	{ "rk3399", "RK33", 0x20000, false },
  };
 
  static unsigned char rc4_key[16] = {
@@ -113,6 +115,16 @@ int rkcommon_get_spl_size(struct image_tool_params *params)
  	return info->spl_size;
  }
 
+bool rkcommon_need_rc4_spl(struct image_tool_params *params)
+{
+	struct spl_info *info = rkcommon_get_spl_info(params->imagename);
+
+	/*
+	 * info would not be NULL, because of we checked params before.
+	 */
+	return info->spl_rc4;
+}
+
  int rkcommon_set_header(void *buf, uint file_size,
  			struct image_tool_params *params)
  {
@@ -124,7 +136,7 @@ int rkcommon_set_header(void *buf, uint file_size,
  	memset(buf,  '\0', RK_INIT_OFFSET * RK_BLK_SIZE);
  	hdr = (struct header0_info *)buf;
  	hdr->signature = RK_SIGNATURE;
-	hdr->disable_rc4 = 1;
+	hdr->disable_rc4 = !rkcommon_need_rc4_spl(params);
  	hdr->init_offset = RK_INIT_OFFSET;
 
  	hdr->init_size = (file_size + RK_BLK_SIZE - 1) / RK_BLK_SIZE;
@@ -135,3 +147,16 @@ int rkcommon_set_header(void *buf, uint file_size,
 
  	return 0;
  }
+
+void rkcommon_rc4_encode_spl(void *buf, unsigned int offset, unsigned int size)
+{
+	unsigned int remaining = size;
+
+	while (remaining > 0) {
+		int step = (remaining > RK_BLK_SIZE) ? RK_BLK_SIZE : remaining;
+
+		rc4_encode(buf + offset, step, rc4_key);
+		offset += RK_BLK_SIZE;
+		remaining -= step;
+	}
+}
tools/rkcommon.h +22 -0
index c69540f5f3..b4f6f327dc 100644
@@ -55,4 +55,26 @@ int rkcommon_get_spl_size(struct image_tool_params *params);
  int rkcommon_set_header(void *buf, uint file_size,
  			struct image_tool_params *params);
 
+/**
+ * rkcommon_need_rc4_spl() - check if rc4 encoded spl is required
+ *
+ * Some socs cannot disable the rc4-encryption of the spl binary.
+ * rc4 encryption is disabled normally except on socs that cannot
+ * handle unencrypted binaries.
+ * @return true or false depending on rc4 being required.
+ */
+bool rkcommon_need_rc4_spl(struct image_tool_params *params);
+
+/**
+ * rkcommon_rc4_encode_spl() - encode the spl binary
+ *
+ * Encrypts the SPL binary using the generic rc4 key as required
+ * by some socs.
+ *
+ * @buf:	Pointer to the SPL data (header and SPL binary)
+ * @offset:	offset inside buf to start at
+ * @size:	number of bytes to encode
+ */
+void rkcommon_rc4_encode_spl(void *buf, unsigned int offset, unsigned int size);
+
  #endif
tools/rkimage.c +3 -0
index ef31cb6944..44d098c775 100644
@@ -28,6 +28,9 @@ static void rkimage_set_header(void *buf, struct stat *sbuf, int ifd,
  {
  	memcpy(buf + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params),
  	       RK_SPL_HDR_SIZE);
+
+	if (rkcommon_need_rc4_spl(params))
+		rkcommon_rc4_encode_spl(buf, 4, params->file_size);
  }
 
  static int rkimage_extract_subimage(void *buf, struct image_tool_params *params)
tools/rksd.c +4 -0
index a2baa74d31..ff2233ff2d 100644
@@ -41,6 +41,10 @@ static void rksd_set_header(void *buf,  struct stat *sbuf,  int ifd,
 
  	memcpy(buf + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params),
  	       RK_SPL_HDR_SIZE);
+
+	if (rkcommon_need_rc4_spl(params))
+		rkcommon_rc4_encode_spl(buf, RK_SPL_START - 4,
+					params->file_size - RK_SPL_START + 4);
  }
 
  static int rksd_extract_subimage(void *buf,  struct image_tool_params *params)
tools/rkspi.c +0 -0
index a0b0051d38..0271d2e817 100644

tools/rkspi.c static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd, · line 57

Quoted 10 lines
tools/rkspi.c +4 -0
@@ -48,6 +48,10 @@ static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd,
  	memcpy(buf + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params),
  	       RK_SPL_HDR_SIZE);
 
+	if (rkcommon_need_rc4_spl(params))
+		rkcommon_rc4_encode_spl(buf, RK_SPL_START - 4,
+					params->file_size - RK_SPL_START + 4);
+
  	/*
  	 * Spread the image out so we only use the first 2KB of each 4KB
  	 * region. This is a feature of the SPI format required by the Rockchip

Thanks,
- Kever

author maintainer
#10 lore raw

PATCH v3 4/16 rockchip: mkimage: Add support rk3188 serial

In reply to Heiko Stuebner

Add the entry for the rk3188 requiring rc4-encryption of the SPL.

---
 tools/rkcommon.c | 1 +
 1 file changed, 1 insertion(+)
tools/rkcommon.c +1 -0
index ed9b24137a..6595e02c1c 100644
@@ -57,6 +57,7 @@ struct spl_info {
 
 static struct spl_info spl_infos[] = {
 	{ "rk3036", "RK30", 0x1000, false },
+	{ "rk3188", "RK31", 0x8000 - 0x800, true },
 	{ "rk3288", "RK32", 0x8000, false },
 	{ "rk3399", "RK33", 0x20000, false },
 };
Signature · 1 line
2.11.0
#12 lore raw

PATCH v3 4/16 rockchip: mkimage: Add support rk3188 serial

In reply to Heiko Stuebner

Hi Heiko,

Quoted 12 lines · Heiko Stuebner

Add the entry for the rk3188 requiring rc4-encryption of the SPL.

---
  tools/rkcommon.c | 1 +
  1 file changed, 1 insertion(+)
tools/rkcommon.c +0 -0
index ed9b24137a..6595e02c1c 100644

tools/rkcommon.c struct spl_info { · line 63

Quoted 7 lines
tools/rkcommon.c +1 -0
@@ -57,6 +57,7 @@ struct spl_info {
 
  static struct spl_info spl_infos[] = {
  	{ "rk3036", "RK30", 0x1000, false },
+	{ "rk3188", "RK31", 0x8000 - 0x800, true },
  	{ "rk3288", "RK32", 0x8000, false },
  	{ "rk3399", "RK33", 0x20000, false },
  };

Thanks,
- Kever

author maintainer
#13 lore raw

PATCH v3 5/16 rockchip: serial: Adapt rockchip of-platdata driver for rk3188

In reply to Heiko Stuebner

Add necessary structs to have the driver also work for the serial on the rk3188.

---
 drivers/serial/serial_rockchip.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/serial/serial_rockchip.c +18 -1
index 6bac95a414..7e030a6aed 100644
@@ -12,12 +12,19 @@
 #include <serial.h>
 #include <asm/arch/clock.h>
 
+#if defined(CONFIG_ROCKCHIP_RK3188)
+struct rockchip_uart_platdata {
+	struct dtd_rockchip_rk3188_uart dtplat;
+	struct ns16550_platdata plat;
+};
+struct dtd_rockchip_rk3188_uart *dtplat, s_dtplat;
+#elif defined(CONFIG_ROCKCHIP_RK3288)
 struct rockchip_uart_platdata {
 	struct dtd_rockchip_rk3288_uart dtplat;
 	struct ns16550_platdata plat;
 };
-
 struct dtd_rockchip_rk3288_uart *dtplat, s_dtplat;
+#endif
 
 static int rockchip_serial_probe(struct udevice *dev)
 {
@@ -32,6 +39,16 @@ static int rockchip_serial_probe(struct udevice *dev)
 	return ns16550_serial_probe(dev);
 }
 
+U_BOOT_DRIVER(rockchip_rk3188_uart) = {
+	.name	= "rockchip_rk3188_uart",
+	.id	= UCLASS_SERIAL,
+	.priv_auto_alloc_size = sizeof(struct NS16550),
+	.platdata_auto_alloc_size = sizeof(struct rockchip_uart_platdata),
+	.probe	= rockchip_serial_probe,
+	.ops	= &ns16550_serial_ops,
+	.flags	= DM_FLAG_PRE_RELOC,
+};
+
 U_BOOT_DRIVER(rockchip_rk3288_uart) = {
 	.name	= "rockchip_rk3288_uart",
 	.id	= UCLASS_SERIAL,
Signature · 1 line
2.11.0
#14 lore raw

PATCH v3 5/16 rockchip: serial: Adapt rockchip of-platdata driver for rk3188

Quoted 7 lines · Heiko Stuebner

Add necessary structs to have the driver also work for the serial on the rk3188.

---
 drivers/serial/serial_rockchip.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
author maintainer
#15 lore raw

PATCH v3 6/16 rockchip: rk3188: Add header files for PMU and GRF

In reply to Heiko Stuebner

PMU is the power management unit and GRF is the general register file. Both are heavily used in U-Boot. Add header files with register definitions.

---
 arch/arm/include/asm/arch-rockchip/grf_rk3188.h | 589 ++++++++++++++++++++++++
 arch/arm/include/asm/arch-rockchip/pmu_rk3188.h |  36 ++
 2 files changed, 625 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3188.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/pmu_rk3188.h
arch/arm/include/asm/arch-rockchip/grf_rk3188.h new file +589 -0
new file mode 100644
index 0000000000..ce7bac5338
@@ -0,0 +1,589 @@
+/*
+ * Copyright (c) 2016 Heiko Stuebner <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0
+ */
+
+#ifndef _ASM_ARCH_GRF_RK3188_H
+#define _ASM_ARCH_GRF_RK3188_H
+
+struct rk3188_grf_gpio_lh {
+	u32 l;
+	u32 h;
+};
+
+struct rk3188_grf {
+	struct rk3188_grf_gpio_lh gpio_dir[4];
+	struct rk3188_grf_gpio_lh gpio_do[4];
+	struct rk3188_grf_gpio_lh gpio_en[4];
+
+	u32 reserved[2];
+	u32 gpio0c_iomux;
+	u32 gpio0d_iomux;
+
+	u32 gpio1a_iomux;
+	u32 gpio1b_iomux;
+	u32 gpio1c_iomux;
+	u32 gpio1d_iomux;
+
+	u32 gpio2a_iomux;
+	u32 gpio2b_iomux;
+	u32 gpio2c_iomux;
+	u32 gpio2d_iomux;
+
+	u32 gpio3a_iomux;
+	u32 gpio3b_iomux;
+	u32 gpio3c_iomux;
+	u32 gpio3d_iomux;
+
+	u32 soc_con0;
+	u32 soc_con1;
+	u32 soc_con2;
+	u32 soc_status0;
+
+	u32 busdmac_con[3];
+	u32 peridmac_con[4];
+
+	u32 cpu_con[6];
+	u32 reserved0[2];
+
+	u32 ddrc_con0;
+	u32 ddrc_stat;
+
+	u32 io_con[5];
+	u32 soc_status1;
+
+	u32 uoc0_con[4];
+	u32 uoc1_con[4];
+	u32 uoc2_con[2];
+	u32 reserved1;
+	u32 uoc3_con[2];
+	u32 hsic_stat;
+	u32 os_reg[8];
+
+	u32 gpio0_p[3];
+	u32 gpio1_p[3][4];
+
+	u32 flash_data_p;
+	u32 flash_cmd_p;
+};
+check_member(rk3188_grf, flash_cmd_p, 0x01a4);
+
+/* GRF_GPIO0D_IOMUX */
+enum {
+	GPIO0D7_SHIFT		= 14,
+	GPIO0D7_MASK		= 1,
+	GPIO0D7_GPIO		= 0,
+	GPIO0D7_SPI1_CSN0,
+
+	GPIO0D6_SHIFT		= 12,
+	GPIO0D6_MASK		= 1,
+	GPIO0D6_GPIO		= 0,
+	GPIO0D6_SPI1_CLK,
+
+	GPIO0D5_SHIFT		= 10,
+	GPIO0D5_MASK		= 1,
+	GPIO0D5_GPIO		= 0,
+	GPIO0D5_SPI1_TXD,
+
+	GPIO0D4_SHIFT		= 8,
+	GPIO0D4_MASK		= 1,
+	GPIO0D4_GPIO		= 0,
+	GPIO0D4_SPI0_RXD,
+
+	GPIO0D3_SHIFT		= 6,
+	GPIO0D3_MASK		= 3,
+	GPIO0D3_GPIO		= 0,
+	GPIO0D3_FLASH_CSN3,
+	GPIO0D3_EMMC_RSTN_OUT,
+
+	GPIO0D2_SHIFT		= 4,
+	GPIO0D2_MASK		= 3,
+	GPIO0D2_GPIO		= 0,
+	GPIO0D2_FLASH_CSN2,
+	GPIO0D2_EMMC_CMD,
+
+	GPIO0D1_SHIFT		= 2,
+	GPIO0D1_MASK		= 1,
+	GPIO0D1_GPIO		= 0,
+	GPIO0D1_FLASH_CSN1,
+
+	GPIO0D0_SHIFT		= 0,
+	GPIO0D0_MASK		= 3,
+	GPIO0D0_GPIO		= 0,
+	GPIO0D0_FLASH_DQS,
+	GPIO0D0_EMMC_CLKOUT
+};
+
+/* GRF_GPIO1A_IOMUX */
+enum {
+	GPIO1A7_SHIFT		= 14,
+	GPIO1A7_MASK		= 3,
+	GPIO1A7_GPIO		= 0,
+	GPIO1A7_UART1_RTS_N,
+	GPIO1A7_SPI0_CSN0,
+
+	GPIO1A6_SHIFT		= 12,
+	GPIO1A6_MASK		= 3,
+	GPIO1A6_GPIO		= 0,
+	GPIO1A6_UART1_CTS_N,
+	GPIO1A6_SPI0_CLK,
+
+	GPIO1A5_SHIFT		= 10,
+	GPIO1A5_MASK		= 3,
+	GPIO1A5_GPIO		= 0,
+	GPIO1A5_UART1_SOUT,
+	GPIO1A5_SPI0_TXD,
+
+	GPIO1A4_SHIFT		= 8,
+	GPIO1A4_MASK		= 3,
+	GPIO1A4_GPIO		= 0,
+	GPIO1A4_UART1_SIN,
+	GPIO1A4_SPI0_RXD,
+
+	GPIO1A3_SHIFT		= 6,
+	GPIO1A3_MASK		= 1,
+	GPIO1A3_GPIO		= 0,
+	GPIO1A3_UART0_RTS_N,
+
+	GPIO1A2_SHIFT		= 4,
+	GPIO1A2_MASK		= 1,
+	GPIO1A2_GPIO		= 0,
+	GPIO1A2_UART0_CTS_N,
+
+	GPIO1A1_SHIFT		= 2,
+	GPIO1A1_MASK		= 1,
+	GPIO1A1_GPIO		= 0,
+	GPIO1A1_UART0_SOUT,
+
+	GPIO1A0_SHIFT		= 0,
+	GPIO1A0_MASK		= 1,
+	GPIO1A0_GPIO		= 0,
+	GPIO1A0_UART0_SIN,
+};
+
+/* GRF_GPIO1B_IOMUX */
+enum {
+	GPIO1B7_SHIFT		= 14,
+	GPIO1B7_MASK		= 1,
+	GPIO1B7_GPIO		= 0,
+	GPIO1B7_SPI0_CSN1,
+
+	GPIO1B6_SHIFT		= 12,
+	GPIO1B6_MASK		= 3,
+	GPIO1B6_GPIO		= 0,
+	GPIO1B6_SPDIF_TX,
+	GPIO1B6_SPI1_CSN1,
+
+	GPIO1B5_SHIFT		= 10,
+	GPIO1B5_MASK		= 3,
+	GPIO1B5_GPIO		= 0,
+	GPIO1B5_UART3_RTS_N,
+	GPIO1B5_RESERVED,
+
+	GPIO1B4_SHIFT		= 8,
+	GPIO1B4_MASK		= 3,
+	GPIO1B4_GPIO		= 0,
+	GPIO1B4_UART3_CTS_N,
+	GPIO1B4_GPS_RFCLK,
+
+	GPIO1B3_SHIFT		= 6,
+	GPIO1B3_MASK		= 3,
+	GPIO1B3_GPIO		= 0,
+	GPIO1B3_UART3_SOUT,
+	GPIO1B3_GPS_SIG,
+
+	GPIO1B2_SHIFT		= 4,
+	GPIO1B2_MASK		= 3,
+	GPIO1B2_GPIO		= 0,
+	GPIO1B2_UART3_SIN,
+	GPIO1B2_GPS_MAG,
+
+	GPIO1B1_SHIFT		= 2,
+	GPIO1B1_MASK		= 3,
+	GPIO1B1_GPIO		= 0,
+	GPIO1B1_UART2_SOUT,
+	GPIO1B1_JTAG_TDO,
+
+	GPIO1B0_SHIFT		= 0,
+	GPIO1B0_MASK		= 3,
+	GPIO1B0_GPIO		= 0,
+	GPIO1B0_UART2_SIN,
+	GPIO1B0_JTAG_TDI,
+};
+
+/* GRF_GPIO1D_IOMUX */
+enum {
+	GPIO1D7_SHIFT		= 14,
+	GPIO1D7_MASK		= 1,
+	GPIO1D7_GPIO		= 0,
+	GPIO1D7_I2C4_SCL,
+
+	GPIO1D6_SHIFT		= 12,
+	GPIO1D6_MASK		= 1,
+	GPIO1D6_GPIO		= 0,
+	GPIO1D6_I2C4_SDA,
+
+	GPIO1D5_SHIFT		= 10,
+	GPIO1D5_MASK		= 1,
+	GPIO1D5_GPIO		= 0,
+	GPIO1D5_I2C2_SCL,
+
+	GPIO1D4_SHIFT		= 8,
+	GPIO1D4_MASK		= 1,
+	GPIO1D4_GPIO		= 0,
+	GPIO1D4_I2C2_SDA,
+
+	GPIO1D3_SHIFT		= 6,
+	GPIO1D3_MASK		= 1,
+	GPIO1D3_GPIO		= 0,
+	GPIO1D3_I2C1_SCL,
+
+	GPIO1D2_SHIFT		= 4,
+	GPIO1D2_MASK		= 1,
+	GPIO1D2_GPIO		= 0,
+	GPIO1D2_I2C1_SDA,
+
+	GPIO1D1_SHIFT		= 2,
+	GPIO1D1_MASK		= 1,
+	GPIO1D1_GPIO		= 0,
+	GPIO1D1_I2C0_SCL,
+
+	GPIO1D0_SHIFT		= 0,
+	GPIO1D0_MASK		= 1,
+	GPIO1D0_GPIO		= 0,
+	GPIO1D0_I2C0_SDA,
+};
+
+/* GRF_GPIO3A_IOMUX */
+enum {
+	GPIO3A7_SHIFT		= 14,
+	GPIO3A7_MASK		= 1,
+	GPIO3A7_GPIO		= 0,
+	GPIO3A7_SDMMC0_DATA3,
+
+	GPIO3A6_SHIFT		= 12,
+	GPIO3A6_MASK		= 1,
+	GPIO3A6_GPIO		= 0,
+	GPIO3A6_SDMMC0_DATA2,
+
+	GPIO3A5_SHIFT		= 10,
+	GPIO3A5_MASK		= 1,
+	GPIO3A5_GPIO		= 0,
+	GPIO3A5_SDMMC0_DATA1,
+
+	GPIO3A4_SHIFT		= 8,
+	GPIO3A4_MASK		= 1,
+	GPIO3A4_GPIO		= 0,
+	GPIO3A4_SDMMC0_DATA0,
+
+	GPIO3A3_SHIFT		= 6,
+	GPIO3A3_MASK		= 1,
+	GPIO3A3_GPIO		= 0,
+	GPIO3A3_SDMMC0_CMD,
+
+	GPIO3A2_SHIFT		= 4,
+	GPIO3A2_MASK		= 1,
+	GPIO3A2_GPIO		= 0,
+	GPIO3A2_SDMMC0_CLKOUT,
+
+	GPIO3A1_SHIFT		= 2,
+	GPIO3A1_MASK		= 1,
+	GPIO3A1_GPIO		= 0,
+	GPIO3A1_SDMMC0_PWREN,
+
+	GPIO3A0_SHIFT		= 0,
+	GPIO3A0_MASK		= 1,
+	GPIO3A0_GPIO		= 0,
+	GPIO3A0_SDMMC0_RSTN,
+};
+
+/* GRF_GPIO3B_IOMUX */
+enum {
+	GPIO3B7_SHIFT		= 14,
+	GPIO3B7_MASK		= 3,
+	GPIO3B7_GPIO		= 0,
+	GPIO3B7_CIF_DATA11,
+	GPIO3B7_I2C3_SCL,
+
+	GPIO3B6_SHIFT		= 12,
+	GPIO3B6_MASK		= 3,
+	GPIO3B6_GPIO		= 0,
+	GPIO3B6_CIF_DATA10,
+	GPIO3B6_I2C3_SDA,
+
+	GPIO3B5_SHIFT		= 10,
+	GPIO3B5_MASK		= 3,
+	GPIO3B5_GPIO		= 0,
+	GPIO3B5_CIF_DATA1,
+	GPIO3B5_HSADC_DATA9,
+
+	GPIO3B4_SHIFT		= 8,
+	GPIO3B4_MASK		= 3,
+	GPIO3B4_GPIO		= 0,
+	GPIO3B4_CIF_DATA0,
+	GPIO3B4_HSADC_DATA8,
+
+	GPIO3B3_SHIFT		= 6,
+	GPIO3B3_MASK		= 1,
+	GPIO3B3_GPIO		= 0,
+	GPIO3B3_CIF_CLKOUT,
+
+	GPIO3B2_SHIFT		= 4,
+	GPIO3B2_MASK		= 1,
+	GPIO3B2_GPIO		= 0,
+	/* no muxes */
+
+	GPIO3B1_SHIFT		= 2,
+	GPIO3B1_MASK		= 1,
+	GPIO3B1_GPIO		= 0,
+	GPIO3B1_SDMMC0_WRITE_PRT,
+
+	GPIO3B0_SHIFT		= 0,
+	GPIO3B0_MASK		= 1,
+	GPIO3B0_GPIO		= 0,
+	GPIO3B0_SDMMC_DETECT_N,
+};
+
+/* GRF_GPIO3C_IOMUX */
+enum {
+	GPIO3C7_SHIFT		= 14,
+	GPIO3C7_MASK		= 3,
+	GPIO3C7_GPIO		= 0,
+	GPIO3C7_SDMMC1_WRITE_PRT,
+	GPIO3C7_RMII_CRS_DVALID,
+	GPIO3C7_RESERVED,
+
+	GPIO3C6_SHIFT		= 12,
+	GPIO3C6_MASK		= 3,
+	GPIO3C6_GPIO		= 0,
+	GPIO3C6_SDMMC1_DECTN,
+	GPIO3C6_RMII_RX_ERR,
+	GPIO3C6_RESERVED,
+
+	GPIO3C5_SHIFT		= 10,
+	GPIO3C5_MASK		= 3,
+	GPIO3C5_GPIO		= 0,
+	GPIO3C5_SDMMC1_CLKOUT,
+	GPIO3C5_RMII_CLKOUT,
+	GPIO3C5_RMII_CLKIN,
+
+	GPIO3C4_SHIFT		= 8,
+	GPIO3C4_MASK		= 3,
+	GPIO3C4_GPIO		= 0,
+	GPIO3C4_SDMMC1_DATA3,
+	GPIO3C4_RMII_RXD1,
+	GPIO3C4_RESERVED,
+
+	GPIO3C3_SHIFT		= 6,
+	GPIO3C3_MASK		= 3,
+	GPIO3C3_GPIO		= 0,
+	GPIO3C3_SDMMC1_DATA2,
+	GPIO3C3_RMII_RXD0,
+	GPIO3C3_RESERVED,
+
+	GPIO3C2_SHIFT		= 4,
+	GPIO3C2_MASK		= 3,
+	GPIO3C2_GPIO		= 0,
+	GPIO3C2_SDMMC1_DATA1,
+	GPIO3C2_RMII_TXD0,
+	GPIO3C2_RESERVED,
+
+	GPIO3C1_SHIFT		= 2,
+	GPIO3C1_MASK		= 3,
+	GPIO3C1_GPIO		= 0,
+	GPIO3C1_SDMMC1_DATA0,
+	GPIO3C1_RMII_TXD1,
+	GPIO3C1_RESERVED,
+
+	GPIO3C0_SHIFT		= 0,
+	GPIO3C0_MASK		= 3,
+	GPIO3C0_GPIO		= 0,
+	GPIO3C0_SDMMC1_CMD,
+	GPIO3C0_RMII_TX_EN,
+	GPIO3C0_RESERVED,
+};
+
+/* GRF_GPIO3D_IOMUX */
+enum {
+	GPIO3D6_SHIFT		= 12,
+	GPIO3D6_MASK		= 3,
+	GPIO3D6_GPIO		= 0,
+	GPIO3D6_PWM_3,
+	GPIO3D6_JTAG_TMS,
+	GPIO3D6_HOST_DRV_VBUS,
+
+	GPIO3D5_SHIFT		= 10,
+	GPIO3D5_MASK		= 3,
+	GPIO3D5_GPIO		= 0,
+	GPIO3D5_PWM_2,
+	GPIO3D5_JTAG_TCK,
+	GPIO3D5_OTG_DRV_VBUS,
+
+	GPIO3D4_SHIFT		= 8,
+	GPIO3D4_MASK		= 3,
+	GPIO3D4_GPIO		= 0,
+	GPIO3D4_PWM_1,
+	GPIO3D4_JTAG_TRSTN,
+
+	GPIO3D3_SHIFT		= 6,
+	GPIO3D3_MASK		= 3,
+	GPIO3D3_GPIO		= 0,
+	GPIO3D3_PWM_0,
+
+	GPIO3D2_SHIFT		= 4,
+	GPIO3D2_MASK		= 3,
+	GPIO3D2_GPIO		= 0,
+	GPIO3D2_SDMMC1_INT_N,
+
+	GPIO3D1_SHIFT		= 2,
+	GPIO3D1_MASK		= 3,
+	GPIO3D1_GPIO		= 0,
+	GPIO3D1_SDMMC1_BACKEND_PWR,
+	GPIO3D1_MII_MDCLK,
+
+	GPIO3D0_SHIFT		= 0,
+	GPIO3D0_MASK		= 3,
+	GPIO3D0_GPIO		= 0,
+	GPIO3D0_SDMMC1_PWR_EN,
+	GPIO3D0_MII_MD,
+};
+
+/* GRF_SOC_CON0 */
+enum {
+	HSADC_CLK_DIR_SHIFT	= 15,
+	HSADC_CLK_DIR_MASK	= 1,
+
+	HSADC_SEL_SHIFT		= 14,
+	HSADC_SEL_MASK		= 1,
+
+	NOC_REMAP_SHIFT		= 12,
+	NOC_REMAP_MASK		= 1,
+
+	EMMC_FLASH_SEL_SHIFT	= 11,
+	EMMC_FLASH_SEL_MASK	= 1,
+
+	TZPC_REVISION_SHIFT	= 7,
+	TZPC_REVISION_MASK	= 0xf,
+
+	L2CACHE_ACC_SHIFT	= 5,
+	L2CACHE_ACC_MASK	= 3,
+
+	L2RD_WAIT_SHIFT		= 3,
+	L2RD_WAIT_MASK		= 3,
+
+	IMEMRD_WAIT_SHIFT	= 1,
+	IMEMRD_WAIT_MASK	= 3,
+};
+
+/* GRF_SOC_CON1 */
+enum {
+	RKI2C4_SEL_SHIFT	= 15,
+	RKI2C4_SEL_MASK		= 1,
+
+	RKI2C3_SEL_SHIFT	= 14,
+	RKI2C3_SEL_MASK		= 1,
+
+	RKI2C2_SEL_SHIFT	= 13,
+	RKI2C2_SEL_MASK		= 1,
+
+	RKI2C1_SEL_SHIFT	= 12,
+	RKI2C1_SEL_MASK		= 1,
+
+	RKI2C0_SEL_SHIFT	= 11,
+	RKI2C0_SEL_MASK		= 1,
+
+	VCODEC_SEL_SHIFT	= 10,
+	VCODEC_SEL_MASK		= 1,
+
+	PERI_EMEM_PAUSE_SHIFT	= 9,
+	PERI_EMEM_PAUSE_MASK	= 1,
+
+	PERI_USB_PAUSE_SHIFT	= 8,
+	PERI_USB_PAUSE_MASK	= 1,
+
+	SMC_MUX_MODE_0_SHIFT	= 6,
+	SMC_MUX_MODE_0_MASK	= 1,
+
+	SMC_SRAM_MW_0_SHIFT	= 4,
+	SMC_SRAM_MW_0_MASK	= 3,
+
+	SMC_REMAP_0_SHIFT	= 3,
+	SMC_REMAP_0_MASK	= 1,
+
+	SMC_A_GT_M0_SYNC_SHIFT	= 2,
+	SMC_A_GT_M0_SYNC_MASK	= 1,
+
+	EMAC_SPEED_SHIFT	= 1,
+	EMAC_SPEEC_MASK		= 1,
+
+	EMAC_MODE_SHIFT		= 0,
+	EMAC_MODE_MASK		= 1,
+};
+
+/* GRF_SOC_CON2 */
+enum {
+	SDIO_CLK_OUT_SR_SHIFT	= 15,
+	SDIO_CLK_OUT_SR_MASK	= 1,
+
+	MEM_EMA_L2C_SHIFT	= 11,
+	MEM_EMA_L2C_MASK	= 7,
+
+	MEM_EMA_A9_SHIFT	= 8,
+	MEM_EMA_A9_MASK		= 7,
+
+	MSCH4_MAINDDR3_SHIFT	= 7,
+	MSCH4_MAINDDR3_MASK	= 1,
+	MSCH4_MAINDDR3_DDR3	= 1,
+
+	EMAC_NEWRCV_EN_SHIFT	= 6,
+	EMAC_NEWRCV_EN_MASK	= 1,
+
+	SW_ADDR15_EN_SHIFT	= 5,
+	SW_ADDR15_EN_MASK	= 1,
+
+	SW_ADDR16_EN_SHIFT	= 4,
+	SW_ADDR16_EN_MASK	= 1,
+
+	SW_ADDR17_EN_SHIFT	= 3,
+	SW_ADDR17_EN_MASK	= 1,
+
+	BANK2_TO_RANK_EN_SHIFT	= 2,
+	BANK2_TO_RANK_EN_MASK	= 1,
+
+	RANK_TO_ROW15_EN_SHIFT	= 1,
+	RANK_TO_ROW15_EN_MASK	= 1,
+
+	UPCTL_C_ACTIVE_IN_SHIFT = 0,
+	UPCTL_C_ACTIVE_IN_MASK	= 1,
+	UPCTL_C_ACTIVE_IN_MAY	= 0,
+	UPCTL_C_ACTIVE_IN_WILL,
+};
+
+/* GRF_DDRC_CON0 */
+enum {
+	DDR_16BIT_EN_SHIFT	= 15,
+	DDR_16BIT_EN_MASK	= 1,
+
+	DTO_LB_SHIFT		= 11,
+	DTO_LB_MASK		= 3,
+
+	DTO_TE_SHIFT		= 9,
+	DTO_TE_MASK		= 3,
+
+	DTO_PDR_SHIFT		= 7,
+	DTO_PDR_MASK		= 3,
+
+	DTO_PDD_SHIFT		= 5,
+	DTO_PDD_MASK		= 3,
+
+	DTO_IOM_SHIFT		= 3,
+	DTO_IOM_MASK		= 3,
+
+	DTO_OE_SHIFT		= 1,
+	DTO_OE_MASK		= 3,
+
+	ATO_AE_SHIFT		= 0,
+	ATO_AE_MASK		= 1,
+};
+#endif
arch/arm/include/asm/arch-rockchip/pmu_rk3188.h new file +36 -0
new file mode 100644
index 0000000000..d3feac3832
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016 Heiko Stuebner <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _ASM_ARCH_PMU_RK3188_H
+#define _ASM_ARCH_PMU_RK3188_H
+
+struct rk3188_pmu {
+	u32 wakeup_cfg[2];
+	u32 pwrdn_con;
+	u32 pwrdn_st;
+
+	u32 int_con;
+	u32 int_st;
+	u32 misc_con;
+
+	u32 osc_cnt;
+	u32 pll_cnt;
+	u32 pmu_cnt;
+	u32 ddrio_pwron_cnt;
+	u32 wakeup_rst_clr_cnt;
+	u32 scu_pwrdwn_cnt;
+	u32 scu_pwrup_cnt;
+	u32 misc_con1;
+	u32 gpio0_con;
+
+	u32 sys_reg[4];
+	u32 reserved0[4];
+	u32 stop_int_dly;
+	u32 gpio0_p[2];
+};
+check_member(rk3188_pmu, gpio0_p[1], 0x0068);
+
+#endif
Signature · 1 line
2.11.0
author maintainer
#16 lore raw

PATCH v3 7/16 rockchip: rk3188: Add pinctrl driver

In reply to Heiko Stuebner

Add a driver which supports pin multiplexing setup for the most commonly used peripherals.

---
 drivers/pinctrl/Kconfig                   |   9 +
 drivers/pinctrl/rockchip/Makefile         |   1 +
 drivers/pinctrl/rockchip/pinctrl_rk3188.c | 611 ++++++++++++++++++++++++++++++
 3 files changed, 621 insertions(+)
 create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c
drivers/pinctrl/Kconfig +9 -0
index efcb4c0003..c68860c092 100644
@@ -132,6 +132,15 @@ config ROCKCHIP_RK3036_PINCTRL
 	  definitions and pin control functions for each available multiplex
 	  function.
 
+config ROCKCHIP_RK3188_PINCTRL
+	bool "Rockchip pin control driver"
+	depends on DM
+	help
+	  Support pin multiplexing control on Rockchip rk3188 SoCs. The driver
+	  is controlled by a device tree node which contains both the GPIO
+	  definitions and pin control functions for each available multiplex
+	  function.
+
 config ROCKCHIP_RK3288_PINCTRL
 	bool "Rockchip pin control driver"
 	depends on DM
drivers/pinctrl/rockchip/Makefile +1 -0
index 805c833ec9..cc99aeebb5 100644
@@ -6,5 +6,6 @@
 #
 
 obj-$(CONFIG_ROCKCHIP_RK3036_PINCTRL) += pinctrl_rk3036.o
+obj-$(CONFIG_ROCKCHIP_RK3188_PINCTRL) += pinctrl_rk3188.o
 obj-$(CONFIG_ROCKCHIP_RK3288_PINCTRL) += pinctrl_rk3288.o
 obj-$(CONFIG_ROCKCHIP_RK3399_PINCTRL) += pinctrl_rk3399.o
drivers/pinctrl/rockchip/pinctrl_rk3188.c new file +611 -0

611 lines not on this page · raw message

Signature · 1 line
2.11.0
author maintainer
#17 lore raw

PATCH v3 8/16 rockchip: rk3188: Add sysreset driver

In reply to Heiko Stuebner

Driver for the sysreset of Rockchip rk3188 socs.

---
 drivers/sysreset/Makefile          |  1 +
 drivers/sysreset/sysreset_rk3188.c | 47 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 drivers/sysreset/sysreset_rk3188.c
drivers/sysreset/Makefile +1 -0
index fa75cc52de..30f1bce390 100644
@@ -9,6 +9,7 @@ obj-$(CONFIG_SYSRESET) += sysreset-uclass.o
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_ROCKCHIP_RK3036) += sysreset_rk3036.o
 endif
+obj-$(CONFIG_ROCKCHIP_RK3188) += sysreset_rk3188.o
 obj-$(CONFIG_ROCKCHIP_RK3288) += sysreset_rk3288.o
 obj-$(CONFIG_ROCKCHIP_RK3399) += sysreset_rk3399.o
 obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o
drivers/sysreset/sysreset_rk3188.c new file +47 -0

47 lines not on this page · raw message

Signature · 1 line
2.11.0
#18 lore raw

PATCH v3 8/16 rockchip: rk3188: Add sysreset driver

Quoted 8 lines · Heiko Stuebner

Driver for the sysreset of Rockchip rk3188 socs.

---
 drivers/sysreset/Makefile          |  1 +
 drivers/sysreset/sysreset_rk3188.c | 47 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 drivers/sysreset/sysreset_rk3188.c
author maintainer
#19 lore raw

PATCH v3 9/16 rockchip: rk3188: Add rk3066/rk3188 clock bindings

In reply to Heiko Stuebner

Bring in required device clock binding files from Linux.
The clock trees for rk3066 and rk3188 are largely similar, which makes them share the common parts in a shared header. While we focus on rk3188 for now, bring in both headers already for completeness sake.

---
 include/dt-bindings/clock/rk3066a-cru.h       |  32 ++++
 include/dt-bindings/clock/rk3188-cru-common.h | 256 ++++++++++++++++++++++++++
 include/dt-bindings/clock/rk3188-cru.h        |  48 +++++
 3 files changed, 336 insertions(+)
 create mode 100644 include/dt-bindings/clock/rk3066a-cru.h
 create mode 100644 include/dt-bindings/clock/rk3188-cru-common.h
 create mode 100644 include/dt-bindings/clock/rk3188-cru.h
include/dt-bindings/clock/rk3066a-cru.h new file +32 -0
new file mode 100644
index 0000000000..549ae6a3f3
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Heiko Stuebner <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3066A_H
+#define _DT_BINDINGS_CLK_ROCKCHIP_RK3066A_H
+
+#include <dt-bindings/clock/rk3188-cru-common.h>
+
+/* soft-reset indices */
+#define SRST_SRST1		0
+#define SRST_SRST2		1
+
+#define SRST_L2MEM		18
+#define SRST_I2S0		23
+#define SRST_I2S1		24
+#define SRST_I2S2		25
+#define SRST_TIMER2		29
+
+#define SRST_GPIO4		36
+#define SRST_GPIO6		38
+
+#define SRST_TSADC		92
+
+#define SRST_HDMI		96
+#define SRST_HDMI_APB		97
+#define SRST_CIF1		111
+
+#endif
include/dt-bindings/clock/rk3188-cru-common.h new file +256 -0

256 lines not on this page · raw message

include/dt-bindings/clock/rk3188-cru.h new file +48 -0

48 lines not on this page · raw message

Signature · 1 line
2.11.0
author maintainer
#20 lore raw

PATCH v3 10/16 rockchip: rk3188: Add clock driver

In reply to Heiko Stuebner

Add a driver for setting up and modifying the various PLLs and peripheral clocks on the RK3188.

---
 arch/arm/include/asm/arch-rockchip/cru_rk3188.h | 191 +++++++++
 drivers/clk/rockchip/Makefile                   |   1 +
 drivers/clk/rockchip/clk_rk3188.c               | 523 ++++++++++++++++++++++++
 3 files changed, 715 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3188.h
 create mode 100644 drivers/clk/rockchip/clk_rk3188.c
arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +191 -0
new file mode 100644
index 0000000000..74f0fedcc6
@@ -0,0 +1,191 @@
+/*
+ * (C) Copyright 2016 Heiko Stuebner <[email protected]>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+#ifndef _ASM_ARCH_CRU_RK3188_H
+#define _ASM_ARCH_CRU_RK3188_H
+
+#define OSC_HZ		(24 * 1000 * 1000)
+
+#define APLL_HZ		(1608 * 1000000)
+#define GPLL_HZ		(594 * 1000000)
+#define CPLL_HZ		(384 * 1000000)
+
+/* The SRAM is clocked off aclk_cpu, so we want to max it out for boot speed */
+#define CPU_ACLK_HZ	297000000
+#define CPU_HCLK_HZ	148500000
+#define CPU_PCLK_HZ	74250000
+#define CPU_H2P_HZ	74250000
+
+#define PERI_ACLK_HZ	148500000
+#define PERI_HCLK_HZ	148500000
+#define PERI_PCLK_HZ	74250000
+
+/* Private data for the clock driver - used by rockchip_get_cru() */
+struct rk3188_clk_priv {
+	struct rk3188_grf *grf;
+	struct rk3188_cru *cru;
+	ulong rate;
+	bool has_bwadj;
+};
+
+struct rk3188_cru {
+	struct rk3188_pll {
+		u32 con0;
+		u32 con1;
+		u32 con2;
+		u32 con3;
+	} pll[4];
+	u32 cru_mode_con;
+	u32 cru_clksel_con[35];
+	u32 cru_clkgate_con[10];
+	u32 reserved1[2];
+	u32 cru_glb_srst_fst_value;
+	u32 cru_glb_srst_snd_value;
+	u32 reserved2[2];
+	u32 cru_softrst_con[9];
+	u32 cru_misc_con;
+	u32 reserved3[2];
+	u32 cru_glb_cnt_th;
+};
+check_member(rk3188_cru, cru_glb_cnt_th, 0x0140);
+
+/* CRU_CLKSEL0_CON */
+enum {
+	/* a9_core_div: core = core_src / (a9_core_div + 1) */
+	A9_CORE_DIV_SHIFT	= 9,
+	A9_CORE_DIV_MASK	= 0x1f,
+	CORE_PLL_SHIFT		= 8,
+	CORE_PLL_MASK		= 1,
+	CORE_PLL_SELECT_APLL	= 0,
+	CORE_PLL_SELECT_GPLL,
+
+	/* core peri div: core:core_peri = 2:1, 4:1, 8:1 or 16:1 */
+	CORE_PERI_DIV_SHIFT	= 6,
+	CORE_PERI_DIV_MASK	= 3,
+
+	/* aclk_cpu pll selection */
+	CPU_ACLK_PLL_SHIFT	= 5,
+	CPU_ACLK_PLL_MASK	= 1,
+	CPU_ACLK_PLL_SELECT_APLL	= 0,
+	CPU_ACLK_PLL_SELECT_GPLL,
+
+	/* a9_cpu_div: aclk_cpu = cpu_src / (a9_cpu_div + 1) */
+	A9_CPU_DIV_SHIFT	= 0,
+	A9_CPU_DIV_MASK		= 0x1f,
+};
+
+/* CRU_CLKSEL1_CON */
+enum {
+	/* ahb2apb_pclk_div: hclk_cpu:pclk_cpu = 1:1, 2:1 or 4:1 */
+	AHB2APB_DIV_SHIFT	= 14,
+	AHB2APB_DIV_MASK	= 3,
+
+	/* cpu_pclk_div: aclk_cpu:pclk_cpu = 1:1, 2:1, 4:1 or 8:1 */
+	CPU_PCLK_DIV_SHIFT	= 12,
+	CPU_PCLK_DIV_MASK	= 3,
+
+	/* cpu_hclk_div: aclk_cpu:hclk_cpu = 1:1, 2:1 or 4:1 */
+	CPU_HCLK_DIV_SHIFT	= 8,
+	CPU_HCLK_DIV_MASK	= 3,
+
+	/* core_aclk_div: cire:aclk_core = 1:1, 2:1, 3:1, 4:1 or 8:1 */
+	CORE_ACLK_DIV_SHIFT	= 3,
+	CORE_ACLK_DIV_MASK	= 7,
+};
+
+/* CRU_CLKSEL10_CON */
+enum {
+	PERI_SEL_PLL_MASK	= 1,
+	PERI_SEL_PLL_SHIFT	= 15,
+	PERI_SEL_CPLL		= 0,
+	PERI_SEL_GPLL,
+
+	/* peri pclk div: aclk_bus:pclk_bus = 1:1, 2:1, 4:1 or 8:1 */
+	PERI_PCLK_DIV_SHIFT	= 12,
+	PERI_PCLK_DIV_MASK	= 3,
+
+	/* peripheral bus hclk div:aclk_bus: hclk_bus = 1:1, 2:1 or 4:1 */
+	PERI_HCLK_DIV_SHIFT	= 8,
+	PERI_HCLK_DIV_MASK	= 3,
+
+	/* peri aclk div: aclk_peri = periph_src / (peri_aclk_div + 1) */
+	PERI_ACLK_DIV_SHIFT	= 0,
+	PERI_ACLK_DIV_MASK	= 0x1f,
+};
+/* CRU_CLKSEL11_CON */
+enum {
+	HSICPHY_DIV_SHIFT	= 8,
+	HSICPHY_DIV_MASK	= 0x3f,
+
+	MMC0_DIV_SHIFT		= 0,
+	MMC0_DIV_MASK		= 0x3f,
+};
+
+/* CRU_CLKSEL12_CON */
+enum {
+	UART_PLL_SHIFT		= 15,
+	UART_PLL_MASK		= 1,
+	UART_PLL_SELECT_GENERAL	= 0,
+	UART_PLL_SELECT_CODEC,
+
+	EMMC_DIV_SHIFT		= 8,
+	EMMC_DIV_MASK		= 0x3f,
+
+	SDIO_DIV_SHIFT		= 0,
+	SDIO_DIV_MASK		= 0x3f,
+};
+
+/* CRU_CLKSEL25_CON */
+enum {
+	SPI1_DIV_SHIFT		= 8,
+	SPI1_DIV_MASK		= 0x7f,
+
+	SPI0_DIV_SHIFT		= 0,
+	SPI0_DIV_MASK		= 0x7f,
+};
+
+/* CRU_MODE_CON */
+enum {
+	GPLL_MODE_SHIFT		= 12,
+	GPLL_MODE_MASK		= 3,
+	GPLL_MODE_SLOW		= 0,
+	GPLL_MODE_NORMAL,
+	GPLL_MODE_DEEP,
+
+	CPLL_MODE_SHIFT		= 8,
+	CPLL_MODE_MASK		= 3,
+	CPLL_MODE_SLOW		= 0,
+	CPLL_MODE_NORMAL,
+	CPLL_MODE_DEEP,
+
+	DPLL_MODE_SHIFT		= 4,
+	DPLL_MODE_MASK		= 3,
+	DPLL_MODE_SLOW		= 0,
+	DPLL_MODE_NORMAL,
+	DPLL_MODE_DEEP,
+
+	APLL_MODE_SHIFT		= 0,
+	APLL_MODE_MASK		= 3,
+	APLL_MODE_SLOW		= 0,
+	APLL_MODE_NORMAL,
+	APLL_MODE_DEEP,
+};
+
+/* CRU_APLL_CON0 */
+enum {
+	CLKR_SHIFT		= 8,
+	CLKR_MASK		= 0x3f,
+
+	CLKOD_SHIFT		= 0,
+	CLKOD_MASK		= 0x3f,
+};
+
+/* CRU_APLL_CON1 */
+enum {
+	CLKF_SHIFT		= 0,
+	CLKF_MASK		= 0x1fff,
+};
+
+#endif
drivers/clk/rockchip/Makefile +1 -0
index 1f8e41739d..b66e81e810 100644
@@ -5,5 +5,6 @@
 #
 
 obj-$(CONFIG_ROCKCHIP_RK3036) += clk_rk3036.o
+obj-$(CONFIG_ROCKCHIP_RK3188) += clk_rk3188.o
 obj-$(CONFIG_ROCKCHIP_RK3288) += clk_rk3288.o
 obj-$(CONFIG_ROCKCHIP_RK3399) += clk_rk3399.o
drivers/clk/rockchip/clk_rk3188.c new file +523 -0

523 lines not on this page · raw message

Signature · 1 line
2.11.0
#21 lore raw

PATCH v3 10/16 rockchip: rk3188: Add clock driver

Hi Heiko.

Quoted 11 lines · Heiko Stuebner

Add a driver for setting up and modifying the various PLLs and peripheral clocks on the RK3188.

---
 arch/arm/include/asm/arch-rockchip/cru_rk3188.h | 191 +++++++++
 drivers/clk/rockchip/Makefile                   |   1 +
 drivers/clk/rockchip/clk_rk3188.c               | 523 ++++++++++++++++++++++++
 3 files changed, 715 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3188.h
 create mode 100644 drivers/clk/rockchip/clk_rk3188.c

With one comment below.

Quoted 55 lines
arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +48 -0
new file mode 100644
index 0000000000..74f0fedcc6
@@ -0,0 +1,191 @@
+/*
+ * (C) Copyright 2016 Heiko Stuebner <[email protected]>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+#ifndef _ASM_ARCH_CRU_RK3188_H
+#define _ASM_ARCH_CRU_RK3188_H
+
+#define OSC_HZ         (24 * 1000 * 1000)
+
+#define APLL_HZ                (1608 * 1000000)
+#define GPLL_HZ                (594 * 1000000)
+#define CPLL_HZ                (384 * 1000000)
+
+/* The SRAM is clocked off aclk_cpu, so we want to max it out for boot speed */
+#define CPU_ACLK_HZ    297000000
+#define CPU_HCLK_HZ    148500000
+#define CPU_PCLK_HZ    74250000
+#define CPU_H2P_HZ     74250000
+
+#define PERI_ACLK_HZ   148500000
+#define PERI_HCLK_HZ   148500000
+#define PERI_PCLK_HZ   74250000
+
+/* Private data for the clock driver - used by rockchip_get_cru() */
+struct rk3188_clk_priv {
+       struct rk3188_grf *grf;
+       struct rk3188_cru *cru;
+       ulong rate;
+       bool has_bwadj;
+};
+
+struct rk3188_cru {
+       struct rk3188_pll {
+               u32 con0;
+               u32 con1;
+               u32 con2;
+               u32 con3;
+       } pll[4];
+       u32 cru_mode_con;
+       u32 cru_clksel_con[35];
+       u32 cru_clkgate_con[10];
+       u32 reserved1[2];
+       u32 cru_glb_srst_fst_value;
+       u32 cru_glb_srst_snd_value;
+       u32 reserved2[2];
+       u32 cru_softrst_con[9];
+       u32 cru_misc_con;

arch/arm/include/asm/arch-rockchip/cru_rk3188.h line 58

Quoted 10 lines
arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +10 -0
+       u32 reserved3[2];
+       u32 cru_glb_cnt_th;
+};
+check_member(rk3188_cru, cru_glb_cnt_th, 0x0140);
+
+/* CRU_CLKSEL0_CON */
+enum {
+       /* a9_core_div: core = core_src / (a9_core_div + 1) */
+       A9_CORE_DIV_SHIFT       = 9,
+       A9_CORE_DIV_MASK        = 0x1f,

Can you define

A9_CORE_DIV_MASK = 0x1f << A9_CORE_DIV_SHIFT

and similarly for other masks. I got this wrong with rk3288, and I think shifting the mask makes the code easier in places.

Regards,
Simon

author maintainer
#22 lore raw

PATCH v3 10/16 rockchip: rk3188: Add clock driver

Hi Simon,

Am Montag, 6. Februar 2017, 07:35:12 CET schrieb Simon Glass:

Quoted 85 lines · Heiko Stuebner
Quoted 4 lines

Add a driver for setting up and modifying the various PLLs and peripheral clocks on the RK3188.

Quoted 8 lines

---

 arch/arm/include/asm/arch-rockchip/cru_rk3188.h | 191 +++++++++
 drivers/clk/rockchip/Makefile                   |   1 +
 drivers/clk/rockchip/clk_rk3188.c               | 523
 ++++++++++++++++++++++++ 3 files changed, 715 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3188.h
 create mode 100644 drivers/clk/rockchip/clk_rk3188.c

With one comment below.

Quoted 54 lines
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file mode 100644 index 0000000000..74f0fedcc6

arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +15 -0
@@ -0,0 +1,191 @@
+/*
+ * (C) Copyright 2016 Heiko Stuebner <[email protected]>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+#ifndef _ASM_ARCH_CRU_RK3188_H
+#define _ASM_ARCH_CRU_RK3188_H
+
+#define OSC_HZ         (24 * 1000 * 1000)
+
+#define APLL_HZ                (1608 * 1000000)
+#define GPLL_HZ                (594 * 1000000)
+#define CPLL_HZ                (384 * 1000000)
+
+/* The SRAM is clocked off aclk_cpu, so we want to max it out for boot

speed */ +#define CPU_ACLK_HZ 297000000

arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +32 -0
+#define CPU_HCLK_HZ    148500000
+#define CPU_PCLK_HZ    74250000
+#define CPU_H2P_HZ     74250000
+
+#define PERI_ACLK_HZ   148500000
+#define PERI_HCLK_HZ   148500000
+#define PERI_PCLK_HZ   74250000
+
+/* Private data for the clock driver - used by rockchip_get_cru() */
+struct rk3188_clk_priv {
+       struct rk3188_grf *grf;
+       struct rk3188_cru *cru;
+       ulong rate;
+       bool has_bwadj;
+};
+
+struct rk3188_cru {
+       struct rk3188_pll {
+               u32 con0;
+               u32 con1;
+               u32 con2;
+               u32 con3;
+       } pll[4];
+       u32 cru_mode_con;
+       u32 cru_clksel_con[35];
+       u32 cru_clkgate_con[10];
+       u32 reserved1[2];
+       u32 cru_glb_srst_fst_value;
+       u32 cru_glb_srst_snd_value;
+       u32 reserved2[2];
+       u32 cru_softrst_con[9];
+       u32 cru_misc_con;

arch/arm/include/asm/arch-rockchip/cru_rk3188.h line 58

Quoted 10 lines
arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +10 -0
+       u32 reserved3[2];
+       u32 cru_glb_cnt_th;
+};
+check_member(rk3188_cru, cru_glb_cnt_th, 0x0140);
+
+/* CRU_CLKSEL0_CON */
+enum {
+       /* a9_core_div: core = core_src / (a9_core_div + 1) */
+       A9_CORE_DIV_SHIFT       = 9,
+       A9_CORE_DIV_MASK        = 0x1f,

Can you define

Quoted 4 lines

A9_CORE_DIV_MASK = 0x1f << A9_CORE_DIV_SHIFT

and similarly for other masks. I got this wrong with rk3288, and I think shifting the mask makes the code easier in places.

I'd disagree here. We're using this scheme everywhere on Rockchip platforms. For example please look at all the pinmux defines

	GPIO3C1_SHIFT		= 2,
	GPIO3C1_MASK		= 3,
	GPIO3C1_GPIO		= 0,
	GPIO3C1_SDMMC1_DATA0,
	GPIO3C1_RMII_TXD1,
	GPIO3C1_RESERVED,

and numerous other places and I'd think mixing paradigms in one soc and between all Rockchip socs would be somewhat unwise.

Heiko

#23 lore raw

PATCH v3 10/16 rockchip: rk3188: Add clock driver

Hi Heiko,

Quoted 102 lines · Heiko Stuebner

Hi Simon,

Am Montag, 6. Februar 2017, 07:35:12 CET schrieb Simon Glass:

Quoted 85 lines · Heiko Stuebner
Quoted 4 lines

Add a driver for setting up and modifying the various PLLs and peripheral clocks on the RK3188.

Quoted 8 lines

---

 arch/arm/include/asm/arch-rockchip/cru_rk3188.h | 191 +++++++++
 drivers/clk/rockchip/Makefile                   |   1 +
 drivers/clk/rockchip/clk_rk3188.c               | 523
 ++++++++++++++++++++++++ 3 files changed, 715 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3188.h
 create mode 100644 drivers/clk/rockchip/clk_rk3188.c

With one comment below.

Quoted 54 lines
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file mode 100644 index 0000000000..74f0fedcc6

arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +15 -0
@@ -0,0 +1,191 @@
+/*
+ * (C) Copyright 2016 Heiko Stuebner <[email protected]>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+#ifndef _ASM_ARCH_CRU_RK3188_H
+#define _ASM_ARCH_CRU_RK3188_H
+
+#define OSC_HZ         (24 * 1000 * 1000)
+
+#define APLL_HZ                (1608 * 1000000)
+#define GPLL_HZ                (594 * 1000000)
+#define CPLL_HZ                (384 * 1000000)
+
+/* The SRAM is clocked off aclk_cpu, so we want to max it out for boot

speed */ +#define CPU_ACLK_HZ 297000000

arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +32 -0
+#define CPU_HCLK_HZ    148500000
+#define CPU_PCLK_HZ    74250000
+#define CPU_H2P_HZ     74250000
+
+#define PERI_ACLK_HZ   148500000
+#define PERI_HCLK_HZ   148500000
+#define PERI_PCLK_HZ   74250000
+
+/* Private data for the clock driver - used by rockchip_get_cru() */
+struct rk3188_clk_priv {
+       struct rk3188_grf *grf;
+       struct rk3188_cru *cru;
+       ulong rate;
+       bool has_bwadj;
+};
+
+struct rk3188_cru {
+       struct rk3188_pll {
+               u32 con0;
+               u32 con1;
+               u32 con2;
+               u32 con3;
+       } pll[4];
+       u32 cru_mode_con;
+       u32 cru_clksel_con[35];
+       u32 cru_clkgate_con[10];
+       u32 reserved1[2];
+       u32 cru_glb_srst_fst_value;
+       u32 cru_glb_srst_snd_value;
+       u32 reserved2[2];
+       u32 cru_softrst_con[9];
+       u32 cru_misc_con;

arch/arm/include/asm/arch-rockchip/cru_rk3188.h line 58

Quoted 10 lines
arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +10 -0
+       u32 reserved3[2];
+       u32 cru_glb_cnt_th;
+};
+check_member(rk3188_cru, cru_glb_cnt_th, 0x0140);
+
+/* CRU_CLKSEL0_CON */
+enum {
+       /* a9_core_div: core = core_src / (a9_core_div + 1) */
+       A9_CORE_DIV_SHIFT       = 9,
+       A9_CORE_DIV_MASK        = 0x1f,

Can you define

Quoted 4 lines

A9_CORE_DIV_MASK = 0x1f << A9_CORE_DIV_SHIFT

and similarly for other masks. I got this wrong with rk3288, and I think shifting the mask makes the code easier in places.

I'd disagree here. We're using this scheme everywhere on Rockchip platforms. For example please look at all the pinmux defines

        GPIO3C1_SHIFT           = 2,
        GPIO3C1_MASK            = 3,
        GPIO3C1_GPIO            = 0,
        GPIO3C1_SDMMC1_DATA0,
        GPIO3C1_RMII_TXD1,
        GPIO3C1_RESERVED,
Quoted 2 lines

and numerous other places and I'd think mixing paradigms in one soc and between all Rockchip socs would be somewhat unwise.

The new ones are going to use this approach and I will get around to converting them at some point. I do think I did it wrong in the first place.

Anyway let's not hold this up for this as we have the same issue with rk3399.

Regards,
Simon

#24 lore raw

PATCH v3 10/16 rockchip: rk3188: Add clock driver

Quoted 108 lines · Simon Glass

Hi Heiko,

Quoted 102 lines · Heiko Stuebner

Hi Simon,

Am Montag, 6. Februar 2017, 07:35:12 CET schrieb Simon Glass:

Quoted 85 lines · Heiko Stuebner
Quoted 4 lines

Add a driver for setting up and modifying the various PLLs and peripheral clocks on the RK3188.

Quoted 8 lines

---

 arch/arm/include/asm/arch-rockchip/cru_rk3188.h | 191 +++++++++
 drivers/clk/rockchip/Makefile                   |   1 +
 drivers/clk/rockchip/clk_rk3188.c               | 523
 ++++++++++++++++++++++++ 3 files changed, 715 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3188.h
 create mode 100644 drivers/clk/rockchip/clk_rk3188.c

With one comment below.

Quoted 54 lines
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file mode 100644 index 0000000000..74f0fedcc6

arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +15 -0
@@ -0,0 +1,191 @@
+/*
+ * (C) Copyright 2016 Heiko Stuebner <[email protected]>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+#ifndef _ASM_ARCH_CRU_RK3188_H
+#define _ASM_ARCH_CRU_RK3188_H
+
+#define OSC_HZ         (24 * 1000 * 1000)
+
+#define APLL_HZ                (1608 * 1000000)
+#define GPLL_HZ                (594 * 1000000)
+#define CPLL_HZ                (384 * 1000000)
+
+/* The SRAM is clocked off aclk_cpu, so we want to max it out for boot

speed */ +#define CPU_ACLK_HZ 297000000

arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +32 -0
+#define CPU_HCLK_HZ    148500000
+#define CPU_PCLK_HZ    74250000
+#define CPU_H2P_HZ     74250000
+
+#define PERI_ACLK_HZ   148500000
+#define PERI_HCLK_HZ   148500000
+#define PERI_PCLK_HZ   74250000
+
+/* Private data for the clock driver - used by rockchip_get_cru() */
+struct rk3188_clk_priv {
+       struct rk3188_grf *grf;
+       struct rk3188_cru *cru;
+       ulong rate;
+       bool has_bwadj;
+};
+
+struct rk3188_cru {
+       struct rk3188_pll {
+               u32 con0;
+               u32 con1;
+               u32 con2;
+               u32 con3;
+       } pll[4];
+       u32 cru_mode_con;
+       u32 cru_clksel_con[35];
+       u32 cru_clkgate_con[10];
+       u32 reserved1[2];
+       u32 cru_glb_srst_fst_value;
+       u32 cru_glb_srst_snd_value;
+       u32 reserved2[2];
+       u32 cru_softrst_con[9];
+       u32 cru_misc_con;

arch/arm/include/asm/arch-rockchip/cru_rk3188.h line 58

Quoted 10 lines
arch/arm/include/asm/arch-rockchip/cru_rk3188.h new file +10 -0
+       u32 reserved3[2];
+       u32 cru_glb_cnt_th;
+};
+check_member(rk3188_cru, cru_glb_cnt_th, 0x0140);
+
+/* CRU_CLKSEL0_CON */
+enum {
+       /* a9_core_div: core = core_src / (a9_core_div + 1) */
+       A9_CORE_DIV_SHIFT       = 9,
+       A9_CORE_DIV_MASK        = 0x1f,

Can you define

Quoted 4 lines

A9_CORE_DIV_MASK = 0x1f << A9_CORE_DIV_SHIFT

and similarly for other masks. I got this wrong with rk3288, and I think shifting the mask makes the code easier in places.

I'd disagree here. We're using this scheme everywhere on Rockchip platforms. For example please look at all the pinmux defines

        GPIO3C1_SHIFT           = 2,
        GPIO3C1_MASK            = 3,
        GPIO3C1_GPIO            = 0,
        GPIO3C1_SDMMC1_DATA0,
        GPIO3C1_RMII_TXD1,
        GPIO3C1_RESERVED,
Quoted 2 lines

and numerous other places and I'd think mixing paradigms in one soc and between all Rockchip socs would be somewhat unwise.

Quoted 8 lines

The new ones are going to use this approach and I will get around to converting them at some point. I do think I did it wrong in the first place.

Anyway let's not hold this up for this as we have the same issue with rk3399.

Regards,
Simon

Applied to u-boot-rockchip, thanks!

author maintainer
#25 lore raw

PATCH v3 11/16 rockchip: rk3188: Add core devicetree files

In reply to Heiko Stuebner

The rk3188 shares a lot of peripherals with the rk3066 and thus has a common include called rk3xxx.dtsi. Add both this one and the specialized rk3188 on top of it.

---
 arch/arm/dts/rk3188.dtsi | 601 +++++++++++++++++++++++++++++++++++++++++++++++
 arch/arm/dts/rk3xxx.dtsi | 417 ++++++++++++++++++++++++++++++++
 2 files changed, 1018 insertions(+)
 create mode 100644 arch/arm/dts/rk3188.dtsi
 create mode 100644 arch/arm/dts/rk3xxx.dtsi
arch/arm/dts/rk3188.dtsi new file +601 -0
new file mode 100644
index 0000000000..f4d438eb66
@@ -0,0 +1,601 @@
+/*
+ * Copyright (c) 2013 MundoReader S.L.
+ * Author: Heiko Stuebner <[email protected]>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+ or X11
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/clock/rk3188-cru.h>
+#include "rk3xxx.dtsi"
+
+/ {
+	compatible = "rockchip,rk3188";
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		enable-method = "rockchip,rk3066-smp";
+
+		cpu0: cpu at 0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a9";
+			next-level-cache = <&L2>;
+			reg = <0x0>;
+			operating-points = <
+				/* kHz    uV */
+				1608000 1350000
+				1416000 1250000
+				1200000 1150000
+				1008000 1075000
+				 816000  975000
+				 600000  950000
+				 504000  925000
+				 312000  875000
+			>;
+			clock-latency = <40000>;
+			clocks = <&cru ARMCLK>;
+		};
+		cpu at 1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a9";
+			next-level-cache = <&L2>;
+			reg = <0x1>;
+		};
+		cpu at 2 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a9";
+			next-level-cache = <&L2>;
+			reg = <0x2>;
+		};
+		cpu at 3 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a9";
+			next-level-cache = <&L2>;
+			reg = <0x3>;
+		};
+	};
+
+	sram: sram at 10080000 {
+		compatible = "mmio-sram";
+		reg = <0x10080000 0x8000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0 0x10080000 0x8000>;
+
+		smp-sram at 0 {
+			compatible = "rockchip,rk3066-smp-sram";
+			reg = <0x0 0x50>;
+		};
+	};
+
+	i2s0: i2s at 1011a000 {
+		compatible = "rockchip,rk3188-i2s", "rockchip,rk3066-i2s";
+		reg = <0x1011a000 0x2000>;
+		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&i2s0_bus>;
+		dmas = <&dmac1_s 6>, <&dmac1_s 7>;
+		dma-names = "tx", "rx";
+		clock-names = "i2s_hclk", "i2s_clk";
+		clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
+		rockchip,playback-channels = <2>;
+		rockchip,capture-channels = <2>;
+		status = "disabled";
+	};
+
+	spdif: sound at 1011e000 {
+		compatible = "rockchip,rk3188-spdif", "rockchip,rk3066-spdif";
+		reg = <0x1011e000 0x2000>;
+		#sound-dai-cells = <0>;
+		clock-names = "hclk", "mclk";
+		clocks = <&cru HCLK_SPDIF>, <&cru SCLK_SPDIF>;
+		dmas = <&dmac1_s 8>;
+		dma-names = "tx";
+		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&spdif_tx>;
+		status = "disabled";
+	};
+
+	cru: clock-controller at 20000000 {
+		compatible = "rockchip,rk3188-cru";
+		reg = <0x20000000 0x1000>;
+		rockchip,grf = <&grf>;
+		u-boot,dm-spl;
+
+		#clock-cells = <1>;
+		#reset-cells = <1>;
+	};
+
+	efuse: efuse at 20010000 {
+		compatible = "rockchip,rockchip-efuse";
+		reg = <0x20010000 0x4000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		clocks = <&cru PCLK_EFUSE>;
+		clock-names = "pclk_efuse";
+
+		cpu_leakage: cpu_leakage at 17 {
+			reg = <0x17 0x1>;
+		};
+	};
+
+	usbphy: phy {
+		compatible = "rockchip,rk3188-usb-phy", "rockchip,rk3288-usb-phy";
+		rockchip,grf = <&grf>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+
+		usbphy0: usb-phy at 10c {
+			#phy-cells = <0>;
+			reg = <0x10c>;
+			clocks = <&cru SCLK_OTGPHY0>;
+			clock-names = "phyclk";
+			#clock-cells = <0>;
+		};
+
+		usbphy1: usb-phy at 11c {
+			#phy-cells = <0>;
+			reg = <0x11c>;
+			clocks = <&cru SCLK_OTGPHY1>;
+			clock-names = "phyclk";
+			#clock-cells = <0>;
+		};
+	};
+
+	pinctrl: pinctrl {
+		compatible = "rockchip,rk3188-pinctrl";
+		rockchip,grf = <&grf>;
+		rockchip,pmu = <&pmu>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+		u-boot,dm-spl;
+
+		gpio0: gpio0 at 2000a000 {
+			compatible = "rockchip,gpio-bank";
+			reg = <0x2000a000 0x100>;
+			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cru PCLK_GPIO0>;
+
+			gpio-controller;
+			#gpio-cells = <2>;
+
+			interrupt-controller;
+			#interrupt-cells = <2>;
+		};
+
+		gpio1: gpio1 at 2003c000 {
+			compatible = "rockchip,gpio-bank";
+			reg = <0x2003c000 0x100>;
+			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cru PCLK_GPIO1>;
+
+			gpio-controller;
+			#gpio-cells = <2>;
+
+			interrupt-controller;
+			#interrupt-cells = <2>;
+		};
+
+		gpio2: gpio2 at 2003e000 {
+			compatible = "rockchip,gpio-bank";
+			reg = <0x2003e000 0x100>;
+			interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cru PCLK_GPIO2>;
+
+			gpio-controller;
+			#gpio-cells = <2>;
+
+			interrupt-controller;
+			#interrupt-cells = <2>;
+		};
+
+		gpio3: gpio3 at 20080000 {
+			compatible = "rockchip,gpio-bank";
+			reg = <0x20080000 0x100>;
+			interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cru PCLK_GPIO3>;
+
+			gpio-controller;
+			#gpio-cells = <2>;
+
+			interrupt-controller;
+			#interrupt-cells = <2>;
+		};
+
+		pcfg_pull_up: pcfg_pull_up {
+			bias-pull-up;
+		};
+
+		pcfg_pull_down: pcfg_pull_down {
+			bias-pull-down;
+		};
+
+		pcfg_pull_none: pcfg_pull_none {
+			bias-disable;
+		};
+
+		emmc {
+			emmc_clk: emmc-clk {
+				rockchip,pins = <RK_GPIO0 24 RK_FUNC_2 &pcfg_pull_none>;
+			};
+
+			emmc_cmd: emmc-cmd {
+				rockchip,pins = <RK_GPIO0 26 RK_FUNC_2 &pcfg_pull_up>;
+			};
+
+			emmc_rst: emmc-rst {
+				rockchip,pins = <RK_GPIO0 27 RK_FUNC_2 &pcfg_pull_none>;
+			};
+
+			/*
+			 * The data pins are shared between nandc and emmc and
+			 * not accessible through pinctrl. Also they should've
+			 * been already set correctly by firmware, as
+			 * flash/emmc is the boot-device.
+			 */
+		};
+
+		emac {
+			emac_xfer: emac-xfer {
+				rockchip,pins = <RK_GPIO3 16 RK_FUNC_2 &pcfg_pull_none>, /* tx_en */
+						<RK_GPIO3 17 RK_FUNC_2 &pcfg_pull_none>, /* txd1 */
+						<RK_GPIO3 18 RK_FUNC_2 &pcfg_pull_none>, /* txd0 */
+						<RK_GPIO3 19 RK_FUNC_2 &pcfg_pull_none>, /* rxd0 */
+						<RK_GPIO3 20 RK_FUNC_2 &pcfg_pull_none>, /* rxd1 */
+						<RK_GPIO3 21 RK_FUNC_2 &pcfg_pull_none>, /* mac_clk */
+						<RK_GPIO3 22 RK_FUNC_2 &pcfg_pull_none>, /* rx_err */
+						<RK_GPIO3 23 RK_FUNC_2 &pcfg_pull_none>; /* crs_dvalid */
+			};
+
+			emac_mdio: emac-mdio {
+				rockchip,pins = <RK_GPIO3 24 RK_FUNC_2 &pcfg_pull_none>,
+						<RK_GPIO3 25 RK_FUNC_2 &pcfg_pull_none>;
+			};
+		};
+
+		i2c0 {
+			i2c0_xfer: i2c0-xfer {
+				rockchip,pins = <RK_GPIO1 24 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO1 25 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		i2c1 {
+			i2c1_xfer: i2c1-xfer {
+				rockchip,pins = <RK_GPIO1 26 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO1 27 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		i2c2 {
+			i2c2_xfer: i2c2-xfer {
+				rockchip,pins = <RK_GPIO1 28 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO1 29 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		i2c3 {
+			i2c3_xfer: i2c3-xfer {
+				rockchip,pins = <RK_GPIO3 14 RK_FUNC_2 &pcfg_pull_none>,
+						<RK_GPIO3 15 RK_FUNC_2 &pcfg_pull_none>;
+			};
+		};
+
+		i2c4 {
+			i2c4_xfer: i2c4-xfer {
+				rockchip,pins = <RK_GPIO1 30 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO1 31 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		pwm0 {
+			pwm0_out: pwm0-out {
+				rockchip,pins = <RK_GPIO3 27 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		pwm1 {
+			pwm1_out: pwm1-out {
+				rockchip,pins = <RK_GPIO3 28 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		pwm2 {
+			pwm2_out: pwm2-out {
+				rockchip,pins = <RK_GPIO3 29 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		pwm3 {
+			pwm3_out: pwm3-out {
+				rockchip,pins = <RK_GPIO3 30 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		spi0 {
+			spi0_clk: spi0-clk {
+				rockchip,pins = <RK_GPIO1 6 RK_FUNC_2 &pcfg_pull_up>;
+			};
+			spi0_cs0: spi0-cs0 {
+				rockchip,pins = <RK_GPIO1 7 RK_FUNC_2 &pcfg_pull_up>;
+			};
+			spi0_tx: spi0-tx {
+				rockchip,pins = <RK_GPIO1 5 RK_FUNC_2 &pcfg_pull_up>;
+			};
+			spi0_rx: spi0-rx {
+				rockchip,pins = <RK_GPIO1 4 RK_FUNC_2 &pcfg_pull_up>;
+			};
+			spi0_cs1: spi0-cs1 {
+				rockchip,pins = <RK_GPIO1 15 RK_FUNC_1 &pcfg_pull_up>;
+			};
+		};
+
+		spi1 {
+			spi1_clk: spi1-clk {
+				rockchip,pins = <RK_GPIO0 30 RK_FUNC_1 &pcfg_pull_up>;
+			};
+			spi1_cs0: spi1-cs0 {
+				rockchip,pins = <RK_GPIO0 31 RK_FUNC_1 &pcfg_pull_up>;
+			};
+			spi1_rx: spi1-rx {
+				rockchip,pins = <RK_GPIO0 28 RK_FUNC_1 &pcfg_pull_up>;
+			};
+			spi1_tx: spi1-tx {
+				rockchip,pins = <RK_GPIO0 29 RK_FUNC_1 &pcfg_pull_up>;
+			};
+			spi1_cs1: spi1-cs1 {
+				rockchip,pins = <RK_GPIO1 14 RK_FUNC_2 &pcfg_pull_up>;
+			};
+		};
+
+		uart0 {
+			uart0_xfer: uart0-xfer {
+				rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>,
+						<RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			uart0_cts: uart0-cts {
+				rockchip,pins = <RK_GPIO1 2 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			uart0_rts: uart0-rts {
+				rockchip,pins = <RK_GPIO1 3 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		uart1 {
+			uart1_xfer: uart1-xfer {
+				rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_up>,
+						<RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			uart1_cts: uart1-cts {
+				rockchip,pins = <RK_GPIO1 6 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			uart1_rts: uart1-rts {
+				rockchip,pins = <RK_GPIO1 7 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		uart2 {
+			uart2_xfer: uart2-xfer {
+				rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_up>,
+						<RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_none>;
+			};
+			/* no rts / cts for uart2 */
+		};
+
+		uart3 {
+			uart3_xfer: uart3-xfer {
+				rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_up>,
+						<RK_GPIO1 11 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			uart3_cts: uart3-cts {
+				rockchip,pins = <RK_GPIO1 12 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			uart3_rts: uart3-rts {
+				rockchip,pins = <RK_GPIO1 13 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		sd0 {
+			sd0_clk: sd0-clk {
+				rockchip,pins = <RK_GPIO3 2 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd0_cmd: sd0-cmd {
+				rockchip,pins = <RK_GPIO3 3 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd0_cd: sd0-cd {
+				rockchip,pins = <RK_GPIO3 8 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd0_wp: sd0-wp {
+				rockchip,pins = <RK_GPIO3 9 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd0_pwr: sd0-pwr {
+				rockchip,pins = <RK_GPIO3 1 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd0_bus1: sd0-bus-width1 {
+				rockchip,pins = <RK_GPIO3 4 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd0_bus4: sd0-bus-width4 {
+				rockchip,pins = <RK_GPIO3 4 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO3 5 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO3 6 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO3 7 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		sd1 {
+			sd1_clk: sd1-clk {
+				rockchip,pins = <RK_GPIO3 21 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd1_cmd: sd1-cmd {
+				rockchip,pins = <RK_GPIO3 16 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd1_cd: sd1-cd {
+				rockchip,pins = <RK_GPIO3 22 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd1_wp: sd1-wp {
+				rockchip,pins = <RK_GPIO3 23 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd1_bus1: sd1-bus-width1 {
+				rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_none>;
+			};
+
+			sd1_bus4: sd1-bus-width4 {
+				rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO3 18 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO3 19 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO3 20 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		i2s0 {
+			i2s0_bus: i2s0-bus {
+				rockchip,pins = <RK_GPIO1 16 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO1 17 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO1 18 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO1 19 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO1 20 RK_FUNC_1 &pcfg_pull_none>,
+						<RK_GPIO1 21 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+
+		spdif {
+			spdif_tx: spdif-tx {
+				rockchip,pins = <RK_GPIO1 14 RK_FUNC_1 &pcfg_pull_none>;
+			};
+		};
+	};
+};
+
+&emac {
+	compatible = "rockchip,rk3188-emac";
+};
+
+&global_timer {
+	interrupts = <GIC_PPI 11 0xf04>;
+};
+
+&grf {
+	compatible = "rockchip,rk3188-grf", "syscon";
+};
+
+&local_timer {
+	interrupts = <GIC_PPI 13 0xf04>;
+};
+
+&i2c0 {
+	compatible = "rockchip,rk3188-i2c";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_xfer>;
+};
+
+&i2c1 {
+	compatible = "rockchip,rk3188-i2c";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1_xfer>;
+};
+
+&i2c2 {
+	compatible = "rockchip,rk3188-i2c";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c2_xfer>;
+};
+
+&i2c3 {
+	compatible = "rockchip,rk3188-i2c";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c3_xfer>;
+};
+
+&i2c4 {
+	compatible = "rockchip,rk3188-i2c";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c4_xfer>;
+};
+
+&pmu {
+	compatible = "rockchip,rk3188-pmu", "syscon";
+};
+
+&pwm0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pwm0_out>;
+};
+
+&pwm1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pwm1_out>;
+};
+
+&pwm2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pwm2_out>;
+};
+
+&pwm3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pwm3_out>;
+};
+
+&spi0 {
+	compatible = "rockchip,rk3188-spi", "rockchip,rk3066-spi";
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi0_clk &spi0_tx &spi0_rx &spi0_cs0>;
+};
+
+&spi1 {
+	compatible = "rockchip,rk3188-spi", "rockchip,rk3066-spi";
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi1_clk &spi1_tx &spi1_rx &spi1_cs0>;
+};
+
+&uart0 {
+	compatible = "rockchip,rk3188-uart", "snps,dw-apb-uart";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_xfer>;
+};
+
+&uart1 {
+	compatible = "rockchip,rk3188-uart", "snps,dw-apb-uart";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1_xfer>;
+};
+
+&uart2 {
+	compatible = "rockchip,rk3188-uart", "snps,dw-apb-uart";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart2_xfer>;
+};
+
+&uart3 {
+	compatible = "rockchip,rk3188-uart", "snps,dw-apb-uart";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3_xfer>;
+};
+
+&wdt {
+	compatible = "rockchip,rk3188-wdt", "snps,dw-wdt";
+};
arch/arm/dts/rk3xxx.dtsi new file +417 -0

417 lines not on this page · raw message

Signature · 1 line
2.11.0
#26 lore raw

PATCH v3 11/16 rockchip: rk3188: Add core devicetree files

Quoted 11 lines · Heiko Stuebner

The rk3188 shares a lot of peripherals with the rk3066 and thus has a common include called rk3xxx.dtsi. Add both this one and the specialized rk3188 on top of it.

---
 arch/arm/dts/rk3188.dtsi | 601 +++++++++++++++++++++++++++++++++++++++++++++++
 arch/arm/dts/rk3xxx.dtsi | 417 ++++++++++++++++++++++++++++++++
 2 files changed, 1018 insertions(+)
 create mode 100644 arch/arm/dts/rk3188.dtsi
 create mode 100644 arch/arm/dts/rk3xxx.dtsi

Does this mirror the Linux kernel setup?

author maintainer
#27 lore raw

PATCH v3 11/16 rockchip: rk3188: Add core devicetree files

Am Montag, 6. Februar 2017, 07:35:16 CET schrieb Simon Glass:

Quoted 15 lines · Heiko Stuebner
Quoted 5 lines

The rk3188 shares a lot of peripherals with the rk3066 and thus has a common include called rk3xxx.dtsi. Add both this one and the specialized rk3188 on top of it.

Quoted 8 lines

---

 arch/arm/dts/rk3188.dtsi | 601
 +++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/rk3xxx.dtsi
 | 417 ++++++++++++++++++++++++++++++++
 2 files changed, 1018 insertions(+)
 create mode 100644 arch/arm/dts/rk3188.dtsi
 create mode 100644 arch/arm/dts/rk3xxx.dtsi
Quoted 3 lines

Does this mirror the Linux kernel setup?

yep, the split on the file level is the same in kernel. rk3066 and rk3188 share nearly every core component. The only change compared to the kernel are the added u-boot,* properties.

Heiko

author maintainer
#28 lore raw

PATCH v3 12/16 rockchip: rk3188: Add core support

In reply to Heiko Stuebner

Add the core architecture code for the rk3188. It doesn't support the SPL yet, as because of some unknown error it doesn't start yet.

---
 arch/arm/mach-rockchip/Kconfig                |  16 ++++
 arch/arm/mach-rockchip/Makefile               |   5 ++
 arch/arm/mach-rockchip/rk3188/Kconfig         |  24 +++++
 arch/arm/mach-rockchip/rk3188/Makefile        |  10 +++
 arch/arm/mach-rockchip/rk3188/clk_rk3188.c    |  33 +++++++
 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c |  55 ++++++++++++
 include/configs/rk3188_common.h               | 125 ++++++++++++++++++++++++++
 7 files changed, 268 insertions(+)
 create mode 100644 arch/arm/mach-rockchip/rk3188/Kconfig
 create mode 100644 arch/arm/mach-rockchip/rk3188/Makefile
 create mode 100644 arch/arm/mach-rockchip/rk3188/clk_rk3188.c
 create mode 100644 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
 create mode 100644 include/configs/rk3188_common.h
arch/arm/mach-rockchip/Kconfig +16 -0
index a776df35f4..ba9fbbbd33 100644
@@ -11,6 +11,21 @@ config ROCKCHIP_RK3036
 	  and video codec support. Peripherals include Gigabit Ethernet,
 	  USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
 
+config ROCKCHIP_RK3188
+	bool "Support Rockchip RK3188"
+	select CPU_V7
+	select SUPPORT_SPL
+	select SUPPORT_TPL
+	select SPL
+	select TPL
+	select ROCKCHIP_BROM_HELPER
+	help
+	  The Rockchip RK3188 is a ARM-based SoC with a quad-core Cortex-A9
+	  including NEON and GPU, 512KB L2 cache, Mali-400 graphics, two
+	  video interfaces, several memory options and video codec support.
+	  Peripherals include Fast Ethernet, USB2 host and OTG, SDIO, I2S,
+	  UART, SPI, I2C and PWMs.
+
 config ROCKCHIP_RK3288
 	bool "Support Rockchip RK3288"
 	select CPU_V7
@@ -50,6 +65,7 @@ config SPL_MMC_SUPPORT
 	default y if !ROCKCHIP_SPL_BACK_TO_BROM
 
 source "arch/arm/mach-rockchip/rk3036/Kconfig"
+source "arch/arm/mach-rockchip/rk3188/Kconfig"
 source "arch/arm/mach-rockchip/rk3288/Kconfig"
 source "arch/arm/mach-rockchip/rk3399/Kconfig"
 endif
arch/arm/mach-rockchip/Makefile +5 -0
index f9ccc9bb2c..2be7e14e3e 100644
@@ -16,5 +16,10 @@ ifndef CONFIG_ARM64
 obj-y += rk_timer.o
 endif
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/
+
+ifndef CONFIG_TPL_BUILD
+obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188/
+endif
+
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288/
 obj-$(CONFIG_ROCKCHIP_RK3399) += rk3399/
arch/arm/mach-rockchip/rk3188/Kconfig new file +24 -0
new file mode 100644
index 0000000000..f8e1d0316b
@@ -0,0 +1,24 @@
+if ROCKCHIP_RK3188
+
+config SYS_SOC
+	default "rockchip"
+
+config SYS_MALLOC_F_LEN
+	default 0x0800
+
+config SPL_LIBCOMMON_SUPPORT
+	default y
+
+config SPL_LIBGENERIC_SUPPORT
+	default y
+
+config SPL_SERIAL_SUPPORT
+	default y
+
+config TPL_LIBCOMMON_SUPPORT
+	default y
+
+config TPL_SERIAL_SUPPORT
+	default y
+
+endif
arch/arm/mach-rockchip/rk3188/Makefile new file +10 -0
new file mode 100644
index 0000000000..7fa010405b
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2015 Google, Inc
+#
+# SPDX-License-Identifier:      GPL-2.0+
+#
+
+ifndef CONFIG_TPL_BUILD
+obj-y += clk_rk3188.o
+obj-y += syscon_rk3188.o
+endif
arch/arm/mach-rockchip/rk3188/clk_rk3188.c new file +33 -0
new file mode 100644
index 0000000000..1ec9e1cb75
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2015 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <syscon.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/cru_rk3188.h>
+
+int rockchip_get_clk(struct udevice **devp)
+{
+	return uclass_get_device_by_driver(UCLASS_CLK,
+			DM_GET_DRIVER(rockchip_rk3188_cru), devp);
+}
+
+void *rockchip_get_cru(void)
+{
+	struct rk3188_clk_priv *priv;
+	struct udevice *dev;
+	int ret;
+
+	ret = rockchip_get_clk(&dev);
+	if (ret)
+		return ERR_PTR(ret);
+
+	priv = dev_get_priv(dev);
+
+	return priv->cru;
+}
arch/arm/mach-rockchip/rk3188/syscon_rk3188.c new file +55 -0

55 lines not on this page · raw message

include/configs/rk3188_common.h new file +125 -0

125 lines not on this page · raw message

Signature · 1 line
2.11.0
#29 lore raw

PATCH v3 12/16 rockchip: rk3188: Add core support

Quoted 5 lines · Heiko Stuebner

Add the core architecture code for the rk3188. It doesn't support the SPL yet, as because of some unknown error it doesn't start yet.

Quoted 14 lines
---
 arch/arm/mach-rockchip/Kconfig                |  16 ++++
 arch/arm/mach-rockchip/Makefile               |   5 ++
 arch/arm/mach-rockchip/rk3188/Kconfig         |  24 +++++
 arch/arm/mach-rockchip/rk3188/Makefile        |  10 +++
 arch/arm/mach-rockchip/rk3188/clk_rk3188.c    |  33 +++++++
 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c |  55 ++++++++++++
 include/configs/rk3188_common.h               | 125 ++++++++++++++++++++++++++
 7 files changed, 268 insertions(+)
 create mode 100644 arch/arm/mach-rockchip/rk3188/Kconfig
 create mode 100644 arch/arm/mach-rockchip/rk3188/Makefile
 create mode 100644 arch/arm/mach-rockchip/rk3188/clk_rk3188.c
 create mode 100644 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
 create mode 100644 include/configs/rk3188_common.h
author maintainer
#30 lore raw

PATCH v3 13/16 rockchip: rk3188: Add sdram driver

In reply to Heiko Stuebner

The sdram controller blocks are very similar to the rk3288 in utilizing memory scheduler, Designware uPCTL and Designware PUBL blocks, only limited to one bank instead of two.

There are some minimal differences when setting up the ram, so it gets a separate driver for the rk3188 but reuses the driver structs, as there is no need to define the same again.

More optimization can happen when the modelling of the controller parts in the dts actually follow the hardware layout hopefully at some point in the future.

---
 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h |  22 +
 arch/arm/mach-rockchip/rk3188/Makefile          |   1 +
 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c    | 985 ++++++++++++++++++++++++
 3 files changed, 1008 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
 create mode 100644 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +22 -0
new file mode 100644
index 0000000000..993c58d1a8
@@ -0,0 +1,22 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:	GPL-2.0
+ */
+
+#ifndef _ASM_ARCH_DDR_RK3188_H
+#define _ASM_ARCH_DDR_RK3188_H
+
+#include <asm/arch/ddr_rk3288.h>
+
+struct rk3188_msch {
+	u32 coreid;
+	u32 revisionid;
+	u32 ddrconf;
+	u32 ddrtiming;
+	u32 ddrmode;
+	u32 readlatency;
+};
+check_member(rk3188_msch, readlatency, 0x0014);
+
+#endif
arch/arm/mach-rockchip/rk3188/Makefile +1 -0
index 7fa010405b..2dc9511de7 100644
@@ -6,5 +6,6 @@
 
 ifndef CONFIG_TPL_BUILD
 obj-y += clk_rk3188.o
+obj-y += sdram_rk3188.o
 obj-y += syscon_rk3188.o
 endif
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +985 -0

985 lines not on this page · raw message

Signature · 1 line
2.11.0
#31 lore raw

PATCH v3 13/16 rockchip: rk3188: Add sdram driver

Hi Heiko,

Quoted 12 lines · Heiko Stuebner

The sdram controller blocks are very similar to the rk3288 in utilizing memory scheduler, Designware uPCTL and Designware PUBL blocks, only limited to one bank instead of two.

There are some minimal differences when setting up the ram, so it gets a separate driver for the rk3188 but reuses the driver structs, as there is no need to define the same again.

More optimization can happen when the modelling of the controller parts in the dts actually follow the hardware layout hopefully at some point in the future.

Quoted 8 lines
---
 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h |  22 +
 arch/arm/mach-rockchip/rk3188/Makefile          |   1 +
 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c    | 985 ++++++++++++++++++++++++
 3 files changed, 1008 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
 create mode 100644 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c

Nits below.

Quoted 15 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +8 -0
new file mode 100644
index 0000000000..993c58d1a8
@@ -0,0 +1,22 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef _ASM_ARCH_DDR_RK3188_H
+#define _ASM_ARCH_DDR_RK3188_H

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h line 18

Quoted 10 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +10 -0
+
+#include <asm/arch/ddr_rk3288.h>
+
+struct rk3188_msch {
+       u32 coreid;
+       u32 revisionid;
+       u32 ddrconf;
+       u32 ddrtiming;
+       u32 ddrmode;
+       u32 readlatency;

Can you comment this struct? What is it for?

Quoted 21 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +4 -0
+};
+check_member(rk3188_msch, readlatency, 0x0014);
+
+#endif
arch/arm/mach-rockchip/rk3188/Makefile +1 -0
index 7fa010405b..2dc9511de7 100644
@@ -6,5 +6,6 @@
 
 ifndef CONFIG_TPL_BUILD
 obj-y += clk_rk3188.o
+obj-y += sdram_rk3188.o
 obj-y += syscon_rk3188.o
 endif
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +0 -0
new file mode 100644
index 0000000000..9e41723c9f

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 7

Quoted 7 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +7 -0
@@ -0,0 +1,985 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ * Copyright 2014 Rockchip Inc.
+ *
+ * SPDX-License-Identifier:     GPL-2.0
+ *
+ * Adapted from coreboot.

Does coreboot support the rk3188?

Quoted 45 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +45 -0
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <dt-structs.h>
+#include <errno.h>
+#include <ram.h>
+#include <regmap.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/cru_rk3188.h>
+#include <asm/arch/ddr_rk3188.h>
+#include <asm/arch/grf_rk3188.h>
+#include <asm/arch/pmu_rk3188.h>
+#include <asm/arch/sdram.h>
+#include <linux/err.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct chan_info {
+       struct rk3288_ddr_pctl *pctl;
+       struct rk3288_ddr_publ *publ;
+       struct rk3188_msch *msch;
+};
+
+struct dram_info {
+       struct chan_info chan[1];
+       struct ram_info info;
+       struct clk ddr_clk;
+       struct rk3188_cru *cru;
+       struct rk3188_grf *grf;
+       struct rk3188_sgrf *sgrf;
+       struct rk3188_pmu *pmu;
+};
+
+struct rk3188_sdram_params {
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+       struct dtd_rockchip_rk3188_dmc of_plat;
+#endif
+       struct rk3288_sdram_channel ch[2];
+       struct rk3288_sdram_pctl_timing pctl_timing;
+       struct rk3288_sdram_phy_timing phy_timing;
+       struct rk3288_base_params base;

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 62

Quoted 10 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +10 -0
+       int num_channels;
+       struct regmap *map;
+};
+
+#define TEST_PATTEN    0x5aa5f00f
+#define DQS_GATE_TRAINING_ERROR_RANK0  (1 << 4)
+#define DQS_GATE_TRAINING_ERROR_RANK1  (2 << 4)
+
+#ifdef CONFIG_SPL_BUILD
+static void copy_to_reg(u32 *dest, const u32 *src, u32 n)

Seems like this should go in a common file as there are several users
- rk_copy_to_reg() ?

Quoted 53 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +53 -0
+{
+       int i;
+
+       for (i = 0; i < n / sizeof(u32); i++) {
+               writel(*src, dest);
+               src++;
+               dest++;
+       }
+}
+
+static void ddr_reset(struct rk3188_cru *cru, u32 ch, u32 ctl, u32 phy)
+{
+       u32 phy_ctl_srstn_shift = 5 + 8 * ch;
+       u32 ctl_psrstn_shift = 3 + 8 * ch;
+       u32 ctl_srstn_shift = 2 + 8 * ch;
+       u32 phy_psrstn_shift = 1 + 8 * ch;
+       u32 phy_srstn_shift = 8 * ch;
+
+       rk_clrsetreg(&cru->cru_softrst_con[5],
+                    1 << phy_ctl_srstn_shift | 1 << ctl_psrstn_shift |
+                    1 << ctl_srstn_shift | 1 << phy_psrstn_shift |
+                    1 << phy_srstn_shift,
+                    phy << phy_ctl_srstn_shift | ctl << ctl_psrstn_shift |
+                    ctl << ctl_srstn_shift | phy << phy_psrstn_shift |
+                    phy << phy_srstn_shift);
+}
+
+static void ddr_phy_ctl_reset(struct rk3188_cru *cru, u32 ch, u32 n)
+{
+       u32 phy_ctl_srstn_shift = 5 + 8 * ch;
+
+       rk_clrsetreg(&cru->cru_softrst_con[5],
+                    1 << phy_ctl_srstn_shift, n << phy_ctl_srstn_shift);
+}
+
+static void phy_pctrl_reset(struct rk3188_cru *cru,
+                           struct rk3288_ddr_publ *publ,
+                           u32 channel)
+{
+       int i;
+
+       ddr_reset(cru, channel, 1, 1);
+       udelay(1);
+       clrbits_le32(&publ->acdllcr, ACDLLCR_DLLSRST);
+       for (i = 0; i < 4; i++)
+               clrbits_le32(&publ->datx8[i].dxdllcr, DXDLLCR_DLLSRST);
+
+       udelay(10);
+       setbits_le32(&publ->acdllcr, ACDLLCR_DLLSRST);
+       for (i = 0; i < 4; i++)
+               setbits_le32(&publ->datx8[i].dxdllcr, DXDLLCR_DLLSRST);
+
+       udelay(10);

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 125

Quoted 10 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +10 -0
+       ddr_reset(cru, channel, 1, 0);
+       udelay(10);
+       ddr_reset(cru, channel, 0, 0);
+       udelay(10);
+}
+
+static void phy_dll_bypass_set(struct rk3288_ddr_publ *publ,
+       u32 freq)
+{
+       int i;

blank line here

Do you have a comment for this logic, and why it is how it is?

Quoted 59 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +59 -0
+       if (freq <= 250000000) {
+               if (freq <= 150000000)
+                       clrbits_le32(&publ->dllgcr, SBIAS_BYPASS);
+               else
+                       setbits_le32(&publ->dllgcr, SBIAS_BYPASS);
+               setbits_le32(&publ->acdllcr, ACDLLCR_DLLDIS);
+               for (i = 0; i < 4; i++)
+                       setbits_le32(&publ->datx8[i].dxdllcr,
+                                    DXDLLCR_DLLDIS);
+
+               setbits_le32(&publ->pir, PIR_DLLBYP);
+       } else {
+               clrbits_le32(&publ->dllgcr, SBIAS_BYPASS);
+               clrbits_le32(&publ->acdllcr, ACDLLCR_DLLDIS);
+               for (i = 0; i < 4; i++) {
+                       clrbits_le32(&publ->datx8[i].dxdllcr,
+                                    DXDLLCR_DLLDIS);
+               }
+
+               clrbits_le32(&publ->pir, PIR_DLLBYP);
+       }
+}
+
+static void dfi_cfg(struct rk3288_ddr_pctl *pctl, u32 dramtype)
+{
+       writel(DFI_INIT_START, &pctl->dfistcfg0);
+       writel(DFI_DRAM_CLK_SR_EN | DFI_DRAM_CLK_DPD_EN,
+              &pctl->dfistcfg1);
+       writel(DFI_PARITY_INTR_EN | DFI_PARITY_EN, &pctl->dfistcfg2);
+       writel(7 << TLP_RESP_TIME_SHIFT | LP_SR_EN | LP_PD_EN,
+              &pctl->dfilpcfg0);
+
+       writel(2 << TCTRL_DELAY_TIME_SHIFT, &pctl->dfitctrldelay);
+       writel(1 << TPHY_WRDATA_TIME_SHIFT, &pctl->dfitphywrdata);
+       writel(0xf << TPHY_RDLAT_TIME_SHIFT, &pctl->dfitphyrdlat);
+       writel(2 << TDRAM_CLK_DIS_TIME_SHIFT, &pctl->dfitdramclkdis);
+       writel(2 << TDRAM_CLK_EN_TIME_SHIFT, &pctl->dfitdramclken);
+       writel(1, &pctl->dfitphyupdtype0);
+
+       /* cs0 and cs1 write odt enable */
+       writel((RANK0_ODT_WRITE_SEL | RANK1_ODT_WRITE_SEL),
+              &pctl->dfiodtcfg);
+       /* odt write length */
+       writel(7 << ODT_LEN_BL8_W_SHIFT, &pctl->dfiodtcfg1);
+       /* phyupd and ctrlupd disabled */
+       writel(0, &pctl->dfiupdcfg);
+}
+
+static void ddr_set_enable(struct rk3188_grf *grf, uint channel, bool enable)
+{
+       uint val = 0;
+
+       if (enable)
+               val = 1 << DDR_16BIT_EN_SHIFT;
+
+       rk_clrsetreg(&grf->ddrc_con0, 1 << DDR_16BIT_EN_SHIFT, val);
+}
+
+static void ddr_set_ddr3_mode(struct rk3188_grf *grf, uint channel,

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 194

Quoted 10 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +10 -0
+                             bool ddr3_mode)
+{
+       uint mask, val;
+
+       mask = 1 << MSCH4_MAINDDR3_SHIFT;
+       val = ddr3_mode << MSCH4_MAINDDR3_SHIFT;
+       rk_clrsetreg(&grf->soc_con2, mask, val);
+}
+
+#define RANK_2_ROW15_EN 1

Can this go at the top of the file?

Quoted 130 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +130 -0
+static void ddr_rank_2_row15en(struct rk3188_grf *grf, bool enable)
+{
+       uint mask, val;
+
+       mask = 1 << RANK_2_ROW15_EN;
+       val = enable << RANK_2_ROW15_EN;
+       rk_clrsetreg(&grf->soc_con2, mask, val);
+}
+
+static void pctl_cfg(u32 channel, struct rk3288_ddr_pctl *pctl,
+                    struct rk3188_sdram_params *sdram_params,
+                    struct rk3188_grf *grf)
+{
+       copy_to_reg(&pctl->togcnt1u, &sdram_params->pctl_timing.togcnt1u,
+                   sizeof(sdram_params->pctl_timing));
+       switch (sdram_params->base.dramtype) {
+       case DDR3:
+               if (sdram_params->phy_timing.mr[1] & DDR3_DLL_DISABLE) {
+                       writel(sdram_params->pctl_timing.tcl - 3,
+                              &pctl->dfitrddataen);
+               } else {
+                       writel(sdram_params->pctl_timing.tcl - 2,
+                              &pctl->dfitrddataen);
+               }
+               writel(sdram_params->pctl_timing.tcwl - 1,
+                      &pctl->dfitphywrlat);
+               writel(0 << MDDR_LPDDR2_CLK_STOP_IDLE_SHIFT | DDR3_EN |
+                      DDR2_DDR3_BL_8 | (6 - 4) << TFAW_SHIFT | PD_EXIT_SLOW |
+                      1 << PD_TYPE_SHIFT | 0 << PD_IDLE_SHIFT,
+                      &pctl->mcfg);
+               ddr_set_ddr3_mode(grf, channel, true);
+               ddr_set_enable(grf, channel, true);
+               break;
+       }
+
+       setbits_le32(&pctl->scfg, 1);
+}
+
+static void phy_cfg(const struct chan_info *chan, u32 channel,
+                   struct rk3188_sdram_params *sdram_params)
+{
+       struct rk3288_ddr_publ *publ = chan->publ;
+       struct rk3188_msch *msch = chan->msch;
+       uint ddr_freq_mhz = sdram_params->base.ddr_freq / 1000000;
+       u32 dinit2;
+       int i;
+
+       dinit2 = DIV_ROUND_UP(ddr_freq_mhz * 200000, 1000);
+       /* DDR PHY Timing */
+       copy_to_reg(&publ->dtpr[0], &sdram_params->phy_timing.dtpr0,
+                   sizeof(sdram_params->phy_timing));
+       writel(sdram_params->base.noc_timing, &msch->ddrtiming);
+       writel(0x3f, &msch->readlatency);
+       writel(DIV_ROUND_UP(ddr_freq_mhz * 5120, 1000) << PRT_DLLLOCK_SHIFT |
+              DIV_ROUND_UP(ddr_freq_mhz * 50, 1000) << PRT_DLLSRST_SHIFT |
+              8 << PRT_ITMSRST_SHIFT, &publ->ptr[0]);
+       writel(DIV_ROUND_UP(ddr_freq_mhz * 500000, 1000) << PRT_DINIT0_SHIFT |
+              DIV_ROUND_UP(ddr_freq_mhz * 400, 1000) << PRT_DINIT1_SHIFT,
+              &publ->ptr[1]);
+       writel(min(dinit2, 0x1ffffU) << PRT_DINIT2_SHIFT |
+              DIV_ROUND_UP(ddr_freq_mhz * 1000, 1000) << PRT_DINIT3_SHIFT,
+              &publ->ptr[2]);
+
+       switch (sdram_params->base.dramtype) {
+       case DDR3:
+               clrbits_le32(&publ->pgcr, 0x1f);
+               clrsetbits_le32(&publ->dcr, DDRMD_MASK << DDRMD_SHIFT,
+                               DDRMD_DDR3 << DDRMD_SHIFT);
+               break;
+       }
+       if (sdram_params->base.odt) {
+               /*dynamic RTT enable */
+               for (i = 0; i < 4; i++)
+                       setbits_le32(&publ->datx8[i].dxgcr, DQSRTT | DQRTT);
+       } else {
+               /*dynamic RTT disable */
+               for (i = 0; i < 4; i++)
+                       clrbits_le32(&publ->datx8[i].dxgcr, DQSRTT | DQRTT);
+       }
+}
+
+static void phy_init(struct rk3288_ddr_publ *publ)
+{
+       setbits_le32(&publ->pir, PIR_INIT | PIR_DLLSRST
+               | PIR_DLLLOCK | PIR_ZCAL | PIR_ITMSRST | PIR_CLRSR);
+       udelay(1);
+       while ((readl(&publ->pgsr) &
+               (PGSR_IDONE | PGSR_DLDONE | PGSR_ZCDONE)) !=
+               (PGSR_IDONE | PGSR_DLDONE | PGSR_ZCDONE))
+               ;
+}
+
+static void send_command(struct rk3288_ddr_pctl *pctl, u32 rank,
+                        u32 cmd, u32 arg)
+{
+       writel((START_CMD | (rank << 20) | arg | cmd), &pctl->mcmd);
+       udelay(1);
+       while (readl(&pctl->mcmd) & START_CMD)
+               ;
+}
+
+static inline void send_command_op(struct rk3288_ddr_pctl *pctl,
+                                  u32 rank, u32 cmd, u32 ma, u32 op)
+{
+       send_command(pctl, rank, cmd, (ma & LPDDR2_MA_MASK) << LPDDR2_MA_SHIFT |
+                    (op & LPDDR2_OP_MASK) << LPDDR2_OP_SHIFT);
+}
+
+static void memory_init(struct rk3288_ddr_publ *publ,
+                       u32 dramtype)
+{
+       setbits_le32(&publ->pir,
+                    (PIR_INIT | PIR_DRAMINIT | PIR_LOCKBYP
+                     | PIR_ZCALBYP | PIR_CLRSR | PIR_ICPC
+                     | (dramtype == DDR3 ? PIR_DRAMRST : 0)));
+       udelay(1);
+       while ((readl(&publ->pgsr) & (PGSR_IDONE | PGSR_DLDONE))
+               != (PGSR_IDONE | PGSR_DLDONE))
+               ;
+}
+
+static void move_to_config_state(struct rk3288_ddr_publ *publ,
+                                struct rk3288_ddr_pctl *pctl)
+{
+       unsigned int state;
+
+       while (1) {
+               state = readl(&pctl->stat) & PCTL_STAT_MSK;
+
+               switch (state) {

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 334

Quoted 10 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +10 -0
+               case LOW_POWER:
+                       writel(WAKEUP_STATE, &pctl->sctl);
+                       while ((readl(&pctl->stat) & PCTL_STAT_MSK)
+                               != ACCESS)
+                               ;
+                       /* wait DLL lock */
+                       while ((readl(&publ->pgsr) & PGSR_DLDONE)
+                               != PGSR_DLDONE)
+                               ;
+                       /* if at low power state,need wakeup first,

Check multi-line comment style:

/*
* If at low-power state ...
* ...
*/

Quoted 48 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +48 -0
+                        * and then enter the config, so
+                        * fallthrough
+                        */
+               case ACCESS:
+                       /* fallthrough */
+               case INIT_MEM:
+                       writel(CFG_STATE, &pctl->sctl);
+                       while ((readl(&pctl->stat) & PCTL_STAT_MSK) != CONFIG)
+                               ;
+                       break;
+               case CONFIG:
+                       return;
+               default:
+                       break;
+               }
+       }
+}
+
+static void set_bandwidth_ratio(const struct chan_info *chan, u32 channel,
+                               u32 n, struct rk3188_grf *grf)
+{
+       struct rk3288_ddr_pctl *pctl = chan->pctl;
+       struct rk3288_ddr_publ *publ = chan->publ;
+       struct rk3188_msch *msch = chan->msch;
+
+       if (n == 1) {
+               setbits_le32(&pctl->ppcfg, 1);
+               ddr_set_enable(grf, channel, 1);
+               setbits_le32(&msch->ddrtiming, 1 << 31);
+               /* Data Byte disable*/
+               clrbits_le32(&publ->datx8[2].dxgcr, 1);
+               clrbits_le32(&publ->datx8[3].dxgcr, 1);
+               /* disable DLL */
+               setbits_le32(&publ->datx8[2].dxdllcr, DXDLLCR_DLLDIS);
+               setbits_le32(&publ->datx8[3].dxdllcr, DXDLLCR_DLLDIS);
+       } else {
+               clrbits_le32(&pctl->ppcfg, 1);
+               ddr_set_enable(grf, channel, 0);
+               clrbits_le32(&msch->ddrtiming, 1 << 31);
+               /* Data Byte enable*/
+               setbits_le32(&publ->datx8[2].dxgcr, 1);
+               setbits_le32(&publ->datx8[3].dxgcr, 1);
+
+               /* enable DLL */
+               clrbits_le32(&publ->datx8[2].dxdllcr, DXDLLCR_DLLDIS);
+               clrbits_le32(&publ->datx8[3].dxdllcr, DXDLLCR_DLLDIS);
+               /* reset DLL */
+               clrbits_le32(&publ->datx8[2].dxdllcr, DXDLLCR_DLLSRST);

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 392

Quoted 10 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +10 -0
+               clrbits_le32(&publ->datx8[3].dxdllcr, DXDLLCR_DLLSRST);
+               udelay(10);
+               setbits_le32(&publ->datx8[2].dxdllcr, DXDLLCR_DLLSRST);
+               setbits_le32(&publ->datx8[3].dxdllcr, DXDLLCR_DLLSRST);
+       }
+       setbits_le32(&pctl->dfistcfg0, 1 << 2);
+}
+
+static int data_training(const struct chan_info *chan, u32 channel,
+                        struct rk3188_sdram_params *sdram_params)

Function comment? What does it return? channel could just be int, right?

Quoted 136 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +136 -0
+{
+       unsigned int j;
+       int ret = 0;
+       u32 rank;
+       int i;
+       u32 step[2] = { PIR_QSTRN, PIR_RVTRN };
+       struct rk3288_ddr_publ *publ = chan->publ;
+       struct rk3288_ddr_pctl *pctl = chan->pctl;
+
+       /* disable auto refresh */
+       writel(0, &pctl->trefi);
+
+       if (sdram_params->base.dramtype != LPDDR3)
+               setbits_le32(&publ->pgcr, 1 << PGCR_DQSCFG_SHIFT);
+       rank = sdram_params->ch[channel].rank | 1;
+       for (j = 0; j < ARRAY_SIZE(step); j++) {
+               /*
+                * trigger QSTRN and RVTRN
+                * clear DTDONE status
+                */
+               setbits_le32(&publ->pir, PIR_CLRSR);
+
+               /* trigger DTT */
+               setbits_le32(&publ->pir,
+                            PIR_INIT | step[j] | PIR_LOCKBYP | PIR_ZCALBYP |
+                            PIR_CLRSR);
+               udelay(1);
+               /* wait echo byte DTDONE */
+               while ((readl(&publ->datx8[0].dxgsr[0]) & rank)
+                       != rank)
+                       ;
+               while ((readl(&publ->datx8[1].dxgsr[0]) & rank)
+                       != rank)
+                       ;
+               if (!(readl(&pctl->ppcfg) & 1)) {
+                       while ((readl(&publ->datx8[2].dxgsr[0])
+                               & rank) != rank)
+                               ;
+                       while ((readl(&publ->datx8[3].dxgsr[0])
+                               & rank) != rank)
+                               ;
+               }
+               if (readl(&publ->pgsr) &
+                   (PGSR_DTERR | PGSR_RVERR | PGSR_RVEIRR)) {
+                       ret = -1;
+                       break;
+               }
+       }
+       /* send some auto refresh to complement the lost while DTT */
+       for (i = 0; i < (rank > 1 ? 8 : 4); i++)
+               send_command(pctl, rank, REF_CMD, 0);
+
+       if (sdram_params->base.dramtype != LPDDR3)
+               clrbits_le32(&publ->pgcr, 1 << PGCR_DQSCFG_SHIFT);
+
+       /* resume auto refresh */
+       writel(sdram_params->pctl_timing.trefi, &pctl->trefi);
+
+       return ret;
+}
+
+static void move_to_access_state(const struct chan_info *chan)
+{
+       struct rk3288_ddr_publ *publ = chan->publ;
+       struct rk3288_ddr_pctl *pctl = chan->pctl;
+       unsigned int state;
+
+       while (1) {
+               state = readl(&pctl->stat) & PCTL_STAT_MSK;
+
+               switch (state) {
+               case LOW_POWER:
+                       if (((readl(&pctl->stat) >> LP_TRIG_SHIFT) &
+                                       LP_TRIG_MASK) == 1)
+                               return;
+
+                       writel(WAKEUP_STATE, &pctl->sctl);
+                       while ((readl(&pctl->stat) & PCTL_STAT_MSK) != ACCESS)
+                               ;
+                       /* wait DLL lock */
+                       while ((readl(&publ->pgsr) & PGSR_DLDONE)
+                               != PGSR_DLDONE)
+                               ;
+                       break;
+               case INIT_MEM:
+                       writel(CFG_STATE, &pctl->sctl);
+                       while ((readl(&pctl->stat) & PCTL_STAT_MSK) != CONFIG)
+                               ;
+                       /* fallthrough */
+               case CONFIG:
+                       writel(GO_STATE, &pctl->sctl);
+                       while ((readl(&pctl->stat) & PCTL_STAT_MSK) == CONFIG)
+                               ;
+                       break;
+               case ACCESS:
+                       return;
+               default:
+                       break;
+               }
+       }
+}
+
+static void dram_cfg_rbc(const struct chan_info *chan, u32 chnum,
+                        struct rk3188_sdram_params *sdram_params)
+{
+       struct rk3288_ddr_publ *publ = chan->publ;
+
+       if (sdram_params->ch[chnum].bk == 3)
+               clrsetbits_le32(&publ->dcr, PDQ_MASK << PDQ_SHIFT,
+                               1 << PDQ_SHIFT);
+       else
+               clrbits_le32(&publ->dcr, PDQ_MASK << PDQ_SHIFT);
+
+       writel(sdram_params->base.ddrconfig, &chan->msch->ddrconf);
+}
+
+static void dram_all_config(const struct dram_info *dram,
+                           struct rk3188_sdram_params *sdram_params)
+{
+       unsigned int chan;
+       u32 sys_reg = 0;
+
+       sys_reg |= sdram_params->base.dramtype << SYS_REG_DDRTYPE_SHIFT;
+       sys_reg |= (sdram_params->num_channels - 1) << SYS_REG_NUM_CH_SHIFT;
+       for (chan = 0; chan < sdram_params->num_channels; chan++) {
+               const struct rk3288_sdram_channel *info =
+                       &sdram_params->ch[chan];
+
+               sys_reg |= info->row_3_4 << SYS_REG_ROW_3_4_SHIFT(chan);
+               sys_reg |= 1 << SYS_REG_CHINFO_SHIFT(chan);
+               sys_reg |= (info->rank - 1) << SYS_REG_RANK_SHIFT(chan);
+               sys_reg |= (info->col - 9) << SYS_REG_COL_SHIFT(chan);
+               sys_reg |= info->bk == 3 ? 0 : 1 << SYS_REG_BK_SHIFT(chan);
+               sys_reg |= (info->cs0_row - 13) << SYS_REG_CS0_ROW_SHIFT(chan);
+               sys_reg |= (info->cs1_row - 13) << SYS_REG_CS1_ROW_SHIFT(chan);
+               sys_reg |= (2 >> info->bw) << SYS_REG_BW_SHIFT(chan);

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 538

Quoted 10 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +10 -0
+               sys_reg |= (2 >> info->dbw) << SYS_REG_DBW_SHIFT(chan);
+
+               dram_cfg_rbc(&dram->chan[chan], chan, sdram_params);
+       }
+       if (sdram_params->ch[0].rank == 2)
+               ddr_rank_2_row15en(dram->grf, 0);
+       else
+               ddr_rank_2_row15en(dram->grf, 1);
+       writel(sys_reg, &dram->pmu->sys_reg[2]);
+}

blank line

Quoted 12 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +12 -0
+const int ddrconf_table[] = {
+       /*
+        * [5:4] row(13+n)
+        * [1:0] col(9+n), assume bw=2
+        * row      col,bw */
+       0,
+       ((2 << 4) | 1),
+       ((1 << 4) | 1),
+       ((0 << 4) | 1),
+       ((2 << 4) | 2),
+       ((1 << 4) | 2),
+       ((0 << 4) | 2),

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 560

Quoted 10 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +10 -0
+       ((1 << 4) | 0),
+       ((0 << 4) | 0),
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+       0,
+};

Can this go at the top of the file? What are the <<4 for ? Can we have a #define?

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 572

Quoted 12 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +12 -0
+
+static int sdram_rank_bw_detect(struct dram_info *dram, int channel,
+               struct rk3188_sdram_params *sdram_params)
+{
+       int reg;
+       int need_trainig = 0;
+       const struct chan_info *chan = &dram->chan[channel];
+       struct rk3288_ddr_publ *publ = chan->publ;
+
+       ddr_rank_2_row15en(dram->grf, 0);
+
+       if (-1 == data_training(chan, channel, sdram_params)) {

Can you check for <0 rather than == -1? That is the normal error check.

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 578

Quoted 6 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +6 -0
+               printf("first data training fail!\n");
+               reg = readl(&publ->datx8[0].dxgsr[0]);
+               /* Check the result for rank 0 */
+               if ((channel == 0) && (reg & DQS_GATE_TRAINING_ERROR_RANK0)) {
+                       printf("data training fail!\n");
+                               return -EIO;

funny indent here

Quoted 13 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +13 -0
+               }
+
+               /* Check the result for rank 1 */
+               if (reg & DQS_GATE_TRAINING_ERROR_RANK1) {
+                       sdram_params->ch[channel].rank = 1;
+                       clrsetbits_le32(&publ->pgcr, 0xF << 18,
+                                       sdram_params->ch[channel].rank << 18);
+                       need_trainig = 1;
+               }
+               reg = readl(&publ->datx8[2].dxgsr[0]);
+               if (reg & (1 << 4)) {
+                       sdram_params->ch[channel].bw = 1;
+                       set_bandwidth_ratio(chan, channel,

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 601

Quoted 10 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +10 -0
+                                           sdram_params->ch[channel].bw,
+                                           dram->grf);
+                       need_trainig = 1;
+               }
+       }
+       /* Assume the Die bit width are the same with the chip bit width */
+       sdram_params->ch[channel].dbw = sdram_params->ch[channel].bw;
+
+       if (need_trainig &&
+           (-1 == data_training(chan, channel, sdram_params))) {

same as above

Quoted 5 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +5 -0
+               if (sdram_params->base.dramtype == LPDDR3) {
+                       ddr_phy_ctl_reset(dram->cru, channel, 1);
+                       udelay(10);
+                       ddr_phy_ctl_reset(dram->cru, channel, 0);
+                       udelay(10);

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 616

Quoted 10 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +10 -0
+               }
+               printf("2nd data training failed!");
+               return -EIO;
+       }
+
+       return 0;
+}
+
+static int sdram_col_row_detect(struct dram_info *dram, int channel,
+               struct rk3188_sdram_params *sdram_params)

Function comment

Quoted 73 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +73 -0
+{
+       int row, col;
+       unsigned int addr;
+       const struct chan_info *chan = &dram->chan[channel];
+       struct rk3288_ddr_pctl *pctl = chan->pctl;
+       struct rk3288_ddr_publ *publ = chan->publ;
+       int ret = 0;
+
+       /* Detect col */
+       for (col = 11; col >= 9; col--) {
+               writel(0, CONFIG_SYS_SDRAM_BASE);
+               addr = CONFIG_SYS_SDRAM_BASE +
+                       (1 << (col + sdram_params->ch[channel].bw - 1));
+               writel(TEST_PATTEN, addr);
+               if ((readl(addr) == TEST_PATTEN) &&
+                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                       break;
+       }
+       if (col == 8) {
+               printf("Col detect error\n");
+               ret = -EINVAL;
+               goto out;
+       } else {
+               sdram_params->ch[channel].col = col;
+       }
+
+       ddr_rank_2_row15en(dram->grf, 1);
+       move_to_config_state(publ, pctl);
+       writel(1, &chan->msch->ddrconf);
+       move_to_access_state(chan);
+       /* Detect row, max 15,min13 in rk3188*/
+       for (row = 16; row >= 13; row--) {
+               writel(0, CONFIG_SYS_SDRAM_BASE);
+               addr = CONFIG_SYS_SDRAM_BASE + (1 << (row + 15 - 1));
+               writel(TEST_PATTEN, addr);
+               if ((readl(addr) == TEST_PATTEN) &&
+                   (readl(CONFIG_SYS_SDRAM_BASE) == 0))
+                       break;
+       }
+       if (row == 12) {
+               printf("Row detect error\n");
+               ret = -EINVAL;
+       } else {
+               sdram_params->ch[channel].cs1_row = row;
+               sdram_params->ch[channel].row_3_4 = 0;
+               printf("chn %d col %d, row %d\n", channel, col, row);
+               sdram_params->ch[channel].cs0_row = row;
+       }
+
+out:
+       return ret;
+}
+
+static int sdram_get_niu_config(struct rk3188_sdram_params *sdram_params)
+{
+       int i, tmp, size, ret = 0;
+
+       tmp = sdram_params->ch[0].col - 9;
+       tmp -= (sdram_params->ch[0].bw == 2) ? 0 : 1;
+       tmp |= ((sdram_params->ch[0].cs0_row - 13) << 4);
+       size = sizeof(ddrconf_table)/sizeof(ddrconf_table[0]);
+       for (i = 0; i < size; i++)
+               if (tmp == ddrconf_table[i])
+                       break;
+       if (i >= size) {
+               printf("niu config not found\n");
+               ret = -EINVAL;
+       } else {
+               printf("niu config %d\n", i);
+               sdram_params->base.ddrconfig = i;
+       }
+
+       return ret;

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 699

Quoted 10 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +10 -0
+}
+
+static int sdram_init(struct dram_info *dram,
+                     struct rk3188_sdram_params *sdram_params)
+{
+       int channel;
+       int zqcr;
+       int ret;
+
+       printf("%s start 001\n", __func__);

debug()

arch/arm/mach-rockchip/rk3188/sdram_rk3188.c line 707

Quoted 8 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +8 -0
+       if ((sdram_params->base.dramtype == DDR3 &&
+            sdram_params->base.ddr_freq > 800000000)) {
+               printf("SDRAM frequency is too high!");
+               return -E2BIG;
+       }
+
+       ret = clk_set_rate(&dram->ddr_clk, sdram_params->base.ddr_freq);
+       printf("ret=%d\n", ret);

debug()

Quoted 279 lines
arch/arm/mach-rockchip/rk3188/sdram_rk3188.c new file +278 -1
+       if (ret) {
+               printf("Could not set DDR clock\n");
+               return ret;
+       }
+
+       for (channel = 0; channel < 1; channel++) {
+               const struct chan_info *chan = &dram->chan[channel];
+               struct rk3288_ddr_pctl *pctl = chan->pctl;
+               struct rk3288_ddr_publ *publ = chan->publ;
+
+               phy_pctrl_reset(dram->cru, publ, channel);
+               phy_dll_bypass_set(publ, sdram_params->base.ddr_freq);
+
+               dfi_cfg(pctl, sdram_params->base.dramtype);
+
+               pctl_cfg(channel, pctl, sdram_params, dram->grf);
+
+               phy_cfg(chan, channel, sdram_params);
+
+               phy_init(publ);
+
+               writel(POWER_UP_START, &pctl->powctl);
+               while (!(readl(&pctl->powstat) & POWER_UP_DONE))
+                       ;
+
+               memory_init(publ, sdram_params->base.dramtype);
+               move_to_config_state(publ, pctl);
+
+               /* Using 32bit bus width for detect */
+               sdram_params->ch[channel].bw = 2;
+               set_bandwidth_ratio(chan, channel,
+                                   sdram_params->ch[channel].bw, dram->grf);
+               /*
+                * set cs, using n=3 for detect
+                * CS0, n=1
+                * CS1, n=2
+                * CS0 & CS1, n = 3
+                */
+               sdram_params->ch[channel].rank = 2,
+               clrsetbits_le32(&publ->pgcr, 0xF << 18,
+                               (sdram_params->ch[channel].rank | 1) << 18);
+
+               /* DS=40ohm,ODT=155ohm */
+               zqcr = 1 << ZDEN_SHIFT | 2 << PU_ONDIE_SHIFT |
+                       2 << PD_ONDIE_SHIFT | 0x19 << PU_OUTPUT_SHIFT |
+                       0x19 << PD_OUTPUT_SHIFT;
+               writel(zqcr, &publ->zq1cr[0]);
+               writel(zqcr, &publ->zq0cr[0]);
+
+               /* Detect the rank and bit-width with data-training */
+               writel(1, &chan->msch->ddrconf);
+               sdram_rank_bw_detect(dram, channel, sdram_params);
+
+               if (sdram_params->base.dramtype == LPDDR3) {
+                       u32 i;
+                       writel(0, &pctl->mrrcfg0);
+                       for (i = 0; i < 17; i++)
+                               send_command_op(pctl, 1, MRR_CMD, i, 0);
+               }
+               writel(4, &chan->msch->ddrconf);
+               move_to_access_state(chan);
+               /* DDR3 and LPDDR3 are always 8 bank, no need detect */
+               sdram_params->ch[channel].bk = 3;
+               /* Detect Col and Row number*/
+               ret = sdram_col_row_detect(dram, channel, sdram_params);
+               if (ret)
+                       goto error;
+       }
+       /* Find NIU DDR configuration */
+       ret = sdram_get_niu_config(sdram_params);
+       if (ret)
+               goto error;
+
+       dram_all_config(dram, sdram_params);
+       printf("%s done\n", __func__);
+
+       return 0;
+error:
+       printf("DRAM init failed!\n");
+       hang();
+}
+#endif /* CONFIG_SPL_BUILD */
+
+size_t sdram_size_mb(struct rk3188_pmu *pmu)
+{
+       u32 rank, col, bk, cs0_row, cs1_row, bw, row_3_4;
+       size_t chipsize_mb = 0;
+       size_t size_mb = 0;
+       u32 ch;
+       u32 sys_reg = readl(&pmu->sys_reg[2]);
+       u32 chans;
+
+       chans = 1 + ((sys_reg >> SYS_REG_NUM_CH_SHIFT) & SYS_REG_NUM_CH_MASK);
+
+       for (ch = 0; ch < chans; ch++) {
+               rank = 1 + (sys_reg >> SYS_REG_RANK_SHIFT(ch) &
+                       SYS_REG_RANK_MASK);
+               col = 9 + (sys_reg >> SYS_REG_COL_SHIFT(ch) & SYS_REG_COL_MASK);
+               bk = 3 - ((sys_reg >> SYS_REG_BK_SHIFT(ch)) & SYS_REG_BK_MASK);
+               cs0_row = 13 + (sys_reg >> SYS_REG_CS0_ROW_SHIFT(ch) &
+                               SYS_REG_CS0_ROW_MASK);
+               cs1_row = 13 + (sys_reg >> SYS_REG_CS1_ROW_SHIFT(ch) &
+                               SYS_REG_CS1_ROW_MASK);
+               bw = (2 >> ((sys_reg >> SYS_REG_BW_SHIFT(ch)) &
+                       SYS_REG_BW_MASK));
+               row_3_4 = sys_reg >> SYS_REG_ROW_3_4_SHIFT(ch) &
+                       SYS_REG_ROW_3_4_MASK;
+               chipsize_mb = (1 << (cs0_row + col + bk + bw - 20));
+
+               if (rank > 1)
+                       chipsize_mb += chipsize_mb >>
+                               (cs0_row - cs1_row);
+               if (row_3_4)
+                       chipsize_mb = chipsize_mb * 3 / 4;
+               size_mb += chipsize_mb;
+       }
+
+       /* there can be no more than 2gb of memory */
+       size_mb = min(size_mb, 0x80000000 >> 20);
+
+       return size_mb;
+}
+
+#ifdef CONFIG_SPL_BUILD
+static int setup_sdram(struct udevice *dev)
+{
+       struct dram_info *priv = dev_get_priv(dev);
+       struct rk3188_sdram_params *params = dev_get_platdata(dev);
+
+       return sdram_init(priv, params);
+}
+
+static int rk3188_dmc_ofdata_to_platdata(struct udevice *dev)
+{
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
+       struct rk3188_sdram_params *params = dev_get_platdata(dev);
+       const void *blob = gd->fdt_blob;
+       int node = dev->of_offset;
+       int ret;
+
+       /* rk3188 supports only one-channel */
+       params->num_channels = 1;
+       ret = fdtdec_get_int_array(blob, node, "rockchip,pctl-timing",
+                                  (u32 *)&params->pctl_timing,
+                                  sizeof(params->pctl_timing) / sizeof(u32));
+       if (ret) {
+               printf("%s: Cannot read rockchip,pctl-timing\n", __func__);
+               return -EINVAL;
+       }
+       ret = fdtdec_get_int_array(blob, node, "rockchip,phy-timing",
+                                  (u32 *)&params->phy_timing,
+                                  sizeof(params->phy_timing) / sizeof(u32));
+       if (ret) {
+               printf("%s: Cannot read rockchip,phy-timing\n", __func__);
+               return -EINVAL;
+       }
+       ret = fdtdec_get_int_array(blob, node, "rockchip,sdram-params",
+                                  (u32 *)&params->base,
+                                  sizeof(params->base) / sizeof(u32));
+       if (ret) {
+               printf("%s: Cannot read rockchip,sdram-params\n", __func__);
+               return -EINVAL;
+       }
+       ret = regmap_init_mem(dev, &params->map);
+       if (ret)
+               return ret;
+#endif
+
+       return 0;
+}
+#endif /* CONFIG_SPL_BUILD */
+
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+static int conv_of_platdata(struct udevice *dev)
+{
+       struct rk3188_sdram_params *plat = dev_get_platdata(dev);
+       struct dtd_rockchip_rk3188_dmc *of_plat = &plat->of_plat;
+       int ret;
+
+       memcpy(&plat->pctl_timing, of_plat->rockchip_pctl_timing,
+              sizeof(plat->pctl_timing));
+       memcpy(&plat->phy_timing, of_plat->rockchip_phy_timing,
+              sizeof(plat->phy_timing));
+       memcpy(&plat->base, of_plat->rockchip_sdram_params, sizeof(plat->base));
+       /* rk3188 supports dual-channel, set default channel num to 2 */
+       plat->num_channels = 1;
+       ret = regmap_init_mem_platdata(dev, of_plat->reg,
+                                      ARRAY_SIZE(of_plat->reg) / 2,
+                                      &plat->map);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+#endif
+
+static int rk3188_dmc_probe(struct udevice *dev)
+{
+#ifdef CONFIG_SPL_BUILD
+       struct rk3188_sdram_params *plat = dev_get_platdata(dev);
+#endif
+       struct dram_info *priv = dev_get_priv(dev);
+       struct regmap *map;
+       int ret;
+       struct udevice *dev_clk;
+
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+       ret = conv_of_platdata(dev);
+       if (ret)
+               return ret;
+#endif
+       map = syscon_get_regmap_by_driver_data(ROCKCHIP_SYSCON_NOC);
+       if (IS_ERR(map))
+               return PTR_ERR(map);
+       priv->chan[0].msch = regmap_get_range(map, 0);
+
+       priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
+       priv->pmu = syscon_get_first_range(ROCKCHIP_SYSCON_PMU);
+
+#ifdef CONFIG_SPL_BUILD
+       priv->chan[0].pctl = regmap_get_range(plat->map, 0);
+       priv->chan[0].publ = regmap_get_range(plat->map, 1);
+#endif
+
+       ret = rockchip_get_clk(&dev_clk);
+       if (ret)
+               return ret;
+       priv->ddr_clk.id = CLK_DDR;
+       ret = clk_request(dev_clk, &priv->ddr_clk);
+       if (ret)
+               return ret;
+
+       priv->cru = rockchip_get_cru();
+       if (IS_ERR(priv->cru))
+               return PTR_ERR(priv->cru);
+#ifdef CONFIG_SPL_BUILD
+       ret = setup_sdram(dev);
+       if (ret)
+               return ret;
+#endif
+       priv->info.base = 0;
+       priv->info.size = sdram_size_mb(priv->pmu) << 20;
+
+       return 0;
+}
+
+static int rk3188_dmc_get_info(struct udevice *dev, struct ram_info *info)
+{
+       struct dram_info *priv = dev_get_priv(dev);
+
+       *info = priv->info;
+
+       return 0;
+}
+
+static struct ram_ops rk3188_dmc_ops = {
+       .get_info = rk3188_dmc_get_info,
+};
+
+static const struct udevice_id rk3188_dmc_ids[] = {
+       { .compatible = "rockchip,rk3188-dmc" },
+       { }
+};
+
+U_BOOT_DRIVER(dmc_rk3188) = {
+       .name = "rockchip_rk3188_dmc",
+       .id = UCLASS_RAM,
+       .of_match = rk3188_dmc_ids,
+       .ops = &rk3188_dmc_ops,
+#ifdef CONFIG_SPL_BUILD
+       .ofdata_to_platdata = rk3188_dmc_ofdata_to_platdata,
+#endif
+       .probe = rk3188_dmc_probe,
+       .priv_auto_alloc_size = sizeof(struct dram_info),
+#ifdef CONFIG_SPL_BUILD
+       .platdata_auto_alloc_size = sizeof(struct rk3188_sdram_params),
+#endif
+};
--
Quoted 2 lines

2.11.0

Regards,
Simon

author maintainer
#32 lore raw

PATCH v3 13/16 rockchip: rk3188: Add sdram driver

Hi Simon,

Am Montag, 6. Februar 2017, 07:35:23 CET schrieb Simon Glass:

Quoted 45 lines · Heiko Stuebner
Quoted 13 lines

The sdram controller blocks are very similar to the rk3288 in utilizing memory scheduler, Designware uPCTL and Designware PUBL blocks, only limited to one bank instead of two.

There are some minimal differences when setting up the ram, so it gets a separate driver for the rk3188 but reuses the driver structs, as there is no need to define the same again.

More optimization can happen when the modelling of the controller parts in the dts actually follow the hardware layout hopefully at some point in the future.

Quoted 8 lines

---

 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h |  22 +
 arch/arm/mach-rockchip/rk3188/Makefile          |   1 +
 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c    | 985
 ++++++++++++++++++++++++ 3 files changed, 1008 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
 create mode 100644 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c

Nits below.

Quoted 18 lines
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file mode 100644 index 0000000000..993c58d1a8

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +12 -0
@@ -0,0 +1,22 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef _ASM_ARCH_DDR_RK3188_H
+#define _ASM_ARCH_DDR_RK3188_H
+
+#include <asm/arch/ddr_rk3288.h>
+
+struct rk3188_msch {
Quoted 8 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h line 18

Quoted 6 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +6 -0
+       u32 coreid;
+       u32 revisionid;
+       u32 ddrconf;
+       u32 ddrtiming;
+       u32 ddrmode;
+       u32 readlatency;

Can you comment this struct? What is it for?

Added a comment that this the memory scheduler register map, but that is all I can say for it, as it is sparsely documented in the chip manuals.

Quoted 5 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h line 20

Quoted 2 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +2 -0
+#ifdef CONFIG_SPL_BUILD
+static void copy_to_reg(u32 *dest, const u32 *src, u32 n)

Seems like this should go in a common file as there are several users
- rk_copy_to_reg() ?

Right now we don't have a common file with shared code and as that function is specific to the SPL build I'm not sure if it wouldn't cause issues if we have a big bunch of common code that gets included in all SPLs.

Looking at my compilation result, it looks like the compiler inlined the function anyway, so maybe just define it as inline in the hardware.h ?

Quoted 10 lines
Quoted 10 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +9 -0
+{
+       int i;
+
+       for (i = 0; i < n / sizeof(u32); i++) {
+               writel(*src, dest);
+               src++;
+               dest++;
+       }
+}

[...]

Quoted 8 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h

Quoted 4 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +4 -0
+static void phy_dll_bypass_set(struct rk3288_ddr_publ *publ,
+       u32 freq)
+{
+       int i;

blank line here

Do you have a comment for this logic, and why it is how it is?

Not really ... the memory controllers of the rk3066,rk3188 are very much similar to the rk3288, so this simply mirrors your own sdram code from rk3288 ;-) .

Speaking of duplicate code, you might already realize that this sdram driver is very much similar to the rk3288.
My current plan is to submit the rk3188 separately at first and after everything lands try to make the common code shared.

rk3066, rk3188 and rk3288 all use a dw-upctl + dw-publ + phy, with some minimal differences, while the rk3036 uses a dw-upctl with a different phy block, so it might get a bit tricky on where to share and how to name stuff.

Also another developer seems to be working on rk3066 uboot support already, so it might be interesting to see if this will also require additional adaptations.

Quoted 22 lines
Quoted 22 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +22 -0
+       if (freq <= 250000000) {
+               if (freq <= 150000000)
+                       clrbits_le32(&publ->dllgcr, SBIAS_BYPASS);
+               else
+                       setbits_le32(&publ->dllgcr, SBIAS_BYPASS);
+               setbits_le32(&publ->acdllcr, ACDLLCR_DLLDIS);
+               for (i = 0; i < 4; i++)
+                       setbits_le32(&publ->datx8[i].dxdllcr,
+                                    DXDLLCR_DLLDIS);
+
+               setbits_le32(&publ->pir, PIR_DLLBYP);
+       } else {
+               clrbits_le32(&publ->dllgcr, SBIAS_BYPASS);
+               clrbits_le32(&publ->acdllcr, ACDLLCR_DLLDIS);
+               for (i = 0; i < 4; i++) {
+                       clrbits_le32(&publ->datx8[i].dxdllcr,
+                                    DXDLLCR_DLLDIS);
+               }
+
+               clrbits_le32(&publ->pir, PIR_DLLBYP);
+       }
+}

[...]

Quoted 5 lines
Quoted 5 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +5 -0
+static void ddr_set_ddr3_mode(struct rk3188_grf *grf, uint channel,
+                             bool ddr3_mode)
+{
+       uint mask, val;
+
Quoted 8 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h

Quoted 6 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +6 -0
+       mask = 1 << MSCH4_MAINDDR3_SHIFT;
+       val = ddr3_mode << MSCH4_MAINDDR3_SHIFT;
+       rk_clrsetreg(&grf->soc_con2, mask, val);
+}
+
+#define RANK_2_ROW15_EN 1

Can this go at the top of the file?

actually already contained in the grf header, so can be simply used from there

Quoted 12 lines
Quoted 8 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +8 -0
+static void ddr_rank_2_row15en(struct rk3188_grf *grf, bool enable)
+{
+       uint mask, val;
+
+       mask = 1 << RANK_2_ROW15_EN;
+       val = enable << RANK_2_ROW15_EN;
+       rk_clrsetreg(&grf->soc_con2, mask, val);
+}
Quoted 4 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h

Quoted 2 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +2 -0
+static int data_training(const struct chan_info *chan, u32 channel,
+                        struct rk3188_sdram_params *sdram_params)

Function comment? What does it return? channel could just be int, right?

I'm not particular insighted on what this code actually does, except what the function name implies ;-) ... but I did swap the channel to int.

Quoted 82 lines
Quoted 82 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +25 -0
+{
+       unsigned int j;
+       int ret = 0;
+       u32 rank;
+       int i;
+       u32 step[2] = { PIR_QSTRN, PIR_RVTRN };
+       struct rk3288_ddr_publ *publ = chan->publ;
+       struct rk3288_ddr_pctl *pctl = chan->pctl;
+
+       /* disable auto refresh */
+       writel(0, &pctl->trefi);
+
+       if (sdram_params->base.dramtype != LPDDR3)
+               setbits_le32(&publ->pgcr, 1 << PGCR_DQSCFG_SHIFT);
+       rank = sdram_params->ch[channel].rank | 1;
+       for (j = 0; j < ARRAY_SIZE(step); j++) {
+               /*
+                * trigger QSTRN and RVTRN
+                * clear DTDONE status
+                */
+               setbits_le32(&publ->pir, PIR_CLRSR);
+
+               /* trigger DTT */
+               setbits_le32(&publ->pir,
+                            PIR_INIT | step[j] | PIR_LOCKBYP |

PIR_ZCALBYP | + PIR_CLRSR);

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +52 -0
+               udelay(1);
+               /* wait echo byte DTDONE */
+               while ((readl(&publ->datx8[0].dxgsr[0]) & rank)
+                       != rank)
+                       ;
+               while ((readl(&publ->datx8[1].dxgsr[0]) & rank)
+                       != rank)
+                       ;
+               if (!(readl(&pctl->ppcfg) & 1)) {
+                       while ((readl(&publ->datx8[2].dxgsr[0])
+                               & rank) != rank)
+                               ;
+                       while ((readl(&publ->datx8[3].dxgsr[0])
+                               & rank) != rank)
+                               ;
+               }
+               if (readl(&publ->pgsr) &
+                   (PGSR_DTERR | PGSR_RVERR | PGSR_RVEIRR)) {
+                       ret = -1;
+                       break;
+               }
+       }
+       /* send some auto refresh to complement the lost while DTT */
+       for (i = 0; i < (rank > 1 ? 8 : 4); i++)
+               send_command(pctl, rank, REF_CMD, 0);
+
+       if (sdram_params->base.dramtype != LPDDR3)
+               clrbits_le32(&publ->pgcr, 1 << PGCR_DQSCFG_SHIFT);
+
+       /* resume auto refresh */
+       writel(sdram_params->pctl_timing.trefi, &pctl->trefi);
+
+       return ret;
+}
+
 
 
 
+const int ddrconf_table[] = {
+       /*
+        * [5:4] row(13+n)
+        * [1:0] col(9+n), assume bw=2
+        * row      col,bw */
+       0,
+       ((2 << 4) | 1),
+       ((1 << 4) | 1),
+       ((0 << 4) | 1),
+       ((2 << 4) | 2),
+       ((1 << 4) | 2),
+       ((0 << 4) | 2),
+       ((1 << 4) | 0),
+       ((0 << 4) | 0),
+       0,
+       0,
+       0,
Quoted 8 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h

Quoted 5 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +5 -0
+       0,
+       0,
+       0,
+       0,
+};

Can this go at the top of the file? What are the <<4 for ? Can we have a #define?

Having that shift as define might get difficult. As you can see this is the value that gets written into the ddrconf register of the memory scheduler and the contents of this registers aren't documented in any TRM (rk3288, rk3188, rk3066).

So I'd like to refrain from introducting possible wrong defines right now :-) .

Heiko

#33 lore raw

PATCH v3 13/16 rockchip: rk3188: Add sdram driver

Hi Heiko,

Quoted 67 lines · Heiko Stuebner

Hi Simon,

Am Montag, 6. Februar 2017, 07:35:23 CET schrieb Simon Glass:

Quoted 45 lines · Heiko Stuebner
Quoted 13 lines

The sdram controller blocks are very similar to the rk3288 in utilizing memory scheduler, Designware uPCTL and Designware PUBL blocks, only limited to one bank instead of two.

There are some minimal differences when setting up the ram, so it gets a separate driver for the rk3188 but reuses the driver structs, as there is no need to define the same again.

More optimization can happen when the modelling of the controller parts in the dts actually follow the hardware layout hopefully at some point in the future.

Quoted 8 lines

---

 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h |  22 +
 arch/arm/mach-rockchip/rk3188/Makefile          |   1 +
 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c    | 985
 ++++++++++++++++++++++++ 3 files changed, 1008 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h
 create mode 100644 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c

Nits below.

Quoted 18 lines
(quoted diff) +0 -0

b/arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file mode 100644 index 0000000000..993c58d1a8

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +12 -0
@@ -0,0 +1,22 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef _ASM_ARCH_DDR_RK3188_H
+#define _ASM_ARCH_DDR_RK3188_H
+
+#include <asm/arch/ddr_rk3288.h>
+
+struct rk3188_msch {
Quoted 8 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h line 18

Quoted 6 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +6 -0
+       u32 coreid;
+       u32 revisionid;
+       u32 ddrconf;
+       u32 ddrtiming;
+       u32 ddrmode;
+       u32 readlatency;

Can you comment this struct? What is it for?

Added a comment that this the memory scheduler register map, but that is all I can say for it, as it is sparsely documented in the chip manuals.

Quoted 5 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h line 20

Quoted 2 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +2 -0
+#ifdef CONFIG_SPL_BUILD
+static void copy_to_reg(u32 *dest, const u32 *src, u32 n)

Seems like this should go in a common file as there are several users
- rk_copy_to_reg() ?

Quoted 6 lines

Right now we don't have a common file with shared code and as that function is specific to the SPL build I'm not sure if it wouldn't cause issues if we have a big bunch of common code that gets included in all SPLs.

Looking at my compilation result, it looks like the compiler inlined the function anyway, so maybe just define it as inline in the hardware.h ?

I'd rather not do that - how about cleaning it up in a separate patch later.

Quoted 33 lines
Quoted 12 lines
Quoted 12 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +9 -0
+{
+       int i;
+
+       for (i = 0; i < n / sizeof(u32); i++) {
+               writel(*src, dest);
+               src++;
+               dest++;
+       }
+}

[...]

Quoted 8 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h

Quoted 4 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +4 -0
+static void phy_dll_bypass_set(struct rk3288_ddr_publ *publ,
+       u32 freq)
+{
+       int i;

blank line here

Do you have a comment for this logic, and why it is how it is?

Not really ... the memory controllers of the rk3066,rk3188 are very much similar to the rk3288, so this simply mirrors your own sdram code from rk3288 ;-) .

Speaking of duplicate code, you might already realize that this sdram driver is very much similar to the rk3288.
My current plan is to submit the rk3188 separately at first and after everything lands try to make the common code shared.

Quoted 7 lines

rk3066, rk3188 and rk3288 all use a dw-upctl + dw-publ + phy, with some minimal differences, while the rk3036 uses a dw-upctl with a different phy block, so it might get a bit tricky on where to share and how to name stuff.

Also another developer seems to be working on rk3066 uboot support already, so it might be interesting to see if this will also require additional adaptations.

OK

Quoted 156 lines
Quoted 24 lines
Quoted 24 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +22 -0
+       if (freq <= 250000000) {
+               if (freq <= 150000000)
+                       clrbits_le32(&publ->dllgcr, SBIAS_BYPASS);
+               else
+                       setbits_le32(&publ->dllgcr, SBIAS_BYPASS);
+               setbits_le32(&publ->acdllcr, ACDLLCR_DLLDIS);
+               for (i = 0; i < 4; i++)
+                       setbits_le32(&publ->datx8[i].dxdllcr,
+                                    DXDLLCR_DLLDIS);
+
+               setbits_le32(&publ->pir, PIR_DLLBYP);
+       } else {
+               clrbits_le32(&publ->dllgcr, SBIAS_BYPASS);
+               clrbits_le32(&publ->acdllcr, ACDLLCR_DLLDIS);
+               for (i = 0; i < 4; i++) {
+                       clrbits_le32(&publ->datx8[i].dxdllcr,
+                                    DXDLLCR_DLLDIS);
+               }
+
+               clrbits_le32(&publ->pir, PIR_DLLBYP);
+       }
+}

[...]

Quoted 5 lines
Quoted 5 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +5 -0
+static void ddr_set_ddr3_mode(struct rk3188_grf *grf, uint channel,
+                             bool ddr3_mode)
+{
+       uint mask, val;
+
Quoted 8 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h

Quoted 6 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +6 -0
+       mask = 1 << MSCH4_MAINDDR3_SHIFT;
+       val = ddr3_mode << MSCH4_MAINDDR3_SHIFT;
+       rk_clrsetreg(&grf->soc_con2, mask, val);
+}
+
+#define RANK_2_ROW15_EN 1

Can this go at the top of the file?

actually already contained in the grf header, so can be simply used from there

Quoted 12 lines
Quoted 8 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +8 -0
+static void ddr_rank_2_row15en(struct rk3188_grf *grf, bool enable)
+{
+       uint mask, val;
+
+       mask = 1 << RANK_2_ROW15_EN;
+       val = enable << RANK_2_ROW15_EN;
+       rk_clrsetreg(&grf->soc_con2, mask, val);
+}
Quoted 4 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h

Quoted 2 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +2 -0
+static int data_training(const struct chan_info *chan, u32 channel,
+                        struct rk3188_sdram_params *sdram_params)

Function comment? What does it return? channel could just be int, right?

I'm not particular insighted on what this code actually does, except what the function name implies ;-) ... but I did swap the channel to int.

Quoted 82 lines
Quoted 82 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +25 -0
+{
+       unsigned int j;
+       int ret = 0;
+       u32 rank;
+       int i;
+       u32 step[2] = { PIR_QSTRN, PIR_RVTRN };
+       struct rk3288_ddr_publ *publ = chan->publ;
+       struct rk3288_ddr_pctl *pctl = chan->pctl;
+
+       /* disable auto refresh */
+       writel(0, &pctl->trefi);
+
+       if (sdram_params->base.dramtype != LPDDR3)
+               setbits_le32(&publ->pgcr, 1 << PGCR_DQSCFG_SHIFT);
+       rank = sdram_params->ch[channel].rank | 1;
+       for (j = 0; j < ARRAY_SIZE(step); j++) {
+               /*
+                * trigger QSTRN and RVTRN
+                * clear DTDONE status
+                */
+               setbits_le32(&publ->pir, PIR_CLRSR);
+
+               /* trigger DTT */
+               setbits_le32(&publ->pir,
+                            PIR_INIT | step[j] | PIR_LOCKBYP |

PIR_ZCALBYP | + PIR_CLRSR);

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +52 -0
+               udelay(1);
+               /* wait echo byte DTDONE */
+               while ((readl(&publ->datx8[0].dxgsr[0]) & rank)
+                       != rank)
+                       ;
+               while ((readl(&publ->datx8[1].dxgsr[0]) & rank)
+                       != rank)
+                       ;
+               if (!(readl(&pctl->ppcfg) & 1)) {
+                       while ((readl(&publ->datx8[2].dxgsr[0])
+                               & rank) != rank)
+                               ;
+                       while ((readl(&publ->datx8[3].dxgsr[0])
+                               & rank) != rank)
+                               ;
+               }
+               if (readl(&publ->pgsr) &
+                   (PGSR_DTERR | PGSR_RVERR | PGSR_RVEIRR)) {
+                       ret = -1;
+                       break;
+               }
+       }
+       /* send some auto refresh to complement the lost while DTT */
+       for (i = 0; i < (rank > 1 ? 8 : 4); i++)
+               send_command(pctl, rank, REF_CMD, 0);
+
+       if (sdram_params->base.dramtype != LPDDR3)
+               clrbits_le32(&publ->pgcr, 1 << PGCR_DQSCFG_SHIFT);
+
+       /* resume auto refresh */
+       writel(sdram_params->pctl_timing.trefi, &pctl->trefi);
+
+       return ret;
+}
+
 
 
 
+const int ddrconf_table[] = {
+       /*
+        * [5:4] row(13+n)
+        * [1:0] col(9+n), assume bw=2
+        * row      col,bw */
+       0,
+       ((2 << 4) | 1),
+       ((1 << 4) | 1),
+       ((0 << 4) | 1),
+       ((2 << 4) | 2),
+       ((1 << 4) | 2),
+       ((0 << 4) | 2),
+       ((1 << 4) | 0),
+       ((0 << 4) | 0),
+       0,
+       0,
+       0,
Quoted 8 lines

arch/arm/include/asm/arch-rockchip/ddr_rk3188.h

Quoted 5 lines
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h new file +5 -0
+       0,
+       0,
+       0,
+       0,
+};

Can this go at the top of the file? What are the <<4 for ? Can we have a #define?

Quoted 6 lines

Having that shift as define might get difficult. As you can see this is the value that gets written into the ddrconf register of the memory scheduler and the contents of this registers aren't documented in any TRM (rk3288, rk3188, rk3066).

So I'd like to refrain from introducting possible wrong defines right now :-) .

OK. The memory init code is a pain point for many SoCs, let's just do our best and hopefully docs and meaning can improve with time.

Regards,
Simon

author maintainer
#34 lore raw

PATCH v3 14/16 rockchip: rk3188: Add main, spl and tpl boards

In reply to Heiko Stuebner

The rk3188 needs 3 uboot stages: a tpl living in 1KB of sram, a spl the resides in the rest of the sram and loads the regular uboot living in regular ram.

---
 arch/arm/mach-rockchip/Makefile           |   7 +-
 arch/arm/mach-rockchip/rk3188-board-spl.c | 220 ++++++++++++++++++++++++++++++
 arch/arm/mach-rockchip/rk3188-board-tpl.c |  87 ++++++++++++
 arch/arm/mach-rockchip/rk3188-board.c     |  71 ++++++++++
 4 files changed, 384 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/mach-rockchip/rk3188-board-spl.c
 create mode 100644 arch/arm/mach-rockchip/rk3188-board-tpl.c
 create mode 100644 arch/arm/mach-rockchip/rk3188-board.c
arch/arm/mach-rockchip/Makefile +6 -1
index 2be7e14e3e..7b8abc2266 100644
@@ -4,11 +4,16 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifdef CONFIG_SPL_BUILD
+ifdef CONFIG_TPL_BUILD
+obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-tpl.o
+obj-$(CONFIG_ROCKCHIP_BROM_HELPER) += save_boot_param.o
+else ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o
+obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-spl.o
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o
 obj-$(CONFIG_ROCKCHIP_BROM_HELPER) += save_boot_param.o
 else
+obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board.o
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board.o
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board.o
 endif
arch/arm/mach-rockchip/rk3188-board-spl.c new file +220 -0

220 lines not on this page · raw message

arch/arm/mach-rockchip/rk3188-board-tpl.c new file +87 -0

87 lines not on this page · raw message

arch/arm/mach-rockchip/rk3188-board.c new file +71 -0

71 lines not on this page · raw message

Signature · 1 line
2.11.0
#35 lore raw

PATCH v3 14/16 rockchip: rk3188: Add main, spl and tpl boards

Hi Heiko,

Quoted 3 lines · Heiko Stuebner

The rk3188 needs 3 uboot stages: a tpl living in 1KB of sram, a spl the resides in the rest of the sram and loads the regular uboot living in regular ram.

s/uboot/U-Boot/

Quoted 5 lines
---
 arch/arm/mach-rockchip/Makefile           |   7 +-
 arch/arm/mach-rockchip/rk3188-board-spl.c | 220 ++++++++++++++++++++++++++++++

There is a lot of common code here with rk3288 - can we unify it a bit, or is that not feasible?

Quoted 136 lines
 arch/arm/mach-rockchip/rk3188-board-tpl.c |  87 ++++++++++++
 arch/arm/mach-rockchip/rk3188-board.c     |  71 ++++++++++
 4 files changed, 384 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/mach-rockchip/rk3188-board-spl.c
 create mode 100644 arch/arm/mach-rockchip/rk3188-board-tpl.c
 create mode 100644 arch/arm/mach-rockchip/rk3188-board.c
arch/arm/mach-rockchip/Makefile +6 -1
index 2be7e14e3e..7b8abc2266 100644
@@ -4,11 +4,16 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-ifdef CONFIG_SPL_BUILD
+ifdef CONFIG_TPL_BUILD
+obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-tpl.o
+obj-$(CONFIG_ROCKCHIP_BROM_HELPER) += save_boot_param.o
+else ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o
+obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-spl.o
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o
 obj-$(CONFIG_ROCKCHIP_BROM_HELPER) += save_boot_param.o
 else
+obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board.o
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board.o
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board.o
 endif
arch/arm/mach-rockchip/rk3188-board-spl.c new file +101 -0
new file mode 100644
index 0000000000..b528a2f73d
@@ -0,0 +1,220 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <debug_uart.h>
+#include <dm.h>
+#include <fdtdec.h>
+#include <led.h>
+#include <malloc.h>
+#include <ram.h>
+#include <spl.h>
+#include <asm/gpio.h>
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/periph.h>
+#include <asm/arch/pmu_rk3188.h>
+#include <asm/arch/sdram.h>
+#include <asm/arch/timer.h>
+#include <dm/pinctrl.h>
+#include <dm/root.h>
+#include <dm/test.h>
+#include <dm/util.h>
+#include <power/regulator.h>
+#include <syscon.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+u32 spl_boot_device(void)
+{
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
+       const void *blob = gd->fdt_blob;
+       struct udevice *dev;
+       const char *bootdev;
+       int node;
+       int ret;
+
+       bootdev = fdtdec_get_config_string(blob, "u-boot,boot0");
+       debug("Boot device %s\n", bootdev);
+       if (!bootdev)
+               goto fallback;
+
+       node = fdt_path_offset(blob, bootdev);
+       if (node < 0) {
+               debug("node=%d\n", node);
+               goto fallback;
+       }
+       ret = device_get_global_by_of_offset(node, &dev);
+       if (ret) {
+               debug("device at node %s/%d not found: %d\n", bootdev, node,
+                     ret);
+               goto fallback;
+       }
+       debug("Found device %s\n", dev->name);
+       switch (device_get_uclass_id(dev)) {
+       case UCLASS_SPI_FLASH:
+               return BOOT_DEVICE_SPI;
+       case UCLASS_MMC:
+               return BOOT_DEVICE_MMC1;
+       default:
+               debug("Booting from device uclass '%s' not supported\n",
+                     dev_get_uclass_name(dev));
+       }
+
+fallback:
+#endif
+       return BOOT_DEVICE_MMC1;
+}
+
+u32 spl_boot_mode(const u32 boot_device)
+{
+       return MMCSD_MODE_RAW;
+}
+
+extern u32 SAVE_SP_ADDR;
+extern void back_to_bootrom(void);
+void board_init_f(ulong dummy)
+{
+       struct udevice *pinctrl, *dev;
+       struct rk3188_pmu *pmu;
+       int ret;
+
+#define EARLY_UART
+       /* Example code showing how to enable the debug UART on RK3188 */
+#ifdef EARLY_UART
+#include <asm/arch/grf_rk3188.h>
+       /* Enable early UART on the RK3188 */
+#define GRF_BASE       0x20008000
+       struct rk3188_grf * const grf = (void *)GRF_BASE;
+
+       rk_clrsetreg(&grf->gpio1b_iomux,
+                    GPIO1B1_MASK << GPIO1B1_SHIFT |
+                    GPIO1B0_MASK << GPIO1B0_SHIFT,
+                    GPIO1B1_UART2_SOUT << GPIO1B1_SHIFT |
+                    GPIO1B0_UART2_SIN << GPIO1B0_SHIFT);
+       /*
+        * Debug UART can be used from here if required:
+        *

arch/arm/mach-rockchip/rk3188-board-spl.c line 111

Quoted 10 lines
arch/arm/mach-rockchip/rk3188-board-spl.c new file +10 -0
+        * debug_uart_init();
+        * printch('a');
+        * printhex8(0x1234);
+        * printascii("string");
+        */
+       debug_uart_init();
+       printch('s');
+       printch('p');
+       printch('l');
+       printch('\n');

printascii("spl\n");

Quoted 121 lines
arch/arm/mach-rockchip/rk3188-board-spl.c new file +109 -0
+#endif
+
+       ret = spl_init();
+       if (ret) {
+               debug("spl_init() failed: %d\n", ret);
+               hang();
+       }
+
+       rockchip_timer_init();
+
+       ret = rockchip_get_clk(&dev);
+       if (ret) {
+               debug("CLK init failed: %d\n", ret);
+               return;
+       }
+
+       /*
+        * Recover the bootrom's stackpointer.
+        * For whatever reason needs to run after rockchip_get_clk.
+        */
+       pmu = syscon_get_first_range(ROCKCHIP_SYSCON_PMU);
+       if (IS_ERR(pmu))
+               error("pmu syscon returned %ld\n", PTR_ERR(pmu));
+       SAVE_SP_ADDR = readl(&pmu->sys_reg[2]);
+
+       ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
+       if (ret) {
+               debug("Pinctrl init failed: %d\n", ret);
+               return;
+       }
+
+       ret = uclass_get_device(UCLASS_RAM, 0, &dev);
+       if (ret) {
+               debug("DRAM init failed: %d\n", ret);
+               return;
+       }
+
+#if defined(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT)
+       back_to_bootrom();
+#endif
+}
+
+static int setup_led(void)
+{
+#ifdef CONFIG_SPL_LED
+       struct udevice *dev;
+       char *led_name;
+       int ret;
+
+       led_name = fdtdec_get_config_string(gd->fdt_blob, "u-boot,boot-led");
+       if (!led_name)
+               return 0;
+       ret = led_get_by_label(led_name, &dev);
+       if (ret) {
+               debug("%s: get=%d\n", __func__, ret);
+               return ret;
+       }
+       ret = led_set_on(dev, 1);
+       if (ret)
+               return ret;
+#endif
+
+       return 0;
+}
+
+void spl_board_init(void)
+{
+       struct udevice *pinctrl;
+       int ret;
+
+       ret = setup_led();
+       if (ret) {
+               debug("LED ret=%d\n", ret);
+               hang();
+       }
+
+       ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
+       if (ret) {
+               debug("%s: Cannot find pinctrl device\n", __func__);
+               goto err;
+       }
+
+#ifdef CONFIG_SPL_MMC_SUPPORT
+       ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
+       if (ret) {
+               debug("%s: Failed to set up SD card\n", __func__);
+               goto err;
+       }
+#endif
+
+       /* Enable debug UART */
+       ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_UART_DBG);
+       if (ret) {
+               debug("%s: Failed to set up console UART\n", __func__);
+               goto err;
+       }
+
+       preloader_console_init();
+#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
+       back_to_bootrom();
+#endif
+       return;
+
+err:
+       printf("spl_board_init: Error %d\n", ret);
+
+       /* No way to report error here */
+       hang();
+}
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +6 -0
new file mode 100644
index 0000000000..62cdb8976a
@@ -0,0 +1,87 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+

arch/arm/mach-rockchip/rk3188-board-tpl.c line 16

Quoted 10 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +10 -0
+#include <common.h>
+#include <debug_uart.h>
+#include <spl.h>
+#include <asm/io.h>
+#include <asm/arch/pmu_rk3188.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* track how often we were entered */
+static int rk3188_num_entries;

Is this in BSS? I suspect it might cause problems. Perhaps put it in the data section?

arch/arm/mach-rockchip/rk3188-board-tpl.c line 17

Quoted 1 line
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +1 -0
+extern void back_to_bootrom(void);

Should be in a header file somewhere

arch/arm/mach-rockchip/rk3188-board-tpl.c line 21

Quoted 4 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +4 -0
+
+#define PMU_BASE       0x20004000
+#define TPL_ENTRY      0x10080C00
+extern u32 SAVE_SP_ADDR;

Blank line

Quoted 32 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +32 -0
+static void jump_to_tpl(void)
+{
+       typedef void __noreturn (*image_entry_noargs_t)(void);
+
+       struct rk3188_pmu * const pmu = (void *)PMU_BASE;
+       image_entry_noargs_t tpl_entry =
+               (image_entry_noargs_t)(unsigned long)TPL_ENTRY;
+
+       /* Store the SAVE_SP_ADDR in a location shared with TPL. */
+       writel(SAVE_SP_ADDR, &pmu->sys_reg[2]);
+       tpl_entry();
+}
+
+void board_init_f(ulong dummy)
+{
+#define EARLY_UART
+       /* Example code showing how to enable the debug UART on RK3188 */
+#ifdef EARLY_UART
+#include <asm/arch/grf_rk3188.h>
+       /* Enable early UART on the RK3188 */
+#define GRF_BASE       0x20008000
+       struct rk3188_grf * const grf = (void *)GRF_BASE;
+
+       rk_clrsetreg(&grf->gpio1b_iomux,
+                    GPIO1B1_MASK << GPIO1B1_SHIFT |
+                    GPIO1B0_MASK << GPIO1B0_SHIFT,
+                    GPIO1B1_UART2_SOUT << GPIO1B1_SHIFT |
+                    GPIO1B0_UART2_SIN << GPIO1B0_SHIFT);
+       /*
+        * Debug UART can be used from here if required:
+        *
+        * debug_uart_init();

arch/arm/mach-rockchip/rk3188-board-tpl.c line 63

Quoted 10 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +10 -0
+        * printch('a');
+        * printhex8(0x1234);
+        * printascii("string");
+        */
+       debug_uart_init();
+
+       printch('t');
+       printch('p');
+       printch('l');
+       printch('-');

printascii()

Quoted 79 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +24 -0
+       printch(rk3188_num_entries + 1 + '0');
+       printch('\n');
+#endif
+
+       rk3188_num_entries++;
+
+       if (rk3188_num_entries == 1) {
+               /*
+                * The original loader did some very basic integrity
+                * checking at this point, but the remaining few bytes
+                * could be used for any improvement making sense
+                * really early on.
+                */
+
+               back_to_bootrom();
+       } else {
+               /*
+                * TPL part of the loader should now wait for us
+                * at offset 0xC00 in the sram. Should never return
+                * from there.
+                */
+               jump_to_tpl();
+       }
+}
arch/arm/mach-rockchip/rk3188-board.c new file +49 -0
new file mode 100644
index 0000000000..16f38559af
@@ -0,0 +1,71 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <ram.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/periph.h>
+#include <asm/arch/pmu_rk3288.h>
+#include <asm/arch/boot_mode.h>
+#include <asm/gpio.h>
+#include <dm/pinctrl.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_init(void)
+{
+#if defined(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM)
+       struct udevice *pinctrl;
+       int ret;
+
+       /*
+        * We need to implement sdcard iomux here for the further
+        * initialization, otherwise, it'll hit sdcard command sending
+        * timeout exception.
+        */
+       ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
+       if (ret) {
+               debug("%s: Cannot find pinctrl device\n", __func__);
+               goto err;
+       }
+       ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
+       if (ret) {
+               debug("%s: Failed to set up SD card\n", __func__);
+               goto err;
+       }
+
+       return 0;
+err:
+       printf("board_init: Error %d\n", ret);
+
+       /* No way to report error here */
+       hang();

arch/arm/mach-rockchip/rk3188-board.c line 59

Quoted 10 lines
arch/arm/mach-rockchip/rk3188-board.c new file +10 -0
+
+       return -1;
+#else
+       return 0;
+#endif
+}
+
+int dram_init(void)
+{
+       /* FIXME: read back ram size from sys_reg2 */

TODO(email):

Quoted 13 lines
arch/arm/mach-rockchip/rk3188-board.c new file +12 -1
+       gd->ram_size = 0x40000000;
+
+       return 0;
+}
+
+#ifndef CONFIG_SYS_DCACHE_OFF
+void enable_caches(void)
+{
+       /* Enable D-cache. I-cache is already enabled in start.S */
+       dcache_enable();
+}
+#endif
--
Quoted 2 lines

2.11.0

Regards,
Simon

author maintainer
#36 lore raw

PATCH v3 14/16 rockchip: rk3188: Add main, spl and tpl boards

Am Montag, 6. Februar 2017, 07:35:25 CET schrieb Simon Glass:

Quoted 9 lines

Hi Heiko,

Quoted 3 lines · Heiko Stuebner

The rk3188 needs 3 uboot stages: a tpl living in 1KB of sram, a spl the resides in the rest of the sram and loads the regular uboot living in regular ram.

s/uboot/U-Boot/

Quoted 8 lines
Quoted 6 lines

---

 arch/arm/mach-rockchip/Makefile           |   7 +-
 arch/arm/mach-rockchip/rk3188-board-spl.c | 220

++++++++++++++++++++++++++++++

There is a lot of common code here with rk3288 - can we unify it a bit, or is that not feasible?

not sure about that. In the end the amount of code is not that much - essentially the setup_led() and spl_board_init() could be unified a bit, but then spl_board_init() would probably require empty functions for not implemented stuff - configure_emmc on rk3188 for example.

So I'm not sure if this would help or just makes everything more complicated.

Quoted 148 lines
Quoted 148 lines
 arch/arm/mach-rockchip/rk3188-board-tpl.c |  87 ++++++++++++
 arch/arm/mach-rockchip/rk3188-board.c     |  71 ++++++++++
 4 files changed, 384 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/mach-rockchip/rk3188-board-spl.c
 create mode 100644 arch/arm/mach-rockchip/rk3188-board-tpl.c
 create mode 100644 arch/arm/mach-rockchip/rk3188-board.c
(quoted diff) +0 -0

b/arch/arm/mach-rockchip/Makefile index 2be7e14e3e..7b8abc2266 100644

arch/arm/mach-rockchip/Makefile +6 -1
@@ -4,11 +4,16 @@
 
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-ifdef CONFIG_SPL_BUILD
+ifdef CONFIG_TPL_BUILD
+obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-tpl.o
+obj-$(CONFIG_ROCKCHIP_BROM_HELPER) += save_boot_param.o
+else ifdef CONFIG_SPL_BUILD
 
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o
 
+obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-spl.o
 
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o
 obj-$(CONFIG_ROCKCHIP_BROM_HELPER) += save_boot_param.o
 else
 
+obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board.o
 
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board.o
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board.o
 endif
(quoted diff) +0 -0

b/arch/arm/mach-rockchip/rk3188-board-spl.c new file mode 100644 index 0000000000..b528a2f73d

arch/arm/mach-rockchip/rk3188-board-spl.c new file +53 -0
@@ -0,0 +1,220 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <debug_uart.h>
+#include <dm.h>
+#include <fdtdec.h>
+#include <led.h>
+#include <malloc.h>
+#include <ram.h>
+#include <spl.h>
+#include <asm/gpio.h>
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/periph.h>
+#include <asm/arch/pmu_rk3188.h>
+#include <asm/arch/sdram.h>
+#include <asm/arch/timer.h>
+#include <dm/pinctrl.h>
+#include <dm/root.h>
+#include <dm/test.h>
+#include <dm/util.h>
+#include <power/regulator.h>
+#include <syscon.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+u32 spl_boot_device(void)
+{
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
+       const void *blob = gd->fdt_blob;
+       struct udevice *dev;
+       const char *bootdev;
+       int node;
+       int ret;
+
+       bootdev = fdtdec_get_config_string(blob, "u-boot,boot0");
+       debug("Boot device %s\n", bootdev);
+       if (!bootdev)
+               goto fallback;
+
+       node = fdt_path_offset(blob, bootdev);
+       if (node < 0) {
+               debug("node=%d\n", node);
+               goto fallback;
+       }
+       ret = device_get_global_by_of_offset(node, &dev);
+       if (ret) {
+               debug("device at node %s/%d not found: %d\n", bootdev,

node, + ret);

arch/arm/mach-rockchip/rk3188-board-spl.c new file +51 -0
+               goto fallback;
+       }
+       debug("Found device %s\n", dev->name);
+       switch (device_get_uclass_id(dev)) {
+       case UCLASS_SPI_FLASH:
+               return BOOT_DEVICE_SPI;
+       case UCLASS_MMC:
+               return BOOT_DEVICE_MMC1;
+       default:
+               debug("Booting from device uclass '%s' not supported\n",
+                     dev_get_uclass_name(dev));
+       }
+
+fallback:
+#endif
+       return BOOT_DEVICE_MMC1;
+}
+
+u32 spl_boot_mode(const u32 boot_device)
+{
+       return MMCSD_MODE_RAW;
+}
+
+extern u32 SAVE_SP_ADDR;
+extern void back_to_bootrom(void);
+void board_init_f(ulong dummy)
+{
+       struct udevice *pinctrl, *dev;
+       struct rk3188_pmu *pmu;
+       int ret;
+
+#define EARLY_UART
+       /* Example code showing how to enable the debug UART on RK3188 */
+#ifdef EARLY_UART
+#include <asm/arch/grf_rk3188.h>
+       /* Enable early UART on the RK3188 */
+#define GRF_BASE       0x20008000
+       struct rk3188_grf * const grf = (void *)GRF_BASE;
+
+       rk_clrsetreg(&grf->gpio1b_iomux,
+                    GPIO1B1_MASK << GPIO1B1_SHIFT |
+                    GPIO1B0_MASK << GPIO1B0_SHIFT,
+                    GPIO1B1_UART2_SOUT << GPIO1B1_SHIFT |
+                    GPIO1B0_UART2_SIN << GPIO1B0_SHIFT);
+       /*
+        * Debug UART can be used from here if required:
+        *
+        * debug_uart_init();
+        * printch('a');
+        * printhex8(0x1234);
+        * printascii("string");
Quoted 8 lines

arch/arm/mach-rockchip/rk3188-board-spl.c line 111

Quoted 6 lines
arch/arm/mach-rockchip/rk3188-board-spl.c new file +6 -0
+        */
+       debug_uart_init();
+       printch('s');
+       printch('p');
+       printch('l');
+       printch('\n');

printascii("spl\n");

actually using printascii at this point make the board hang in the past. So far I haven't figured out why printch works but printascii does not.

I'll try again, maybe it magically fixed itself

Quoted 126 lines
Quoted 126 lines
arch/arm/mach-rockchip/rk3188-board-spl.c new file +38 -0
+#endif
+
+       ret = spl_init();
+       if (ret) {
+               debug("spl_init() failed: %d\n", ret);
+               hang();
+       }
+
+       rockchip_timer_init();
+
+       ret = rockchip_get_clk(&dev);
+       if (ret) {
+               debug("CLK init failed: %d\n", ret);
+               return;
+       }
+
+       /*
+        * Recover the bootrom's stackpointer.
+        * For whatever reason needs to run after rockchip_get_clk.
+        */
+       pmu = syscon_get_first_range(ROCKCHIP_SYSCON_PMU);
+       if (IS_ERR(pmu))
+               error("pmu syscon returned %ld\n", PTR_ERR(pmu));
+       SAVE_SP_ADDR = readl(&pmu->sys_reg[2]);
+
+       ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
+       if (ret) {
+               debug("Pinctrl init failed: %d\n", ret);
+               return;
+       }
+
+       ret = uclass_get_device(UCLASS_RAM, 0, &dev);
+       if (ret) {
+               debug("DRAM init failed: %d\n", ret);
+               return;
+       }
+
+#if defined(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) &&

!defined(CONFIG_SPL_BOARD_INIT) + back_to_bootrom();

arch/arm/mach-rockchip/rk3188-board-spl.c new file +11 -0
+#endif
+}
+
+static int setup_led(void)
+{
+#ifdef CONFIG_SPL_LED
+       struct udevice *dev;
+       char *led_name;
+       int ret;
+
+       led_name = fdtdec_get_config_string(gd->fdt_blob,

"u-boot,boot-led"); + if (!led_name)

arch/arm/mach-rockchip/rk3188-board-spl.c new file +58 -0
+               return 0;
+       ret = led_get_by_label(led_name, &dev);
+       if (ret) {
+               debug("%s: get=%d\n", __func__, ret);
+               return ret;
+       }
+       ret = led_set_on(dev, 1);
+       if (ret)
+               return ret;
+#endif
+
+       return 0;
+}
+
+void spl_board_init(void)
+{
+       struct udevice *pinctrl;
+       int ret;
+
+       ret = setup_led();
+       if (ret) {
+               debug("LED ret=%d\n", ret);
+               hang();
+       }
+
+       ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
+       if (ret) {
+               debug("%s: Cannot find pinctrl device\n", __func__);
+               goto err;
+       }
+
+#ifdef CONFIG_SPL_MMC_SUPPORT
+       ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
+       if (ret) {
+               debug("%s: Failed to set up SD card\n", __func__);
+               goto err;
+       }
+#endif
+
+       /* Enable debug UART */
+       ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_UART_DBG);
+       if (ret) {
+               debug("%s: Failed to set up console UART\n", __func__);
+               goto err;
+       }
+
+       preloader_console_init();
+#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
+       back_to_bootrom();
+#endif
+       return;
+
+err:
+       printf("spl_board_init: Error %d\n", ret);
+
+       /* No way to report error here */
+       hang();
+}
(quoted diff) +0 -0

b/arch/arm/mach-rockchip/rk3188-board-tpl.c new file mode 100644 index 0000000000..62cdb8976a

arch/arm/mach-rockchip/rk3188-board-tpl.c new file +11 -0
@@ -0,0 +1,87 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <debug_uart.h>
+#include <spl.h>
+#include <asm/io.h>
+#include <asm/arch/pmu_rk3188.h>
Quoted 8 lines

arch/arm/mach-rockchip/rk3188-board-tpl.c line 16

Quoted 5 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +5 -0
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* track how often we were entered */
+static int rk3188_num_entries;

Is this in BSS? I suspect it might cause problems. Perhaps put it in the data section?

ok, I'll give that a try. So far I've never reached linker stuff, but judging from other uboot code a " __attribute__ ((section(".data")))" should be sufficient?

Quoted 4 lines

arch/arm/mach-rockchip/rk3188-board-tpl.c line 17

Quoted 2 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +1 -0
+extern void back_to_bootrom(void);

Should be in a header file somewhere

So far each board has declared this itself, but I've moved it to a header now for all of them.

Quoted 4 lines

arch/arm/mach-rockchip/rk3188-board-tpl.c line 21

Quoted 4 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +4 -0
+
+#define PMU_BASE       0x20004000
+#define TPL_ENTRY      0x10080C00
+extern u32 SAVE_SP_ADDR;

I've also moved this to my new bootrom.h

Quoted 2 lines

Blank line

ok

Quoted 36 lines
Quoted 36 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +36 -0
+static void jump_to_tpl(void)
+{
+       typedef void __noreturn (*image_entry_noargs_t)(void);
+
+       struct rk3188_pmu * const pmu = (void *)PMU_BASE;
+       image_entry_noargs_t tpl_entry =
+               (image_entry_noargs_t)(unsigned long)TPL_ENTRY;
+
+       /* Store the SAVE_SP_ADDR in a location shared with TPL. */
+       writel(SAVE_SP_ADDR, &pmu->sys_reg[2]);
+       tpl_entry();
+}
+
+void board_init_f(ulong dummy)
+{
+#define EARLY_UART
+       /* Example code showing how to enable the debug UART on RK3188 */
+#ifdef EARLY_UART
+#include <asm/arch/grf_rk3188.h>
+       /* Enable early UART on the RK3188 */
+#define GRF_BASE       0x20008000
+       struct rk3188_grf * const grf = (void *)GRF_BASE;
+
+       rk_clrsetreg(&grf->gpio1b_iomux,
+                    GPIO1B1_MASK << GPIO1B1_SHIFT |
+                    GPIO1B0_MASK << GPIO1B0_SHIFT,
+                    GPIO1B1_UART2_SOUT << GPIO1B1_SHIFT |
+                    GPIO1B0_UART2_SIN << GPIO1B0_SHIFT);
+       /*
+        * Debug UART can be used from here if required:
+        *
+        * debug_uart_init();
+        * printch('a');
+        * printhex8(0x1234);
+        * printascii("string");
+        */
Quoted 8 lines

arch/arm/mach-rockchip/rk3188-board-tpl.c line 63

Quoted 6 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +6 -0
+       debug_uart_init();
+
+       printch('t');
+       printch('p');
+       printch('l');
+       printch('-');

printascii()

see spl printascii comment :-)

Quoted 84 lines
Quoted 84 lines
arch/arm/mach-rockchip/rk3188-board-tpl.c new file +24 -0
+       printch(rk3188_num_entries + 1 + '0');
+       printch('\n');
+#endif
+
+       rk3188_num_entries++;
+
+       if (rk3188_num_entries == 1) {
+               /*
+                * The original loader did some very basic integrity
+                * checking at this point, but the remaining few bytes
+                * could be used for any improvement making sense
+                * really early on.
+                */
+
+               back_to_bootrom();
+       } else {
+               /*
+                * TPL part of the loader should now wait for us
+                * at offset 0xC00 in the sram. Should never return
+                * from there.
+                */
+               jump_to_tpl();
+       }
+}
(quoted diff) +0 -0

b/arch/arm/mach-rockchip/rk3188-board.c new file mode 100644 index 0000000000..16f38559af

arch/arm/mach-rockchip/rk3188-board.c new file +53 -0
@@ -0,0 +1,71 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <clk.h>
+#include <dm.h>
+#include <ram.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/periph.h>
+#include <asm/arch/pmu_rk3288.h>
+#include <asm/arch/boot_mode.h>
+#include <asm/gpio.h>
+#include <dm/pinctrl.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_init(void)
+{
+#if defined(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM)
+       struct udevice *pinctrl;
+       int ret;
+
+       /*
+        * We need to implement sdcard iomux here for the further
+        * initialization, otherwise, it'll hit sdcard command sending
+        * timeout exception.
+        */
+       ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
+       if (ret) {
+               debug("%s: Cannot find pinctrl device\n", __func__);
+               goto err;
+       }
+       ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
+       if (ret) {
+               debug("%s: Failed to set up SD card\n", __func__);
+               goto err;
+       }
+
+       return 0;
+err:
+       printf("board_init: Error %d\n", ret);
+
+       /* No way to report error here */
+       hang();
+
+       return -1;
+#else
+       return 0;
Quoted 9 lines

arch/arm/mach-rockchip/rk3188-board.c line 59

Quoted 6 lines
arch/arm/mach-rockchip/rk3188-board.c new file +6 -0
+#endif
+}
+
+int dram_init(void)
+{
+       /* FIXME: read back ram size from sys_reg2 */

TODO(email):

Quoted 1 line
arch/arm/mach-rockchip/rk3188-board.c new file +1 -0
+       gd->ram_size = 0x40000000;

yep, I plan on doing this once the jump from spl to uboot actually works :-)

Quoted 16 lines
Quoted 12 lines
arch/arm/mach-rockchip/rk3188-board.c new file +11 -1
+
+       return 0;
+}
+
+#ifndef CONFIG_SYS_DCACHE_OFF
+void enable_caches(void)
+{
+       /* Enable D-cache. I-cache is already enabled in start.S */
+       dcache_enable();
+}
+#endif
--
Quoted 1 line

2.11.0

Regards,
Simon

author maintainer
#37 lore raw

PATCH v3 15/16 rockchip: rk3188: Add Radxa Rock board

In reply to Heiko Stuebner

The Rock is a RK3188 based single board computer by Radxa. Currently it still relies on the proprietary DDR init and cannot use the generic SPL, but at least is able to boot a linux kernel and system up to a regular login prompt.

---
 arch/arm/dts/Makefile                 |   1 +
 arch/arm/dts/rk3188-radxarock.dts     | 382 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-rockchip/rk3188/Kconfig |  11 +
 board/radxa/rock/Kconfig              |  15 ++
 board/radxa/rock/MAINTAINERS          |   6 +
 board/radxa/rock/Makefile             |   7 +
 board/radxa/rock/rock.c               |   7 +
 configs/rock_defconfig                |  56 +++++
 include/configs/rock.h                |  30 +++
 9 files changed, 515 insertions(+)
 create mode 100644 arch/arm/dts/rk3188-radxarock.dts
 create mode 100644 board/radxa/rock/Kconfig
 create mode 100644 board/radxa/rock/MAINTAINERS
 create mode 100644 board/radxa/rock/Makefile
 create mode 100644 board/radxa/rock/rock.c
 create mode 100644 configs/rock_defconfig
 create mode 100644 include/configs/rock.h
arch/arm/dts/Makefile +1 -0
index 3ee608b5b4..647285253e 100644
@@ -29,6 +29,7 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \
 dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3036-sdk.dtb \
+	rk3188-radxarock.dtb \
 	rk3288-firefly.dtb \
 	rk3288-veyron-jerry.dtb \
 	rk3288-veyron-mickey.dtb \
arch/arm/dts/rk3188-radxarock.dts new file +382 -0

382 lines not on this page · raw message

arch/arm/mach-rockchip/rk3188/Kconfig +11 -0
index f8e1d0316b..5afc23ad2f 100644
@@ -1,5 +1,14 @@
 if ROCKCHIP_RK3188
 
+config TARGET_ROCK
+	bool "Radxa Rock"
+	help
+	  Rock is a RK3188-based development board with 2 USB and 1 otg
+	  ports, HDMI, TV-out, micro-SD card, audio, WiFi  and 100MBit
+	  Ethernet, It also includes on-board nand and 1GB of SDRAM.
+	  Expansion connectors provide access to display pins, I2C, SPI,
+	  UART and GPIOs.
+
 config SYS_SOC
 	default "rockchip"
 
@@ -21,4 +30,6 @@ config TPL_LIBCOMMON_SUPPORT
 config TPL_SERIAL_SUPPORT
 	default y
 
+source "board/radxa/rock/Kconfig"
+
 endif
board/radxa/rock/Kconfig new file +15 -0
new file mode 100644
index 0000000000..855b9b6954
@@ -0,0 +1,15 @@
+if TARGET_ROCK
+
+config SYS_BOARD
+	default "rock"
+
+config SYS_VENDOR
+	default "radxa"
+
+config SYS_CONFIG_NAME
+	default "rock"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+
+endif
board/radxa/rock/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000000..c5f59c0a6f
@@ -0,0 +1,6 @@
+RADXA_ROCK
+M:	Heiko Stuebner <[email protected]>
+S:	Maintained
+F:	board/radxa/rock
+F:	include/configs/rock.h
+F:	configs/rock_defconfig
board/radxa/rock/Makefile new file +7 -0
new file mode 100644
index 0000000000..fe94b60c35
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2015 Heiko Stuebner
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y	+= rock.o
board/radxa/rock/rock.c new file +7 -0
new file mode 100644
index 0000000000..5119e95455
@@ -0,0 +1,7 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
configs/rock_defconfig new file +56 -0

56 lines not on this page · raw message

include/configs/rock.h new file +30 -0
new file mode 100644
index 0000000000..de5291cd05
@@ -0,0 +1,30 @@
+/*
+ * (C) Copyright 2015 Google, Inc
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define ROCKCHIP_DEVICE_SETTINGS
+#include <configs/rk3188_common.h>
+
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV 0
+
+#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
+/* SPL @ 32k for 34k
+ * u-boot directly after @ 68k for 400k or so
+ * ENV @ 992k
+ */
+#define CONFIG_ENV_OFFSET ((1024-32) * 1024)
+#else
+/* SPL @ 32k for ~36k
+ * ENV @ 96k
+ * u-boot @ 128K
+ */
+#define CONFIG_ENV_OFFSET (96 * 1024)
+#endif
+
+#endif
Signature · 1 line
2.11.0
#38 lore raw

PATCH v3 15/16 rockchip: rk3188: Add Radxa Rock board

Quoted 16 lines · Heiko Stuebner

The Rock is a RK3188 based single board computer by Radxa. Currently it still relies on the proprietary DDR init and cannot use the generic SPL, but at least is able to boot a linux kernel and system up to a regular login prompt.

---
 arch/arm/dts/Makefile                 |   1 +
 arch/arm/dts/rk3188-radxarock.dts     | 382 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-rockchip/rk3188/Kconfig |  11 +
 board/radxa/rock/Kconfig              |  15 ++
 board/radxa/rock/MAINTAINERS          |   6 +
 board/radxa/rock/Makefile             |   7 +
 board/radxa/rock/rock.c               |   7 +
 configs/rock_defconfig                |  56 +++++
 include/configs/rock.h                |  30 +++
Quoted 8 lines
 9 files changed, 515 insertions(+)
 create mode 100644 arch/arm/dts/rk3188-radxarock.dts
 create mode 100644 board/radxa/rock/Kconfig
 create mode 100644 board/radxa/rock/MAINTAINERS
 create mode 100644 board/radxa/rock/Makefile
 create mode 100644 board/radxa/rock/rock.c
 create mode 100644 configs/rock_defconfig
 create mode 100644 include/configs/rock.h
author maintainer
#39 lore raw

PATCH v3 16/16 Add a temporary script that can create a bootimage for rk3188

In reply to Heiko Stuebner

Combines tpl, spl and uboot image in one flashable image.

---
 mkuboot | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100755 mkuboot
mkuboot new file +35 -0
new file mode 100755
index 0000000000..42109b2b87
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+LOCALPATH=$(pwd)
+ROOTDIR=$(dirname $(dirname $(readlink -f $0)))
+OUT=${ROOTDIR}/out
+IMAGE=${ROOTDIR}/image
+BOARD=$1
+DEFCONFIG=""
+
+if [ $# != 1 ] ; then
+BOARD=rock
+fi
+OUTBIN=${BOARD}-uboot.bin
+
+
+# copy tpl and pad to 1020 byte
+cat tpl/u-boot-tpl.bin > tpl/u-boot-tplspl.bin
+truncate -s 1020 tpl/u-boot-tplspl.bin
+
+#append spl and encode the result using mkimage
+truncate -s %2048 spl/u-boot-spl.bin
+cat spl/u-boot-spl.bin >> tpl/u-boot-tplspl.bin
+tools/mkimage  -n rk3188 -T rksd -d tpl/u-boot-tplspl.bin ${OUTBIN}
+
+########
+# Need to remove the RK31 from the FlashBoot binary to create FlashSpl
+# This can be used instead of the open spl as first stage
+#tools/mkimage  -n rk3188 -T rksd -d FlashSpl ${OUTBIN}
+
+# bootrom reads and decodes 2kb blocks, so bring u-boot.bin in line
+truncate -s %2048 u-boot.bin
+
+# rk3188 needs an rc4-encoded uboot as well
+cat u-boot.bin | split -b 512 --filter='openssl rc4 -K 7C4E0304550509072D2C7B38170D1711' >> ${OUTBIN}
+echo U-boot image:${OUTBIN}
Signature · 1 line
2.11.0
#40 lore raw

PATCH v3 16/16 Add a temporary script that can create a bootimage for rk3188

Quoted 5 lines · Heiko Stuebner

Combines tpl, spl and uboot image in one flashable image.

---
 mkuboot | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100755 mkuboot

Could use binman?

#41 lore raw

v3 cover rk3188 uboot support

In reply to Heiko Stuebner

Hi Heiko,

Quoted 22 lines · Heiko Stuebner

Hi,

this is meant as a status update and possible discussion for the core parts if needed.

After talking with Simon and Tom the order is now also correct with tpl -> spl -> uboot.

Status right now is:
- the full uboot still works
- the tpl/spl does start and is able to configure the ddr into a working state
- The jump spl -> bootrom -> uboot doesn't work though

On the other hand, Kever was able to make this work, booting from nand when building the image with a very ancient tool.

All newer tools (including boot_merger.c from Rockchip's uboot) do not produce working images. But it is possible to produce a working sd-boot image using the proprietary 1st-stage loader.

Quoted 7 lines

See the temporary mkuboot script in the last patch, which can create both types of images now (especially wrt. the needed rc4 encryption of everything).

Combining this (it does work using some special tool), it looks like there is still some minor glitch in the way we build the spl image somewhere.

What should we do with this series? There are a few minor things to resolve but other than that, do you think it is ready to apply?

The above problem could perhaps be resolved later if there is a suitable README describing it?

Regards,
Simon

author maintainer
#42 lore raw

v3 cover rk3188 uboot support

Hi Simon,

Am Donnerstag, 16. Februar 2017, 13:43:45 CET schrieb Simon Glass:

Quoted 27 lines · Heiko Stuebner
Quoted 26 lines

this is meant as a status update and possible discussion for the core parts if needed.

After talking with Simon and Tom the order is now also correct with tpl -> spl -> uboot.

Status right now is:
- the full uboot still works
- the tpl/spl does start and is able to configure the ddr

into a working state

- The jump spl -> bootrom -> uboot doesn't work though

On the other hand, Kever was able to make this work, booting from nand when building the image with a very ancient tool.

All newer tools (including boot_merger.c from Rockchip's uboot) do not produce working images. But it is possible to produce a working sd-boot image using the proprietary 1st-stage loader.

See the temporary mkuboot script in the last patch, which can create both types of images now (especially wrt. the needed rc4 encryption of everything).

Quoted 6 lines
Quoted 3 lines

Combining this (it does work using some special tool), it looks like there is still some minor glitch in the way we build the spl image somewhere.

What should we do with this series? There are a few minor things to resolve but other than that, do you think it is ready to apply?

It's somehow always on the backburner, but I already started fixing the things you pointed out. Though I'll be in Portland, Mountain View and San Francisco for the next two weeks, so will only be able to resend the fixes after that.

Quoted 2 lines

The above problem could perhaps be resolved later if there is a suitable README describing it?

Kever already found out, that the sd read the bootrom does fails when trying to load the uboot from the spl. I'm still trying to investigate this [same Portland remark applies], but if you're ok with stuff going in in this state, that is definitly fine by me, as it spares me from sending the full series all the time ;-)

Heiko

author maintainer
#43 lore raw

v3 cover rk3188 uboot support

Am Freitag, 17. Februar 2017, 01:41:27 CET schrieb Heiko St?bner:

Quoted 41 lines

Hi Simon,

Am Donnerstag, 16. Februar 2017, 13:43:45 CET schrieb Simon Glass:

Quoted 27 lines · Heiko Stuebner
Quoted 26 lines

this is meant as a status update and possible discussion for the core parts if needed.

After talking with Simon and Tom the order is now also correct with tpl -> spl -> uboot.

Status right now is:
- the full uboot still works
- the tpl/spl does start and is able to configure the ddr

into a working state

- The jump spl -> bootrom -> uboot doesn't work though

On the other hand, Kever was able to make this work, booting from nand when building the image with a very ancient tool.

All newer tools (including boot_merger.c from Rockchip's uboot) do not produce working images. But it is possible to produce a working sd-boot image using the proprietary 1st-stage loader.

See the temporary mkuboot script in the last patch, which can create both types of images now (especially wrt. the needed rc4 encryption of everything).

Quoted 6 lines
Quoted 3 lines

Combining this (it does work using some special tool), it looks like there is still some minor glitch in the way we build the spl image somewhere.

What should we do with this series? There are a few minor things to resolve but other than that, do you think it is ready to apply?

It's somehow always on the backburner, but I already started fixing the things you pointed out. Though I'll be in Portland, Mountain View and San Francisco for the next two weeks, so will only be able to resend the fixes after that.

Quoted 8 lines
Quoted 2 lines

The above problem could perhaps be resolved later if there is a suitable README describing it?

Kever already found out, that the sd read the bootrom does fails when trying to load the uboot from the spl. I'm still trying to investigate this [same Portland remark applies], but if you're ok with stuff going in in this state, that is definitly fine by me, as it spares me from sending the full series all the time ;-)

schedule update :-)

Kever is the hero of the day, as he found out what was causing the load failure (reset in sdram driver did actually reset the sdmmc controller). So now the real uboot does load finally from spl.

So with the technical issues solved, I'm hoping to just get the review commens finalized tomorrow on my flight over the atlantic and plane-wifi permitting may even resend from there ;-) .

Heiko

#44 lore raw

v3 cover rk3188 uboot support

In reply to Heiko Stuebner

Hi Heiko,

For this patch series, I have test and works on my NAND based rodxa board.

For the sd-card, you will need one patch to fix the problem which I have send
to you offline.

Thanks,
- Kever

Quoted 130 lines · Heiko Stuebner

Hi,

this is meant as a status update and possible discussion for the core parts if needed.

After talking with Simon and Tom the order is now also correct with tpl -> spl -> uboot.

Status right now is:
- the full uboot still works
- the tpl/spl does start and is able to configure the ddr into a working state
- The jump spl -> bootrom -> uboot doesn't work though

On the other hand, Kever was able to make this work, booting from nand when building the image with a very ancient tool.

All newer tools (including boot_merger.c from Rockchip's uboot) do not produce working images. But it is possible to produce a working sd-boot image using the proprietary 1st-stage loader.

See the temporary mkuboot script in the last patch, which can create both types of images now (especially wrt. the needed rc4 encryption of everything).

Combining this (it does work using some special tool), it looks like there is still some minor glitch in the way we build the spl image somewhere.

Heiko Stuebner (16):
dm: allow limiting pre-reloc markings to spl or tpl
rockchip: move bootrom helper compilation to a hidden option
rockchip: mkimage: Allow encoding of loader code in spl images
rockchip: mkimage: Add support rk3188 serial
rockchip: serial: Adapt rockchip of-platdata driver for rk3188
rockchip: rk3188: Add header files for PMU and GRF
rockchip: rk3188: Add pinctrl driver
rockchip: rk3188: Add sysreset driver
rockchip: rk3188: Add rk3066/rk3188 clock bindings
rockchip: rk3188: Add clock driver
rockchip: rk3188: Add core devicetree files
rockchip: rk3188: Add core support
rockchip: rk3188: Add sdram driver
rockchip: rk3188: Add main, spl and tpl boards
rockchip: rk3188: Add Radxa Rock board
Add a temporary script that can create a bootimage for rk3188

  arch/arm/dts/Makefile                           |   1 +
  arch/arm/dts/rk3188-radxarock.dts               | 382 +++++++++
  arch/arm/dts/rk3188.dtsi                        | 601 +++++++++++++++
  arch/arm/dts/rk3xxx.dtsi                        | 417 ++++++++++
  arch/arm/include/asm/arch-rockchip/cru_rk3188.h | 191 +++++
  arch/arm/include/asm/arch-rockchip/ddr_rk3188.h |  22 +
  arch/arm/include/asm/arch-rockchip/grf_rk3188.h | 589 ++++++++++++++
  arch/arm/include/asm/arch-rockchip/pmu_rk3188.h |  36 +
  arch/arm/mach-rockchip/Kconfig                  |  20 +
  arch/arm/mach-rockchip/Makefile                 |  14 +-
  arch/arm/mach-rockchip/rk3188-board-spl.c       | 220 ++++++
  arch/arm/mach-rockchip/rk3188-board-tpl.c       |  87 +++
  arch/arm/mach-rockchip/rk3188-board.c           |  71 ++
  arch/arm/mach-rockchip/rk3188/Kconfig           |  35 +
  arch/arm/mach-rockchip/rk3188/Makefile          |  11 +
  arch/arm/mach-rockchip/rk3188/clk_rk3188.c      |  33 +
  arch/arm/mach-rockchip/rk3188/sdram_rk3188.c    | 985 ++++++++++++++++++++++++
  arch/arm/mach-rockchip/rk3188/syscon_rk3188.c   |  55 ++
  board/radxa/rock/Kconfig                        |  15 +
  board/radxa/rock/MAINTAINERS                    |   6 +
  board/radxa/rock/Makefile                       |   7 +
  board/radxa/rock/rock.c                         |   7 +
  configs/rock_defconfig                          |  56 ++
  doc/driver-model/README.txt                     |   4 +
  drivers/clk/at91/pmc.c                          |   3 +-
  drivers/clk/rockchip/Makefile                   |   1 +
  drivers/clk/rockchip/clk_rk3188.c               | 523 +++++++++++++
  drivers/core/root.c                             |   2 +-
  drivers/core/util.c                             |  29 +
  drivers/pinctrl/Kconfig                         |   9 +
  drivers/pinctrl/pinctrl-uclass.c                |   3 +-
  drivers/pinctrl/rockchip/Makefile               |   1 +
  drivers/pinctrl/rockchip/pinctrl_rk3188.c       | 611 +++++++++++++++
  drivers/serial/serial_rockchip.c                |  19 +-
  drivers/sysreset/Makefile                       |   1 +
  drivers/sysreset/sysreset_rk3188.c              |  47 ++
  include/configs/rk3188_common.h                 | 125 +++
  include/configs/rock.h                          |  30 +
  include/dm/util.h                               |   2 +
  include/dt-bindings/clock/rk3066a-cru.h         |  32 +
  include/dt-bindings/clock/rk3188-cru-common.h   | 256 ++++++
  include/dt-bindings/clock/rk3188-cru.h          |  48 ++
  mkuboot                                         |  35 +
  scripts/Makefile.spl                            |   7 +-
  tools/dtoc/dtoc.py                              |   2 +
  tools/rkcommon.c                                |  34 +-
  tools/rkcommon.h                                |  22 +
  tools/rkimage.c                                 |   3 +
  tools/rksd.c                                    |   4 +
  tools/rkspi.c                                   |   4 +
  50 files changed, 5707 insertions(+), 11 deletions(-)

create mode 100644 arch/arm/dts/rk3188-radxarock.dts create mode 100644 arch/arm/dts/rk3188.dtsi
create mode 100644 arch/arm/dts/rk3xxx.dtsi
create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3188.h create mode 100644 arch/arm/include/asm/arch-rockchip/ddr_rk3188.h create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3188.h create mode 100644 arch/arm/include/asm/arch-rockchip/pmu_rk3188.h create mode 100644 arch/arm/mach-rockchip/rk3188-board-spl.c create mode 100644 arch/arm/mach-rockchip/rk3188-board-tpl.c create mode 100644 arch/arm/mach-rockchip/rk3188-board.c create mode 100644 arch/arm/mach-rockchip/rk3188/Kconfig create mode 100644 arch/arm/mach-rockchip/rk3188/Makefile create mode 100644 arch/arm/mach-rockchip/rk3188/clk_rk3188.c create mode 100644 arch/arm/mach-rockchip/rk3188/sdram_rk3188.c create mode 100644 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c create mode 100644 board/radxa/rock/Kconfig
create mode 100644 board/radxa/rock/MAINTAINERS
create mode 100644 board/radxa/rock/Makefile
create mode 100644 board/radxa/rock/rock.c
create mode 100644 configs/rock_defconfig
create mode 100644 drivers/clk/rockchip/clk_rk3188.c create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c create mode 100644 drivers/sysreset/sysreset_rk3188.c create mode 100644 include/configs/rk3188_common.h create mode 100644 include/configs/rock.h
create mode 100644 include/dt-bindings/clock/rk3066a-cru.h create mode 100644 include/dt-bindings/clock/rk3188-cru-common.h create mode 100644 include/dt-bindings/clock/rk3188-cru.h create mode 100755 mkuboot