Op 22 mrt. 2012, om 06:19 heeft Russ Dill het volgende geschreven:
> Signed-off-by: Russ Dill <[email protected]>
> ---
> arch/arm/mach-omap2/board-ldp.c | 7 +++++++
> arch/arm/mach-omap2/board-omap3evm.c | 9 +++++++++
Is that evm hunk intentional?
regards,
Koen
> 2 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
> index d50a562a..1b60495 100644
> --- a/arch/arm/mach-omap2/board-ldp.c
> +++ b/arch/arm/mach-omap2/board-ldp.c
> @@ -22,6 +22,7 @@
> #include <linux/err.h>
> #include <linux/clk.h>
> #include <linux/spi/spi.h>
> +#include <linux/regulator/fixed.h>
> #include <linux/regulator/machine.h>
> #include <linux/i2c/twl.h>
> #include <linux/io.h>
> @@ -410,8 +411,14 @@ static struct mtd_partition ldp_nand_partitions[] = {
>
> };
>
> +static struct regulator_consumer_supply dummy_supplies[] = {
> + REGULATOR_SUPPLY("vddvario", "smsc911x.0"),
> + REGULATOR_SUPPLY("vdd33a", "smsc911x.0"),
> +};
> +
> static void __init omap_ldp_init(void)
> {
> + regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
> omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
> ldp_init_smsc911x();
> omap_i2c_init();
> diff --git a/arch/arm/mach-omap2/board-omap3evm.c
> b/arch/arm/mach-omap2/board-omap3evm.c
> index 548e1ef..a659e19 100644
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@ -114,6 +114,15 @@ static struct omap_smsc911x_platform_data smsc911x_cfg =
> {
>
> static inline void __init omap3evm_init_smsc911x(void)
> {
> + struct clk *l3ck;
> + unsigned int rate;
> +
> + l3ck = clk_get(NULL, "l3_ck");
> + if (IS_ERR(l3ck))
> + rate = 100000000;
> + else
> + rate = clk_get_rate(l3ck);
> +
> /* Configure ethernet controller reset gpio */
> if (cpu_is_omap3430()) {
> if (get_omap3_evm_rev() == OMAP3EVM_BOARD_GEN_1)
> --
> 1.7.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
