Skip to contentSkip to conversation

Introduce UCLASS_SOC

PATCH New Dave Gerlach 3 participants 12 messages Jul 16, 2020 – Jul 17, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover Introduce UCLASS_SOC

Hi,

This is v2 of the series to introduce UCLASS_SOC to be used for SOC identification and attribute matching based on SoC ID info. The first version of this series can be found at [1].

Biggest change is the addition of a patch to add documentation for the SOC ID framework as requested by several folks. Otherwise, several comments were addressed in the patch to introduce the UCLASS_SOC implementation:

* Renamed soc_device_attribute to soc_attr.
* Added inline docs for same struct.
* Moved ifdef for CONFIG_SOC_DEVICE to only include functions
* Documented NULL return possiblity for soc_device_match.

And a change to SOC Revision macro naming in the soc_ti_k3 driver to use SR consistently instead of PG.

Regards,
Dave

[1] https://lists.denx.de/pipermail/u-boot/2020-June/418109.html

Dave Gerlach (9):
doc: Add new doc for soc ID driver model
dm: soc: Introduce UCLASS_SOC for SOC ID and attribute matching
test: Add tests for SOC uclass
dm: soc: Introduce soc_ti_k3 driver for TI K3 SoCs
arm: dts: k3-am65-wakeup: Introduce chipid node
arm: dts: k3-j721e-mcu-wakeup: Introduce chipid node
configs: am65x_evm: Enable CONFIG_SOC_DEVICE and
CONFIG_SOC_DEVICE_TI_K3
configs: j721e_evm: Enable CONFIG_SOC_DEVICE and
CONFIG_SOC_DEVICE_TI_K3
arm: mach-k3: Use SOC driver for device identification

 arch/arm/dts/k3-am65-wakeup.dtsi              |   5 +
 arch/arm/dts/k3-am654-base-board-u-boot.dtsi  |   4 +
 .../k3-j721e-common-proc-board-u-boot.dtsi    |   4 +
 arch/arm/dts/k3-j721e-mcu-wakeup.dtsi         |   5 +
 arch/arm/mach-k3/common.c                     |  48 +++---
 arch/arm/mach-k3/common.h                     |   6 -
 arch/arm/mach-k3/include/mach/hardware.h      |   1 -
 arch/sandbox/dts/test.dts                     |   4 +
 configs/am65x_evm_a53_defconfig               |   2 +
 configs/am65x_evm_r5_defconfig                |   2 +
 configs/am65x_hs_evm_a53_defconfig            |   2 +
 configs/am65x_hs_evm_r5_defconfig             |   2 +
 configs/j721e_evm_a72_defconfig               |   2 +
 configs/j721e_evm_r5_defconfig                |   2 +
 configs/j721e_hs_evm_a72_defconfig            |   2 +
 configs/j721e_hs_evm_r5_defconfig             |   2 +
 configs/sandbox64_defconfig                   |   1 +
 configs/sandbox_defconfig                     |   1 +
 configs/sandbox_flattree_defconfig            |   1 +
 configs/sandbox_spl_defconfig                 |   1 +
 doc/driver-model/index.rst                    |   1 +
 doc/driver-model/soc-framework.rst            |  68 ++++++++
 drivers/soc/Kconfig                           |  16 ++
 drivers/soc/Makefile                          |   3 +
 drivers/soc/soc-uclass.c                      | 102 ++++++++++++
 drivers/soc/soc_sandbox.c                     |  56 +++++++
 drivers/soc/soc_ti_k3.c                       | 124 +++++++++++++++
 include/dm/uclass-id.h                        |   1 +
 include/soc.h                                 | 145 ++++++++++++++++++
 test/dm/Makefile                              |   1 +
 test/dm/soc.c                                 | 120 +++++++++++++++
 31 files changed, 698 insertions(+), 36 deletions(-)
 create mode 100644 doc/driver-model/soc-framework.rst
 create mode 100644 drivers/soc/soc-uclass.c
 create mode 100644 drivers/soc/soc_sandbox.c
 create mode 100644 drivers/soc/soc_ti_k3.c
 create mode 100644 include/soc.h
 create mode 100644 test/dm/soc.c
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/9 doc: Add new doc for soc ID driver model

