diff --git a/Documentation/netlink/specs/dpll.yaml b/Documentation/netlink/specs/dpll.yaml index cdc8c7b456df..e2ca4df5699a 100644 --- a/Documentation/netlink/specs/dpll.yaml +++ b/Documentation/netlink/specs/dpll.yaml @@ -632,6 +632,7 @@ operations: - mode-supported - lock-status - lock-status-error + - clock-quality-level - temp - clock-id - type @@ -700,11 +701,9 @@ operations: doc: | Get list of pins and its attributes. - - dump request without any attributes given - list all the pins in the - system - - dump request with target dpll - list all the pins registered with - a given dpll device - - do request with target dpll and target pin - single pin attributes + - dump request - list all the registered, available pins in the + system, the request takes no attributes + - do request with target pin - single pin attributes attribute-set: pin flags: [admin-perm] @@ -741,9 +740,6 @@ operations: - measured-frequency dump: - request: - attributes: - - id reply: *pin-attrs - @@ -759,9 +755,6 @@ operations: attributes: - id - frequency - - direction - - prio - - state - parent-device - parent-pin - phase-adjust diff --git a/MAINTAINERS b/MAINTAINERS index b23fb6f2f4ef..b000853829b5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7919,6 +7919,7 @@ S: Supported F: Documentation/devicetree/bindings/dpll/dpll-device.yaml F: Documentation/devicetree/bindings/dpll/dpll-pin.yaml F: Documentation/driver-api/dpll.rst +F: Documentation/netlink/specs/dpll.yaml F: drivers/dpll/ F: include/linux/dpll.h F: include/uapi/linux/dpll.h diff --git a/drivers/dpll/dpll_nl.c b/drivers/dpll/dpll_nl.c index b1ba490e72b0..fa09b524a4a0 100644 --- a/drivers/dpll/dpll_nl.c +++ b/drivers/dpll/dpll_nl.c @@ -65,12 +65,7 @@ static const struct nla_policy dpll_pin_id_get_nl_policy[DPLL_A_PIN_TYPE + 1] = }; /* DPLL_CMD_PIN_GET - do */ -static const struct nla_policy dpll_pin_get_do_nl_policy[DPLL_A_PIN_ID + 1] = { - [DPLL_A_PIN_ID] = { .type = NLA_U32, }, -}; - -/* DPLL_CMD_PIN_GET - dump */ -static const struct nla_policy dpll_pin_get_dump_nl_policy[DPLL_A_PIN_ID + 1] = { +static const struct nla_policy dpll_pin_get_nl_policy[DPLL_A_PIN_ID + 1] = { [DPLL_A_PIN_ID] = { .type = NLA_U32, }, }; @@ -78,9 +73,6 @@ static const struct nla_policy dpll_pin_get_dump_nl_policy[DPLL_A_PIN_ID + 1] = static const struct nla_policy dpll_pin_set_nl_policy[DPLL_A_PIN_REFERENCE_SYNC + 1] = { [DPLL_A_PIN_ID] = { .type = NLA_U32, }, [DPLL_A_PIN_FREQUENCY] = { .type = NLA_U64, }, - [DPLL_A_PIN_DIRECTION] = NLA_POLICY_RANGE(NLA_U32, 1, 2), - [DPLL_A_PIN_PRIO] = { .type = NLA_U32, }, - [DPLL_A_PIN_STATE] = NLA_POLICY_RANGE(NLA_U32, 1, 3), [DPLL_A_PIN_PARENT_DEVICE] = NLA_POLICY_NESTED(dpll_pin_parent_device_nl_policy), [DPLL_A_PIN_PARENT_PIN] = NLA_POLICY_NESTED(dpll_pin_parent_pin_nl_policy), [DPLL_A_PIN_PHASE_ADJUST] = { .type = NLA_S32, }, @@ -136,16 +128,14 @@ static const struct genl_split_ops dpll_nl_ops[] = { .pre_doit = dpll_pin_pre_doit, .doit = dpll_nl_pin_get_doit, .post_doit = dpll_pin_post_doit, - .policy = dpll_pin_get_do_nl_policy, + .policy = dpll_pin_get_nl_policy, .maxattr = DPLL_A_PIN_ID, .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, }, { - .cmd = DPLL_CMD_PIN_GET, - .dumpit = dpll_nl_pin_get_dumpit, - .policy = dpll_pin_get_dump_nl_policy, - .maxattr = DPLL_A_PIN_ID, - .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP, + .cmd = DPLL_CMD_PIN_GET, + .dumpit = dpll_nl_pin_get_dumpit, + .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DUMP, }, { .cmd = DPLL_CMD_PIN_SET,