33
33
34
34
#define IMX708_REG_ORIENTATION 0x101
35
35
36
- #define IMX708_XCLK_FREQ 24000000
36
+ #define IMX708_INCLK_FREQ 24000000
37
37
38
38
/* Default initial pixel rate, will get updated for each mode. */
39
39
#define IMX708_INITIAL_PIXEL_RATE 590000000
@@ -786,10 +786,10 @@ static const int imx708_test_pattern_val[] = {
786
786
/* regulator supplies */
787
787
static const char * const imx708_supply_name [] = {
788
788
/* 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 */
793
793
};
794
794
795
795
/*
@@ -809,8 +809,8 @@ struct imx708 {
809
809
810
810
struct v4l2_mbus_framefmt fmt ;
811
811
812
- struct clk * xclk ;
813
- u32 xclk_freq ;
812
+ struct clk * inclk ;
813
+ u32 inclk_freq ;
814
814
815
815
struct gpio_desc * reset_gpio ;
816
816
struct regulator_bulk_data supplies [ARRAY_SIZE (imx708_supply_name )];
@@ -1602,7 +1602,7 @@ static int imx708_power_on(struct device *dev)
1602
1602
return ret ;
1603
1603
}
1604
1604
1605
- ret = clk_prepare_enable (imx708 -> xclk );
1605
+ ret = clk_prepare_enable (imx708 -> inclk );
1606
1606
if (ret ) {
1607
1607
dev_err (& client -> dev , "%s: failed to enable clock\n" ,
1608
1608
__func__ );
@@ -1630,7 +1630,7 @@ static int imx708_power_off(struct device *dev)
1630
1630
gpiod_set_value_cansleep (imx708 -> reset_gpio , 0 );
1631
1631
regulator_bulk_disable (ARRAY_SIZE (imx708_supply_name ),
1632
1632
imx708 -> supplies );
1633
- clk_disable_unprepare (imx708 -> xclk );
1633
+ clk_disable_unprepare (imx708 -> inclk );
1634
1634
1635
1635
/* Force reprogramming of the common registers when powered up again. */
1636
1636
imx708 -> common_regs_written = false;
@@ -1951,17 +1951,17 @@ static int imx708_probe(struct i2c_client *client)
1951
1951
if (imx708_check_hwcfg (dev , imx708 ))
1952
1952
return - EINVAL ;
1953
1953
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" );
1959
1959
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 )
1962
1962
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 );
1965
1965
1966
1966
ret = imx708_get_regulators (imx708 );
1967
1967
if (ret )
0 commit comments