tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'v6.19-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/drivers
Some additional sane defaults for the oldish rk3368 soc.
* tag 'v6.19-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
soc: rockchip: grf: Add select correct PWM implementation on RK3368
soc: rockchip: grf: Set pwm2/xin32k pad default to xin32k for rk3368
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+15
+15
drivers/soc/rockchip/grf.c
+15
drivers/soc/rockchip/grf.c
···
91
91
92
92
static const struct rockchip_grf_value rk3368_defaults[] __initconst = {
93
93
{ "jtag switching", RK3368_GRF_SOC_CON15, FIELD_PREP_WM16_CONST(BIT(13), 0) },
94
+
{ "pwm select", RK3368_GRF_SOC_CON15, FIELD_PREP_WM16_CONST(BIT(12), 1) },
94
95
};
95
96
96
97
static const struct rockchip_grf_info rk3368_grf __initconst = {
97
98
.values = rk3368_defaults,
98
99
.num_values = ARRAY_SIZE(rk3368_defaults),
100
+
};
101
+
102
+
#define RK3368_PMUGRF_SOC_CON0 0x100
103
+
104
+
static const struct rockchip_grf_value rk3368_pmugrf_defaults[] __initconst = {
105
+
{ "pwm2 select", RK3368_PMUGRF_SOC_CON0, FIELD_PREP_WM16_CONST(BIT(7), 0) },
106
+
};
107
+
108
+
static const struct rockchip_grf_info rk3368_pmugrf __initconst = {
109
+
.values = rk3368_pmugrf_defaults,
110
+
.num_values = ARRAY_SIZE(rk3368_pmugrf_defaults),
99
111
};
100
112
101
113
#define RK3399_GRF_SOC_CON7 0xe21c
···
187
175
}, {
188
176
.compatible = "rockchip,rk3368-grf",
189
177
.data = (void *)&rk3368_grf,
178
+
}, {
179
+
.compatible = "rockchip,rk3368-pmugrf",
180
+
.data = (void *)&rk3368_pmugrf,
190
181
}, {
191
182
.compatible = "rockchip,rk3399-grf",
192
183
.data = (void *)&rk3399_grf,