From aef35104a9e5b8555cdaeebd4563df9921f6d605 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 17 Aug 2012 10:42:52 +0800 Subject: ARM: dts: imx28: Add compatible and interrupt for LRADC Signed-off-by: Marek Vasut Cc: Jonathan Cameron Cc: Juergen Beisert Cc: Lars-Peter Clausen Cc: Wolfgang Denk Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx28.dtsi | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/boot/dts/imx28.dtsi') diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 3fa6d190fab4..e2240da7ba95 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -638,7 +638,10 @@ }; lradc@80050000 { + compatible = "fsl,imx28-lradc"; reg = <0x80050000 0x2000>; + interrupts = <10 14 15 16 17 18 19 + 20 21 22 23 24 25>; status = "disabled"; }; -- cgit v1.2.3 From 5c697ea2eec2bf4146e57f964e1163333659cbf8 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 23 Aug 2012 10:42:29 +0200 Subject: ARM: dts: mxs: Add alternative I2C muxing options for imx28 Signed-off-by: Maxime Ripard Cc: Brian Lilly Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx28.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'arch/arm/boot/dts/imx28.dtsi') diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index e2240da7ba95..fac0f69a16ec 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -410,6 +410,17 @@ fsl,pull-up = <1>; }; + i2c0_pins_b: i2c0@1 { + reg = <1>; + fsl,pinmux-ids = < + 0x3001 /* MX28_PAD_AUART0_RX__I2C0_SCL */ + 0x3011 /* MX28_PAD_AUART0_TX__I2C0_SDA */ + >; + fsl,drive-strength = <1>; + fsl,voltage = <1>; + fsl,pull-up = <1>; + }; + saif0_pins_a: saif0@0 { reg = <0>; fsl,pinmux-ids = < -- cgit v1.2.3 From 2f44211f938397be1a9a06945e8c6e07a7232333 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 23 Aug 2012 10:42:30 +0200 Subject: ARM: dts: mxs: Add pwm4 muxing options for imx28 Signed-off-by: Maxime Ripard Cc: Brian Lilly Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx28.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'arch/arm/boot/dts/imx28.dtsi') diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index fac0f69a16ec..ece801c727f9 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -464,6 +464,16 @@ fsl,pull-up = <0>; }; + pwm4_pins_a: pwm4@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x31d0 /* MX28_PAD_PWM4__PWM_4 */ + >; + fsl,drive-strength = <0>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + lcdif_24bit_pins_a: lcdif-24bit@0 { reg = <0>; fsl,pinmux-ids = < -- cgit v1.2.3 From 7f1222130c1ba4171eac1e4794c8c41631aad915 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 25 Aug 2012 01:51:37 +0200 Subject: ARM: mx28: Add SPI 2 pinmux into imx28.dtsi Add this SSP port 2 pin multiplexing configuration into the imx28.dtsi file. Signed-off-by: Marek Vasut Cc: Chris Ball Cc: Fabio Estevam Cc: Mark Brown Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx28.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'arch/arm/boot/dts/imx28.dtsi') diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index ece801c727f9..fa5253a1f16d 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -528,6 +528,19 @@ fsl,voltage = <1>; fsl,pull-up = <0>; }; + + spi2_pins_a: spi2@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x2100 /* MX28_PAD_SSP2_SCK__SSP2_SCK */ + 0x2110 /* MX28_PAD_SSP2_MOSI__SSP2_CMD */ + 0x2120 /* MX28_PAD_SSP2_MISO__SSP2_D0 */ + 0x2130 /* MX28_PAD_SSP2_SS0__SSP2_D3 */ + >; + fsl,drive-strength = <1>; + fsl,voltage = <1>; + fsl,pull-up = <1>; + }; }; digctl@8001c000 { -- cgit v1.2.3 From bb2f1261c2ededd168d774e84e456bdad25ffdbf Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 25 Aug 2012 01:51:38 +0200 Subject: ARM: mx28: Add USB PHY overcurrent pinmux Add the pinmux settings for USB PHY overcurrent pins. Signed-off-by: Marek Vasut Cc: Chris Ball Cc: Fabio Estevam Cc: Mark Brown Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx28.dtsi | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'arch/arm/boot/dts/imx28.dtsi') diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index fa5253a1f16d..5f9dbea7e6a5 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -541,6 +541,36 @@ fsl,voltage = <1>; fsl,pull-up = <1>; }; + + usbphy0_pins_a: usbphy0@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x2152 /* MX28_PAD_SSP2_SS2__USB0_OVERCURRENT */ + >; + fsl,drive-strength = <2>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + + usbphy0_pins_b: usbphy0@1 { + reg = <1>; + fsl,pinmux-ids = < + 0x3061 /* MX28_PAD_AUART1_CTS__USB0_OVERCURRENT */ + >; + fsl,drive-strength = <2>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; + + usbphy1_pins_a: usbphy1@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x2142 /* MX28_PAD_SSP2_SS1__USB1_OVERCURRENT */ + >; + fsl,drive-strength = <2>; + fsl,voltage = <1>; + fsl,pull-up = <0>; + }; }; digctl@8001c000 { -- cgit v1.2.3 From de7e934f2bd27e2636946600e4335c929fae3c87 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 31 Aug 2012 16:00:40 +0200 Subject: ARM: dts: mxs: Add I2C1 muxing options for imx28 Signed-off-by: Maxime Ripard Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx28.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'arch/arm/boot/dts/imx28.dtsi') diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 5f9dbea7e6a5..a9bda8e2ecca 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -421,6 +421,17 @@ fsl,pull-up = <1>; }; + i2c1_pins_a: i2c1@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x3101 /* MX28_PAD_PWM0__I2C1_SCL */ + 0x3111 /* MX28_PAD_PWM1__I2C1_SDA */ + >; + fsl,drive-strength = <1>; + fsl,voltage = <1>; + fsl,pull-up = <1>; + }; + saif0_pins_a: saif0@0 { reg = <0>; fsl,pinmux-ids = < -- cgit v1.2.3 From 41bf5706f46a19a35c5b38dd1202f8e69eb2ffbf Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 4 Sep 2012 10:44:02 +0200 Subject: ARM: dts: mxs: Add missing address and size cells in SSP nodes Signed-off-by: Maxime Ripard Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx28.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch/arm/boot/dts/imx28.dtsi') diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index a9bda8e2ecca..96fe74e4935c 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -86,6 +86,8 @@ }; ssp0: ssp@80010000 { + #address-cells = <1>; + #size-cells = <0>; reg = <0x80010000 0x2000>; interrupts = <96 82>; fsl,ssp-dma-channel = <0>; @@ -93,6 +95,8 @@ }; ssp1: ssp@80012000 { + #address-cells = <1>; + #size-cells = <0>; reg = <0x80012000 0x2000>; interrupts = <97 83>; fsl,ssp-dma-channel = <1>; @@ -100,6 +104,8 @@ }; ssp2: ssp@80014000 { + #address-cells = <1>; + #size-cells = <0>; reg = <0x80014000 0x2000>; interrupts = <98 84>; fsl,ssp-dma-channel = <2>; @@ -107,6 +113,8 @@ }; ssp3: ssp@80016000 { + #address-cells = <1>; + #size-cells = <0>; reg = <0x80016000 0x2000>; interrupts = <99 85>; fsl,ssp-dma-channel = <3>; -- cgit v1.2.3