From 506a73614843e70c4a81cdba1177f0e4718d44e8 Mon Sep 17 00:00:00 2001 From: Valentin Longchamp Date: Sat, 17 Nov 2012 17:00:56 +0100 Subject: [PATCH] --- yaml --- r: 342357 b: refs/heads/master c: 9891b3f63d551bcc249a4121f4bb5813dfda94db h: refs/heads/master i: 342355: 06b4bb03c5c0717e825e6149a50972d09bbea96a v: v3 --- [refs] | 2 +- .../arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 17 +++++++++++++++++ .../arch/arm/mach-kirkwood/board-km_kirkwood.c | 12 ------------ 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 907ac65180aa..0d57dcb4b3ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e5bc99ce97fec27466a0654b35d4d3ae0afb054 +refs/heads/master: 9891b3f63d551bcc249a4121f4bb5813dfda94db diff --git a/trunk/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/trunk/arch/arm/boot/dts/kirkwood-km_kirkwood.dts index 75bdb93fed26..8db3123ac80f 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-km_kirkwood.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-km_kirkwood.dts @@ -1,6 +1,7 @@ /dts-v1/; /include/ "kirkwood.dtsi" +/include/ "kirkwood-98dx4122.dtsi" / { model = "Keymile Kirkwood Reference Design"; @@ -16,6 +17,22 @@ }; ocp@f1000000 { + pinctrl: pinctrl@10000 { + + pinctrl-0 = < &pmx_nand &pmx_i2c_gpio_sda + &pmx_i2c_gpio_scl >; + pinctrl-names = "default"; + + pmx_i2c_gpio_sda: pmx-gpio-sda { + marvell,pins = "mpp8"; + marvell,function = "gpio"; + }; + pmx_i2c_gpio_scl: pmx-gpio-scl { + marvell,pins = "mpp9"; + marvell,function = "gpio"; + }; + }; + serial@12000 { clock-frequency = <200000000>; status = "ok"; diff --git a/trunk/arch/arm/mach-kirkwood/board-km_kirkwood.c b/trunk/arch/arm/mach-kirkwood/board-km_kirkwood.c index 1e9ac4bbfe61..44e4605ba0bf 100644 --- a/trunk/arch/arm/mach-kirkwood/board-km_kirkwood.c +++ b/trunk/arch/arm/mach-kirkwood/board-km_kirkwood.c @@ -18,26 +18,14 @@ #include #include #include "common.h" -#include "mpp.h" static struct mv643xx_eth_platform_data km_kirkwood_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(0), }; -static unsigned int km_kirkwood_mpp_config[] __initdata = { - MPP8_GPIO, /* I2C SDA */ - MPP9_GPIO, /* I2C SCL */ - 0 -}; - void __init km_kirkwood_init(void) { struct clk *sata_clk; - /* - * Basic setup. Needs to be called early. - */ - kirkwood_mpp_conf(km_kirkwood_mpp_config); - /* * Our variant of kirkwood (integrated in the Bobcat) hangs on accessing * SATA bits (14-15) of the Clock Gating Control Register. Since these