Add a new documentation file for UCLASS_SOC and its usage to describe the SoC Device ID framework that allows SoC identification and device data matching.

---
 doc/driver-model/index.rst         |  1 +
 doc/driver-model/soc-framework.rst | 68 ++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 doc/driver-model/soc-framework.rst
doc/driver-model/index.rst +1 -0
index b9df221627e2..f17c72ce69d8 100644
@@ -19,5 +19,6 @@ Driver Model
    pmic-framework
    remoteproc-framework
    serial-howto
+   soc-framework
    spi-howto
    usb-info
doc/driver-model/soc-framework.rst new file +68 -0

68 lines not on this page · raw message

Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 1/9 doc: Add new doc for soc ID driver model

Quoted 11 lines · Dave Gerlach

Add a new documentation file for UCLASS_SOC and its usage to describe the SoC Device ID framework that allows SoC identification and device data matching.

---
 doc/driver-model/index.rst         |  1 +
 doc/driver-model/soc-framework.rst | 68 ++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 doc/driver-model/soc-framework.rst
#3 lore raw

PATCH v2 2/9 dm: soc: Introduce UCLASS_SOC for SOC ID and attribute matching

In reply to Dave Gerlach

Introduce UCLASS_SOC to be used for SOC identification and attribute matching based on the SoC ID info. This allows drivers to be provided for SoCs to retrieve SoC identifying information and also for matching device attributes for selecting SoC specific data.

This is useful for other device drivers that may need different parameters or quirks enabled depending on the specific device variant in use.

---
 drivers/soc/Kconfig      |   9 +++
 drivers/soc/Makefile     |   1 +
 drivers/soc/soc-uclass.c | 102 +++++++++++++++++++++++++++
 include/dm/uclass-id.h   |   1 +
 include/soc.h            | 145 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 258 insertions(+)
 create mode 100644 drivers/soc/soc-uclass.c
 create mode 100644 include/soc.h
drivers/soc/Kconfig +9 -0
index 7b4e4d613088..e715dfd01712 100644
@@ -1,5 +1,14 @@
 menu "SOC (System On Chip) specific Drivers"
 
+config SOC_DEVICE
+	bool "Enable SoC Device ID drivers using Driver Model"
+	help
+	  This allows drivers to be provided for SoCs to help in identifying
+	  the SoC in use and matching SoC attributes for selecting SoC
+	  specific data. This is useful for other device drivers that may
+	  need different parameters or quirks enabled depending on the
+	  specific device variant in use.
+
 source "drivers/soc/ti/Kconfig"
 
 endmenu
drivers/soc/Makefile +1 -0
index ce253b7aa886..1c09a8465670 100644
@@ -3,3 +3,4 @@
 # Makefile for the U-Boot SOC specific device drivers.
 
 obj-$(CONFIG_SOC_TI) += ti/
+obj-$(CONFIG_SOC_DEVICE) += soc-uclass.o
drivers/soc/soc-uclass.c new file +102 -0

102 lines not on this page · raw message

