rockchip: idb: prepare IDB block device
Subsystems (4)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/11 rockchip: idb: prepare IDB block device
Prepare for the IDB block device by adding some constants and function extentions.
--- drivers/block/blk-uclass.c | 2 ++ include/blk.h | 1 + include/dm/uclass-id.h | 1 + include/efi_loader.h | 4 ++++ lib/efi_loader/efi_device_path.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 38 insertions(+)
drivers/block/blk-uclass.c +2 -0
@@ -32,6 +32,7 @@ static const char *if_typename_str[IF_TYPE_COUNT] = { [IF_TYPE_EFI_LOADER] = "efiloader", [IF_TYPE_VIRTIO] = "virtio", [IF_TYPE_PVBLOCK] = "pvblock", + [IF_TYPE_RK_IDB] = "idb", };static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT ] = {
@@ -49,6 +50,7 @@ static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT] = { [IF_TYPE_EFI_LOADER] = UCLASS_EFI_LOADER, [IF_TYPE_VIRTIO] = UCLASS_VIRTIO, [IF_TYPE_PVBLOCK] = UCLASS_PVBLOCK, + [IF_TYPE_RK_IDB] = UCLASS_RK_IDB, };static enum if_type if_typename_to_iftype (const char *if_typename)
include/blk.h +1 -0
@@ -38,6 +38,7 @@ enum if_type {IF_TYPE_PVBLOCK ,IF_TYPE_VIRTIO ,IF_TYPE_EFI_MEDIA , +IF_TYPE_RK_IDB , IF_TYPE_COUNT, /* Number of interface types */ };
include/dm/uclass-id.h +1 -0
@@ -104,6 +104,7 @@ enum uclass_id {UCLASS_REGULATOR ,/* Regulator device */ UCLASS_REMOTEPROC ,/* Remote Processor device */ UCLASS_RESET ,/* Reset controller device */ +UCLASS_RK_IDB ,/* Rockchip IDB device */ UCLASS_RNG ,/* Random Number Generator */ UCLASS_RTC ,/* Real time clock device */ UCLASS_SCMI_AGENT, /* Interface with an SCMI server */
include/efi_loader.h +4 -0
@@ -141,6 +141,10 @@ static inline efi_status_t efi_launch_capsules(void)#define U_BOOT_VIRTIO_DEV_GUID \ EFI_GUID(0x63293792, 0xadf5, 0x9325, \ 0xb9, 0x9f, 0x4e, 0x0e, 0x45, 0x5c, 0x1b, 0x1e) +/* GUID used as root for Rockchip IDB devices */ +#define U_BOOT_IDB_DEV_GUID \ + EFI_GUID(0xadc021df, 0x5f24, 0x464f, \ + 0x9a, 0x88, 0xdb, 0xee, 0x3f, 0x1d, 0x14, 0x0f)/* Use internal device tree when starting UEFI application */ #define EFI_FDT_USE_INTERNAL NULL
lib/efi_loader/efi_device_path.c +30 -0
@@ -28,6 +28,9 @@ const efi_guid_t efi_guid_host_dev = U_BOOT_HOST_DEV_GUID;#ifdef CONFIG_VIRTIO_BLK const efi_guid_t efi_guid_virtio_dev =U_BOOT_VIRTIO_DEV_GUID ;#endif +#if CONFIG_IS_ENABLED (ROCKCHIP_IDB ) +const efi_guid_t efi_guid_idb_dev =U_BOOT_IDB_DEV_GUID ; +#endif /* template END node: */ static const struct efi_device_path END = {
@@ -574,6 +577,16 @@ __maybe_unused static unsigned int dp_size(struct udevice *dev)*/ return dp_size (dev->parent) +sizeof (struct efi_device_path_vendor ) +1 ; +#endif +#if CONFIG_IS_ENABLED (ROCKCHIP_IDB ) +case UCLASS_RK_IDB : +/* +* Rockchip IDB device will be represented +* as vendor device with extra one byte for +* device number +*/ +return dp_size (dev->parent) + +sizeof (struct efi_device_path_vendor ) +1 ;#endif default :return dp_size (dev->parent);
@@ -667,6 +680,23 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev)return &dp->vendor_data[1 ]; }#endif +#if CONFIG_IS_ENABLED (ROCKCHIP_IDB ) +case UCLASS_RK_IDB : { +struct efi_device_path_vendor *dp; +struct blk_desc *desc =dev_get_uclass_plat (dev); + +dp_fill (buf, dev->parent); + dp = buf; + ++dp; + dp->dp.type =DEVICE_PATH_TYPE_HARDWARE_DEVICE ; + dp->dp.sub_type =DEVICE_PATH_SUB_TYPE_VENDOR ; + dp->dp.length =sizeof (*dp) +1 ; +memcpy (&dp->guid, &efi_guid_idb_dev, +sizeof (efi_guid_t)); + dp->vendor_data[0 ] = desc->devnum; +return &dp->vendor_data[1 ]; + } +#endif #ifdef CONFIG_IDE case UCLASS_IDE : { struct efi_device_path_atapi *dp =
Signature · 1 line
2.20.1
PATCH v2 2/11 rockchip: idb: add basic functions
In reply to a message not in the archiveOn Rockchip SoCs with a NAND as boot device the information data base (IDB) loaded by the boot ROM is stored at the beginning of several erase blocks. Add basic functions for reading and writing.
---
Changed V2:
remove CamelCases
remove randomizer
remove sector1 info
remove stop and info cmd
remove block driver
--- arch/arm/mach-rockchip/Kconfig | 12 + arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/rockchip_idb.c | 1074 +++++++++++++++++++++++++ 3 files changed, 1087 insertions(+) create mode 100644 arch/arm/mach-rockchip/rockchip_idb.c
arch/arm/mach-rockchip/Kconfig +12 -0
@@ -425,6 +425,18 @@ config ROCKCHIP_SPI_IMAGE config LNX_KRNL_IMG_TEXT_OFFSET_BASE default SYS_TEXT_BASE +config ROCKCHIP_IDB + bool "Use Rockchip IDB block device" + depends on BLK + help + This option enables the Rockchip IDB block device + +config SPL_ROCKCHIP_IDB + bool "Use rockchip IDB block device in SPL" + depends on SPL_BLK + help + This option enables the Rockchip IDB block device in SPL + source "arch/arm/mach-rockchip/px30/Kconfig" source "arch/arm/mach-rockchip/rk3036/Kconfig" source "arch/arm/mach-rockchip/rk3066/Kconfig"
arch/arm/mach-rockchip/Makefile +1 -0
@@ -29,6 +29,7 @@ obj-$(CONFIG_ROCKCHIP_COMMON_BOARD) += board.o ifeq ($(CONFIG_TPL_BUILD),) obj-$(CONFIG_DISPLAY_CPUINFO) += cpu-info.o +obj-$(CONFIG_$(SPL_)ROCKCHIP_IDB) += rockchip_idb.o endif obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram.o
arch/arm/mach-rockchip/rockchip_idb.c new file +1074 -0
1,074 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 3/11 rockchip: idb: add IDB block device
In reply to a message not in the archiveThe Rockchip SoCs with a NAND as boot device need a special Rockchip IDB block device to transfer the data from the rockusb gadget to the NAND driver.
--- arch/arm/mach-rockchip/rockchip_idb.c | 402 ++++++++++++++++++++++++++ 1 file changed, 402 insertions(+)
arch/arm/mach-rockchip/rockchip_idb.c +402 -0
@@ -3,10 +3,16 @@* Copyright (C) 2022 Johan Jonker <[email protected]> */ +#include <blk.h> #include <clk.h> +#include <command.h> #include <dm.h> #include <memalign.h> +#include <part.h> +#include <dm/device-internal.h> +#include <dm/uclass-internal.h> #include <linux/iopoll.h> +#include <u-boot/crc.h> #define NFC_DEF_TIMEOUT 20000#define NFC_ECC_MAX_MODES 4
@@ -152,10 +158,18 @@ struct rk_idb {u32 pages_per_blk;struct idb idblock[5 ];u32 blk_counter; +u32 idb_need_write_back;u32 sectors;u16 page_table[512 ]; +legacy_mbr *mbr; +gpt_header *gpt_h; +gpt_header *gpt_h2; +gpt_entry *gpt_e;char *check;char *idb; +char *str; +char uuid_part_str[UUID_STR_LEN +1 ]; +char uuid_disk_str[UUID_STR_LEN +1 ]; };struct nand_para_info nand_para_tbl[] = {
@@ -816,6 +830,171 @@ void rk_idb_write_block(struct rk_idb *plat, u32 idb, u32 sectors, u32 *data, u3 } } +unsigned long rk_idb_read (struct udevice *dev, +unsigned long start,lbaint_t blkcnt, +void *buffer) +{ +struct rk_idb *plat =dev_get_plat (dev->parent); +struct blk_desc *block_dev =dev_get_uclass_plat (dev); +char *buf = buffer; +int i; + +debug ("start : %lu blkcnt: %lu\n" , start, blkcnt); + +if (start > (block_dev->lba -1 ) || (start + blkcnt) > block_dev->lba) { +debug ("invalid block\n" ); +return -1 ; + } + +memset (buffer,0xff , blkcnt * block_dev->blksz); + +for (i = start; i < (start + blkcnt); i++) { +if (i ==0 ) { +debug ("mbr : %d\n" , i); + +memcpy (&buf[(i - start) * block_dev->blksz], + plat->mbr,sizeof (legacy_mbr)); + }else if (i ==1 ) { +debug ("gpt_h : %d\n" , i); + +memcpy (&buf[(i - start) * block_dev->blksz], + plat->gpt_h,sizeof (gpt_header)); + }else if (i == (block_dev->lba -1 )) { +debug ("gpt_h2 : %d\n" , i); + +memcpy (&buf[(i - start) * block_dev->blksz], + plat->gpt_h2,sizeof (gpt_header)); + }else if (i ==2 || i == (block_dev->lba -33 )) { +debug ("gpt_e : %d\n" , i); + +memcpy (&buf[(i - start) * block_dev->blksz], + plat->gpt_e,sizeof (gpt_entry)); + }else if (i >=64 && i < (block_dev->lba -33 )) { +debug ("idb rd : %d\n" , i); + +memcpy (&buf[(i - start) * block_dev->blksz], + &plat->idb[(i -64 ) * block_dev->blksz], block_dev->blksz); + } + } + +return blkcnt; +} + +unsigned long rk_idb_write (struct udevice *dev, +unsigned long start,lbaint_t blkcnt, +const void *buffer) +{ +struct rk_idb *plat =dev_get_plat (dev->parent); +struct blk_desc *block_dev =dev_get_uclass_plat (dev); +u32 data[512 ]; +u32 spare[2 ]; +int i, j; + +if (start > (block_dev->lba -1 ) || (start + blkcnt) > block_dev->lba) { +debug ("invalid block\n" ); +return -1 ; + } + +debug ("start : %lu blkcnt: %lu\n" , start, blkcnt); + +for (i = start; i < (start + blkcnt); i++) { +debug ("idb wr : %d\n" , i); + +if (i >=64 && i < (block_dev->lba -33 )) { +if (i ==64 ) { +debug ("first block\n" ); + + plat->idb_need_write_back =1 ; +memset (plat->idb,0xff ,512 *512 ); + } + +if (plat->idb_need_write_back) { +char *buf = (char *)buffer; + +memcpy (&plat->idb[(i -64 ) * block_dev->blksz], + &buf[(i - start) * block_dev->blksz], + block_dev->blksz); + +if (i ==64 ) { +memcpy (data, plat->idb,512 ); + +if (*data ==RK_MAGIC ) { +u32 boot_size; + +rk_idb_rc4 ((char *)data,512 ); + +struct sector0 *sec0 = (struct sector0 *)data; + +if ((sec0->flash_boot_size - + sec0->flash_data_size) !=1024 ) { + boot_size = sec0->flash_boot_size - + sec0->flash_data_size; + }else { + boot_size =0 ; + } + + plat->sectors = sec0->boot_code1_offset + + sec0->flash_data_size + + boot_size; + +if (plat->sectors >512 ) { +debug ("max sector limit\n" ); + plat->idb_need_write_back =0 ; + } + }else { +debug ("no IDB block found\n" ); + plat->idb_need_write_back =0 ; + } + } + +if (i == (64 + plat->sectors -1 )) { +debug ("last block\n" ); + + plat->idb_need_write_back =0 ; + +if (!plat->blk_counter) { + plat->idblock[0 ].blk =2 ; + plat->idblock[0 ].ecc = plat->boot_ecc; + plat->idblock[1 ].blk =3 ; + plat->idblock[1 ].ecc = plat->boot_ecc; + plat->idblock[2 ].blk =4 ; + plat->idblock[2 ].ecc = plat->boot_ecc; + plat->idblock[3 ].blk =5 ; + plat->idblock[3 ].ecc = plat->boot_ecc; + plat->idblock[4 ].blk =6 ; + plat->idblock[4 ].ecc = plat->boot_ecc; + plat->blk_counter =5 ; + } + +for (j =0 ; j < plat->blk_counter; j++) { +if (plat->idblock[j].blk < plat->boot_blks) +rk_idb_write_block (plat, j, plat->sectors, + (u32 *)plat->idb, spare); + } + +rk_idb_scan_block (plat, data, spare); + +memset (plat->idb,0xff ,512 *512 ); + +if (plat->blk_counter) +rk_idb_read_block (plat,0 , plat->idblock[0 ].sectors, + (u32 *)plat->idb, spare); + } + } + }else if (plat->idb_need_write_back) { + plat->idb_need_write_back =0 ; + +memset (plat->idb,0xff ,512 *512 ); + +if (plat->blk_counter) +rk_idb_read_block (plat,0 , plat->idblock[0 ].sectors, + (u32 *)plat->idb, spare); + } + } + +return blkcnt; +} +void rk_idb_block_align (struct rk_idb *plat,u32 pages_per_blk) { plat->pages_per_blk = pages_per_blk;
@@ -827,9 +1006,25 @@ void rk_idb_block_align(struct rk_idb *plat, u32 pages_per_blk) plat->pages_per_blk =256 ; } +static inline u32 efi_crc32 (const void *buf,u32 len) +{ +return crc32 (0 , buf, len); +} +int rk_idb_init_plat (struct udevice *dev) { +static const efi_guid_t partition_basic_data_guid =PARTITION_BASIC_DATA_GUID ;struct rk_idb *plat =dev_get_plat (dev); +size_t efiname_len, dosname_len; +uchar name[] ="loader1" ; +u32 calc_crc32; +int k; + +gen_rand_uuid_str (plat->uuid_disk_str,UUID_STR_FORMAT_GUID ); +gen_rand_uuid_str (plat->uuid_part_str,UUID_STR_FORMAT_GUID ); + +debug ("uuid_part_str : %s\n" , plat->uuid_part_str); +debug ("uuid_disk_str : %s\n" , plat->uuid_disk_str); plat->idb =malloc_cache_aligned (512 *512 );
@@ -845,6 +1040,127 @@ int rk_idb_init_plat(struct udevice *dev)return -1 ; } + plat->mbr =malloc_cache_aligned (sizeof (legacy_mbr)); + +if (!plat->mbr) { +debug ("mbr malloc failed\n" ); +free (plat->idb); +free (plat->check); +return -1 ; + } + + plat->gpt_e =malloc_cache_aligned (sizeof (gpt_entry)); + +if (!plat->gpt_e) { +debug ("gpt_e malloc failed\n" ); +free (plat->idb); +free (plat->check); +free (plat->mbr); +return -1 ; + } + + plat->gpt_h =malloc_cache_aligned (sizeof (gpt_header)); + +if (!plat->gpt_h) { +debug ("gpt_h malloc failed\n" ); +free (plat->idb); +free (plat->check); +free (plat->mbr); +free (plat->gpt_e); +return -1 ; + } + + plat->gpt_h2 =malloc_cache_aligned (sizeof (gpt_header)); + +if (!plat->gpt_h2) { +debug ("gpt_h2 malloc failed\n" ); +free (plat->idb); +free (plat->check); +free (plat->mbr); +free (plat->gpt_e); +free (plat->gpt_h); +return -1 ; + } + +/* Init idb */ +memset (plat->idb,0xff ,512 *512 ); + +/* Init mbr */ +memset ((char *)plat->mbr,0 ,sizeof (legacy_mbr)); + + plat->mbr->signature =MSDOS_MBR_SIGNATURE ; + plat->mbr->partition_record[0 ].sys_ind =EFI_PMBR_OSTYPE_EFI_GPT ; + plat->mbr->partition_record[0 ].start_sect =1 ; + plat->mbr->partition_record[0 ].nr_sects =LBA -1 ; + +/* Init gpt_e */ +memset (plat->gpt_e,0 ,sizeof (gpt_entry)); + + plat->gpt_e->starting_lba =cpu_to_le64 (64 ); + plat->gpt_e->ending_lba =cpu_to_le64 (LBA -34 ); + +debug ("starting_lba : %llu\n" ,le64_to_cpu (plat->gpt_e->starting_lba)); +debug ("ending_lba : %llu\n" ,le64_to_cpu (plat->gpt_e->ending_lba)); + +memcpy (plat->gpt_e->partition_type_guid.b, &partition_basic_data_guid,16 ); + +uuid_str_to_bin (plat->uuid_part_str, plat->gpt_e->unique_partition_guid.b, +UUID_STR_FORMAT_GUID ); + + efiname_len =sizeof (plat->gpt_e->partition_name) /sizeof (efi_char16_t); + dosname_len =sizeof (name); + +for (k =0 ; k <min (dosname_len, efiname_len); k++) + plat->gpt_e->partition_name[k] = (efi_char16_t)(name[k]); + +/* Init gpt_h */ +memset (plat->gpt_h,0 ,sizeof (gpt_header)); + + plat->gpt_h->signature =cpu_to_le64 (GPT_HEADER_SIGNATURE_UBOOT ); + plat->gpt_h->revision =cpu_to_le32 (GPT_HEADER_REVISION_V1 ); + plat->gpt_h->header_size =cpu_to_le32 (sizeof (gpt_header)); + plat->gpt_h->first_usable_lba =cpu_to_le64 (64 ); + plat->gpt_h->last_usable_lba =cpu_to_le64 (LBA -34 ); + plat->gpt_h->num_partition_entries =cpu_to_le32 (1 ); + plat->gpt_h->sizeof_partition_entry =cpu_to_le32 (sizeof (gpt_entry)); + +uuid_str_to_bin (plat->uuid_disk_str, plat->gpt_h->disk_guid.b, +UUID_STR_FORMAT_GUID ); + + plat->gpt_h->partition_entry_array_crc32 =0 ; + calc_crc32 =efi_crc32 ((const unsigned char *)plat->gpt_e, +le32_to_cpu (plat->gpt_h->num_partition_entries) * +le32_to_cpu (plat->gpt_h->sizeof_partition_entry)); + plat->gpt_h->partition_entry_array_crc32 =cpu_to_le32 (calc_crc32); + +debug ("partition crc32 : 0x%08x\n" , calc_crc32); + + plat->gpt_h->my_lba =cpu_to_le64 (1 ); + plat->gpt_h->partition_entry_lba =cpu_to_le64 (2 ); + plat->gpt_h->alternate_lba =cpu_to_le64 (LBA -1 ); + + plat->gpt_h->header_crc32 =0 ; + calc_crc32 =efi_crc32 ((const unsigned char *)plat->gpt_h, +le32_to_cpu (plat->gpt_h->header_size)); + plat->gpt_h->header_crc32 =cpu_to_le32 (calc_crc32); + +debug ("header h1 crc32 : 0x%08x\n" , calc_crc32); + +/* Init gpt_h2 */ +memcpy (plat->gpt_h2, plat->gpt_h,sizeof (gpt_header)); + + plat->gpt_h2->my_lba =cpu_to_le64 (LBA -1 ); + plat->gpt_h2->partition_entry_lba = +cpu_to_le64 (le64_to_cpu (plat->gpt_h2->last_usable_lba) +1 ); + plat->gpt_h2->alternate_lba =cpu_to_le64 (1 ); + + plat->gpt_h2->header_crc32 =0 ; + calc_crc32 =efi_crc32 ((const unsigned char *)plat->gpt_h2, +le32_to_cpu (plat->gpt_h2->header_size)); + plat->gpt_h2->header_crc32 =cpu_to_le32 (calc_crc32); + +debug ("header h2 crc32 : 0x%08x\n" , calc_crc32); +return 0 ; }
@@ -853,6 +1169,8 @@ int rk_idb_probe(struct udevice *dev)struct rk_idb *plat =dev_get_plat (dev);const char *node_name;ofnode subnode; +u32 data[512 ]; +u32 spare[2 ];u8 id[8 ];int ret;int i;
@@ -935,6 +1253,23 @@ int rk_idb_probe(struct udevice *dev)return -ENOENT ; } +rk_idb_scan_block (plat, data, spare); + +if (plat->blk_counter) +rk_idb_read_block (plat,0 , plat->idblock[0 ].sectors, (u32 *)plat->idb, spare); + +return 0 ; +} + +static int rk_idb_blk_probe (struct udevice *udev) +{ +struct blk_desc *desc =dev_get_uclass_plat (udev); + + desc->removable = true; +snprintf (desc->vendor,BLK_VEN_SIZE ,"Rockchip" ); +snprintf (desc->product,BLK_PRD_SIZE ,"IDB" ); +snprintf (desc->revision,BLK_REV_SIZE ,"1.0" ); +return 0 ; }
@@ -1065,6 +1400,24 @@ static const struct udevice_id rk_idb_ids[] = { {/* sentinel */ } }; +static const struct blk_ops rk_idb_ops = { + .read = rk_idb_read, + .write = rk_idb_write, +}; + +U_BOOT_DRIVER (idb_blk) = { + .name ="idb_blk" , + .id =UCLASS_BLK , + .ops = &rk_idb_ops, + .probe = rk_idb_blk_probe, +}; + +UCLASS_DRIVER (idb) = { + .id =UCLASS_RK_IDB , + .name ="idb" , + .flags =DM_UC_FLAG_SEQ_ALIAS , +}; +U_BOOT_DRIVER (rockchip_idb) = { .name ="rockchip_idb" , .id =UCLASS_RK_IDB ,
@@ -1072,3 +1425,52 @@ U_BOOT_DRIVER(rockchip_idb) = { .probe = rk_idb_probe, .plat_auto = sizeof(struct rk_idb), }; + +int rk_idb_start (void ) +{ +struct udevice *dev; +struct udevice *bdev; +int ret; + + ret =uclass_get_device (UCLASS_RK_IDB ,0 , &dev); +if (ret) { +printf ("no IDB device found\n" ); +return CMD_RET_FAILURE ; + } + + ret =blk_get_device (IF_TYPE_RK_IDB ,0 , &bdev); +if (ret) { + ret =blk_create_device (dev,"idb_blk" ,"blk" , +IF_TYPE_RK_IDB ,0 ,512 , +LBA , &bdev); +if (ret) +return ret; + + ret =blk_probe_or_unbind (bdev); +if (ret) +return ret; + } + +return 0 ; +} + +#if !defined(CONFIG_SPL_BUILD ) + +static int rk_idb_do (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +if (argc ==2 ) { +if (!strcmp (argv[1 ],"start" )) +return rk_idb_start (); + } + +return CMD_RET_USAGE ; +} + +U_BOOT_CMD ( + idb,5 ,1 , rk_idb_do, +"Rockchip IDB block device" , +"start - start IDB device\n" +); + +#endif
Signature · 1 line
2.20.1
PATCH v2 4/11 rockchip: idb: add info and stop command
In reply to a message not in the archiveAdd info and stop command to become aware of what goes on inside the driver and to release some resources.
---
optional
--- arch/arm/mach-rockchip/rockchip_idb.c | 116 ++++++++++++++++++++++++++ 1 file changed, 116 insertions(+)
arch/arm/mach-rockchip/rockchip_idb.c +116 -0
@@ -1456,10 +1456,124 @@ int rk_idb_start(void)#if !defined(CONFIG_SPL_BUILD ) +int rk_idb_stop (void ) +{ +struct udevice *bdev; +int ret; + + ret =blk_find_device (IF_TYPE_RK_IDB ,0 , &bdev); +if (ret) { +printf ("no IDB blk device found\n" ); +return 0 ; + } + +device_remove (bdev,DM_REMOVE_NORMAL ); +device_unbind (bdev); + +return 0 ; +} + +void rk_idb_print_idb_data (u32 *data) +{ +struct sector0 *sec0 = (struct sector0 *)data; + +printf ("\n" ); + +printf ("magic : %08x\n" +"rc4_flag : %08x\n" +"boot_code1_offset: %d\n" +"flash_data_size : %d\n" +"flash_boot_size : %d\n" , + sec0->magic, + sec0->rc4_flag, + sec0->boot_code1_offset, + sec0->flash_data_size, + sec0->flash_boot_size); + +printf ("\n" ); +} + +static int rk_idb_info (void ) +{ +struct rk_idb *plat; +struct udevice *dev; +u32 data[512 ]; +u32 spare[2 ]; +int ret; +int i, j; + + ret =uclass_find_device (UCLASS_RK_IDB ,0 , &dev); +if (ret) { +printf ("no IDB device found\n" ); +return CMD_RET_FAILURE ; + } + +if (!device_active (dev)) { +printf ("IDB device present but not probed\n" ); +return CMD_RET_FAILURE ; + } + + plat =dev_get_plat (dev); + +printf ("\n##### HARDWARE #####\n" ); + +printf ("REG : 0x%08x\n" , (u32 )plat->regs); + +printf ("FLASH ID : %02x %02x %02x %02x %02x %02x\n" , + plat->info->nand_id[0 ], + plat->info->nand_id[1 ], + plat->info->nand_id[2 ], + plat->info->nand_id[3 ], + plat->info->nand_id[4 ], + plat->info->nand_id[5 ]); + +printf ("page_per_blk : %d\n" , plat->info->page_per_blk); +printf ("lsb_mode : %d\n" , plat->info->lsb_mode); +printf ("randomizer : %d\n" , (plat->info->operation_opt >>7 ) &1 ); + +printf ("\n##### BLOCK DEVICE #####\n" ); + + ret =blk_find_device (IF_TYPE_RK_IDB ,0 , &dev); +if (ret) { +printf ("no IDB blk device found\n" ); + }else { +struct blk_desc *blk_dev =dev_get_uclass_plat (dev); + +printf ("blocks : %lu\n" , (unsigned long )blk_dev->lba); + } + +printf ("uuid_part_str : %s\n" , plat->uuid_part_str); +printf ("uuid_disk_str : %s\n" , plat->uuid_disk_str); + +printf ("\n##### IDB #####\n" ); +for (i =0 ; i < plat->blk_counter; i++) { +rk_idb_read_block (plat, j,4 , data, spare); + +for (j =0 ; j <4 ; j++) { +if (j !=1 ) +rk_idb_rc4 ((char *)data + j *512 ,512 ); + } + +printf ("\nblk : %d\n" , plat->idblock[i].blk); +printf ("ecc : %d\n" , plat->idblock[i].ecc); +printf ("sectors : %d\n" , plat->idblock[i].sectors); + +rk_idb_print_idb_data (data); + } + +return 0 ; +} +static int rk_idb_do (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {if (argc ==2 ) { +if (!strcmp (argv[1 ],"info" )) +return rk_idb_info (); + +if (!strcmp (argv[1 ],"stop" )) +return rk_idb_stop (); +if (!strcmp (argv[1 ],"start" ))return rk_idb_start (); }
@@ -1471,6 +1585,8 @@ U_BOOT_CMD( idb,5 ,1 , rk_idb_do,"Rockchip IDB block device" ,"start - start IDB device\n" +"idb stop - stop IDB blk device\n" +"idb info - show IDB device info\n" );#endif
Signature · 1 line
2.20.1
PATCH v2 5/11 rockchip: idb: add sector1 info
In reply to a message not in the archiveAdd Rockchip IDB sector1 info to make it easier to identify the IDB date and version. Sector1 data is currently not added by U-boot tools, but is generated by external tools that have support for it.
---
optional
--- arch/arm/mach-rockchip/rockchip_idb.c | 46 +++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
arch/arm/mach-rockchip/rockchip_idb.c +46 -0
@@ -59,6 +59,11 @@#define NAND_CMD_ERASE2 0xd0#define NAND_CMD_RESET 0xff +#define BCD2INT (num) (((((num) >> 12) & 0x0F) * 1000) + \ + ((((num) >> 8) & 0x0F) * 100) + \ + ((((num) >> 4) & 0x0F) * 10) + \ + ((num) & 0x0F)) +#define DATA_STEP 1024#define OOB_STEP 4#define LBA 64 + 512 + 33
@@ -80,6 +85,35 @@ struct sector0 {u8 reserved2[2 ]; } __packed; +struct sector1 { +u16 sys_reserved_block; +u16 disk0_size; +u16 disk1_size; +u16 disk2_size; +u16 disk3_size; +u32 chip_tag; +u32 machine_id; +u16 loader_year; +u16 loader_date; +u16 loader_ver; +u8 reserved[72 ]; +u16 flash_data_offset; +u16 flash_data_len; +u8 reserved2[384 ]; +u32 flash_chip_size; +u8 reserved1; +u8 access_time; +u16 phy_block_size; +u8 phy_page_size; +u8 ecc_bits; +u8 reserved3[8 ]; +u16 id_block0; +u16 id_block1; +u16 id_block2; +u16 id_block3; +u16 id_block4; +} __packed; +struct nand_para_info {u8 id_bytes;u8 nand_id[6 ];
@@ -1475,10 +1509,22 @@ int rk_idb_stop(void)void rk_idb_print_idb_data (u32 *data) { +struct sector1 *sec1 = (struct sector1 *)((u8 *)data +512 );struct sector0 *sec0 = (struct sector0 *)data;printf ("\n" ); +printf ("DATE : %d-%d-%d\n" , +BCD2INT (sec1->loader_year), +BCD2INT (sec1->loader_date >>8 ), +BCD2INT (sec1->loader_date &0xff )); + +printf ("VERSION : %d.%d\n" , +BCD2INT (sec1->loader_ver >>8 ), +BCD2INT (sec1->loader_ver &0xff )); + +printf ("\n" ); +printf ("magic : %08x\n" "rc4_flag : %08x\n" "boot_code1_offset: %d\n"
Signature · 1 line
2.20.1
PATCH v2 6/11 rockchip: idb: add randomizer option
In reply to a message not in the archiveAdd randomizer option as on some NAND chip all data writen by Rockchip tools after the IDB blocks is scrambled.
---
optional
--- arch/arm/mach-rockchip/rockchip_idb.c | 56 +++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)
arch/arm/mach-rockchip/rockchip_idb.c +56 -0
@@ -190,6 +190,7 @@ struct rk_idb {u32 boot_blks;u32 boot_ecc;u32 pages_per_blk; +u32 randomizer;struct idb idblock[5 ];u32 blk_counter;u32 idb_need_write_back;
@@ -206,6 +207,41 @@ struct rk_idb {char uuid_disk_str[UUID_STR_LEN +1 ]; }; +u16 random_seed[] = { +0x576a ,0x05e8 ,0x629d ,0x45a3 , +0x649c ,0x4bf0 ,0x2342 ,0x272e , +0x7358 ,0x4ff3 ,0x73ec ,0x5f70 , +0x7a60 ,0x1ad8 ,0x3472 ,0x3612 , +0x224f ,0x0454 ,0x030e ,0x70a5 , +0x7809 ,0x2521 ,0x48f4 ,0x5a2d , +0x492a ,0x043d ,0x7f61 ,0x3969 , +0x517a ,0x3b42 ,0x769d ,0x0647 , +0x7e2a ,0x1383 ,0x49d9 ,0x07b8 , +0x2578 ,0x4eec ,0x4423 ,0x352f , +0x5b22 ,0x72b9 ,0x367b ,0x24b6 , +0x7e8e ,0x2318 ,0x6bd0 ,0x5519 , +0x1783 ,0x18a7 ,0x7b6e ,0x7602 , +0x4b7f ,0x3648 ,0x2c53 ,0x6b99 , +0x0c23 ,0x67cf ,0x7e0e ,0x4d8c , +0x5079 ,0x209d ,0x244a ,0x747b , +0x350b ,0x0e4d ,0x7004 ,0x6ac3 , +0x7f3e ,0x21f5 ,0x7a15 ,0x2379 , +0x1517 ,0x1aba ,0x4e77 ,0x15a1 , +0x04fa ,0x2d61 ,0x253a ,0x1302 , +0x1f63 ,0x5ab3 ,0x049a ,0x5ae8 , +0x1cd7 ,0x4a00 ,0x30c8 ,0x3247 , +0x729c ,0x5034 ,0x2b0e ,0x57f2 , +0x00e4 ,0x575b ,0x6192 ,0x38f8 , +0x2f6a ,0x0c14 ,0x45fc ,0x41df , +0x38da ,0x7ae1 ,0x7322 ,0x62df , +0x5e39 ,0x0e64 ,0x6d85 ,0x5951 , +0x5937 ,0x6281 ,0x33a1 ,0x6a32 , +0x3a5a ,0x2bac ,0x743a ,0x5e74 , +0x3b2e ,0x7ec7 ,0x4fd2 ,0x5d28 , +0x751f ,0x3ef8 ,0x39b1 ,0x4e49 , +0x746b ,0x6ef6 ,0x44be ,0x6db7 , +}; +struct nand_para_info nand_para_tbl[] = { {6 , {0x2c ,0x64 ,0x44 ,0x4b ,0xa9 ,0x00 },4 ,1 ,16 ,256 ,2 ,2 ,2048 ,0x01df ,3 ,17 ,40 ,32 ,1 ,0 ,1 ,0 ,0 , {0 ,0 ,0 ,0 ,0 }}, {6 , {0x2c ,0x44 ,0x44 ,0x4b ,0xa9 ,0x00 },4 ,1 ,16 ,256 ,2 ,2 ,1064 ,0x01df ,3 ,17 ,40 ,32 ,1 ,0 ,1 ,0 ,0 , {0 ,0 ,0 ,0 ,0 }},
@@ -640,6 +676,15 @@ void rk_idb_read_page_op(struct rk_idb *plat, int page, int col)writeb (page >>8 , bank_base +BANK_ADDR );writeb (page >>16 , bank_base +BANK_ADDR );writeb (NAND_CMD_READSTART , bank_base +BANK_CMD ); + +u32 seed = random_seed[page &0x7F ]; + +if (plat->randomizer) { +if (!(page < plat->pages_per_blk * plat->boot_blks)) + seed |=0xC0000000 ; + } + +writel (seed, regs + plat->cfg->randmz_off); }void rk_idb_write_page_op_begin (struct rk_idb *plat,int page,int col)
@@ -653,6 +698,15 @@ void rk_idb_write_page_op_begin(struct rk_idb *plat, int page, int col)writeb (page, bank_base +BANK_ADDR );writeb (page >>8 , bank_base +BANK_ADDR );writeb (page >>16 , bank_base +BANK_ADDR ); + +u32 seed = random_seed[page &0x7F ]; + +if (plat->randomizer) { +if (!(page < plat->pages_per_blk * plat->boot_blks)) + seed |=0xC0000000 ; + } + +writel (seed, regs + plat->cfg->randmz_off); }void rk_idb_write_page_op_end (struct rk_idb *plat)
@@ -1277,6 +1331,8 @@ int rk_idb_probe(struct udevice *dev)return -ENODEV ; } + plat->randomizer = (plat->info->operation_opt >>7 ) &1 ; +rk_idb_block_align (plat, plat->info->page_per_blk);rk_idb_build_page_table (plat, plat->info->lsb_mode);
Signature · 1 line
2.20.1
PATCH v2 7/11 rockchip: spl: allow more boot devices
In reply to a message not in the archiveRockchip SoCs have more boot device options then currently included in the function spl_boot_device().
Make this function generic for SPI and NAND.
---
This patch should replace a patch in the serie called:
[PATCH v1 02/17] rockchip: spl: allow more boot devices
https://lore.kernel.org/u-boot/[email protected]/
Changed:
replace #elseif by #elif
--- arch/arm/mach-rockchip/spl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/mach-rockchip/spl.c +4 -1
@@ -53,13 +53,16 @@ u32 spl_boot_device(void) {u32 boot_device =BOOT_DEVICE_MMC1 ; -#if defined(CONFIG_TARGET_CHROMEBOOK_JERRY ) || \ +#if defined(CONFIG_SPI_BOOT ) || \ + defined(CONFIG_TARGET_CHROMEBOOK_JERRY ) || \ defined(CONFIG_TARGET_CHROMEBIT_MICKEY ) || \ defined(CONFIG_TARGET_CHROMEBOOK_MINNIE ) || \ defined(CONFIG_TARGET_CHROMEBOOK_SPEEDY ) || \ defined(CONFIG_TARGET_CHROMEBOOK_BOB ) || \ defined(CONFIG_TARGET_CHROMEBOOK_KEVIN )return BOOT_DEVICE_SPI ; +#elif defined(CONFIG_NAND_BOOT ) +return BOOT_DEVICE_NAND ;#endif if (CONFIG_IS_ENABLED (ROCKCHIP_BACK_TO_BROM ))return BOOT_DEVICE_BOOTROM ;
Signature · 1 line
2.20.1
PATCH v2 8/11 rockchip: rk3066: add Rockchip IDB block device as boot action
In reply to a message not in the archiveAdd Rockchip IDB block device as boot action for rk3066. When a key is pressed the NAND IDB blocks can be accessed by a USB gadget like rockusb.
---
This patch comes on top of a serie called:
[PATCH v1 00/17] Add rk3066 ADC and USB support
--- arch/arm/mach-rockchip/rk3066/rk3066.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/mach-rockchip/rk3066/rk3066.c +11 -0
@@ -32,6 +32,8 @@ void board_debug_uart_init(void) GPIO1B0_UART2_SIN << GPIO1B0_SHIFT); } +int rk_idb_start (void ); +__weak void do_spl (void ) {if (CONFIG_IS_ENABLED (OF_PLATDATA ))
@@ -43,6 +45,15 @@ __weak void do_spl(void)int ret;switch (spl_boot_device ()) { +#if IS_ENABLED (CONFIG_SPL_ROCKCHIP_IDB ) +case BOOT_DEVICE_NAND : + dev_type ="idb" ; + dev_index =0 ; + ret =rk_idb_start (); +if (ret) +return ; +break ; +#endif case BOOT_DEVICE_MMC1 : dev_type ="mmc" ; dev_index =0 ;
Signature · 1 line
2.20.1
PATCH v2 9/11 arm: dts: rockchip: sync rk3066/rk3188 DT files from Linux
In reply to a message not in the archiveSync rk3066/rk3188 DT files from Linux.
This is the state as of v5.18 in Linux +
nfc node for MK808 rk3066a.
CRU nodes now have a clock property.
To prefend dtoc errors a fixed clock must also be included for tpl/spl in the rk3xxx-u-boot.dtsi file.
--- arch/arm/dts/rk3066a-mk808.dts | 18 ++++++++++++++++++ arch/arm/dts/rk3066a.dtsi | 3 ++- arch/arm/dts/rk3188-radxarock.dts | 3 +-- arch/arm/dts/rk3188.dtsi | 24 +++++++++++++++--------- arch/arm/dts/rk3xxx-u-boot.dtsi | 4 ++++ 5 files changed, 40 insertions(+), 12 deletions(-)
arch/arm/dts/rk3066a-mk808.dts +18 -0
@@ -160,6 +160,24 @@ status = "okay"; }; +&nfc { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + nand@0 { + reg = <0>; + label = "rk-nand"; + nand-bus-width = <8>; + nand-ecc-mode = "hw"; + nand-ecc-step-size = <1024>; + nand-ecc-strength = <40>; + nand-is-boot-medium; + rockchip,boot-blks = <8>; + rockchip,boot-ecc-strength = <24>; + }; +}; + &pinctrl { usb-host { host_drv: host-drv {
arch/arm/dts/rk3066a.dtsi +2 -1
@@ -202,8 +202,9 @@ cru: clock-controller@20000000 { compatible = "rockchip,rk3066a-cru"; reg = <0x20000000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; - #clock-cells = <1>; #reset-cells = <1>; assigned-clocks = <&cru PLL_CPLL>, <&cru PLL_GPLL>,
arch/arm/dts/rk3188-radxarock.dts +1 -2
@@ -6,7 +6,6 @@ /dts-v1/; #include <dt-bindings/input/input.h> #include "rk3188.dtsi" -#include "rk3188-radxarock-u-boot.dtsi" / { model = "Radxa Rock";
@@ -25,7 +24,7 @@ compatible = "gpio-keys"; autorepeat; - power { + key-power { gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; label = "GPIO Key Power";
arch/arm/dts/rk3188.dtsi +15 -9
@@ -54,7 +54,7 @@ }; }; - cpu0_opp_table: opp_table0 { + cpu0_opp_table: opp-table-0 { compatible = "operating-points-v2"; opp-shared;
@@ -195,8 +195,9 @@ cru: clock-controller@20000000 { compatible = "rockchip,rk3188-cru"; reg = <0x20000000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; - #clock-cells = <1>; #reset-cells = <1>; };
@@ -223,7 +224,7 @@ #size-cells = <1>; ranges; - gpio0: gpio0@2000a000 { + gpio0: gpio@2000a000 { compatible = "rockchip,rk3188-gpio-bank0"; reg = <0x2000a000 0x100>; interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
@@ -236,7 +237,7 @@ #interrupt-cells = <2>; }; - gpio1: gpio1@2003c000 { + gpio1: gpio@2003c000 { compatible = "rockchip,gpio-bank"; reg = <0x2003c000 0x100>; interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
@@ -249,7 +250,7 @@ #interrupt-cells = <2>; }; - gpio2: gpio2@2003e000 { + gpio2: gpio@2003e000 { compatible = "rockchip,gpio-bank"; reg = <0x2003e000 0x100>; interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
@@ -262,7 +263,7 @@ #interrupt-cells = <2>; }; - gpio3: gpio3@20080000 { + gpio3: gpio@20080000 { compatible = "rockchip,gpio-bank"; reg = <0x20080000 0x100>; interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
@@ -275,15 +276,15 @@ #interrupt-cells = <2>; }; - pcfg_pull_up: pcfg_pull_up { + pcfg_pull_up: pcfg-pull-up { bias-pull-up; }; - pcfg_pull_down: pcfg_pull_down { + pcfg_pull_down: pcfg-pull-down { bias-pull-down; }; - pcfg_pull_none: pcfg_pull_none { + pcfg_pull_none: pcfg-pull-none { bias-disable; };
@@ -641,6 +642,11 @@ &grf { compatible = "rockchip,rk3188-grf", "syscon", "simple-mfd"; + io_domains: io-domains { + compatible = "rockchip,rk3188-io-voltage-domain"; + status = "disabled"; + }; + usbphy: usbphy { compatible = "rockchip,rk3188-usb-phy"; #address-cells = <1>;
arch/arm/dts/rk3xxx-u-boot.dtsi +4 -0
@@ -33,3 +33,7 @@ &uart2 { clock-frequency = <24000000>; }; + +&xin24m { + u-boot,dm-pre-reloc; +};
Signature · 1 line
2.20.1
Re: [PATCH v2 09/11] arm: dts: rockchip: sync rk3066/rk3188 DT files from Linux
Hi Kever,
Despite you marked this serie as "Rejected" this patch contains a normal sync from Linux and therefore can be applied independently. Could you a have a look at it again?
Kind regards,
Johan Jonker
Quoted 184 lines · Johan Jonker
Sync rk3066/rk3188 DT files from Linux.
This is the state as of v5.18 in Linux +
nfc node for MK808 rk3066a.
CRU nodes now have a clock property.
To prefend dtoc errors a fixed clock must also be included for tpl/spl in therk3xxx-u-boot.dtsifile.Signed-off-by Johan Jonker <[email protected]>--- arch/arm/dts/rk3066a-mk808.dts | 18 ++++++++++++++++++ arch/arm/dts/rk3066a.dtsi | 3 ++- arch/arm/dts/rk3188-radxarock.dts | 3 +-- arch/arm/dts/rk3188.dtsi | 24 +++++++++++++++--------- arch/arm/dts/rk3xxx-u-boot.dtsi | 4 ++++ 5 files changed, 40 insertions(+), 12 deletions(-)arch/arm/dts/rk3066a-mk808.dts +18
-0@@ -160,6 +160,24 @@ status = "okay"; }; +&nfc { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + nand@0 { + reg = <0>; + label = "rk-nand"; + nand-bus-width = <8>; + nand-ecc-mode = "hw"; + nand-ecc-step-size = <1024>; + nand-ecc-strength = <40>; + nand-is-boot-medium; + rockchip,boot-blks = <8>; + rockchip,boot-ecc-strength = <24>; + }; +}; + &pinctrl { usb-host { host_drv: host-drv {arch/arm/dts/rk3066a.dtsi +2
-1@@ -202,8 +202,9 @@ cru: clock-controller@20000000 { compatible = "rockchip,rk3066a-cru"; reg = <0x20000000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; - #clock-cells = <1>; #reset-cells = <1>; assigned-clocks = <&cru PLL_CPLL>, <&cru PLL_GPLL>,arch/arm/dts/rk3188-radxarock.dts +1
-2@@ -6,7 +6,6 @@ /dts-v1/; #include <dt-bindings/input/input.h> #include "rk3188.dtsi" -#include "rk3188-radxarock-u-boot.dtsi" / { model = "Radxa Rock";@@ -25,7 +24,7 @@ compatible = "gpio-keys"; autorepeat; - power { + key-power { gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; label = "GPIO Key Power";arch/arm/dts/rk3188.dtsi +15
-9@@ -54,7 +54,7 @@ }; }; - cpu0_opp_table: opp_table0 { + cpu0_opp_table: opp-table-0 { compatible = "operating-points-v2"; opp-shared;@@ -195,8 +195,9 @@ cru: clock-controller@20000000 { compatible = "rockchip,rk3188-cru"; reg = <0x20000000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; - #clock-cells = <1>; #reset-cells = <1>; };@@ -223,7 +224,7 @@ #size-cells = <1>; ranges; - gpio0: gpio0@2000a000 { + gpio0: gpio@2000a000 { compatible = "rockchip,rk3188-gpio-bank0"; reg = <0x2000a000 0x100>; interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;@@ -236,7 +237,7 @@ #interrupt-cells = <2>; }; - gpio1: gpio1@2003c000 { + gpio1: gpio@2003c000 { compatible = "rockchip,gpio-bank"; reg = <0x2003c000 0x100>; interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;@@ -249,7 +250,7 @@ #interrupt-cells = <2>; }; - gpio2: gpio2@2003e000 { + gpio2: gpio@2003e000 { compatible = "rockchip,gpio-bank"; reg = <0x2003e000 0x100>; interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;@@ -262,7 +263,7 @@ #interrupt-cells = <2>; }; - gpio3: gpio3@20080000 { + gpio3: gpio@20080000 { compatible = "rockchip,gpio-bank"; reg = <0x20080000 0x100>; interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;@@ -275,15 +276,15 @@ #interrupt-cells = <2>; }; - pcfg_pull_up: pcfg_pull_up { + pcfg_pull_up: pcfg-pull-up { bias-pull-up; }; - pcfg_pull_down: pcfg_pull_down { + pcfg_pull_down: pcfg-pull-down { bias-pull-down; }; - pcfg_pull_none: pcfg_pull_none { + pcfg_pull_none: pcfg-pull-none { bias-disable; };@@ -641,6 +642,11 @@ &grf { compatible = "rockchip,rk3188-grf", "syscon", "simple-mfd"; + io_domains: io-domains { + compatible = "rockchip,rk3188-io-voltage-domain"; + status = "disabled"; + }; + usbphy: usbphy { compatible = "rockchip,rk3188-usb-phy"; #address-cells = <1>;arch/arm/dts/rk3xxx-u-boot.dtsi +4
-0@@ -33,3 +33,7 @@ &uart2 { clock-frequency = <24000000>; }; + +&xin24m { + u-boot,dm-pre-reloc; +};
Re: [PATCH v2 09/11] arm: dts: rockchip: sync rk3066/rk3188 DT files from Linux
Hi Johan,
Quoted 4 lines · Johan Jonker
Hi Kever,
Despite you marked this serie as "Rejected" this patch contains a normal sync from Linux and therefore can be applied independently. Could you a have a look at it again?
Please send the patches for sync dts with linux by a new patch set.
Thanks,
- Kever
Quoted 190 lines
Kind regards,
Johan Jonker
Quoted 184 lines · Johan Jonker
Sync rk3066/rk3188 DT files from Linux.
This is the state as of v5.18 in Linux +
nfc node for MK808 rk3066a.
CRU nodes now have a clock property.
To prefend dtoc errors a fixed clock must also be included for tpl/spl in therk3xxx-u-boot.dtsifile.Signed-off-by Johan Jonker <[email protected]>--- arch/arm/dts/rk3066a-mk808.dts | 18 ++++++++++++++++++ arch/arm/dts/rk3066a.dtsi | 3 ++- arch/arm/dts/rk3188-radxarock.dts | 3 +-- arch/arm/dts/rk3188.dtsi | 24 +++++++++++++++--------- arch/arm/dts/rk3xxx-u-boot.dtsi | 4 ++++ 5 files changed, 40 insertions(+), 12 deletions(-)arch/arm/dts/rk3066a-mk808.dts +18
-0@@ -160,6 +160,24 @@ status = "okay"; }; +&nfc { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + nand@0 { + reg = <0>; + label = "rk-nand"; + nand-bus-width = <8>; + nand-ecc-mode = "hw"; + nand-ecc-step-size = <1024>; + nand-ecc-strength = <40>; + nand-is-boot-medium; + rockchip,boot-blks = <8>; + rockchip,boot-ecc-strength = <24>; + }; +}; + &pinctrl { usb-host { host_drv: host-drv {arch/arm/dts/rk3066a.dtsi +2
-1@@ -202,8 +202,9 @@ cru: clock-controller@20000000 { compatible = "rockchip,rk3066a-cru"; reg = <0x20000000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; - #clock-cells = <1>; #reset-cells = <1>; assigned-clocks = <&cru PLL_CPLL>, <&cru PLL_GPLL>,arch/arm/dts/rk3188-radxarock.dts +1
-2@@ -6,7 +6,6 @@ /dts-v1/; #include <dt-bindings/input/input.h> #include "rk3188.dtsi" -#include "rk3188-radxarock-u-boot.dtsi" / { model = "Radxa Rock";@@ -25,7 +24,7 @@ compatible = "gpio-keys"; autorepeat; - power { + key-power { gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; label = "GPIO Key Power";arch/arm/dts/rk3188.dtsi +15
-9@@ -54,7 +54,7 @@ }; }; - cpu0_opp_table: opp_table0 { + cpu0_opp_table: opp-table-0 { compatible = "operating-points-v2"; opp-shared;@@ -195,8 +195,9 @@ cru: clock-controller@20000000 { compatible = "rockchip,rk3188-cru"; reg = <0x20000000 0x1000>; + clocks = <&xin24m>; + clock-names = "xin24m"; rockchip,grf = <&grf>; - #clock-cells = <1>; #reset-cells = <1>; };@@ -223,7 +224,7 @@ #size-cells = <1>; ranges; - gpio0: gpio0@2000a000 { + gpio0: gpio@2000a000 { compatible = "rockchip,rk3188-gpio-bank0"; reg = <0x2000a000 0x100>; interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;@@ -236,7 +237,7 @@ #interrupt-cells = <2>; }; - gpio1: gpio1@2003c000 { + gpio1: gpio@2003c000 { compatible = "rockchip,gpio-bank"; reg = <0x2003c000 0x100>; interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;@@ -249,7 +250,7 @@ #interrupt-cells = <2>; }; - gpio2: gpio2@2003e000 { + gpio2: gpio@2003e000 { compatible = "rockchip,gpio-bank"; reg = <0x2003e000 0x100>; interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;@@ -262,7 +263,7 @@ #interrupt-cells = <2>; }; - gpio3: gpio3@20080000 { + gpio3: gpio@20080000 { compatible = "rockchip,gpio-bank"; reg = <0x20080000 0x100>; interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;@@ -275,15 +276,15 @@ #interrupt-cells = <2>; }; - pcfg_pull_up: pcfg_pull_up { + pcfg_pull_up: pcfg-pull-up { bias-pull-up; }; - pcfg_pull_down: pcfg_pull_down { + pcfg_pull_down: pcfg-pull-down { bias-pull-down; }; - pcfg_pull_none: pcfg_pull_none { + pcfg_pull_none: pcfg-pull-none { bias-disable; };@@ -641,6 +642,11 @@ &grf { compatible = "rockchip,rk3188-grf", "syscon", "simple-mfd"; + io_domains: io-domains { + compatible = "rockchip,rk3188-io-voltage-domain"; + status = "disabled"; + }; + usbphy: usbphy { compatible = "rockchip,rk3188-usb-phy"; #address-cells = <1>;arch/arm/dts/rk3xxx-u-boot.dtsi +4
-0@@ -33,3 +33,7 @@ &uart2 { clock-frequency = <24000000>; }; + +&xin24m { + u-boot,dm-pre-reloc; +};
PATCH v2 10/11 arm: dts: rockchip: enable nfc node in spl for rk3066 mk808
In reply to a message not in the archiveEnable the nfc node in spl for rk3066 mk808 in the rk3066a-mk808-u-boot.dtsi file.
--- arch/arm/dts/rk3066a-mk808-u-boot.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/dts/rk3066a-mk808-u-boot.dtsi +8 -0
@@ -39,6 +39,14 @@ status = "disabled"; }; +&nfc { + u-boot,dm-spl; + + nand@0 { + u-boot,dm-spl; + }; +}; + &noc { compatible = "rockchip,rk3066-noc", "syscon"; };
Signature · 1 line
2.20.1
PATCH v2 11/11 rockchip: configs: mk808: add idb configs
In reply to a message not in the archiveAdd IDB configs for mk808.
---
This patch comes on top of a serie called:
[PATCH v1 00/17] Add rk3066 ADC and USB support
--- configs/mk808_defconfig | 4 ++++ 1 file changed, 4 insertions(+)
configs/mk808_defconfig +4 -0
@@ -15,6 +15,8 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3066a-mk808" CONFIG_SPL_TEXT_BASE=0x60000000 CONFIG_ROCKCHIP_RK3066=y # CONFIG_ROCKCHIP_STIMER is not set +CONFIG_ROCKCHIP_IDB=y +CONFIG_SPL_ROCKCHIP_IDB=y CONFIG_TPL_TEXT_BASE=0x10080C04 CONFIG_TPL_MAX_SIZE=32764 CONFIG_TPL_STACK=0x1008FFFF
@@ -27,6 +29,7 @@ CONFIG_SYS_LOAD_ADDR=0x70800800 CONFIG_SPL_PAYLOAD="u-boot.bin" CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set +CONFIG_NAND_BOOT=y CONFIG_SD_BOOT=y CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="rk3066a-mk808.dtb"
@@ -91,6 +94,7 @@ CONFIG_MMC_UHS_SUPPORT=y CONFIG_SPL_MMC_UHS_SUPPORT=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y +# CONFIG_MTD_RAW_NAND is not set CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_PINCTRL=y CONFIG_DM_PMIC=y
Signature · 1 line
2.20.1