Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ARM: Kirkwood: Convert km_kirkwood to pinctrl

parent 4e5bc99c
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
/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";
+0 −12
Original line number Diff line number Diff line
@@ -18,26 +18,14 @@
#include <linux/clk.h>
#include <linux/clk-private.h>
#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