Merge tag 'ux500-dt-asoc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

Ux500 devicetree patches:
- Move the ab8500 compatible string from the board to the
  chipset.
- Define GPIO line names for the boards.

* tag 'ux500-dt-asoc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: dts: UX500: name the GPIO lines on HREFv60plus
  ARM: dts: Ux500: name the GPIO lines on Snowball
  ARM: dts: Ux500: move compatible string to chipset

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index 6ae5683..d309314 100644 (file)
--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -604,6 +604,7 @@
                                #interrupt-cells = <2>;
 
                                ab8500_gpio: ab8500-gpio {
+                                       compatible = "stericsson,ab8500-gpio";
                                        gpio-controller;
                                        #gpio-cells = <2>;
                                };

diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 6d8ce15..48dc384 100644 (file)
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -223,7 +223,6 @@
                prcmu@80157000 {
                        ab8500 {
                                ab8500-gpio {
-                                       compatible = "stericsson,ab8500-gpio";
                                };
 
                                ab8500-regulators {

diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index 45d7af3..7187676 100644 (file)
--- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -18,6 +18,126 @@
        compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
 
        soc {
+               /* Name the GPIO muxed rails on the HREF boards */
+               gpio@8012e000 {
+                       /* GPIOs 0 - 31 */
+                       gpio-line-names =
+                                    /* GPIO0,1 used for UART0 BT RX/TX */
+                                    "", "",
+                                    "UART_WAKE",
+                                    "BT_WAKE",
+                                    "",
+                                    "SDMMC_1V8_3V_SEL",
+                                    "FLASH_LED_SYNC (FLASH_CTRL_0)",
+                                    "XENON_READY (FLASH_CTRL_1)",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "",
+                                    "",
+                                    "FLASH_LED_EN (FLASH_CTRL_3)",
+                                    "", "",
+                                    "", "", "", "", "",
+                                    /* Used by UART2 (console) */
+                                    "", "",
+                                    "MAGNETOMETER_INT";
+               };
+
+               gpio@8012e080 {
+                       /* GPIOs 32 - 63 */
+                       gpio-line-names =
+                                    "MAGNETOMETER_DRDY",
+                                    "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "";
+               };
+
+               gpio@8000e000 {
+                       /* GPIOs 64 - 95 */
+                       gpio-line-names = "XENON_EN2 (FLASH_CTRL_4)",
+                                    "DISP1_RST",
+                                    "DISP2_RST",
+                                    "TOUCH_INT2",
+                                    "LCD_VSI0_A",
+                                    "LCD_VSI1_A",
+                                    /* GPIO 70-77 used for ETM */
+                                    "", "", "", "", "", "", "", "",
+                                    /* GPIO 78-81 used for YCBCR */
+                                    "", "", "", "",
+                                    "ACCELEROMETER_INT1_RDY",
+                                    "ACCELEROMETER_INT2",
+                                    "TOUCH_INT",
+                                    "WLAN_ENA",
+                                    "", "", "", "", "",
+                                    "FORCE_SENSING_INT",
+                                    "FORCE_SENSING_RESET",
+                                    "", "",
+                                    "SDMMC_CD";
+               };
+
+               gpio@8000e080 {
+                       /* GPIOs 96 - 127 */
+                       gpio-line-names = "",
+                                    "FORCE_SENSING_WU",
+                                    "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "";
+               };
+
+               gpio@8000e100 {
+                       /* GPIOs 128 - 159 */
+                       gpio-line-names = "", "", "", "", "", "", "", "",
+                                    "", "", "",
+                                    "DIPRO_INT", /* GPIO139 */
+                                    "XSHUTDOWN_SECONDARY_SENSOR",
+                                    "XSHUTDOWN_PRIMARY_SENSOR",
+                                    "NFC_RST (NFC_CTRL_",
+                                    "TOUCH_RST",
+                                    "NFC_IRQ (NFC_CTRL_1)",
+                                    "HAL_SW",
+                                    "TOUCH_RST2",
+                                    "", "",
+                                    "VAUDIO_HF_EN", /* GPIO149 */
+                                    "", "", "", "", "", "", "", "", "", "";
+               };
+
+               gpio@8000e180 {
+                       /* GPIOs 160 - 191 */
+                       gpio-line-names = "", "", "", "", "", "", "", "",
+                                    "",
+                                    "SDMMC_EN",
+                                    "XENON_CHARGE (FLASH_CONTROL_5)",
+                                    "GBF_ENA_RESET",
+                                    "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "";
+               };
+
+               gpio@8011e000 {
+                       /* GPIOs 192 - 223 */
+                       gpio-line-names = "HDTV_INTN",
+                                    "", "", "",
+                                    "HDTV_RSTN",
+                                    "", "", "",
+                                    "", /* GPIO200 */
+                                    "", "", "", "", "", "", "",
+                                    /* GPIO208-216 used for WGBF_MC1 */
+                                    "", "", "", "", "", "", "", "", "",
+                                    "SW_FRONT_PROXIMITY", /* GPIO217 */
+                                    "KPD_CTRL_INT", /* Keypad controller */
+                                    "", "", "", "", "";
+               };
+
+               gpio@8011e080 {
+                       /* GPIOs 224 - 255 */
+                       gpio-line-names = "", "",
+                                    "HSIT_ACWAKE0",
+                                    "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "";
+               };
+
                // External Micro SD slot
                sdi0_per1@80126000 {
                        cd-gpios  = <&gpio2 31 GPIO_ACTIVE_HIGH>; // 95

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 36e84ef..b3df1c6 100644 (file)
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -95,6 +95,70 @@
        };
 
        soc {
+               /* Name the GPIO muxed rails on the Snowball board */
+               gpio@8012e000 {
+                       /* GPIOs 0 - 31 */
+                       gpio-line-names = "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "",
+                                    "AP_GPIO31";
+               };
+
+               gpio@8012e080 {
+                       /* GPIOs 32 - 63 */
+                       gpio-line-names = "USR PB", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "";
+               };
+
+               gpio@8000e000 {
+                       /* GPIOs 64 - 95 */
+                       gpio-line-names = "", "", "", "", "AP_GPIO68", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "";
+               };
+
+               gpio@8000e100 {
+                       /* GPIOs 128 - 159 */
+                       gpio-line-names = "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "IRQ_LAN", "RSTn_LAN",
+                                    "USR_LED", "", "", "", "", "", "",
+                                    "", "", "AP_GPIO151", "AP_GPIO152",
+                                    "", "", "", "", "", "", "";
+               };
+
+               gpio@8000e180 {
+                       /* GPIOs 160 - 191 */
+                       gpio-line-names = "", "AP_GPIO161", "AP_GPIO162",
+                                    "ACCELEROMETER_INT1_RDY",
+                                    "ACCELEROMETER_INT2", "MAG_DRDY",
+                                    "GYRO_DRDY", "RSTn_MLC", "RSTn_SLC",
+                                    "GYRO_INT", "UART_WAKE", "GBF_RESET",
+                                    "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "";
+               };
+
+               gpio@8011e000 {
+                       /* GPIOs 192 - 223 */
+                       gpio-line-names = "HDTV_INTn", "", "", "", "HDTV_RST",
+                                    "", "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "", "",
+                                    "WLAN_RESETN", "WLAN_IRQ", "MMC_EN",
+                                    "MMC_CD", "", "", "", "", "";
+               };
+
+               gpio@8011e080 {
+                       /* GPIOs 224 - 255 */
+                       gpio-line-names = "", "", "", "", "SD_SEL", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "",
+                                    "", "", "", "", "", "", "", "";
+               };
+
                usb_per5@a03e0000 {
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&musb_default_mode>;
@@ -352,7 +416,25 @@
 
                        ab8500 {
                                ab8500-gpio {
-                                       compatible = "stericsson,ab8500-gpio";
+                                       /*
+                                        * AB8500 GPIOs are numbered starting from 1, so the first
+                                        * index 0 is what in the datasheet is called "GPIO1", and
+                                        * the second is "GPIO2" and so forth. Confusingly, the
+                                        * Snowball schematic then names the "GPIO2" line "PM_GPIO1".
+                                        * while later naming "GPIO4" as "PM_GPIO4".
+                                        */
+                                       gpio-line-names = "", /* AB8500 GPIO1 */
+                                                    "PM_GPIO1", /* AB8500 GPIO2 */
+                                                    "WLAN_CLK_REQ", /* AB8500 GPIO3 */
+                                                    "PM_GPIO4", /* AB8500 GPIO4 */
+                                                    "", "", "", "", "", "", "", "", "", "", "",
+                                                    "EN_3V6", /* AB8500 GPIO16 */
+                                                    "", "", "", "" ,"", "", "", "", "",
+                                                    "EN_3V3", /* AB8500 GPIO26 */
+                                                    "", "", "", "", "", "", "", "", "", "", "", "", "",
+                                                    "PM_GPIO40", /* AB8500 GPIO40 */
+                                                    "PM_GPIO41", /* AB8500 GPIO41 */
+                                                    "PM_GPIO42"; /* AB8500 GPIO42 */
                                };
 
                                ext_regulators: ab8500-ext-regulators {