include/dm/uclass-id.h +1 -0
index 7837d459f18c..690a8ed4df49 100644
@@ -97,6 +97,7 @@ enum uclass_id {
 	UCLASS_SERIAL,		/* Serial UART */
 	UCLASS_SIMPLE_BUS,	/* Bus with child devices */
 	UCLASS_SMEM,		/* Shared memory interface */
+	UCLASS_SOC,		/* SOC Device */
 	UCLASS_SOUND,		/* Playing simple sounds */
 	UCLASS_SPI,		/* SPI bus */
 	UCLASS_SPI_FLASH,	/* SPI flash */
include/soc.h new file +145 -0

145 lines not on this page · raw message

Signature · 1 line
2.20.1
#4 lore raw

PATCH v2 3/9 test: Add tests for SOC uclass

In reply to Dave Gerlach

Add a sandbox SOC driver, and some tests for the SOC uclass.

---
 arch/sandbox/dts/test.dts          |   4 +
 configs/sandbox64_defconfig        |   1 +
 configs/sandbox_defconfig          |   1 +
 configs/sandbox_flattree_defconfig |   1 +
 configs/sandbox_spl_defconfig      |   1 +
 drivers/soc/Makefile               |   1 +
 drivers/soc/soc_sandbox.c          |  56 ++++++++++++++
 test/dm/Makefile                   |   1 +
 test/dm/soc.c                      | 120 +++++++++++++++++++++++++++++
 9 files changed, 186 insertions(+)
 create mode 100644 drivers/soc/soc_sandbox.c
 create mode 100644 test/dm/soc.c
arch/sandbox/dts/test.dts +4 -0
index 5ce5e2847642..20404c4a0ce9 100644
@@ -492,6 +492,10 @@
 		};
 	};
 
+	chipid: chipid {
+		compatible = "sandbox,soc";
+	};
+
 	i2s: i2s {
 		compatible = "sandbox,i2s";
 		#sound-dai-cells = <1>;
configs/sandbox64_defconfig +1 -0
index a3f049e124e1..3ded31f4a9a7 100644
@@ -114,6 +114,7 @@ CONFIG_LED_GPIO=y
 CONFIG_DM_MAILBOX=y
 CONFIG_SANDBOX_MBOX=y
 CONFIG_MISC=y
+CONFIG_SOC_DEVICE=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_LPC=y
configs/sandbox_defconfig +1 -0
index 5b7569319b73..b19f337f3f0c 100644
@@ -133,6 +133,7 @@ CONFIG_LED_GPIO=y
 CONFIG_DM_MAILBOX=y
 CONFIG_SANDBOX_MBOX=y
 CONFIG_MISC=y
+CONFIG_SOC_DEVICE=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_LPC=y
configs/sandbox_flattree_defconfig +1 -0
index 21f9047046a3..b889ecb058c8 100644
@@ -99,6 +99,7 @@ CONFIG_LED_GPIO=y
 CONFIG_DM_MAILBOX=y
 CONFIG_SANDBOX_MBOX=y
 CONFIG_MISC=y
+CONFIG_SOC_DEVICE=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_LPC=y
configs/sandbox_spl_defconfig +1 -0
index fc8b26e88cfe..45cb9e78d769 100644
@@ -118,6 +118,7 @@ CONFIG_LED_GPIO=y
 CONFIG_DM_MAILBOX=y
 CONFIG_SANDBOX_MBOX=y
 CONFIG_MISC=y
+CONFIG_SOC_DEVICE=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_LPC=y
drivers/soc/Makefile +1 -0
index 1c09a8465670..649e92b3906d 100644
@@ -4,3 +4,4 @@
 
 obj-$(CONFIG_SOC_TI) += ti/
 obj-$(CONFIG_SOC_DEVICE) += soc-uclass.o
+obj-$(CONFIG_SANDBOX) += soc_sandbox.o
drivers/soc/soc_sandbox.c new file +56 -0

56 lines not on this page · raw message

test/dm/Makefile +1 -0
index 6c18fd04ce1c..9d570d3f5b89 100644
@@ -66,6 +66,7 @@ obj-$(CONFIG_AXI) += axi.o
 obj-$(CONFIG_MISC) += misc.o
 obj-$(CONFIG_DM_SERIAL) += serial.o
 obj-$(CONFIG_CPU) += cpu.o
+obj-$(CONFIG_SOC_DEVICE) += soc.o
 obj-$(CONFIG_SOUND) += sound.o
 obj-$(CONFIG_TEE) += tee.o
 obj-$(CONFIG_VIRTIO_SANDBOX) += virtio.o
test/dm/soc.c new file +120 -0

120 lines not on this page · raw message

Signature · 1 line
2.20.1
#5 lore raw

PATCH v2 4/9 dm: soc: Introduce soc_ti_k3 driver for TI K3 SoCs

In reply to Dave Gerlach

Introduce an soc_ti_k3_driver that allows identification and selection of SoC specific data based on the JTAG ID register for device identification, as described for AM65x[0] and J721E[1] devices.

[0] http://www.ti.com/lit/ug/spruid7e/spruid7e.pdf
[1] http://www.ti.com/lit/ug/spruil1a/spruil1a.pdf

---
 drivers/soc/Kconfig     |   7 +++
 drivers/soc/Makefile    |   1 +
 drivers/soc/soc_ti_k3.c | 124 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 132 insertions(+)
 create mode 100644 drivers/soc/soc_ti_k3.c
drivers/soc/Kconfig +7 -0
index e715dfd01712..864d00a88538 100644
@@ -9,6 +9,13 @@ config SOC_DEVICE
 	  need different parameters or quirks enabled depending on the
 	  specific device variant in use.
 
+config SOC_DEVICE_TI_K3
+	depends on SOC_DEVICE
+	bool "Enable SoC Device ID driver for TI K3 SoCs"
+	help
+	  This allows Texas Instruments Keystone 3 SoCs to identify
+	  specifics about the SoC in use.
+
 source "drivers/soc/ti/Kconfig"
 
 endmenu
drivers/soc/Makefile +1 -0
index 649e92b3906d..9ef20ca5066f 100644
@@ -4,4 +4,5 @@
 
 obj-$(CONFIG_SOC_TI) += ti/
 obj-$(CONFIG_SOC_DEVICE) += soc-uclass.o
+obj-$(CONFIG_SOC_DEVICE_TI_K3) += soc_ti_k3.o
 obj-$(CONFIG_SANDBOX) += soc_sandbox.o
drivers/soc/soc_ti_k3.c new file +124 -0

124 lines not on this page · raw message

Signature · 1 line
2.20.1
#6 lore raw

PATCH v2 5/9 arm: dts: k3-am65-wakeup: Introduce chipid node

In reply to Dave Gerlach

Introduce a chipid node to provide a UCLASS_SOC driver to identify TI K3 SoCs.

---
 arch/arm/dts/k3-am65-wakeup.dtsi             | 5 +++++
 arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 4 ++++
 2 files changed, 9 insertions(+)
arch/arm/dts/k3-am65-wakeup.dtsi +5 -0
index 2676d6035b21..666c30d01919 100644
@@ -62,4 +62,9 @@
 		clocks = <&k3_clks 115 1>;
 		power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>;
 	};
