Skip to content

Commit 192c132

Browse files
committed
drivers: media: imx708: Follow the documented devicetree labels
Switch the system clock name from "xclk" to "inclk". Use lower case lables for all regulator names. Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
1 parent c881f21 commit 192c132

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

arch/arm/boot/dts/overlays/imx708.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ cam_node: imx708@1a {
66
status = "disabled";
77

88
clocks = <&cam1_clk>;
9-
clock-names = "xclk";
9+
clock-names = "inclk";
1010

11-
VANA1-supply = <&cam1_reg>; /* 2.8v */
12-
VANA2-supply = <&cam_dummy_reg>;/* 1.8v */
13-
VDIG-supply = <&cam_dummy_reg>; /* 1.1v */
14-
VDDL-supply = <&cam_dummy_reg>; /* 1.8v */
11+
vana1-supply = <&cam1_reg>; /* 2.8v */
12+
vana2-supply = <&cam_dummy_reg>;/* 1.8v */
13+
vdig-supply = <&cam_dummy_reg>; /* 1.1v */
14+
vddl-supply = <&cam_dummy_reg>; /* 1.8v */
1515

1616
rotation = <180>;
1717
orientation = <2>;

drivers/media/i2c/imx708.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#define IMX708_REG_ORIENTATION 0x101
3535

36-
#define IMX708_XCLK_FREQ 24000000
36+
#define IMX708_INCLK_FREQ 24000000
3737

3838
/* Default initial pixel rate, will get updated for each mode. */
3939
#define IMX708_INITIAL_PIXEL_RATE 590000000
@@ -786,10 +786,10 @@ static const int imx708_test_pattern_val[] = {
786786
/* regulator supplies */
787787
static const char * const imx708_supply_name[] = {
788788
/* Supplies can be enabled in any order */
789-
"VANA1", /* Analog1 (2.8V) supply */
790-
"VANA2", /* Analog2 (1.8V) supply */
791-
"VDIG", /* Digital Core (1.1V) supply */
792-
"VDDL", /* IF (1.8V) supply */
789+
"vana1", /* Analog1 (2.8V) supply */
790+
"vana2", /* Analog2 (1.8V) supply */
791+
"vdig", /* Digital Core (1.1V) supply */
792+
"vddl", /* IF (1.8V) supply */
793793
};
794794

795795
/*
@@ -809,8 +809,8 @@ struct imx708 {
809809

810810
struct v4l2_mbus_framefmt fmt;
811811

812-
struct clk *xclk;
813-
u32 xclk_freq;
812+
struct clk *inclk;
813+
u32 inclk_freq;
814814

815815
struct gpio_desc *reset_gpio;
816816
struct regulator_bulk_data supplies[ARRAY_SIZE(imx708_supply_name)];
@@ -1602,7 +1602,7 @@ static int imx708_power_on(struct device *dev)
16021602
return ret;
16031603
}
16041604

1605-
ret = clk_prepare_enable(imx708->xclk);
1605+
ret = clk_prepare_enable(imx708->inclk);
16061606
if (ret) {
16071607
dev_err(&client->dev, "%s: failed to enable clock\n",
16081608
__func__);
@@ -1630,7 +1630,7 @@ static int imx708_power_off(struct device *dev)
16301630
gpiod_set_value_cansleep(imx708->reset_gpio, 0);
16311631
regulator_bulk_disable(ARRAY_SIZE(imx708_supply_name),
16321632
imx708->supplies);
1633-
clk_disable_unprepare(imx708->xclk);
1633+
clk_disable_unprepare(imx708->inclk);
16341634

16351635
/* Force reprogramming of the common registers when powered up again. */
16361636
imx708->common_regs_written = false;
@@ -1951,17 +1951,17 @@ static int imx708_probe(struct i2c_client *client)
19511951
if (imx708_check_hwcfg(dev, imx708))
19521952
return -EINVAL;
19531953

1954-
/* Get system clock (xclk) */
1955-
imx708->xclk = devm_clk_get(dev, NULL);
1956-
if (IS_ERR(imx708->xclk))
1957-
return dev_err_probe(dev, PTR_ERR(imx708->xclk),
1958-
"failed to get xclk\n");
1954+
/* Get system clock (inclk) */
1955+
imx708->inclk = devm_clk_get(dev, "inclk");
1956+
if (IS_ERR(imx708->inclk))
1957+
return dev_err_probe(dev, PTR_ERR(imx708->inclk),
1958+
"failed to get inclk\n");
19591959

1960-
imx708->xclk_freq = clk_get_rate(imx708->xclk);
1961-
if (imx708->xclk_freq != IMX708_XCLK_FREQ)
1960+
imx708->inclk_freq = clk_get_rate(imx708->inclk);
1961+
if (imx708->inclk_freq != IMX708_INCLK_FREQ)
19621962
return dev_err_probe(dev, -EINVAL,
1963-
"xclk frequency not supported: %d Hz\n",
1964-
imx708->xclk_freq);
1963+
"inclk frequency not supported: %d Hz\n",
1964+
imx708->inclk_freq);
19651965

19661966
ret = imx708_get_regulators(imx708);
19671967
if (ret)

0 commit comments

Comments
 (0)