History

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC driver updates from Arnd Bergmann: "As usual, the drivers/tee and drivers/reset subsystems get merged here, with the expected set of smaller updates and some new hardware support. The tee subsystem now supports device drivers to be attached to a tee, the first example here is a random number driver with its implementation in the secure world. Three new power domain drivers get added for specific chip families: - Broadcom BCM283x chips (used in Raspberry Pi) - Qualcomm Snapdragon phone chips - Xilinx ZynqMP FPGA SoCs One new driver is added to talk to the BPMP firmware on NVIDIA Tegra210 Existing drivers are extended for new SoC variants from NXP, NVIDIA, Amlogic and Qualcomm" * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (113 commits) tee: optee: update optee_msg.h and optee_smc.h to dual license tee: add cancellation support to client interface dpaa2-eth: configure the cache stashing amount on a queue soc: fsl: dpio: configure cache stashing destination soc: fsl: dpio: enable frame data cache stashing per software portal soc: fsl: guts: make fsl_guts_get_svr() static hwrng: make symbol 'optee_rng_id_table' static tee: optee: Fix unsigned comparison with less than zero hwrng: Fix unsigned comparison with less than zero tee: fix possible error pointer ctx dereferencing hwrng: optee: Initialize some structs using memset instead of braces tee: optee: Initialize some structs using memset instead of braces soc: fsl: dpio: fix memory leak of a struct qbman on error exit path clk: tegra: dfll: Make symbol 'tegra210_cpu_cvb_tables' static soc: qcom: llcc-slice: Fix typos qcom: soc: llcc-slice: Consolidate some code qcom: soc: llcc-slice: Clear the global drv_data pointer on error drivers: soc: xilinx: Add ZynqMP power domain driver firmware: xilinx: Add APIs to control node status/power dt-bindings: power: Add ZynqMP power domain bindings ...

Linus Torvalds committed 7 years ago

Commit 384d11f2 parents 6ad63de 8ceb820126 files · +7122 −744Browse files

Showing the changes to scripts (2 of 126 files). Show all

Unified · Split

2 files
  1. scripts/mod/devicetable-offsets.c +3 −0
  2. scripts/mod/file2alias.c +19 −0
scripts/mod/devicetable-offsets.c+3−0
@@ -225,5 +225,8 @@ int main(void) · 224 unmodified lines
225 DEVID_FIELD(typec_device_id, svid);225 DEVID_FIELD(typec_device_id, svid);
226 DEVID_FIELD(typec_device_id, mode);226 DEVID_FIELD(typec_device_id, mode);
227 227
228 DEVID(tee_client_device_id);
229 DEVID_FIELD(tee_client_device_id, uuid);
230
228 return 0;231 return 0;
229}232}
scripts/mod/file2alias.c+19−0
@@ -37,6 +37,9 @@ typedef unsigned char __u8; · 36 unmodified lines
37typedef struct {37typedef struct {
38 __u8 b[16];38 __u8 b[16];
39} uuid_le;39} uuid_le;
40typedef struct {
41 __u8 b[16];
42} uuid_t;
40 43
41/* Big exception to the "don't include kernel headers into userspace, which44/* Big exception to the "don't include kernel headers into userspace, which
42 * even potentially has different endianness and word sizes, since45 * even potentially has different endianness and word sizes, since
@@ -1287,6 +1290,21 @@ static int do_typec_entry(const char *filename, void *symval, char *alias) · 1244 unmodified lines
1287 return 1;1290 return 1;
1288}1291}
1289 1292
1293/* Looks like: tee:uuid */
1294static int do_tee_entry(const char *filename, void *symval, char *alias)
1295{
1296 DEF_FIELD(symval, tee_client_device_id, uuid);
1297
1298 sprintf(alias, "tee:%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
1299 uuid.b[0], uuid.b[1], uuid.b[2], uuid.b[3], uuid.b[4],
1300 uuid.b[5], uuid.b[6], uuid.b[7], uuid.b[8], uuid.b[9],
1301 uuid.b[10], uuid.b[11], uuid.b[12], uuid.b[13], uuid.b[14],
1302 uuid.b[15]);
1303
1304 add_wildcard(alias);
1305 return 1;
1306}
1307
1290/* Does namelen bytes of name exactly match the symbol? */1308/* Does namelen bytes of name exactly match the symbol? */
1291static bool sym_is(const char *name, unsigned namelen, const char *symbol)1309static bool sym_is(const char *name, unsigned namelen, const char *symbol)
1292{1310{
@@ -1357,6 +1375,7 @@ static const struct devtable devtable[] = { · 64 unmodified lines
1357 {"fslmc", SIZE_fsl_mc_device_id, do_fsl_mc_entry},1375 {"fslmc", SIZE_fsl_mc_device_id, do_fsl_mc_entry},
1358 {"tbsvc", SIZE_tb_service_id, do_tbsvc_entry},1376 {"tbsvc", SIZE_tb_service_id, do_tbsvc_entry},
1359 {"typec", SIZE_typec_device_id, do_typec_entry},1377 {"typec", SIZE_typec_device_id, do_typec_entry},
1378 {"tee", SIZE_tee_client_device_id, do_tee_entry},
1360};1379};
1361 1380
1362/* Create MODULE_ALIAS() statements.1381/* Create MODULE_ALIAS() statements.