forked from Openwrt/openwrt
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
72 lines
2.5 KiB
Diff
72 lines
2.5 KiB
Diff
From 1e4a91f7643b37d33b146bcfd714f378da77df5a Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Mon, 11 Jul 2022 15:58:36 +0200
|
|
Subject: [PATCH 0425/1085] clk: bcm: rpi: Create helper to retrieve private
|
|
data
|
|
|
|
The RaspberryPi firmware clocks driver uses in several instances a
|
|
container_of to retrieve the struct raspberrypi_clk_data from a pointer
|
|
to struct clk_hw. Let's create a small function to avoid duplicating it
|
|
all over the place.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/clk/bcm/clk-raspberrypi.c | 18 ++++++++++--------
|
|
1 file changed, 10 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-raspberrypi.c
|
|
+++ b/drivers/clk/bcm/clk-raspberrypi.c
|
|
@@ -56,6 +56,12 @@ struct raspberrypi_clk_data {
|
|
struct raspberrypi_clk *rpi;
|
|
};
|
|
|
|
+static inline
|
|
+const struct raspberrypi_clk_data *clk_hw_to_data(const struct clk_hw *hw)
|
|
+{
|
|
+ return container_of(hw, struct raspberrypi_clk_data, hw);
|
|
+}
|
|
+
|
|
struct raspberrypi_clk_variant {
|
|
bool export;
|
|
char *clkdev;
|
|
@@ -177,8 +183,7 @@ static int raspberrypi_clock_property(st
|
|
|
|
static int raspberrypi_fw_is_prepared(struct clk_hw *hw)
|
|
{
|
|
- struct raspberrypi_clk_data *data =
|
|
- container_of(hw, struct raspberrypi_clk_data, hw);
|
|
+ const struct raspberrypi_clk_data *data = clk_hw_to_data(hw);
|
|
struct raspberrypi_clk *rpi = data->rpi;
|
|
u32 val = 0;
|
|
int ret;
|
|
@@ -195,8 +200,7 @@ static int raspberrypi_fw_is_prepared(st
|
|
static unsigned long raspberrypi_fw_get_rate(struct clk_hw *hw,
|
|
unsigned long parent_rate)
|
|
{
|
|
- struct raspberrypi_clk_data *data =
|
|
- container_of(hw, struct raspberrypi_clk_data, hw);
|
|
+ const struct raspberrypi_clk_data *data = clk_hw_to_data(hw);
|
|
struct raspberrypi_clk *rpi = data->rpi;
|
|
u32 val = 0;
|
|
int ret;
|
|
@@ -212,8 +216,7 @@ static unsigned long raspberrypi_fw_get_
|
|
static int raspberrypi_fw_set_rate(struct clk_hw *hw, unsigned long rate,
|
|
unsigned long parent_rate)
|
|
{
|
|
- struct raspberrypi_clk_data *data =
|
|
- container_of(hw, struct raspberrypi_clk_data, hw);
|
|
+ const struct raspberrypi_clk_data *data = clk_hw_to_data(hw);
|
|
struct raspberrypi_clk *rpi = data->rpi;
|
|
u32 _rate = rate;
|
|
int ret;
|
|
@@ -230,8 +233,7 @@ static int raspberrypi_fw_set_rate(struc
|
|
static int raspberrypi_fw_dumb_determine_rate(struct clk_hw *hw,
|
|
struct clk_rate_request *req)
|
|
{
|
|
- struct raspberrypi_clk_data *data =
|
|
- container_of(hw, struct raspberrypi_clk_data, hw);
|
|
+ const struct raspberrypi_clk_data *data = clk_hw_to_data(hw);
|
|
struct raspberrypi_clk_variant *variant = data->variant;
|
|
|
|
/*
|