Commit c6e3324e authored by Olof Johansson's avatar Olof Johansson

Merge tag 'sunxi-fixes-for-3.19' of...

Merge tag 'sunxi-fixes-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

Merge "Allwinner fixes for 3.19" from Maxime Ripard:

Allwinner fixes for 3.19

A few minor fixes for the 3.19 kernel:
  - The 8250 uart driver now respects the aliases, which pointed out that we
    were using them wrong. Fixed them.
  - The simplefb pipeline that was used on the A10 caused flickering and
    tearing, and rendered it pretty much useless. Added a new simplefb node
    with another pipeline that removes this issue. Note that we need to keep
    the old node because u-boot 2015.01 uses it.
  - Added a fix for the USB phy node on sun4i/sun5i

* tag 'sunxi-fixes-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: dt: Fix aliases
  ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline
  ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias
  ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4b3415c9 117a2cc3
...@@ -17,14 +17,6 @@ / { ...@@ -17,14 +17,6 @@ / {
aliases { aliases {
ethernet0 = &emac; ethernet0 = &emac;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
serial4 = &uart4;
serial5 = &uart5;
serial6 = &uart6;
serial7 = &uart7;
}; };
chosen { chosen {
...@@ -39,6 +31,14 @@ framebuffer@0 { ...@@ -39,6 +31,14 @@ framebuffer@0 {
<&ahb_gates 44>; <&ahb_gates 44>;
status = "disabled"; status = "disabled";
}; };
framebuffer@1 {
compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";
clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
<&ahb_gates 44>, <&ahb_gates 46>;
status = "disabled";
};
}; };
cpus { cpus {
...@@ -438,8 +438,8 @@ usbphy: phy@01c13400 { ...@@ -438,8 +438,8 @@ usbphy: phy@01c13400 {
reg-names = "phy_ctrl", "pmu1", "pmu2"; reg-names = "phy_ctrl", "pmu1", "pmu2";
clocks = <&usb_clk 8>; clocks = <&usb_clk 8>;
clock-names = "usb_phy"; clock-names = "usb_phy";
resets = <&usb_clk 1>, <&usb_clk 2>; resets = <&usb_clk 0>, <&usb_clk 1>, <&usb_clk 2>;
reset-names = "usb1_reset", "usb2_reset"; reset-names = "usb0_reset", "usb1_reset", "usb2_reset";
status = "disabled"; status = "disabled";
}; };
......
...@@ -55,6 +55,12 @@ / { ...@@ -55,6 +55,12 @@ / {
model = "Olimex A10s-Olinuxino Micro"; model = "Olimex A10s-Olinuxino Micro";
compatible = "olimex,a10s-olinuxino-micro", "allwinner,sun5i-a10s"; compatible = "olimex,a10s-olinuxino-micro", "allwinner,sun5i-a10s";
aliases {
serial0 = &uart0;
serial1 = &uart2;
serial2 = &uart3;
};
soc@01c00000 { soc@01c00000 {
emac: ethernet@01c0b000 { emac: ethernet@01c0b000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -18,10 +18,6 @@ / { ...@@ -18,10 +18,6 @@ / {
aliases { aliases {
ethernet0 = &emac; ethernet0 = &emac;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
}; };
chosen { chosen {
...@@ -390,8 +386,8 @@ usbphy: phy@01c13400 { ...@@ -390,8 +386,8 @@ usbphy: phy@01c13400 {
reg-names = "phy_ctrl", "pmu1"; reg-names = "phy_ctrl", "pmu1";
clocks = <&usb_clk 8>; clocks = <&usb_clk 8>;
clock-names = "usb_phy"; clock-names = "usb_phy";
resets = <&usb_clk 1>; resets = <&usb_clk 0>, <&usb_clk 1>;
reset-names = "usb1_reset"; reset-names = "usb0_reset", "usb1_reset";
status = "disabled"; status = "disabled";
}; };
......
...@@ -53,6 +53,10 @@ / { ...@@ -53,6 +53,10 @@ / {
model = "HSG H702"; model = "HSG H702";
compatible = "hsg,h702", "allwinner,sun5i-a13"; compatible = "hsg,h702", "allwinner,sun5i-a13";
aliases {
serial0 = &uart1;
};
soc@01c00000 { soc@01c00000 {
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -54,6 +54,10 @@ / { ...@@ -54,6 +54,10 @@ / {
model = "Olimex A13-Olinuxino Micro"; model = "Olimex A13-Olinuxino Micro";
compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13"; compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13";
aliases {
serial0 = &uart1;
};
soc@01c00000 { soc@01c00000 {
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -55,6 +55,10 @@ / { ...@@ -55,6 +55,10 @@ / {
model = "Olimex A13-Olinuxino"; model = "Olimex A13-Olinuxino";
compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13"; compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13";
aliases {
serial0 = &uart1;
};
soc@01c00000 { soc@01c00000 {
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -16,11 +16,6 @@ ...@@ -16,11 +16,6 @@
/ { / {
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
aliases {
serial0 = &uart1;
serial1 = &uart3;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -349,8 +344,8 @@ usbphy: phy@01c13400 { ...@@ -349,8 +344,8 @@ usbphy: phy@01c13400 {
reg-names = "phy_ctrl", "pmu1"; reg-names = "phy_ctrl", "pmu1";
clocks = <&usb_clk 8>; clocks = <&usb_clk 8>;
clock-names = "usb_phy"; clock-names = "usb_phy";
resets = <&usb_clk 1>; resets = <&usb_clk 0>, <&usb_clk 1>;
reset-names = "usb1_reset"; reset-names = "usb0_reset", "usb1_reset";
status = "disabled"; status = "disabled";
}; };
......
...@@ -53,12 +53,6 @@ / { ...@@ -53,12 +53,6 @@ / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases { aliases {
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
serial4 = &uart4;
serial5 = &uart5;
ethernet0 = &gmac; ethernet0 = &gmac;
}; };
......
...@@ -55,6 +55,12 @@ / { ...@@ -55,6 +55,12 @@ / {
model = "LeMaker Banana Pi"; model = "LeMaker Banana Pi";
compatible = "lemaker,bananapi", "allwinner,sun7i-a20"; compatible = "lemaker,bananapi", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
serial1 = &uart3;
serial2 = &uart7;
};
soc@01c00000 { soc@01c00000 {
spi0: spi@01c05000 { spi0: spi@01c05000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -19,6 +19,14 @@ / { ...@@ -19,6 +19,14 @@ / {
model = "Merrii A20 Hummingbird"; model = "Merrii A20 Hummingbird";
compatible = "merrii,a20-hummingbird", "allwinner,sun7i-a20"; compatible = "merrii,a20-hummingbird", "allwinner,sun7i-a20";
aliases {
serial0 = &uart0;
serial1 = &uart2;
serial2 = &uart3;
serial3 = &uart4;
serial4 = &uart5;
};
soc@01c00000 { soc@01c00000 {
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -20,6 +20,9 @@ / { ...@@ -20,6 +20,9 @@ / {
compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20"; compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20";
aliases { aliases {
serial0 = &uart0;
serial1 = &uart6;
serial2 = &uart7;
spi0 = &spi1; spi0 = &spi1;
spi1 = &spi2; spi1 = &spi2;
}; };
......
...@@ -54,14 +54,6 @@ / { ...@@ -54,14 +54,6 @@ / {
aliases { aliases {
ethernet0 = &gmac; ethernet0 = &gmac;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
serial4 = &uart4;
serial5 = &uart5;
serial6 = &uart6;
serial7 = &uart7;
}; };
chosen { chosen {
......
...@@ -55,6 +55,10 @@ / { ...@@ -55,6 +55,10 @@ / {
model = "Ippo Q8H Dual Core Tablet (v5)"; model = "Ippo Q8H Dual Core Tablet (v5)";
compatible = "ippo,q8h-v5", "allwinner,sun8i-a23"; compatible = "ippo,q8h-v5", "allwinner,sun8i-a23";
aliases {
serial0 = &r_uart;
};
chosen { chosen {
bootargs = "earlyprintk console=ttyS0,115200"; bootargs = "earlyprintk console=ttyS0,115200";
}; };
......
...@@ -52,15 +52,6 @@ ...@@ -52,15 +52,6 @@
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases {
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
serial4 = &uart4;
serial5 = &r_uart;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
...@@ -54,6 +54,11 @@ / { ...@@ -54,6 +54,11 @@ / {
model = "Merrii A80 Optimus Board"; model = "Merrii A80 Optimus Board";
compatible = "merrii,a80-optimus", "allwinner,sun9i-a80"; compatible = "merrii,a80-optimus", "allwinner,sun9i-a80";
aliases {
serial0 = &uart0;
serial1 = &uart4;
};
chosen { chosen {
bootargs = "earlyprintk console=ttyS0,115200"; bootargs = "earlyprintk console=ttyS0,115200";
}; };
......
...@@ -52,16 +52,6 @@ ...@@ -52,16 +52,6 @@
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases {
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
serial3 = &uart3;
serial4 = &uart4;
serial5 = &uart5;
serial6 = &r_uart;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment