lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 293/477] ARM: davinci: fix build failure without I2C
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit 147922f91965e734664374a3f226adfeaa586d72 ]

    The two supplies are referenced outside of #ifdef CONFIG_I2C but
    defined inside, which breaks the build if that is not built-in:

    mach-davinci/board-dm644x-evm.c:861:21: error: use of undeclared identifier 'fixed_supplies_1_8v'
    ARRAY_SIZE(fixed_supplies_1_8v), 1800000);
    ^
    mach-davinci/board-dm644x-evm.c:861:21: error: use of undeclared identifier 'fixed_supplies_1_8v'
    mach-davinci/board-dm644x-evm.c:861:21: error: use of undeclared identifier 'fixed_supplies_1_8v'
    mach-davinci/board-dm644x-evm.c:860:49: error: use of undeclared identifier 'fixed_supplies_1_8v'
    regulator_register_always_on(0, "fixed-dummy", fixed_supplies_1_8v,

    I don't know if the regulators are used anywhere without I2C, but
    always registering them seems to be the safe choice here.

    On a related note, it might be best to also deal with CONFIG_I2C=m
    across the file, unless this is going to be moved to DT and removed
    really soon anyway.

    Link: https://lore.kernel.org/r/20200527133746.643895-1-arnd@arndb.de
    Fixes: 5e06d19694a4 ("ARM: davinci: dm644x-evm: Add Fixed regulators needed for tlv320aic33")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mach-davinci/board-dm644x-evm.c | 26 ++++++++++++------------
    1 file changed, 13 insertions(+), 13 deletions(-)

    diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
    index 3461d12bbfc06..a5d3708fedf68 100644
    --- a/arch/arm/mach-davinci/board-dm644x-evm.c
    +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
    @@ -655,19 +655,6 @@ static struct i2c_board_info __initdata i2c_info[] = {
    },
    };

    -/* Fixed regulator support */
    -static struct regulator_consumer_supply fixed_supplies_3_3v[] = {
    - /* Baseboard 3.3V: 5V -> TPS54310PWP -> 3.3V */
    - REGULATOR_SUPPLY("AVDD", "1-001b"),
    - REGULATOR_SUPPLY("DRVDD", "1-001b"),
    -};
    -
    -static struct regulator_consumer_supply fixed_supplies_1_8v[] = {
    - /* Baseboard 1.8V: 5V -> TPS54310PWP -> 1.8V */
    - REGULATOR_SUPPLY("IOVDD", "1-001b"),
    - REGULATOR_SUPPLY("DVDD", "1-001b"),
    -};
    -
    #define DM644X_I2C_SDA_PIN GPIO_TO_PIN(2, 12)
    #define DM644X_I2C_SCL_PIN GPIO_TO_PIN(2, 11)

    @@ -700,6 +687,19 @@ static void __init evm_init_i2c(void)
    }
    #endif

    +/* Fixed regulator support */
    +static struct regulator_consumer_supply fixed_supplies_3_3v[] = {
    + /* Baseboard 3.3V: 5V -> TPS54310PWP -> 3.3V */
    + REGULATOR_SUPPLY("AVDD", "1-001b"),
    + REGULATOR_SUPPLY("DRVDD", "1-001b"),
    +};
    +
    +static struct regulator_consumer_supply fixed_supplies_1_8v[] = {
    + /* Baseboard 1.8V: 5V -> TPS54310PWP -> 1.8V */
    + REGULATOR_SUPPLY("IOVDD", "1-001b"),
    + REGULATOR_SUPPLY("DVDD", "1-001b"),
    +};
    +
    #define VENC_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL)

    /* venc standard timings */
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 23:32    [W:2.348 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site