ARM: kirkwood: nsa310: convert to pinctrl (4ded6575) · Commits · e / devices / android_kernel_xiaomi_markw

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

+99 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,105 @@
		};

		ocp@f1000000 {
		pinctrl: pinctrl@10000 {
		pinctrl-0 = < &pmx_led_esata_green
		&pmx_led_esata_red
		&pmx_led_usb_green
		&pmx_led_usb_red
		&pmx_usb_power_off
		&pmx_led_sys_green
		&pmx_led_sys_red
		&pmx_btn_reset
		&pmx_btn_copy
		&pmx_led_copy_green
		&pmx_led_copy_red
		&pmx_led_hdd_green
		&pmx_led_hdd_red
		&pmx_unknown
		&pmx_btn_power
		&pmx_pwr_off >;
		pinctrl-names = "default";

		pmx_led_esata_green: pmx-led-esata-green {
		marvell,pins = "mpp12";
		marvell,function = "gpio";
		};

		pmx_led_esata_red: pmx-led-esata-red {
		marvell,pins = "mpp13";
		marvell,function = "gpio";
		};

		pmx_led_usb_green: pmx-led-usb-green {
		marvell,pins = "mpp15";
		marvell,function = "gpio";
		};

		pmx_led_usb_red: pmx-led-usb-red {
		marvell,pins = "mpp16";
		marvell,function = "gpio";
		};

		pmx_usb_power_off: pmx-usb-power-off {
		marvell,pins = "mpp21";
		marvell,function = "gpio";
		};

		pmx_led_sys_green: pmx-led-sys-green {
		marvell,pins = "mpp28";
		marvell,function = "gpio";
		};

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

		pmx_btn_reset: pmx-btn-reset {
		marvell,pins = "mpp36";
		marvell,function = "gpio";
		};

		pmx_btn_copy: pmx-btn-copy {
		marvell,pins = "mpp37";
		marvell,function = "gpio";
		};

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

		pmx_led_copy_red: pmx-led-copy-red {
		marvell,pins = "mpp40";
		marvell,function = "gpio";
		};

		pmx_led_hdd_green: pmx-led-hdd-green {
		marvell,pins = "mpp41";
		marvell,function = "gpio";
		};

		pmx_led_hdd_red: pmx-led-hdd-red {
		marvell,pins = "mpp42";
		marvell,function = "gpio";
		};

		pmx_unknown: pmx-unknown {
		marvell,pins = "mpp44";
		marvell,function = "gpio";
		};

		pmx_btn_power: pmx-btn-power {
		marvell,pins = "mpp46";
		marvell,function = "gpio";
		};

		pmx_pwr_off: pmx-pwr-off {
		marvell,pins = "mpp48";
		marvell,function = "gpio";
		};
		};

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

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -144,9 +144,6 @@ static void __init kirkwood_dt_init(void)
		if (of_machine_is_compatible("usi,topkick"))
		usi_topkick_init();

		if (of_machine_is_compatible("zyxel,nsa310"))
		nsa310_init();

		of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL);
		}

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

+0 −26

Original line number	Diff line number	Diff line
		@@ -14,32 +14,6 @@
		#include <mach/kirkwood.h>
		#include <linux/of.h>
		#include "common.h"
		#include "mpp.h"

		static unsigned int nsa310_mpp_config[] __initdata = {
		MPP12_GPIO, /* led esata green */
		MPP13_GPIO, /* led esata red */
		MPP15_GPIO, /* led usb green */
		MPP16_GPIO, /* led usb red */
		MPP21_GPIO, /* control usb power off */
		MPP28_GPIO, /* led sys green */
		MPP29_GPIO, /* led sys red */
		MPP36_GPIO, /* key reset */
		MPP37_GPIO, /* key copy */
		MPP39_GPIO, /* led copy green */
		MPP40_GPIO, /* led copy red */
		MPP41_GPIO, /* led hdd green */
		MPP42_GPIO, /* led hdd red */
		MPP44_GPIO, /* ?? */
		MPP46_GPIO, /* key power */
		MPP48_GPIO, /* control power off */
		0
		};

		void __init nsa310_init(void)
		{
		kirkwood_mpp_conf(nsa310_mpp_config);
		}

		static int __init nsa310_pci_init(void)
		{

arch/arm/mach-kirkwood/common.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -135,12 +135,6 @@ void ns2_init(void);
		static inline void ns2_init(void) {};
		#endif

		#ifdef CONFIG_MACH_NSA310_DT
		void nsa310_init(void);
		#else
		static inline void nsa310_init(void) {};
		#endif

		#ifdef CONFIG_MACH_OPENBLOCKS_A6_DT
		void openblocks_a6_init(void);
		#else