Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[can-eth-gw-linux.git] / arch / arm / boot / dts / kirkwood-iomega_ix2_200.dts

diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index 865aeec40a268da8f2a0b2ab3416ccbad4da90f5..6cae4599c4b3e620974dbfa318119db952a56136 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 
 /include/ "kirkwood.dtsi"
+/include/ "kirkwood-6281.dtsi"
 
 / {
        model = "Iomega StorCenter ix2-200";
@@ -16,6 +17,94 @@
        };
 
        ocp@f1000000 {
+               pinctrl: pinctrl@10000 {
+
+                       pinctrl-0 = < &pmx_button_reset &pmx_button_power
+                                     &pmx_led_backup &pmx_led_power
+                                     &pmx_button_otb &pmx_led_rebuild
+                                     &pmx_led_health
+                                     &pmx_led_sata_brt_ctrl_1
+                                     &pmx_led_sata_brt_ctrl_2
+                                     &pmx_led_backup_brt_ctrl_1
+                                     &pmx_led_backup_brt_ctrl_2
+                                     &pmx_led_power_brt_ctrl_1
+                                     &pmx_led_power_brt_ctrl_2
+                                     &pmx_led_health_brt_ctrl_1
+                                     &pmx_led_health_brt_ctrl_2
+                                     &pmx_led_rebuild_brt_ctrl_1
+                                     &pmx_led_rebuild_brt_ctrl_2 >;
+                       pinctrl-names = "default";
+
+                       pmx_button_reset: pmx-button-reset {
+                               marvell,pins = "mpp12";
+                               marvell,function = "gpio";
+                       };
+                       pmx_button_power: pmx-button-power {
+                               marvell,pins = "mpp14";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_backup: pmx-led-backup {
+                               marvell,pins = "mpp15";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_power: pmx-led-power {
+                               marvell,pins = "mpp16";
+                               marvell,function = "gpio";
+                       };
+                       pmx_button_otb: pmx-button-otb {
+                               marvell,pins = "mpp35";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_rebuild: pmx-led-rebuild {
+                               marvell,pins = "mpp36";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_health: pmx-led_health {
+                               marvell,pins = "mpp37";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_sata_brt_ctrl_1: pmx-led-sata-brt-ctrl-1 {
+                               marvell,pins = "mpp38";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_sata_brt_ctrl_2: pmx-led-sata-brt-ctrl-2 {
+                               marvell,pins = "mpp39";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_backup_brt_ctrl_1: pmx-led-backup-brt-ctrl-1 {
+                               marvell,pins = "mpp40";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_backup_brt_ctrl_2: pmx-led-backup-brt-ctrl-2 {
+                               marvell,pins = "mpp41";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_power_brt_ctrl_1: pmx-led-power-brt-ctrl-1 {
+                               marvell,pins = "mpp42";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_power_brt_ctrl_2: pmx-led-power-brt-ctrl-2 {
+                               marvell,pins = "mpp43";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_health_brt_ctrl_1: pmx-led-health-brt-ctrl-1 {
+                               marvell,pins = "mpp44";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_health_brt_ctrl_2: pmx-led-health-brt-ctrl-2 {
+                               marvell,pins = "mpp45";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_rebuild_brt_ctrl_1: pmx-led-rebuild-brt-ctrl-1 {
+                               marvell,pins = "mpp44";
+                               marvell,function = "gpio";
+                       };
+                       pmx_led_rebuild_brt_ctrl_2: pmx-led-rebuild-brt-ctrl-2 {
+                               marvell,pins = "mpp45";
+                               marvell,function = "gpio";
+                       };
+
+               };
                i2c@11000 {
                        status = "okay";