Commit 9891b3f6 authored by Valentin Longchamp's avatar Valentin Longchamp Committed by Jason Cooper

ARM: Kirkwood: Convert km_kirkwood to pinctrl

Signed-off-by: default avatarValentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 4e5bc99c
/dts-v1/; /dts-v1/;
/include/ "kirkwood.dtsi" /include/ "kirkwood.dtsi"
/include/ "kirkwood-98dx4122.dtsi"
/ { / {
model = "Keymile Kirkwood Reference Design"; model = "Keymile Kirkwood Reference Design";
...@@ -16,6 +17,22 @@ chosen { ...@@ -16,6 +17,22 @@ chosen {
}; };
ocp@f1000000 { 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 { serial@12000 {
clock-frequency = <200000000>; clock-frequency = <200000000>;
status = "ok"; status = "ok";
......
...@@ -18,26 +18,14 @@ ...@@ -18,26 +18,14 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/clk-private.h> #include <linux/clk-private.h>
#include "common.h" #include "common.h"
#include "mpp.h"
static struct mv643xx_eth_platform_data km_kirkwood_ge00_data = { static struct mv643xx_eth_platform_data km_kirkwood_ge00_data = {
.phy_addr = MV643XX_ETH_PHY_ADDR(0), .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) void __init km_kirkwood_init(void)
{ {
struct clk *sata_clk; 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 * Our variant of kirkwood (integrated in the Bobcat) hangs on accessing
* SATA bits (14-15) of the Clock Gating Control Register. Since these * SATA bits (14-15) of the Clock Gating Control Register. Since these
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment