[v2,4/9] ARM: dts: support pinctrl single in pxa910

Message ID	1350922139-3693-5-git-send-email-haojian.zhuang@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> From: Haojian Zhuang <haojian.zhuang@gmail.com> To: swarren@wwwdotorg.org, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, tony@atomide.com, devicetree-discuss@lists.ozlabs.org, linus.walleij@linaro.org Subject: [PATCH v2 4/9] ARM: dts: support pinctrl single in pxa910 Date: Tue, 23 Oct 2012 00:08:54 +0800 Message-Id: <1350922139-3693-5-git-send-email-haojian.zhuang@gmail.com> In-Reply-To: <1350922139-3693-1-git-send-email-haojian.zhuang@gmail.com> References: <1350922139-3693-1-git-send-email-haojian.zhuang@gmail.com> summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org

diff --git a/arch/arm/boot/dts/pxa910-dkb.dts b/arch/arm/boot/dts/pxa910-dkb.dts index 595492a..394396a 100644 --- a/arch/arm/boot/dts/pxa910-dkb.dts +++ b/arch/arm/boot/dts/pxa910-dkb.dts @@ -24,10 +24,195 @@ soc { apb@d4000000 { - uart1: uart@d4017000 { + pmx: pinmux@d401e000 { + pinctrl-names = "default"; + pinctrl-0 = <&board_pins>; + + board_pins: pinmux_board_pins { + /* pins not owned by device driver */ + }; + uart1_pins: pinmux_uart1_pins { + pinctrl-single,pins = < + 0x198 0x6 /* GPIO47_UART1_RXD */ + 0x19c 0x6 /* GPIO48_UART1_TXD */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0x6>; + }; + uart2_pins: pinmux_uart2_pins { + pinctrl-single,pins = < + 0x150 0x4 /* GPIO29_UART2_CTS */ + 0x154 0x4 /* GPIO30_UART2_RTS */ + 0x158 0x4 /* GPIO31_UART2_TXD */ + 0x15c 0x4 /* GPIO32_UART2_RXD */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + uart3_pins: pinmux_uart3_pins { + pinctrl-single,pins = < + 0x188 0x7 /* GPIO43_UART3_RXD */ + 0x18c 0x7 /* GPIO44_UART3_TXD */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + twsi1_pins: pinmux_twsi1_pins { + pinctrl-single,pins = < + 0x1b0 0x2 /* GPIO53_TWSI_SCL */ + 0x1b4 0x2 /* GPIO54_TWSI_SDA */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + nand_pins: pinmux_nand_pins { + pinctrl-single,pins = < + 0x040 0x0 /* ND_IO0 */ + 0x03c 0x0 /* ND_IO1 */ + 0x038 0x0 /* ND_IO2 */ + 0x034 0x0 /* ND_IO3 */ + 0x030 0x0 /* ND_IO4 */ + 0x02c 0x0 /* ND_IO5 */ + 0x028 0x0 /* ND_IO6 */ + 0x024 0x0 /* ND_IO7 */ + 0x020 0x0 /* ND_IO8 */ + 0x01c 0x0 /* ND_IO9 */ + 0x018 0x0 /* ND_IO10 */ + 0x014 0x0 /* ND_IO11 */ + 0x010 0x0 /* ND_IO12 */ + 0x00c 0x0 /* ND_IO13 */ + 0x008 0x0 /* ND_IO14 */ + 0x004 0x0 /* ND_IO15 */ + 0x044 0x0 /* ND_nCS0 */ + 0x060 0x1 /* ND_ALE */ + 0x05c 0x0 /* ND_CLE */ + 0x054 0x1 /* ND_nWE */ + 0x058 0x1 /* ND_nRE */ + 0x068 0x0 /* ND_RDY0 */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + mmc1_ldata_pins: pinmux_mmc1_ldata_pins { + pinctrl-single,pins = < + 0x0a0 0x0 /* MMC1_DATA0 */ + 0x09c 0x0 /* MMC1_DATA1 */ + 0x098 0x0 /* MMC1_DATA2 */ + 0x094 0x0 /* MMC1_DATA3 */ + >; + pinctrl-single,power-source = <0x3>; + pinctrl-single,bias = <0>; + }; + mmc1_hdata_pins: pinmux_mmc1_hdata_pins { + pinctrl-single,pins = < + 0x090 0x0 /* MMC1_DATA4 */ + 0x08c 0x0 /* MMC1_DATA5 */ + 0x088 0x0 /* MMC1_DATA6 */ + 0x084 0x0 /* MMC1_DATA7 */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + mmc1_clk_pins: pinmux_mmc1_clk_pins { + pinctrl-single,pins = < + 0x0a4 0x0 /* MMC1_CMD */ + 0x0a8 0x0 /* MMC1_CLK */ + >; + pinctrl-single,power-source = <0x3>; + pinctrl-single,bias = <0>; + }; + mmc1_cd_pins: pinmux_mmc1_cd_pins { + pinctrl-single,pins = < + 0x0ac 0x0 /* MMC1_CD */ + 0x0b0 0x0 /* MMC1_WP */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + mmc2_pins: pinmux_mmc2_pins { + pinctrl-single,pins = < + 0x180 0x1 /* MMC2_CMD */ + 0x184 0x1 /* MMC2_CLK */ + 0x17c 0x1 /* MMC2_DATA0 */ + 0x178 0x1 /* MMC2_DATA1 */ + 0x174 0x1 /* MMC2_DATA2 */ + 0x170 0x1 /* MMC2_DATA3 */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + w1_pins: pinmux_w1_pins { + pinctrl-single,pins = < + 0x0cc 0x2 /* CLK_REQ_W1 */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + ssp1_pins: pinmux_ssp1_pins { + pinctrl-single,pins = < + 0x130 0x1 /* GPIO21_SSP1_SCLK */ + 0x134 0x1 /* GPIO22_SSP1_FRM */ + 0x138 0x1 /* GPIO23_SSP1_TXD */ + 0x13c 0x1 /* GPIO24_SSP1_RXD */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + keypad_pins: pinmux_keypad_pins { + pinctrl-single,pins = < + 0x0dc 0x1 /* GPIO0_MKIN0 */ + 0x0e0 0x1 /* GPIO1_MKOUT0 */ + 0x0e4 0x1 /* GPIO2_MKIN1 */ + 0x0e8 0x1 /* GPIO3_MKOUT1 */ + 0x0ec 0x1 /* GPIO4_MKIN2 */ + 0x0f0 0x1 /* GPIO5_MKOUT2 */ + 0x0f4 0x1 /* GPIO6_MKIN3 */ + 0x0f8 0x1 /* GPIO7_MKOUT3 */ + 0x0fc 0x1 /* GPIO8_MKIN4 */ + 0x100 0x1 /* GPIO9_MKOUT4 */ + 0x10c 0x1 /* GPIO12_MKIN6 */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + nfc_pins: pinmux_nfc_pins { + pinctrl-single,pins = < + 0x120 0x0 /* GPIO17 */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + wlan_pins: pinmux_wlan_pins { + pinctrl-single,pins = < + 0x114 0x0 /* GPIO14 */ + 0x12c 0x0 /* GPIO20 */ + 0x160 0x0 /* GPIO33 */ + 0x164 0x0 /* GPIO34 */ + 0x168 0x0 /* GPIO35 */ + 0x16c 0x0 /* GPIO36 */ + >; + pinctrl-single,power-source = <0x2>; + pinctrl-single,bias = <0>; + }; + }; + uart1: uart@d4017000 { /* FFUART */ + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pins>; + status = "okay"; + }; + uart2: uart@d4018000 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2_pins>; + status = "okay"; + }; + uart3: uart@d4036000 { + pinctrl-names = "default"; + pinctrl-0 = <&uart3_pins>; status = "okay"; }; twsi1: i2c@d4011000 { + pinctrl-names = "default"; + pinctrl-0 = <&twsi1_pins>; status = "okay"; pmic: 88pm860x@34 { diff --git a/arch/arm/boot/dts/pxa910.dtsi b/arch/arm/boot/dts/pxa910.dtsi index 825aaca..cf807e8 100644 --- a/arch/arm/boot/dts/pxa910.dtsi +++ b/arch/arm/boot/dts/pxa910.dtsi @@ -54,6 +54,84 @@ reg = <0xd4000000 0x00200000>; ranges; + pmx: pinmux@d401e000 { + compatible = "pinctrl-single"; + reg = <0xd401e000 0x0330>; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <7>; + pinctrl-single,gpio-mask = <7>; + pinctrl-single,gpio-ranges = <&gpiorange0 &gpiorange1 + &gpiorange2 &gpiorange3 + &gpiorange4 &gpiorange5 + &gpiorange6 &gpiorange7 + &gpiorange8 &gpiorange9 + &gpiorange10>; + pinctrl-single,power-source-mask = <0x1800>; + pinctrl-single,bias-mask = <0xe000>; + pinctrl-single,bias-disable = <0>; + pinctrl-single,bias-pull-down = <0xa000>; + pinctrl-single,bias-pull-up = <0xc000>; + pinctrl-single,input-schmitt-mask = <0x70>; + + gpiorange0: gpiorange@d401e0dc { + /* GPIO0 ~ GPIO54 */ + pinctrl-single,gpio = <0 55 0x0dc>; + pinctrl-single,gpio-func = <0>; + }; + gpiorange1: gpiorange@d401e2f0 { + /* GPIO55 ~ GPIO59 */ + pinctrl-single,gpio = <55 5 0x2f0>; + pinctrl-single,gpio-func = <1>; + }; + gpiorange2: gpiorange@d401e304 { + /* GPIO60 ~ GPIO66 */ + pinctrl-single,gpio = <60 7 0x304>; + pinctrl-single,gpio-func = <0>; + }; + gpiorange3: gpiorange@d401e1b8 { + /* GPIO67 ~ GPIO109 */ + pinctrl-single,gpio = <67 43 0x1b8>; + pinctrl-single,gpio-func = <0>; + }; + gpiorange4: gpiorange@d401e298 { + /* GPIO110 ~ GPIO116 */ + pinctrl-single,gpio = <110 7 0x298>; + pinctrl-single,gpio-func = <0>; + }; + gpiorange5: gpiorange@d401e0b4 { + /* GPIO117 ~ GPIO120 */ + pinctrl-single,gpio = <117 4 0x0b4>; + pinctrl-single,gpio-func = <1>; + }; + gpiorange6: gpiorange@d401e32c { + /* GPIO121 */ + pinctrl-single,gpio = <121 1 0x32c>; + pinctrl-single,gpio-func = <0>; + }; + gpiorange7: gpiorange@d401e0c8 { + /* GPIO122 ~ GPIO123 */ + pinctrl-single,gpio = <122 2 0x0c8>; + pinctrl-single,gpio-func = <1>; + }; + gpiorange8: gpiorange@d401e0d0 { + /* GPIO124 */ + pinctrl-single,gpio = <124 1 0x0d0>; + pinctrl-single,gpio-func = <0>; + }; + gpiorange9: gpiorange@d401e0d4 { + /* GPIO125 */ + pinctrl-single,gpio = <125 1 0x0d4>; + pinctrl-single,gpio-func = <1>; + }; + gpiorange10: gpiorange@d401e06c { + /* GPIO126 ~ GPIO127 */ + pinctrl-single,gpio = <126 2 0x06c>; + pinctrl-single,gpio-func = <0>; + }; + }; + timer0: timer@d4014000 { compatible = "mrvl,mmp-timer"; reg = <0xd4014000 0x100>;

[v2,4/9] ARM: dts: support pinctrl single in pxa910

Commit Message

Patch