0d9f760f27
Includes memory allocation fixes as well as several networking fixes. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37103
77 lines
1.7 KiB
Diff
77 lines
1.7 KiB
Diff
--- a/arch/arm/boot/dts/imx23.dtsi
|
|
+++ b/arch/arm/boot/dts/imx23.dtsi
|
|
@@ -292,8 +292,42 @@
|
|
fsl,voltage = <1>;
|
|
fsl,pull-up = <1>;
|
|
};
|
|
- };
|
|
|
|
+ i2c0_pins_a: i2c0@0 {
|
|
+ reg = <0>;
|
|
+ fsl,pinmux-ids = <
|
|
+ 0x01e0 /* MX23_PAD_I2C_SCL__I2C_SCL */
|
|
+ 0x01f0 /* MX23_PAD_I2C_SDA__I2C_SDA */
|
|
+ >;
|
|
+ fsl,drive-strength = <1>;
|
|
+ fsl,voltage = <1>;
|
|
+ fsl,pull-up = <1>;
|
|
+ };
|
|
+
|
|
+ i2c1_pins_a: i2c1@0 {
|
|
+ reg = <0>;
|
|
+ fsl,pinmux-ids = <
|
|
+ 0x1171 /* MX23_PAD_LCD_ENABLE__I2C_SCL */
|
|
+ 0x1181 /* MX23_PAD_LCD_HSYNC__I2C_SDA */
|
|
+ >;
|
|
+ fsl,drive-strength = <1>;
|
|
+ fsl,voltage = <1>;
|
|
+ fsl,pull-up = <1>;
|
|
+ };
|
|
+
|
|
+ i2c2_pins_a: i2c2@0 {
|
|
+ reg = <0>;
|
|
+ fsl,pinmux-ids = <
|
|
+ 0x2031 /* MX23_PAD_SSP1_DATA1__I2C_SCL */
|
|
+ 0x2041 /* MX23_PAD_SSP1_DATA2__I2C_SDA */
|
|
+ >;
|
|
+ fsl,drive-strength = <1>;
|
|
+ fsl,voltage = <1>;
|
|
+ fsl,pull-up = <1>;
|
|
+ };
|
|
+
|
|
+ };
|
|
+
|
|
digctl@8001c000 {
|
|
reg = <0x8001c000 2000>;
|
|
status = "disabled";
|
|
@@ -402,8 +436,14 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- i2c@80058000 {
|
|
+ i2c0: i2c@80058000 {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ compatible = "fsl,imx28-i2c";
|
|
reg = <0x80058000 0x2000>;
|
|
+ interrupts = <27 26>;
|
|
+ clock-frequency = <100000>;
|
|
+ fsl,i2c-dma-channel = <3>;
|
|
status = "disabled";
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
|
|
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
|
|
@@ -68,6 +68,12 @@
|
|
};
|
|
|
|
apbx@80040000 {
|
|
+ i2c0: i2c@80058000 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&i2c1_pins_a>;
|
|
+ status = "okay";
|
|
+ };
|
|
+
|
|
duart: serial@80070000 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&duart_pins_a>;
|