+
+	chipid: chipid at 43000014 {
+		compatible = "ti,am654-chipid";
+		reg = <0x43000014 0x4>;
+	};
 };
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +4 -0
index a7e5eb055313..ef75a68fd511 100644
@@ -393,3 +393,7 @@
 		u-boot,dm-spl;
 	};
 };
+
+&chipid {
+	u-boot,dm-spl;
+};
Signature · 1 line
2.20.1
#7 lore raw

PATCH v2 6/9 arm: dts: k3-j721e-mcu-wakeup: Introduce chipid node

In reply to Dave Gerlach

Introduce a chipid node to provide a UCLASS_SOC driver to identify TI K3 SoCs.

---
 arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi | 4 ++++
 arch/arm/dts/k3-j721e-mcu-wakeup.dtsi               | 5 +++++
 2 files changed, 9 insertions(+)
arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +4 -0
index 7b01e4204f73..bea77cb1f74c 100644
@@ -377,3 +377,7 @@
 &mcu_fss0_ospi1_pins_default {
 	u-boot,dm-spl;
 };
+
+&chipid {
+	u-boot,dm-spl;
+};
arch/arm/dts/k3-j721e-mcu-wakeup.dtsi +5 -0
index 2eed50aa5a4c..7a815620a507 100644
@@ -199,4 +199,9 @@
 		clocks = <&k3_clks 195 0>;
 		power-domains = <&k3_pds 195 TI_SCI_PD_EXCLUSIVE>;
 	};
