summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2025-10-06 13:00:50 -0500
committerStephen Boyd <sboyd@kernel.org>2025-10-06 13:00:50 -0500
commitf35f83208c7735a3ed03629f934bb7ebbcf2ddf9 (patch)
treef2532a4baa7554bc9f4834ee222467f80ff3f9d1
parent8397c58ea73ebd1236820093b57ea4664f4d21b4 (diff)
parentdecdff7db9d18a57a8581c5de3afd78a0a92aeac (diff)
parent383c4ff4987f651c5340b8e95f4c3e17ebd90ea8 (diff)
Merge branches 'clk-aspeed' and 'clk-rockchip' into clk-next
* clk-aspeed: reset: aspeed: register AST2700 reset auxiliary bus device dt-bindings: clock: ast2700: modify soc0/1 clock define * clk-rockchip: clk: rockchip: rk3368: use clock ids for SCLK_MIPIDSI_24M dt-bindings: clock: rk3368: Add SCLK_MIPIDSI_24M