OpenWrt – Diff between revs 2 and 3
?pathlinks?
| Rev 2 | Rev 3 | |||
|---|---|---|---|---|
| Line 1... | Line 1... | |||
| 1 | --- a/arch/arm/dts/Makefile |
1 | --- a/arch/arm/dts/Makefile |
|
| 2 | +++ b/arch/arm/dts/Makefile |
2 | +++ b/arch/arm/dts/Makefile |
|
| 3 | @@ -306,6 +306,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ |
3 | @@ -261,6 +261,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ |
|
| 4 | sun6i-a31-m9.dtb \ |
4 | sun6i-a31-m9.dtb \ |
|
| 5 | sun6i-a31-mele-a1000g-quad.dtb \ |
5 | sun6i-a31-mele-a1000g-quad.dtb \ |
|
| 6 | sun6i-a31-mixtile-loftq.dtb \ |
6 | sun6i-a31-mixtile-loftq.dtb \ |
|
| 7 | + sun6i-a31-pangolin.dtb \ |
7 | + sun6i-a31-pangolin.dtb \ |
|
| 8 | sun6i-a31s-colorfly-e708-q1.dtb \ |
8 | sun6i-a31s-colorfly-e708-q1.dtb \ |
|
| 9 | sun6i-a31s-cs908.dtb \ |
9 | sun6i-a31s-cs908.dtb \ |
|
| 10 | sun6i-a31s-inet-q972.dtb \ |
10 | sun6i-a31s-inet-q972.dtb \ |
|
| 11 | --- a/arch/arm/dts/sun6i-a31.dtsi |
11 | --- a/arch/arm/dts/sun6i-a31.dtsi |
|
| 12 | +++ b/arch/arm/dts/sun6i-a31.dtsi |
12 | +++ b/arch/arm/dts/sun6i-a31.dtsi |
|
| 13 | @@ -641,6 +641,11 @@ |
13 | @@ -679,6 +679,13 @@ |
|
| 14 | function = "lcd0"; |
14 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
|
| 15 | }; |
15 | }; |
|
| Line 16... | Line 16... | |||
| 16 | |
16 | |
|
| 17 | + i2c3_pins_a: i2c3@0 { |
17 | + i2c3_pins_a: i2c3@0 { |
|
| 18 | + allwinner,pins = "PB5", "PB6"; |
18 | + allwinner,pins = "PB5", "PB6"; |
|
| - | 19 | + allwinner,function = "i2c3"; |
||
| - | 20 | + allwinner,drive = <SUN4I_PINCTRL_10_MA>; |
||
| 19 | + allwinner,function = "i2c3"; |
21 | + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
|
| 20 | + }; |
22 | + }; |
|
| 21 | + |
23 | + |
|
| 22 | mmc0_pins_a: mmc0@0 { |
24 | mmc0_pins_a: mmc0@0 { |
|
| 23 | pins = "PF0", "PF1", "PF2", |
25 | allwinner,pins = "PF0", "PF1", "PF2", |
|
| 24 | "PF3", "PF4", "PF5"; |
26 | "PF3", "PF4", "PF5"; |
|
| 25 | --- /dev/null |
27 | --- /dev/null |
|
| 26 | +++ b/arch/arm/dts/sun6i-a31-pangolin.dts |
28 | +++ b/arch/arm/dts/sun6i-a31-pangolin.dts |
|
| 27 | @@ -0,0 +1,292 @@ |
29 | @@ -0,0 +1,292 @@ |
|
| Line 356... | Line 358... | |||
| 356 | +CONFIG_DM_SPI=y |
358 | +CONFIG_DM_SPI=y |
|
| 357 | +CONFIG_DM_SPI_FLASH=y |
359 | +CONFIG_DM_SPI_FLASH=y |
|
| 358 | +CONFIG_SUNXI_SPI=y |
360 | +CONFIG_SUNXI_SPI=y |
|
| 359 | --- a/arch/arm/mach-sunxi/Kconfig |
361 | --- a/arch/arm/mach-sunxi/Kconfig |
|
| 360 | +++ b/arch/arm/mach-sunxi/Kconfig |
362 | +++ b/arch/arm/mach-sunxi/Kconfig |
|
| 361 | @@ -872,6 +872,14 @@ config VIDEO_LCD_PANEL_I2C_SCL |
363 | @@ -752,6 +752,14 @@ config VIDEO_LCD_PANEL_I2C_SCL |
|
| 362 | Set the SCL pin for the LCD i2c interface. This takes a string in the |
364 | Set the SCL pin for the LCD i2c interface. This takes a string in the |
|
| 363 | format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H. |
365 | format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H. |
|
| Line 364... | Line 366... | |||
| 364 | |
366 | |
|
| 365 | +choice |
367 | +choice |
|