+
+	chipid: chipid at 43000014 {
+		compatible = "ti,am654-chipid";
+		reg = <0x0 0x43000014 0x0 0x4>;
+	};
 };
Signature · 1 line
2.20.1
#8 lore raw

PATCH v2 7/9 configs: am65x_evm: Enable CONFIG_SOC_DEVICE and CONFIG_SOC_DEVICE_TI_K3

In reply to Dave Gerlach

Enable CONFIG_SOC_DEVICE and CONFIG_SOC_DEVICE_TI_K3 so the TI K3 SoC driver can be used for SoC detection.

---
 configs/am65x_evm_a53_defconfig    | 2 ++
 configs/am65x_evm_r5_defconfig     | 2 ++
 configs/am65x_hs_evm_a53_defconfig | 2 ++
 configs/am65x_hs_evm_r5_defconfig  | 2 ++
 4 files changed, 8 insertions(+)
configs/am65x_evm_a53_defconfig +2 -0
index d74a2d09309b..32817321e762 100644
@@ -144,3 +144,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6162
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SOC_DEVICE=y
+CONFIG_SOC_DEVICE_TI_K3=y
configs/am65x_evm_r5_defconfig +2 -0
index 4fc199e80911..f6b1d71d9d83 100644
@@ -118,3 +118,5 @@ CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_FS_FAT_MAX_CLUSTSIZE=16384
+CONFIG_SOC_DEVICE=y
+CONFIG_SOC_DEVICE_TI_K3=y
configs/am65x_hs_evm_a53_defconfig +2 -0
index 117953817d82..58f47bd511f3 100644
@@ -146,3 +146,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6162
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SOC_DEVICE=y
+CONFIG_SOC_DEVICE_TI_K3=y
configs/am65x_hs_evm_r5_defconfig +2 -0
index b2d638672e33..13be670a3647 100644
@@ -119,3 +119,5 @@ CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_FS_FAT_MAX_CLUSTSIZE=16384
+CONFIG_SOC_DEVICE=y
+CONFIG_SOC_DEVICE_TI_K3=y
Signature · 1 line
2.20.1
#9 lore raw

PATCH v2 8/9 configs: j721e_evm: Enable CONFIG_SOC_DEVICE and CONFIG_SOC_DEVICE_TI_K3

In reply to Dave Gerlach

Enable CONFIG_SOC_DEVICE and CONFIG_SOC_DEVICE_TI_K3 so the TI K3 SoC driver can be used for SoC detection.

---
 configs/j721e_evm_a72_defconfig    | 2 ++
 configs/j721e_evm_r5_defconfig     | 2 ++
 configs/j721e_hs_evm_a72_defconfig | 2 ++
 configs/j721e_hs_evm_r5_defconfig  | 2 ++
 4 files changed, 8 insertions(+)
configs/j721e_evm_a72_defconfig +2 -0
index 4deb4e219fe7..1bc0ef4ed8a0 100644
@@ -168,3 +168,5 @@ CONFIG_CADENCE_UFS=y
 CONFIG_TI_J721E_UFS=y
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SOC_DEVICE=y
+CONFIG_SOC_DEVICE_TI_K3=y
configs/j721e_evm_r5_defconfig +2 -0
index ee9217aee238..eec5a3c0d11c 100644
@@ -133,3 +133,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6163
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_FS_EXT4=y
 CONFIG_FS_FAT_MAX_CLUSTSIZE=16384
+CONFIG_SOC_DEVICE=y
+CONFIG_SOC_DEVICE_TI_K3=y
configs/j721e_hs_evm_a72_defconfig +2 -0
index ae540a26a401..c6755e41cc6b 100644
@@ -156,3 +156,5 @@ CONFIG_CADENCE_UFS=y
 CONFIG_TI_J721E_UFS=y
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_SOC_DEVICE=y
+CONFIG_SOC_DEVICE_TI_K3=y
configs/j721e_hs_evm_r5_defconfig +2 -0
index 51d5a3bb98fa..f8893ed58622 100644
@@ -114,3 +114,5 @@ CONFIG_SPL_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_FS_EXT4=y
 CONFIG_FS_FAT_MAX_CLUSTSIZE=16384
