[PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers - Kernel

This is a discussion on [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers - Kernel ; Fix build breakage introduced in commit "[POWERPC] i2c: OF helpers for the i2c API". If i2c-core is compiled as module, the helper needs to be compiled as module, as well. Rename i2c.c to of_i2c.c to avoid name space conflict. Signed-off-by: ...

+ Reply to Thread
Results 1 to 8 of 8

Thread: [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers

  1. [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers

    Fix build breakage introduced in commit
    "[POWERPC] i2c: OF helpers for the i2c API".
    If i2c-core is compiled as module, the helper needs to be
    compiled as module, as well. Rename i2c.c to of_i2c.c to
    avoid name space conflict.

    Signed-off-by: Jochen Friedrich
    ---
    drivers/of/Kconfig | 2 +-
    drivers/of/Makefile | 2 +-
    drivers/of/{i2c.c => of_i2c.c} | 0
    3 files changed, 2 insertions(+), 2 deletions(-)
    rename drivers/of/{i2c.c => of_i2c.c} (100%)

    diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
    index 7c30531..0e39f00 100644
    --- a/drivers/of/Kconfig
    +++ b/drivers/of/Kconfig
    @@ -9,7 +9,7 @@ config OF_GPIO
    OpenFirmware GPIO accessors

    config OF_I2C
    - def_bool y
    + def_tristate I2C
    depends on OF && I2C
    help
    OpenFirmware I2C accessors
    diff --git a/drivers/of/Makefile b/drivers/of/Makefile
    index a07b953..548772e 100644
    --- a/drivers/of/Makefile
    +++ b/drivers/of/Makefile
    @@ -1,4 +1,4 @@
    obj-y = base.o
    obj-$(CONFIG_OF_DEVICE) += device.o platform.o
    obj-$(CONFIG_OF_GPIO) += gpio.o
    -obj-$(CONFIG_OF_I2C) += i2c.o
    +obj-$(CONFIG_OF_I2C) += of_i2c.o
    diff --git a/drivers/of/i2c.c b/drivers/of/of_i2c.c
    similarity index 100%
    rename from drivers/of/i2c.c
    rename to drivers/of/of_i2c.c
    --
    1.5.5

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. Re: [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers

    From: Paul Mackerras
    Date: Sat, 19 Apr 2008 14:04:32 +1000

    > Jochen Friedrich writes:
    >
    > > Fix build breakage introduced in commit
    > > "[POWERPC] i2c: OF helpers for the i2c API".
    > > If i2c-core is compiled as module, the helper needs to be
    > > compiled as module, as well. Rename i2c.c to of_i2c.c to
    > > avoid name space conflict.

    >
    > Actually, since only powerpc has irq_of_parse_and_map, I'm now
    > inclined to think that drivers/of/i2c.c should live under arch/powerpc
    > for now, or at the least its option should depend on PPC_OF.


    I specifically asked for this to not be PPC only so that I
    can make use of this infrastructure on sparc64 for I2C devices.

    It's OK if this breaks the sparc64 allmodconfig build, I'll take
    care of this once it's merged in.

    Please merge the PPC tree to Linus soon, so that I can merge
    in my sparc64 NUMA bits which depend upon the LMB changesets
    in the PPC tree.

    Thanks.
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  3. Re: [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers

    Jochen Friedrich writes:

    > Fix build breakage introduced in commit
    > "[POWERPC] i2c: OF helpers for the i2c API".
    > If i2c-core is compiled as module, the helper needs to be
    > compiled as module, as well. Rename i2c.c to of_i2c.c to
    > avoid name space conflict.


    Actually, since only powerpc has irq_of_parse_and_map, I'm now
    inclined to think that drivers/of/i2c.c should live under arch/powerpc
    for now, or at the least its option should depend on PPC_OF.

    Paul.
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  4. Re: [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers

    David Miller writes:
    > From: Paul Mackerras
    > Date: Sat, 19 Apr 2008 14:04:32 +1000
    >
    > > Jochen Friedrich writes:
    > >
    > > > Fix build breakage introduced in commit
    > > > "[POWERPC] i2c: OF helpers for the i2c API".
    > > > If i2c-core is compiled as module, the helper needs to be
    > > > compiled as module, as well. Rename i2c.c to of_i2c.c to
    > > > avoid name space conflict.

    > >
    > > Actually, since only powerpc has irq_of_parse_and_map, I'm now
    > > inclined to think that drivers/of/i2c.c should live under arch/powerpc
    > > for now, or at the least its option should depend on PPC_OF.

    >
    > I specifically asked for this to not be PPC only so that I
    > can make use of this infrastructure on sparc64 for I2C devices.


    OK.

    > It's OK if this breaks the sparc64 allmodconfig build, I'll take
    > care of this once it's merged in.


    It breaks the sparc32 allmodconfig build, which seems to be a
    concern. How do you suggest we fix that?

    > Please merge the PPC tree to Linus soon, so that I can merge
    > in my sparc64 NUMA bits which depend upon the LMB changesets
    > in the PPC tree.


    Sure, it's just this sparc32 breakage which is holding me up.

    Paul.
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  5. Re: [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers

    From: Paul Mackerras
    Date: Sat, 19 Apr 2008 15:22:37 +1000

    > David Miller writes:
    > > From: Paul Mackerras
    > > Date: Sat, 19 Apr 2008 14:04:32 +1000
    > >
    > > It's OK if this breaks the sparc64 allmodconfig build, I'll take
    > > care of this once it's merged in.

    >
    > It breaks the sparc32 allmodconfig build, which seems to be a
    > concern. How do you suggest we fix that?


    I'll fix both sparc64 and sparc32 builds when I merge my sparc
    tree in.
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  6. Re: [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers

    From: Jean Delvare
    Date: Sat, 19 Apr 2008 11:09:34 +0200

    > Guys, you're doing things the wrong way around. Breaking things to fix
    > them later is not OK, it's a pain for testers and also when bisecting
    > the kernel. Everything should still work after merging the powerpc
    > tree. Dave, if you need to loosen the dependency, you should do it
    > yourself _after_ having changed whatever needs to be in the sparc32 and
    > sparc64 trees so that loosening the dependency doesn't break anything.
    > As far as I can see it's only a matter of changing one line in a
    > Kconfig file, that's not exactly difficult to do it in the right order.


    Fair enough.

    At least don't move this stuff under arch/powerpc as paulus originally
    had suggested.
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  7. Re: [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers

    On Fri, 18 Apr 2008 23:11:28 -0700 (PDT), David Miller wrote:
    > From: Paul Mackerras
    > Date: Sat, 19 Apr 2008 15:22:37 +1000
    >
    > > David Miller writes:
    > > > From: Paul Mackerras
    > > > Date: Sat, 19 Apr 2008 14:04:32 +1000
    > > >
    > > > It's OK if this breaks the sparc64 allmodconfig build, I'll take
    > > > care of this once it's merged in.

    > >
    > > It breaks the sparc32 allmodconfig build, which seems to be a
    > > concern. How do you suggest we fix that?

    >
    > I'll fix both sparc64 and sparc32 builds when I merge my sparc
    > tree in.


    Guys, you're doing things the wrong way around. Breaking things to fix
    them later is not OK, it's a pain for testers and also when bisecting
    the kernel. Everything should still work after merging the powerpc
    tree. Dave, if you need to loosen the dependency, you should do it
    yourself _after_ having changed whatever needs to be in the sparc32 and
    sparc64 trees so that loosening the dependency doesn't break anything.
    As far as I can see it's only a matter of changing one line in a
    Kconfig file, that's not exactly difficult to do it in the right order.

    Thanks,
    --
    Jean Delvare
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  8. Re: [PATCH] [POWERPC] i2c: fix build breakage introduced by OF helpers

    Jean Delvare writes:

    > Guys, you're doing things the wrong way around. Breaking things to fix
    > them later is not OK, it's a pain for testers and also when bisecting
    > the kernel. Everything should still work after merging the powerpc
    > tree. Dave, if you need to loosen the dependency, you should do it
    > yourself _after_ having changed whatever needs to be in the sparc32 and
    > sparc64 trees so that loosening the dependency doesn't break anything.
    > As far as I can see it's only a matter of changing one line in a
    > Kconfig file, that's not exactly difficult to do it in the right order.


    You're right. I'll put in a dependency on PPC_OF for now and Dave can
    take it out once sparc32/64 have irq_of_parse_and_map etc.

    Paul.
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread