ARM: kirkwood: topkick: convert to pinctrl (15989543) · Commits · EulixOS / Software / Kernel

arch/arm/boot/dts/kirkwood-topkick.dts

+90 −0

Original line number	Diff line number	Diff line
		/dts-v1/;

		/include/ "kirkwood.dtsi"
		/include/ "kirkwood-6282.dtsi"

		/ {
		model = "Univeral Scientific Industrial Co. Topkick-1281P2";
		@@ -16,6 +17,95 @@
		};

		ocp@f1000000 {
		pinctrl: pinctrl@10000 {
		/*
		* GPIO LED layout
		*
		* /-SYS_LED(2)
		* \|
		* \| /-DISK_LED
		* \| \|
		* \| \| /-WLAN_LED(2)
		* \| \| \|
		* [SW] [] [] [*]
		*/

		/*
		* Switch positions
		*
		* /-SW_LEFT(2)
		* \|
		* \| /-SW_IDLE
		* \| \|
		* \| \| /-SW_RIGHT
		* \| \| \|
		* PS [L] [I] [R] LEDS
		*/
		pinctrl-0 = < &pmx_led_disk_yellow
		&pmx_sata0_pwr_enable
		&pmx_led_sys_red
		&pmx_led_sys_blue
		&pmx_led_wifi_green
		&pmx_sw_left
		&pmx_sw_right
		&pmx_sw_idle
		&pmx_sw_left2
		&pmx_led_wifi_yellow
		&pmx_uart0
		&pmx_nand >;
		pinctrl-names = "default";

		pmx_led_disk_yellow: pmx-led-disk-yellow {
		marvell,pins = "mpp21";
		marvell,function = "gpio";
		};

		pmx_sata0_pwr_enable: pmx-sata0-pwr-enable {
		marvell,pins = "mpp36";
		marvell,function = "gpio";
		};

		pmx_led_sys_red: pmx-led-sys-red {
		marvell,pins = "mpp37";
		marvell,function = "gpio";
		};

		pmx_led_sys_blue: pmx-led-sys-blue {
		marvell,pins = "mpp38";
		marvell,function = "gpio";
		};

		pmx_led_wifi_green: pmx-led-wifi-green {
		marvell,pins = "mpp39";
		marvell,function = "gpio";
		};

		pmx_sw_left: pmx-sw-left {
		marvell,pins = "mpp43";
		marvell,function = "gpio";
		};

		pmx_sw_right: pmx-sw-right {
		marvell,pins = "mpp44";
		marvell,function = "gpio";
		};

		pmx_sw_idle: pmx-sw-idle {
		marvell,pins = "mpp45";
		marvell,function = "gpio";
		};

		pmx_sw_left2: pmx-sw-left2 {
		marvell,pins = "mpp46";
		marvell,function = "gpio";
		};

		pmx_led_wifi_yellow: pmx-led-wifi-yellow {
		marvell,pins = "mpp48";
		marvell,function = "gpio";
		};
		};

		serial@12000 {
		clock-frequency = <200000000>;
		status = "ok";

arch/arm/mach-kirkwood/board-usi_topkick.c

+0 −42

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		#include <linux/gpio.h>
		#include <linux/platform_data/mmc-mvsdio.h>
		#include "common.h"
		#include "mpp.h"

		static struct mv643xx_eth_platform_data topkick_ge00_data = {
		.phy_addr = MV643XX_ETH_PHY_ADDR(0),
		@@ -26,52 +25,11 @@ static struct mvsdio_platform_data topkick_mvsdio_data = {
		/* unfortunately the CD signal has not been connected */
		};

		/*
		* GPIO LED layout
		*
		* /-SYS_LED(2)
		* \|
		* \| /-DISK_LED
		* \| \|
		* \| \| /-WLAN_LED(2)
		* \| \| \|
		* [SW] [] [] [*]
		*/

		/*
		* Switch positions
		*
		* /-SW_LEFT
		* \|
		* \| /-SW_IDLE
		* \| \|
		* \| \| /-SW_RIGHT
		* \| \| \|
		* PS [L] [I] [R] LEDS
		*/

		static unsigned int topkick_mpp_config[] __initdata = {
		MPP21_GPIO, /* DISK_LED (low active) - yellow */
		MPP36_GPIO, /* SATA0 power enable (high active) */
		MPP37_GPIO, /* SYS_LED2 (low active) - red */
		MPP38_GPIO, /* SYS_LED (low active) - blue */
		MPP39_GPIO, /* WLAN_LED (low active) - green */
		MPP43_GPIO, /* SW_LEFT (low active) */
		MPP44_GPIO, /* SW_RIGHT (low active) */
		MPP45_GPIO, /* SW_IDLE (low active) */
		MPP46_GPIO, /* SW_LEFT (low active) */
		MPP48_GPIO, /* WLAN_LED2 (low active) - yellow */
		0
		};

		void __init usi_topkick_init(void)
		{
		/*
		* Basic setup. Needs to be called early.
		*/
		kirkwood_mpp_conf(topkick_mpp_config);


		kirkwood_ge00_init(&topkick_ge00_data);
		kirkwood_sdio_init(&topkick_mvsdio_data);
		}