Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3036-pinctrl.dtsi

diff --git a/arch/arm/boot/dts/rk3036-pinctrl.dtsi b/arch/arm/boot/dts/rk3036-pinctrl.dtsi
old mode 100755 (executable)
new mode 100644 (file)
index d5225b1..6297a05
--- a/arch/arm/boot/dts/rk3036-pinctrl.dtsi
+++ b/arch/arm/boot/dts/rk3036-pinctrl.dtsi
@@ -3,7 +3,7 @@
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/pinctrl/rockchip-rk3036.h>
 
-/ { 
+/ {
        pinctrl: pinctrl@20008000 {
                compatible = "rockchip,rk3036-pinctrl";
                reg = <0x20008000 0xA8>,
@@ -84,28 +84,28 @@
                                rockchip,pins = <UART0_SIN>,
                                                <UART0_SOUT>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        uart0_cts: uart0-cts {
                                rockchip,pins = <UART0_CTSN>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        uart0_rts: uart0-rts {
                                rockchip,pins = <UART0_RTSN>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        uart0_rts_gpio: uart0-rts-gpio {
                                rockchip,pins = <FUNC_TO_GPIO(UART0_RTSN)>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
                };
 
@@ -114,8 +114,8 @@
                                rockchip,pins = <UART1_SIN>,
                                                <UART1_SOUT>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                };
@@ -125,8 +125,8 @@
                                rockchip,pins = <UART2_SIN>,
                                                <UART2_SOUT>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
                        /* no rts / cts for uart2 */
                };
@@ -136,21 +136,21 @@
                        i2c0_sda:i2c0-sda {
                                rockchip,pins = <I2C0_SDA>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        i2c0_scl:i2c0-scl {
                                rockchip,pins = <I2C0_SCL>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        i2c0_gpio: i2c0-gpio {
                                rockchip,pins = <FUNC_TO_GPIO(I2C0_SDA)>, <FUNC_TO_GPIO(I2C0_SCL)>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
                };
 
@@ -158,21 +158,21 @@
                        i2c1_sda:i2c1-sda {
                                rockchip,pins = <I2C1_SDA>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        i2c1_scl:i2c1-scl {
                                rockchip,pins = <I2C1_SCL>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        i2c1_gpio: i2c1-gpio {
                                rockchip,pins = <FUNC_TO_GPIO(I2C1_SDA)>, <FUNC_TO_GPIO(I2C1_SCL)>;
                                 rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
                };
 
@@ -180,21 +180,21 @@
                        i2c2_sda:i2c2-sda {
                                rockchip,pins = <I2C2_SDA>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        i2c2_scl:i2c2-scl {
                                rockchip,pins = <I2C2_SCL>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        i2c2_gpio: i2c2-gpio {
                                rockchip,pins = <FUNC_TO_GPIO(I2C2_SDA)>, <FUNC_TO_GPIO(I2C2_SCL)>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
                };
 
@@ -202,36 +202,36 @@
                        spi0_txd:spi0-txd {
                                rockchip,pins = <SPI0_TXD>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        spi0_rxd:spi0-rxd {
                                rockchip,pins = <SPI0_RXD>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        spi0_clk:spi0-clk {
                                rockchip,pins = <SPI0_CLK>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        spi0_cs0:spi0-cs0 {
                                rockchip,pins = <SPI0_CS0>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                        spi0_cs1:spi0-cs1 {
                                rockchip,pins = <SPI0_CS1>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
 
                };
@@ -265,45 +265,45 @@
                        hdmi_gpio: hdmi-gpio {
                                rockchip,pins = <FUNC_TO_GPIO(HDMI_CEC)>, <FUNC_TO_GPIO(HDMI_SDA)>, <FUNC_TO_GPIO(HDMI_SCL)>, <FUNC_TO_GPIO(HDMI_HPD)>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               //rockchip,drive = <VALUE_DRV_DEFAULT>;                         
+                               //rockchip,drive = <VALUE_DRV_DEFAULT>;
                        };
-               };              
+               };
 
                gpio1_i2s0 {
                        i2s0_mclk:i2s0-mclk {
                                rockchip,pins = <I2S0_MCLK>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
 
                        i2s0_sclk:i2s0-sclk {
                                rockchip,pins = <I2S0_SCLK>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
 
                        i2s0_lrckrx:i2s0-lrckrx {
                                rockchip,pins = <I2S0_LRCKRX>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
 
                        i2s0_lrcktx:i2s0-lrcktx {
                                rockchip,pins = <I2S0_LRCKTX>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
 
                        i2s0_sdo:i2s0-sdo {
                                rockchip,pins = <I2S0_SDO>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
 
                        i2s0_sdi:i2s0-sdi {
                                rockchip,pins = <I2S0_SDI>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
 
                        i2s0_gpio: i2s0-gpio {
@@ -314,30 +314,30 @@
                                                <FUNC_TO_GPIO(I2S0_SDO)>,
                                                <FUNC_TO_GPIO(I2S0_SDI)>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
                };
 
-               gpio1_spdif {
+               gpio0_spdif {
                        spdif_tx: spdif-tx {
                                rockchip,pins = <SPDIF_TX>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
                        };
                };
-               
+
                gpio1_emmc0 {
                        emmc0_clk: emmc0-clk {
                                rockchip,pins = <EMMC_CLKOUT>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
 
                        };
 
                        emmc0_cmd: emmc0-cmd {
                                rockchip,pins = <EMMC_CMD>;
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
 
@@ -345,7 +345,7 @@
                        emmc0_bus1: emmc0-bus-width1 {
                                rockchip,pins = <EMMC_D0>;
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
 
@@ -355,7 +355,7 @@
                                                <EMMC_D2 >,
                                                <EMMC_D3>;
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
                };
@@ -364,20 +364,20 @@
                        sdmmc0_clk: sdmmc0-clk {
                                rockchip,pins = <MMC0_CLKOUT>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
 
                        };
 
                        sdmmc0_cmd: sdmmc0-cmd {
                                rockchip,pins = <MMC0_CMD>;
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
                        };
 
                        sdmmc0_dectn: sdmmc0-dectn{
                                rockchip,pins = <MMC0_DETN>;
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
 
@@ -385,7 +385,7 @@
                        sdmmc0_bus1: sdmmc0-bus-width1 {
                                rockchip,pins = <MMC0_D0>;
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
 
@@ -395,7 +395,7 @@
                                                <MMC0_D2>,
                                                <MMC0_D3>;
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
 
@@ -409,7 +409,7 @@
                                        <GPIO1_C4>,  //D2
                                        <GPIO1_C5>;  //D3
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
 
@@ -456,7 +456,7 @@
                                                <NAND_D5>,
                                                <NAND_D6>,
                                                <NAND_D7>;
-                               rockchip,pull = <VALUE_PULL_DEFAULT>;   
+                               rockchip,pull = <VALUE_PULL_DEFAULT>;
 
                        };
 
@@ -466,21 +466,21 @@
                        sdio0_clk: sdio0_clk {
                                rockchip,pins = <MMC1_CLKOUT>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
 
                        };
 
                        sdio0_cmd: sdio0_cmd {
                                rockchip,pins = <MMC1_CMD>;
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
 
                        sdio0_bus1: sdio0-bus-width1 {
                                rockchip,pins = <MMC1_D0>;
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
 
@@ -490,7 +490,7 @@
                                                <MMC1_D2>,
                                                <MMC1_D3>;
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
 
@@ -503,75 +503,80 @@
                                        <GPIO0_B5>,   //D2
                                        <GPIO0_B6>;   //D3
                                rockchip,pull = <VALUE_PULL_UP>;
-                               
+
 
                        };
                };
-                
+
                gpio0_pwm{
                        pwm0_pin:pwm0 {
                                rockchip,pins = <PWM0>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
 
                        };
 
                        pwm1_pin:pwm1 {
                                rockchip,pins = <PWM1>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
 
                        };
 
                        pwm2_pin:pwm2 {
                                rockchip,pins = <PWM2>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
 
                        };
 
                        pwm3_pin:pwm3 {
                                rockchip,pins = <PWM3(IR)>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
+
 
                        };
                };
 
-               gpio2_gmac {            
+               gpio2_gmac {
+                       mac_clk: mac-clk {
+                               rockchip,pins = <MAC_CLKOUT>;
+                               rockchip,pull = <VALUE_PULL_DEFAULT>;
+                       };
+
                        mac_txpins: mac-txpins {
                                rockchip,pins = <MAC_TXD0>, <MAC_TXD1>,  <MAC_TXEN>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
-                       
+
                        mac_rxpins: mac-rxpins {
                                rockchip,pins = <MAC_RXD0>, <MAC_RXD1>,<MAC_RXER>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
-                       
+
                        mac_crs: mac-crs {
                                rockchip,pins = <MAC_CRS>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
-                       
+
                        mac_mdpins: mac-mdpins {
                                rockchip,pins = <MAC_MDIO>, <MAC_MDC>;
                                rockchip,pull = <VALUE_PULL_DEFAULT>;
-                               
-                               
+
+
                        };
                };
 
 
-               //to add 
+               //to add
+
 
-               
-       };      
+       };
 
 };