bmips: backport accepted pinctrl patches

[openwrt/staging/dedeckeh.git] / target / linux / bmips / dts / bcm6368.dtsi

diff --git a/target/linux/bmips/dts/bcm6368.dtsi b/target/linux/bmips/dts/bcm6368.dtsi
index afdf3c5dc05aeffae62dd3264aa839c933d58a3a..b50a572fd0007382bf16ce6bb6eec5a9bed389b6 100644 (file)
--- a/target/linux/bmips/dts/bcm6368.dtsi
+++ b/target/linux/bmips/dts/bcm6368.dtsi
@@ -148,198 +148,190 @@
                        timeout-sec = <30>;
                };
 
-               gpio: syscon@10000080 {
-                       compatible = "syscon", "simple-mfd";
+               gpio_cntl: syscon@10000080 {
+                       compatible = "brcm,bcm6368-gpio-sysctl",
+                                    "syscon", "simple-mfd";
                        reg = <0x10000080 0x80>;
+                       ranges = <0 0x10000080 0x80>;
                        native-endian;
 
-                       pinctrl: pin-controller {
-                               compatible = "brcm,bcm6368-pinctrl";
+                       gpio: gpio@0 {
+                               compatible = "brcm,bcm6368-gpio";
+                               reg-names = "dirout", "dat";
+                               reg = <0x0 0x8>, <0x8 0x8>;
 
                                gpio-controller;
+                               gpio-ranges = <&pinctrl 0 0 38>;
                                #gpio-cells = <2>;
+                       };
 
-                               interrupts-extended = <&ext_intc1 0 0>,
-                                                     <&ext_intc1 1 0>,
-                                                     <&ext_intc0 0 0>,
-                                                     <&ext_intc0 1 0>,
-                                                     <&ext_intc0 2 0>,
-                                                     <&ext_intc0 3 0>;
-                               interrupt-names = "gpio32",
-                                                 "gpio33",
-                                                 "gpio34",
-                                                 "gpio35",
-                                                 "gpio36",
-                                                 "gpio37";
-
-                               pinctrl_analog_afe_0: analog_afe_0 {
+                       pinctrl: pinctrl@18 {
+                               compatible = "brcm,bcm6368-pinctrl";
+                               reg = <0x18 0x4>, <0x38 0x4>;
+
+                               pinctrl_analog_afe_0: analog_afe_0-pins {
                                        function = "analog_afe_0";
                                        pins = "gpio0";
                                };
 
-                               pinctrl_analog_afe_1: analog_afe_1 {
+                               pinctrl_analog_afe_1: analog_afe_1-pins {
                                        function = "analog_afe_1";
                                        pins = "gpio1";
                                };
 
-                               pinctrl_sys_irq: sys_irq {
+                               pinctrl_sys_irq: sys_irq-pins {
                                        function = "sys_irq";
                                        pins = "gpio2";
                                };
 
-                               pinctrl_serial_led: serial_led {
-                                       pinctrl_serial_led_data: serial_led_data {
+                               pinctrl_serial_led: serial_led-pins {
+                                       pinctrl_serial_led_data: serial_led_data-pins {
                                                function = "serial_led_data";
                                                pins = "gpio3";
                                        };
 
-                                       pinctrl_serial_led_clk: serial_led_clk {
+                                       pinctrl_serial_led_clk: serial_led_clk-pins {
                                                function = "serial_led_clk";
                                                pins = "gpio4";
                                        };
                                };
 
-                               pinctrl_inet_led: inet_led {
+                               pinctrl_inet_led: inet_led-pins {
                                        function = "inet_led";
                                        pins = "gpio5";
                                };
 
-                               pinctrl_ephy0_led: ephy0_led {
+                               pinctrl_ephy0_led: ephy0_led-pins {
                                        function = "ephy0_led";
                                        pins = "gpio6";
                                };
 
-                               pinctrl_ephy1_led: ephy1_led {
+                               pinctrl_ephy1_led: ephy1_led-pins {
                                        function = "ephy1_led";
                                        pins = "gpio7";
                                };
 
-                               pinctrl_ephy2_led: ephy2_led {
+                               pinctrl_ephy2_led: ephy2_led-pins {
                                        function = "ephy2_led";
                                        pins = "gpio8";
                                };
 
-                               pinctrl_ephy3_led: ephy3_led {
+                               pinctrl_ephy3_led: ephy3_led-pins {
                                        function = "ephy3_led";
                                        pins = "gpio9";
                                };
 
-                               pinctrl_robosw_led_data: robosw_led_data {
+                               pinctrl_robosw_led_data: robosw_led_data-pins {
                                        function = "robosw_led_data";
                                        pins = "gpio10";
                                };
 
-                               pinctrl_robosw_led_clk: robosw_led_clk {
+                               pinctrl_robosw_led_clk: robosw_led_clk-pins {
                                        function = "robosw_led_clk";
                                        pins = "gpio11";
                                };
 
-                               pinctrl_robosw_led0: robosw_led0 {
+                               pinctrl_robosw_led0: robosw_led0-pins {
                                        function = "robosw_led0";
                                        pins = "gpio12";
                                };
 
-                               pinctrl_robosw_led1: robosw_led1 {
+                               pinctrl_robosw_led1: robosw_led1-pins {
                                        function = "robosw_led1";
                                        pins = "gpio13";
                                };
 
-                               pinctrl_usb_device_led: usb_device_led {
+                               pinctrl_usb_device_led: usb_device_led-pins {
                                        function = "usb_device_led";
                                        pins = "gpio14";
                                };
 
-                               pinctrl_pci: pci {
-                                       pinctrl_pci_req1: pci_req1 {
+                               pinctrl_pci: pci-pins {
+                                       pinctrl_pci_req1: pci_req1-pins {
                                                function = "pci_req1";
                                                pins = "gpio16";
                                        };
 
-                                       pinctrl_pci_gnt1: pci_gnt1 {
+                                       pinctrl_pci_gnt1: pci_gnt1-pins {
                                                function = "pci_gnt1";
                                                pins = "gpio17";
                                        };
 
-                                       pinctrl_pci_intb: pci_intb {
+                                       pinctrl_pci_intb: pci_intb-pins {
                                                function = "pci_intb";
                                                pins = "gpio18";
                                        };
 
-                                       pinctrl_pci_req0: pci_req0 {
+                                       pinctrl_pci_req0: pci_req0-pins {
                                                function = "pci_req0";
                                                pins = "gpio19";
                                        };
 
-                                       pinctrl_pci_gnt0: pci_gnt0 {
+                                       pinctrl_pci_gnt0: pci_gnt0-pins {
                                                function = "pci_gnt0";
                                                pins = "gpio20";
                                        };
                                };
 
-                               pinctrl_pcmcia: pcmcia {
-                                       pinctrl_pcmcia_cd1: pcmcia_cd1 {
+                               pinctrl_pcmcia: pcmcia-pins {
+                                       pinctrl_pcmcia_cd1: pcmcia_cd1-pins {
                                                function = "pcmcia_cd1";
                                                pins = "gpio22";
                                        };
 
-                                       pinctrl_pcmcia_cd2: pcmcia_cd2 {
+                                       pinctrl_pcmcia_cd2: pcmcia_cd2-pins {
                                                function = "pcmcia_cd2";
                                                pins = "gpio23";
                                        };
 
-                                       pinctrl_pcmcia_vs1: pcmcia_vs1 {
+                                       pinctrl_pcmcia_vs1: pcmcia_vs1-pins {
                                                function = "pcmcia_vs1";
                                                pins = "gpio24";
                                        };
 
-                                       pinctrl_pcmcia_vs2: pcmcia_vs2 {
+                                       pinctrl_pcmcia_vs2: pcmcia_vs2-pins {
                                                function = "pcmcia_vs2";
                                                pins = "gpio25";
                                        };
                                };
 
-                               pinctrl_ebi_cs2: ebi_cs2 {
+                               pinctrl_ebi_cs2: ebi_cs2-pins {
                                        function = "ebi_cs2";
                                        pins = "gpio26";
                                };
 
-                               pinctrl_ebi_cs3: ebi_cs3 {
+                               pinctrl_ebi_cs3: ebi_cs3-pins {
                                        function = "ebi_cs3";
                                        pins = "gpio27";
                                };
 
-                               pinctrl_spi_cs2: spi_cs2 {
+                               pinctrl_spi_cs2: spi_cs2-pins {
                                        function = "spi_cs2";
                                        pins = "gpio28";
                                };
 
-                               pinctrl_spi_cs3: spi_cs3 {
+                               pinctrl_spi_cs3: spi_cs3-pins {
                                        function = "spi_cs3";
                                        pins = "gpio29";
                                };
 
-                               pinctrl_spi_cs4: spi_cs4 {
+                               pinctrl_spi_cs4: spi_cs4-pins {
                                        function = "spi_cs4";
                                        pins = "gpio30";
                                };
 
-                               pinctrl_spi_cs5: spi_cs5 {
+                               pinctrl_spi_cs5: spi_cs5-pins {
                                        function = "spi_cs5";
                                        pins = "gpio31";
                                };
 
-                               pinctrl_uart1: uart1 {
+                               pinctrl_uart1: uart1-pins {
                                        function = "uart1";
                                        group = "uart1_grp";
                                };
                        };
                };
 
-               gpiobasemode: gpiobasemode@100000b8 {
-                       compatible = "brcm,bcm6368-gpiobasemode", "syscon";
-                       reg = <0x100000b8 0x4>;
-               };
-
                leds: led-controller@100000d0 {
                        #address-cells = <1>;
                        #size-cells = <0>;