Hi Caleb,
On 2024-03-04 17:51, Caleb Connolly wrote:
> Drop in favour of dts/upstream.
>
> Small driver adjustment to fix compatibility.
>
> Signed-off-by: Caleb Connolly <caleb.connolly at linaro.org>
> ---
> drivers/pinctrl/rockchip/pinctrl-rk3568.c | 15 +
> include/dt-bindings/pinctrl/rockchip.h | 60 --
> include/dt-bindings/power/px30-power.h | 27 -
> include/dt-bindings/power/rk3066-power.h | 22 -
> include/dt-bindings/power/rk3188-power.h | 24 -
> include/dt-bindings/power/rk3228-power.h | 21 -
> include/dt-bindings/power/rk3288-power.h | 32 -
> include/dt-bindings/power/rk3328-power.h | 19 -
> include/dt-bindings/power/rk3399-power.h | 53 --
> include/dt-bindings/power/rk3568-power.h | 32 -
> include/dt-bindings/power/rk3588-power.h | 69 --
> include/dt-bindings/power/rockchip,rv1126-power.h | 35 -
> include/dt-bindings/reset/rockchip,rk3588-cru.h | 754 ----------------------
> include/dt-bindings/soc/rockchip,boot-mode.h | 16 -
> include/dt-bindings/soc/rockchip,vop2.h | 18 -
> 15 files changed, 15 insertions(+), 1182 deletions(-)
>
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3568.c b/drivers/pinctrl/rockchip/pinctrl-rk3568.c
> index 1d4391982605..35a69c2a1a28 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rk3568.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3568.c
> @@ -11,8 +11,23 @@
> #include <dt-bindings/pinctrl/rockchip.h>
>
> #include "pinctrl-rockchip.h"
>
> +#define RK_GPIO0 0
> +#define RK_GPIO1 1
> +#define RK_GPIO2 2
> +#define RK_GPIO3 3
> +#define RK_GPIO4 4
> +#define RK_GPIO6 6
> +
> +#define RK_FUNC_GPIO 0
> +#define RK_FUNC_1 1
> +#define RK_FUNC_2 2
> +#define RK_FUNC_3 3
> +#define RK_FUNC_4 4
> +#define RK_FUNC_5 5
> +#define RK_FUNC_6 6
I would suggest to just drop the RK_GPIO and RK_FUNC_ prefix in the
table below instead of having to define these here.
Regards,
Jonas
> +
> static struct rockchip_mux_route_data rk3568_mux_route_data[] = {
> MR_PMUGRF(RK_GPIO0, RK_PB7, RK_FUNC_1, 0x0110, RK_GENMASK_VAL(1, 0, 0)), /* PWM0 IO mux selection M0 */
> MR_PMUGRF(RK_GPIO0, RK_PC7, RK_FUNC_2, 0x0110, RK_GENMASK_VAL(1, 0, 1)), /* PWM0 IO mux selection M1 */
> MR_PMUGRF(RK_GPIO0, RK_PC0, RK_FUNC_1, 0x0110, RK_GENMASK_VAL(3, 2, 0)), /* PWM1 IO mux selection M0 */
[snip]