+CONFIG_SOC_DEVICE=y
+CONFIG_SOC_DEVICE_TI_K3=y
Signature · 1 line
2.20.1
#10 lore raw

PATCH v2 9/9 arm: mach-k3: Use SOC driver for device identification

In reply to Dave Gerlach

Make use of UCLASS_SOC to find device family and revision for print_cpuinfo.

---
 arch/arm/mach-k3/common.c                | 48 ++++++++++--------------
 arch/arm/mach-k3/common.h                |  6 ---
 arch/arm/mach-k3/include/mach/hardware.h |  1 -
 3 files changed, 19 insertions(+), 36 deletions(-)
arch/arm/mach-k3/common.c +19 -29
index 9695b2236ecd..b88516b8c02b 100644
@@ -25,6 +25,7 @@
 #include <fs.h>
 #include <env.h>
 #include <elf.h>
+#include <soc.h>
 
 struct ti_sci_handle *get_ti_sci_handle(void)
 {
@@ -308,38 +309,27 @@ void reset_cpu(ulong ignored)
 #if defined(CONFIG_DISPLAY_CPUINFO)
 int print_cpuinfo(void)
 {
-	u32 soc, rev;
-	char *name;
-
-	soc = (readl(CTRLMMR_WKUP_JTAG_ID) &
-		JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT;
-	rev = (readl(CTRLMMR_WKUP_JTAG_ID) &
-		JTAG_ID_VARIANT_MASK) >> JTAG_ID_VARIANT_SHIFT;
+	struct udevice *soc;
+	char name[64];
+	int ret;
 
 	printf("SoC:   ");
-	switch (soc) {
-	case AM65X:
-		name = "AM65x";
-		break;
-	case J721E:
-		name = "J721E";
-		break;
-	default:
-		name = "Unknown Silicon";
-	};
 
-	printf("%s SR ", name);
-	switch (rev) {
-	case REV_PG1_0:
-		name = "1.0";
-		break;
-	case REV_PG2_0:
-		name = "2.0";
-		break;
-	default:
-		name = "Unknown Revision";
-	};
-	printf("%s\n", name);
+	ret = soc_get(&soc);
+	if (ret) {
+		printf("UNKNOWN\n");
+		return 0;
+	}
+
+	ret = soc_get_family(soc, name, 64);
+	if (!ret) {
+		printf("%s ", name);
+	}
+
+	ret = soc_get_revision(soc, name, 64);
+	if (!ret) {
+		printf("%s\n", name);
+	}
 
 	return 0;
 }
arch/arm/mach-k3/common.h +0 -6
index 94cdcb56aded..ba344c5bc9dd 100644
@@ -8,12 +8,6 @@
 
 #include <asm/armv7_mpu.h>
 
-#define AM65X	0xbb5a
-#define J721E	0xbb64
-
-#define REV_PG1_0	0
-#define REV_PG2_0	1
-
 struct fwl_data {
 	const char *name;
 	u16 fwl_id;
arch/arm/mach-k3/include/mach/hardware.h +0 -1
index 0ad761418bb7..f2ca80af1a9b 100644
@@ -15,7 +15,6 @@
 #endif
 
 /* Assuming these addresses and definitions stay common across K3 devices */
-#define CTRLMMR_WKUP_JTAG_ID	0x43000014
 #define JTAG_ID_VARIANT_SHIFT	28
 #define JTAG_ID_VARIANT_MASK	(0xf << 28)
 #define JTAG_ID_PARTNO_SHIFT	12
Signature · 1 line
2.20.1
#11 lore raw

v2 cover Introduce UCLASS_SOC

In reply to Dave Gerlach
Quoted 69 lines · Dave Gerlach

Hi,

This is v2 of the series to introduce UCLASS_SOC to be used for SOC identification and attribute matching based on SoC ID info. The first version of this series can be found at [1].

Biggest change is the addition of a patch to add documentation for the SOC ID framework as requested by several folks. Otherwise, several comments were addressed in the patch to introduce the UCLASS_SOC implementation:

* Renamed soc_device_attribute to soc_attr.
* Added inline docs for same struct.
* Moved ifdef for CONFIG_SOC_DEVICE to only include functions
* Documented NULL return possiblity for soc_device_match.

And a change to SOC Revision macro naming in the soc_ti_k3 driver to use SR consistently instead of PG.

Regards,
Dave

[1] https://lists.denx.de/pipermail/u-boot/2020-June/418109.html

Dave Gerlach (9):
doc: Add new doc for soc ID driver model
dm: soc: Introduce UCLASS_SOC for SOC ID and attribute matching
test: Add tests for SOC uclass
dm: soc: Introduce soc_ti_k3 driver for TI K3 SoCs
arm: dts: k3-am65-wakeup: Introduce chipid node
arm: dts: k3-j721e-mcu-wakeup: Introduce chipid node
configs: am65x_evm: Enable CONFIG_SOC_DEVICE and
CONFIG_SOC_DEVICE_TI_K3
configs: j721e_evm: Enable CONFIG_SOC_DEVICE and
CONFIG_SOC_DEVICE_TI_K3
arm: mach-k3: Use SOC driver for device identification

  arch/arm/dts/k3-am65-wakeup.dtsi              |   5 +
  arch/arm/dts/k3-am654-base-board-u-boot.dtsi  |   4 +
  .../k3-j721e-common-proc-board-u-boot.dtsi    |   4 +
  arch/arm/dts/k3-j721e-mcu-wakeup.dtsi         |   5 +
  arch/arm/mach-k3/common.c                     |  48 +++---
  arch/arm/mach-k3/common.h                     |   6 -
  arch/arm/mach-k3/include/mach/hardware.h      |   1 -
  arch/sandbox/dts/test.dts                     |   4 +
  configs/am65x_evm_a53_defconfig               |   2 +
  configs/am65x_evm_r5_defconfig                |   2 +
  configs/am65x_hs_evm_a53_defconfig            |   2 +
  configs/am65x_hs_evm_r5_defconfig             |   2 +
  configs/j721e_evm_a72_defconfig               |   2 +
  configs/j721e_evm_r5_defconfig                |   2 +
  configs/j721e_hs_evm_a72_defconfig            |   2 +
  configs/j721e_hs_evm_r5_defconfig             |   2 +
  configs/sandbox64_defconfig                   |   1 +
  configs/sandbox_defconfig                     |   1 +
  configs/sandbox_flattree_defconfig            |   1 +
  configs/sandbox_spl_defconfig                 |   1 +
  doc/driver-model/index.rst                    |   1 +
  doc/driver-model/soc-framework.rst            |  68 ++++++++
  drivers/soc/Kconfig                           |  16 ++
  drivers/soc/Makefile                          |   3 +
  drivers/soc/soc-uclass.c                      | 102 ++++++++++++
  drivers/soc/soc_sandbox.c                     |  56 +++++++
  drivers/soc/soc_ti_k3.c                       | 124 +++++++++++++++
  include/dm/uclass-id.h                        |   1 +
  include/soc.h                                 | 145 ++++++++++++++++++
  test/dm/Makefile                              |   1 +
  test/dm/soc.c                                 | 120 +++++++++++++++
  31 files changed, 698 insertions(+), 36 deletions(-)
Quoted 7 lines

create mode 100644 doc/driver-model/soc-framework.rst create mode 100644 drivers/soc/soc-uclass.c create mode 100644 drivers/soc/soc_sandbox.c create mode 100644 drivers/soc/soc_ti_k3.c create mode 100644 include/soc.h
create mode 100644 test/dm/soc.c

Thank you.

Signature · 2 lines
Best regards,
grygorii