Skip to content

L
linux
Commit ec4c22e7 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'sunxi-dt-for-4.12' of... 

Merge tag 'sunxi-dt-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner DT changes for 4.12

As usual a number of changes, among which:
  - All the sun5i DTSI has been reworked based on the new documentation and
    the IPs that are actually found in all those SoCs. Part of that rework
    also brought the GR8 DTSI to include sun5i.dtsi
  - Mali devfreq and thermal throttling support on the A33
  - AC power supplies for the AXP209 and AXP22X PMIC
  - CAN support for the A20
  - CPUFreq-based thermal throttling for the A33
  - New board: NanoPi NEO Air

* tag 'sunxi-dt-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (38 commits)
  ARM: sun8i: sina33: add highest OPP of CPUs
  ARM: sun8i: a33: Add devfreq-based GPU cooling
  ARM: sun8i: a33: add CPU thermal throttling
  ARM: sun8i: a33: add thermal sensor
  ARM: dts: sun7i: fix device node ordering
  ARM: dts: sun4i: fix device node ordering
  ARM: dts: sun7i: Add can0_pins_a pinctrl settings
  ARM: dts: sun7i: Add CAN node
  ARM: dts: sun4i: Add can0_pins_a pinctrl settings
  ARM: dts: sun4i: Add CAN node
  ARM: sun7i: cubietruck: enable ACIN und USB power supply subnode
  ARM: dts: sun5i: Add interrupt for display backend
  dt-bindings: display: sun4i: Add display backend interrupt to device tree binding
  ARM: dts: sun7i: Use axp209.dtsi on A20-OLinuXino-Micro
  ARM: dts: sun6i: sina31s: Enable SPDIF out
  ARM: sun8i: sina33: add cpu-supply
  ARM: sun8i: a33: add all operating points
  ARM: sun5i: chip: enable ACIN power supply subnode
  ARM: dts: sun8i: sina33: enable ACIN power supply subnode
  ARM: dtsi: axp22x: add AC power supply subnode
  ...
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1409ce03 367d2b0c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 806 additions and 968 deletions
Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
View file @ ec4c22e7
...@@ -94,6 +94,7 @@ Required properties: ...@@ -94,6 +94,7 @@ Required properties:
* allwinner,sun6i-a31-display-backend * allwinner,sun6i-a31-display-backend
* allwinner,sun8i-a33-display-backend * allwinner,sun8i-a33-display-backend
- reg: base address and size of the memory-mapped region. - reg: base address and size of the memory-mapped region.
- interrupts: interrupt associated to this IP
- clocks: phandles to the clocks feeding the frontend and backend - clocks: phandles to the clocks feeding the frontend and backend
* ahb: the backend interface clock * ahb: the backend interface clock
* mod: the backend module clock * mod: the backend module clock
...@@ -265,6 +266,7 @@ fe0: display-frontend@1e00000 { ...@@ -265,6 +266,7 @@ fe0: display-frontend@1e00000 {
be0: display-backend@1e60000 { be0: display-backend@1e60000 {
compatible = "allwinner,sun5i-a13-display-backend"; compatible = "allwinner,sun5i-a13-display-backend";
reg = <0x01e60000 0x10000>; reg = <0x01e60000 0x10000>;
interrupts = <47>;
clocks = <&ahb_gates 44>, <&de_be_clk>, clocks = <&ahb_gates 44>, <&de_be_clk>,
<&dram_gates 26>; <&dram_gates 26>;
clock-names = "ahb", "mod", clock-names = "ahb", "mod",
......
Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
View file @ ec4c22e7
...@@ -35,6 +35,14 @@ Optional properties: ...@@ -35,6 +35,14 @@ Optional properties:
- interrupt-names and interrupts: - interrupt-names and interrupts:
* pmu: Power Management Unit interrupt, if implemented in hardware * pmu: Power Management Unit interrupt, if implemented in hardware
- memory-region:
Memory region to allocate from, as defined in
Documentation/devicetree/bindi/reserved-memory/reserved-memory.txt
- operating-points-v2:
Operating Points for the GPU, as defined in
Documentation/devicetree/bindings/opp/opp.txt
Vendor-specific bindings Vendor-specific bindings
------------------------ ------------------------
......
arch/arm/boot/dts/Makefile
View file @ ec4c22e7
...@@ -881,6 +881,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ ...@@ -881,6 +881,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
sun8i-h3-beelink-x2.dtb \ sun8i-h3-beelink-x2.dtb \
sun8i-h3-nanopi-m1.dtb \ sun8i-h3-nanopi-m1.dtb \
sun8i-h3-nanopi-neo.dtb \ sun8i-h3-nanopi-neo.dtb \
sun8i-h3-nanopi-neo-air.dtb \
sun8i-h3-orangepi-2.dtb \ sun8i-h3-orangepi-2.dtb \
sun8i-h3-orangepi-lite.dtb \ sun8i-h3-orangepi-lite.dtb \
sun8i-h3-orangepi-one.dtb \ sun8i-h3-orangepi-one.dtb \
......
arch/arm/boot/dts/axp209.dtsi
View file @ ec4c22e7
...@@ -53,6 +53,11 @@ &axp209 { ...@@ -53,6 +53,11 @@ &axp209 {
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <1>;
ac_power_supply: ac-power-supply {
compatible = "x-powers,axp202-ac-power-supply";
status = "disabled";
};
axp_gpio: gpio { axp_gpio: gpio {
compatible = "x-powers,axp209-gpio"; compatible = "x-powers,axp209-gpio";
gpio-controller; gpio-controller;
......
arch/arm/boot/dts/axp22x.dtsi
View file @ ec4c22e7
...@@ -52,6 +52,11 @@ &axp22x { ...@@ -52,6 +52,11 @@ &axp22x {
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <1>;
ac_power_supply: ac-power-supply {
compatible = "x-powers,axp221-ac-power-supply";
status = "disabled";
};
regulators { regulators {
/* Default work frequency for buck regulators */ /* Default work frequency for buck regulators */
x-powers,dcdc-freq = <3000>; x-powers,dcdc-freq = <3000>;
......
arch/arm/boot/dts/sun4i-a10-a1000.dts
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Mele A1000"; model = "Mele A1000";
......
arch/arm/boot/dts/sun4i-a10-cubieboard.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Cubietech Cubieboard"; model = "Cubietech Cubieboard";
......
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/pwm/pwm.h>
/ { / {
......
arch/arm/boot/dts/sun4i-a10-hackberry.dts
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Miniand Hackberry"; model = "Miniand Hackberry";
......
arch/arm/boot/dts/sun4i-a10-inet1.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/pwm/pwm.h>
/ { / {
......
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "iNet-9F Rev 03"; model = "iNet-9F Rev 03";
......
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Jesurun Q5"; model = "Jesurun Q5";
......
arch/arm/boot/dts/sun4i-a10-marsboard.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "HAOYU Electronics Marsboard A10"; model = "HAOYU Electronics Marsboard A10";
......
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "PineRiver Mini X-Plus"; model = "PineRiver Mini X-Plus";
......
arch/arm/boot/dts/sun4i-a10-mk802.dts
View file @ ec4c22e7
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include "sun4i-a10.dtsi" #include "sun4i-a10.dtsi"
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "MK802"; model = "MK802";
......
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
View file @ ec4c22e7
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Olimex A10-OLinuXino-LIME"; model = "Olimex A10-OLinuXino-LIME";
......
arch/arm/boot/dts/sun4i-a10-pcduino.dts
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "LinkSprite pcDuino"; model = "LinkSprite pcDuino";
......
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/pwm/pwm.h>
/ { / {
......
arch/arm/boot/dts/sun4i-a10.dtsi
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <dt-bindings/clock/sun4i-a10-pll2.h> #include <dt-bindings/clock/sun4i-a10-pll2.h>
#include <dt-bindings/dma/sun4i-a10.h> #include <dt-bindings/dma/sun4i-a10.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
...@@ -974,6 +973,11 @@ pio: pinctrl@01c20800 { ...@@ -974,6 +973,11 @@ pio: pinctrl@01c20800 {
#interrupt-cells = <3>; #interrupt-cells = <3>;
#gpio-cells = <3>; #gpio-cells = <3>;
can0_pins_a: can0@0 {
pins = "PH20", "PH21";
function = "can";
};
emac_pins_a: emac0@0 { emac_pins_a: emac0@0 {
pins = "PA0", "PA1", "PA2", pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6", "PA3", "PA4", "PA5", "PA6",
...@@ -1283,6 +1287,22 @@ uart7: serial@01c29c00 { ...@@ -1283,6 +1287,22 @@ uart7: serial@01c29c00 {
status = "disabled"; status = "disabled";
}; };
ps20: ps2@01c2a000 {
compatible = "allwinner,sun4i-a10-ps2";
reg = <0x01c2a000 0x400>;
interrupts = <62>;
clocks = <&apb1_gates 6>;
status = "disabled";
};
ps21: ps2@01c2a400 {
compatible = "allwinner,sun4i-a10-ps2";
reg = <0x01c2a400 0x400>;
interrupts = <63>;
clocks = <&apb1_gates 7>;
status = "disabled";
};
i2c0: i2c@01c2ac00 { i2c0: i2c@01c2ac00 {
compatible = "allwinner,sun4i-a10-i2c"; compatible = "allwinner,sun4i-a10-i2c";
reg = <0x01c2ac00 0x400>; reg = <0x01c2ac00 0x400>;
...@@ -1313,19 +1333,11 @@ i2c2: i2c@01c2b400 { ...@@ -1313,19 +1333,11 @@ i2c2: i2c@01c2b400 {
#size-cells = <0>; #size-cells = <0>;
}; };
ps20: ps2@01c2a000 { can0: can@01c2bc00 {
compatible = "allwinner,sun4i-a10-ps2"; compatible = "allwinner,sun4i-a10-can";
reg = <0x01c2a000 0x400>; reg = <0x01c2bc00 0x400>;
interrupts = <62>; interrupts = <26>;
clocks = <&apb1_gates 6>; clocks = <&apb1_gates 4>;
status = "disabled";
};
ps21: ps2@01c2a400 {
compatible = "allwinner,sun4i-a10-ps2";
reg = <0x01c2a400 0x400>;
interrupts = <63>;
clocks = <&apb1_gates 7>;
status = "disabled"; status = "disabled";
}; };
}; };
......
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
View file @ ec4c22e7
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include "sun5i-a10s.dtsi" #include "sun5i-a10s.dtsi"
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Auxtek t003 A10s hdmi tv-stick"; model = "Auxtek t003 A10s hdmi tv-stick";
......
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
View file @ ec4c22e7
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include "sun5i-a10s.dtsi" #include "sun5i-a10s.dtsi"
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Auxtek t004 A10s hdmi tv-stick"; model = "Auxtek t004 A10s hdmi tv-stick";
......
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Olimex A10s-Olinuxino Micro"; model = "Olimex A10s-Olinuxino Micro";
...@@ -83,7 +82,7 @@ &ehci0 { ...@@ -83,7 +82,7 @@ &ehci0 {
&emac { &emac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>; pinctrl-0 = <&emac_pins_b>;
phy = <&phy1>; phy = <&phy1>;
status = "okay"; status = "okay";
}; };
...@@ -257,7 +256,7 @@ &uart0 { ...@@ -257,7 +256,7 @@ &uart0 {
&uart2 { &uart2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart2_pins_a>; pinctrl-0 = <&uart2_pins_b>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
View file @ ec4c22e7
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "R7 A10s hdmi tv-stick"; model = "R7 A10s hdmi tv-stick";
......
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "A10s-Wobo i5"; model = "A10s-Wobo i5";
...@@ -95,7 +94,7 @@ &ehci0 { ...@@ -95,7 +94,7 @@ &ehci0 {
&emac { &emac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emac_pins_b>; pinctrl-0 = <&emac_pins_a>;
phy = <&phy1>; phy = <&phy1>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-a10s.dtsi
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "sun5i.dtsi" #include "sun5i.dtsi"
#include <dt-bindings/dma/sun4i-a10.h> #include <dt-bindings/dma/sun4i-a10.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
...@@ -61,7 +60,7 @@ chosen { ...@@ -61,7 +60,7 @@ chosen {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
framebuffer@0 { framebuffer@2 {
compatible = "allwinner,simple-framebuffer", compatible = "allwinner,simple-framebuffer",
"simple-framebuffer"; "simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-hdmi"; allwinner,pipeline = "de_be0-lcd0-hdmi";
...@@ -70,45 +69,9 @@ framebuffer@0 { ...@@ -70,45 +69,9 @@ framebuffer@0 {
<&ccu CLK_DE_BE>, <&ccu CLK_HDMI>; <&ccu CLK_DE_BE>, <&ccu CLK_HDMI>;
status = "disabled"; status = "disabled";
}; };
framebuffer@1 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0";
clocks = <&ccu CLK_AHB_LCD>, <&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>,
<&ccu CLK_TCON_CH0>, <&ccu CLK_DRAM_DE_BE>;
status = "disabled";
};
framebuffer@2 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-tve0";
clocks = <&ccu CLK_AHB_TVE>, <&ccu CLK_AHB_LCD>,
<&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>,
<&ccu CLK_TCON_CH1>, <&ccu CLK_DRAM_DE_BE>;
status = "disabled";
};
}; };
soc@01c00000 { soc@01c00000 {
emac: ethernet@01c0b000 {
compatible = "allwinner,sun4i-a10-emac";
reg = <0x01c0b000 0x1000>;
interrupts = <55>;
clocks = <&ccu CLK_AHB_EMAC>;
allwinner,sram = <&emac_sram 1>;
status = "disabled";
};
mdio: mdio@01c0b080 {
compatible = "allwinner,sun4i-a10-mdio";
reg = <0x01c0b080 0x14>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};
pwm: pwm@01c20e00 { pwm: pwm@01c20e00 {
compatible = "allwinner,sun5i-a10s-pwm"; compatible = "allwinner,sun5i-a10s-pwm";
reg = <0x01c20e00 0xc>; reg = <0x01c20e00 0xc>;
...@@ -116,26 +79,6 @@ pwm: pwm@01c20e00 { ...@@ -116,26 +79,6 @@ pwm: pwm@01c20e00 {
#pwm-cells = <3>; #pwm-cells = <3>;
status = "disabled"; status = "disabled";
}; };
uart0: serial@01c28000 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>;
interrupts = <1>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&ccu CLK_APB1_UART0>;
status = "disabled";
};
uart2: serial@01c28800 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28800 0x400>;
interrupts = <3>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&ccu CLK_APB1_UART2>;
status = "disabled";
};
}; };
}; };
...@@ -151,12 +94,12 @@ uart0_pins_a: uart0@0 { ...@@ -151,12 +94,12 @@ uart0_pins_a: uart0@0 {
function = "uart0"; function = "uart0";
}; };
uart2_pins_a: uart2@0 { uart2_pins_b: uart2@1 {
pins = "PC18", "PC19"; pins = "PC18", "PC19";
function = "uart2"; function = "uart2";
}; };
emac_pins_a: emac0@0 { emac_pins_b: emac0@1 {
pins = "PA0", "PA1", "PA2", pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6", "PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10", "PA7", "PA8", "PA9", "PA10",
...@@ -165,15 +108,6 @@ emac_pins_a: emac0@0 { ...@@ -165,15 +108,6 @@ emac_pins_a: emac0@0 {
function = "emac"; function = "emac";
}; };
emac_pins_b: emac0@1 {
pins = "PD6", "PD7", "PD10",
"PD11", "PD12", "PD13", "PD14",
"PD15", "PD18", "PD19", "PD20",
"PD21", "PD22", "PD23", "PD24",
"PD25", "PD26", "PD27";
function = "emac";
};
mmc1_pins_a: mmc1@0 { mmc1_pins_a: mmc1@0 {
pins = "PG3", "PG4", "PG5", pins = "PG3", "PG4", "PG5",
"PG6", "PG7", "PG8"; "PG6", "PG7", "PG8";
...@@ -193,9 +127,4 @@ spi2_cs0_pins_b: spi2_cs0@1 { ...@@ -193,9 +127,4 @@ spi2_cs0_pins_b: spi2_cs0@1 {
}; };
&sram_a { &sram_a {
emac_sram: sram-section@8000 {
compatible = "allwinner,sun4i-a10-sram-a3-a4";
reg = <0x8000 0x4000>;
status = "disabled";
};
}; };
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/pwm/pwm.h>
/ { / {
......
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "HSG H702"; model = "HSG H702";
......
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
View file @ ec4c22e7
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Lichee Pi One"; model = "Lichee Pi One";
......
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Olimex A13-Olinuxino Micro"; model = "Olimex A13-Olinuxino Micro";
......
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Olimex A13-Olinuxino"; model = "Olimex A13-Olinuxino";
......
arch/arm/boot/dts/sun5i-a13.dtsi
View file @ ec4c22e7
...@@ -46,27 +46,11 @@ ...@@ -46,27 +46,11 @@
#include "sun5i.dtsi" #include "sun5i.dtsi"
#include <dt-bindings/pinctrl/sun4i-a10.h>
#include <dt-bindings/thermal/thermal.h> #include <dt-bindings/thermal/thermal.h>
/ { / {
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
chosen {
#address-cells = <1>;
#size-cells = <1>;
ranges;
framebuffer@0 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0";
clocks = <&ccu CLK_AHB_LCD>, <&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>,
<&ccu CLK_TCON_CH0>, <&ccu CLK_DRAM_DE_BE>;
status = "disabled";
};
};
thermal-zones { thermal-zones {
cpu_thermal { cpu_thermal {
/* milliseconds */ /* milliseconds */
...@@ -105,44 +89,6 @@ display-engine { ...@@ -105,44 +89,6 @@ display-engine {
}; };
soc@01c00000 { soc@01c00000 {
tcon0: lcd-controller@01c0c000 {
compatible = "allwinner,sun5i-a13-tcon";
reg = <0x01c0c000 0x1000>;
interrupts = <44>;
resets = <&ccu RST_LCD>;
reset-names = "lcd";
clocks = <&ccu CLK_AHB_LCD>,
<&ccu CLK_TCON_CH0>,
<&ccu CLK_TCON_CH1>;
clock-names = "ahb",
"tcon-ch0",
"tcon-ch1";
clock-output-names = "tcon-pixel-clock";
status = "disabled";
ports {
#address-cells = <1>;
#size-cells = <0>;
tcon0_in: port@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
tcon0_in_be0: endpoint@0 {
reg = <0>;
remote-endpoint = <&be0_out_tcon0>;
};
};
tcon0_out: port@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
};
};
};
pwm: pwm@01c20e00 { pwm: pwm@01c20e00 {
compatible = "allwinner,sun5i-a13-pwm"; compatible = "allwinner,sun5i-a13-pwm";
reg = <0x01c20e00 0xc>; reg = <0x01c20e00 0xc>;
...@@ -151,74 +97,6 @@ pwm: pwm@01c20e00 { ...@@ -151,74 +97,6 @@ pwm: pwm@01c20e00 {
status = "disabled"; status = "disabled";
}; };
fe0: display-frontend@01e00000 {
compatible = "allwinner,sun5i-a13-display-frontend";
reg = <0x01e00000 0x20000>;
interrupts = <47>;
clocks = <&ccu CLK_DE_FE>, <&ccu CLK_DE_FE>,
<&ccu CLK_DRAM_DE_FE>;
clock-names = "ahb", "mod",
"ram";
resets = <&ccu RST_DE_FE>;
status = "disabled";
ports {
#address-cells = <1>;
#size-cells = <0>;
fe0_out: port@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
fe0_out_be0: endpoint@0 {
reg = <0>;
remote-endpoint = <&be0_in_fe0>;
};
};
};
};
be0: display-backend@01e60000 {
compatible = "allwinner,sun5i-a13-display-backend";
reg = <0x01e60000 0x10000>;
clocks = <&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>,
<&ccu CLK_DRAM_DE_BE>;
clock-names = "ahb", "mod",
"ram";
resets = <&ccu RST_DE_BE>;
status = "disabled";
assigned-clocks = <&ccu CLK_DE_BE>;
assigned-clock-rates = <300000000>;
ports {
#address-cells = <1>;
#size-cells = <0>;
be0_in: port@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
be0_in_fe0: endpoint@0 {
reg = <0>;
remote-endpoint = <&fe0_out_be0>;
};
};
be0_out: port@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
be0_out_tcon0: endpoint@0 {
reg = <0>;
remote-endpoint = <&tcon0_in_be0>;
};
};
};
};
}; };
}; };
...@@ -244,22 +122,4 @@ &cpu0 { ...@@ -244,22 +122,4 @@ &cpu0 {
&pio { &pio {
compatible = "allwinner,sun5i-a13-pinctrl"; compatible = "allwinner,sun5i-a13-pinctrl";
lcd_rgb666_pins: lcd_rgb666@0 {
pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
"PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
"PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
"PD24", "PD25", "PD26", "PD27";
function = "lcd0";
};
uart1_pins_a: uart1@0 {
pins = "PE10", "PE11";
function = "uart1";
};
uart1_pins_b: uart1@1 {
pins = "PG3", "PG4";
function = "uart1";
};
}; };
arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
View file @ ec4c22e7
...@@ -171,7 +171,7 @@ wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 { ...@@ -171,7 +171,7 @@ wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 {
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>, <&pwm1_pins>; pinctrl-0 = <&pwm0_pins>, <&pwm1_pins>;
status = "disabled"; status = "disabled";
}; };
...@@ -220,7 +220,7 @@ &reg_ldo4 { ...@@ -220,7 +220,7 @@ &reg_ldo4 {
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_a>, <&uart1_cts_rts_pins_a>; pinctrl-0 = <&uart1_pins_b>, <&uart1_cts_rts_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-gr8-evb.dts
View file @ ec4c22e7
...@@ -281,7 +281,7 @@ usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 { ...@@ -281,7 +281,7 @@ usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 {
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>; pinctrl-0 = <&pwm0_pins>;
status = "okay"; status = "okay";
}; };
...@@ -332,7 +332,7 @@ &tve0 { ...@@ -332,7 +332,7 @@ &tve0 {
&uart1 { &uart1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_a>, <&uart1_cts_rts_pins_a>; pinctrl-0 = <&uart1_pins_b>, <&uart1_cts_rts_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-gr8.dtsi
View file @ ec4c22e7
This diff is collapsed.
arch/arm/boot/dts/sun5i-r8-chip.dts
View file @ ec4c22e7
...@@ -128,6 +128,10 @@ axp209: pmic@34 { ...@@ -128,6 +128,10 @@ axp209: pmic@34 {
#include "axp209.dtsi" #include "axp209.dtsi"
&ac_power_supply {
status = "okay";
};
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins_a>;
...@@ -281,7 +285,7 @@ &uart1 { ...@@ -281,7 +285,7 @@ &uart1 {
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_a>, pinctrl-0 = <&uart3_pins_a>,
<&uart3_pins_cts_rts_a>; <&uart3_cts_rts_pins_a>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun5i-r8.dtsi
View file @ ec4c22e7
...@@ -45,43 +45,3 @@ ...@@ -45,43 +45,3 @@
#include "sun5i-a13.dtsi" #include "sun5i-a13.dtsi"
/ {
chosen {
framebuffer@1 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-tve0";
clocks = <&ccu CLK_AHB_TVE>, <&ccu CLK_AHB_LCD>,
<&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>,
<&ccu CLK_TCON_CH1>, <&ccu CLK_DRAM_DE_BE>;
status = "disabled";
};
};
soc@01c00000 {
tve0: tv-encoder@01c0a000 {
compatible = "allwinner,sun4i-a10-tv-encoder";
reg = <0x01c0a000 0x1000>;
clocks = <&ccu CLK_AHB_TVE>;
resets = <&ccu RST_TVE>;
status = "disabled";
port {
#address-cells = <1>;
#size-cells = <0>;
tve0_in_tcon0: endpoint@0 {
reg = <0>;
remote-endpoint = <&tcon0_out_tve0>;
};
};
};
};
};
&tcon0_out {
tcon0_out_tve0: endpoint@1 {
reg = <1>;
remote-endpoint = <&tve0_in_tcon0>;
};
};
arch/arm/boot/dts/sun5i.dtsi
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/clock/sun5i-ccu.h> #include <dt-bindings/clock/sun5i-ccu.h>
#include <dt-bindings/dma/sun4i-a10.h> #include <dt-bindings/dma/sun4i-a10.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
#include <dt-bindings/reset/sun5i-ccu.h> #include <dt-bindings/reset/sun5i-ccu.h>
/ { / {
...@@ -64,6 +63,31 @@ cpu0: cpu@0 { ...@@ -64,6 +63,31 @@ cpu0: cpu@0 {
}; };
}; };
chosen {
#address-cells = <1>;
#size-cells = <1>;
ranges;
framebuffer@0 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0";
clocks = <&ccu CLK_AHB_LCD>, <&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>,
<&ccu CLK_TCON_CH0>, <&ccu CLK_DRAM_DE_BE>;
status = "disabled";
};
framebuffer@1 {
compatible = "allwinner,simple-framebuffer",
"simple-framebuffer";
allwinner,pipeline = "de_be0-lcd0-tve0";
clocks = <&ccu CLK_AHB_TVE>, <&ccu CLK_AHB_LCD>,
<&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>,
<&ccu CLK_TCON_CH1>, <&ccu CLK_DRAM_DE_BE>;
status = "disabled";
};
};
clocks { clocks {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -105,6 +129,12 @@ sram_a: sram@00000000 { ...@@ -105,6 +129,12 @@ sram_a: sram@00000000 {
ranges = <0 0x00000000 0xc000>; ranges = <0 0x00000000 0xc000>;
}; };
emac_sram: sram-section@8000 {
compatible = "allwinner,sun4i-a10-sram-a3-a4";
reg = <0x8000 0x4000>;
status = "disabled";
};
sram_d: sram@00010000 { sram_d: sram@00010000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x00010000 0x1000>; reg = <0x00010000 0x1000>;
...@@ -128,6 +158,19 @@ dma: dma-controller@01c02000 { ...@@ -128,6 +158,19 @@ dma: dma-controller@01c02000 {
#dma-cells = <2>; #dma-cells = <2>;
}; };
nfc: nand@01c03000 {
compatible = "allwinner,sun4i-a10-nand";
reg = <0x01c03000 0x1000>;
interrupts = <37>;
clocks = <&ccu CLK_AHB_NAND>, <&ccu CLK_NAND>;
clock-names = "ahb", "mod";
dmas = <&dma SUN4I_DMA_DEDICATED 3>;
dma-names = "rxtx";
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};
spi0: spi@01c05000 { spi0: spi@01c05000 {
compatible = "allwinner,sun4i-a10-spi"; compatible = "allwinner,sun4i-a10-spi";
reg = <0x01c05000 0x1000>; reg = <0x01c05000 0x1000>;
...@@ -156,6 +199,84 @@ spi1: spi@01c06000 { ...@@ -156,6 +199,84 @@ spi1: spi@01c06000 {
#size-cells = <0>; #size-cells = <0>;
}; };
tve0: tv-encoder@01c0a000 {
compatible = "allwinner,sun4i-a10-tv-encoder";
reg = <0x01c0a000 0x1000>;
clocks = <&ccu CLK_AHB_TVE>;
resets = <&ccu RST_TVE>;
status = "disabled";
port {
#address-cells = <1>;
#size-cells = <0>;
tve0_in_tcon0: endpoint@0 {
reg = <0>;
remote-endpoint = <&tcon0_out_tve0>;
};
};
};
emac: ethernet@01c0b000 {
compatible = "allwinner,sun4i-a10-emac";
reg = <0x01c0b000 0x1000>;
interrupts = <55>;
clocks = <&ccu CLK_AHB_EMAC>;
allwinner,sram = <&emac_sram 1>;
status = "disabled";
};
mdio: mdio@01c0b080 {
compatible = "allwinner,sun4i-a10-mdio";
reg = <0x01c0b080 0x14>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};
tcon0: lcd-controller@01c0c000 {
compatible = "allwinner,sun5i-a13-tcon";
reg = <0x01c0c000 0x1000>;
interrupts = <44>;
resets = <&ccu RST_LCD>;
reset-names = "lcd";
clocks = <&ccu CLK_AHB_LCD>,
<&ccu CLK_TCON_CH0>,
<&ccu CLK_TCON_CH1>;
clock-names = "ahb",
"tcon-ch0",
"tcon-ch1";
clock-output-names = "tcon-pixel-clock";
status = "disabled";
ports {
#address-cells = <1>;
#size-cells = <0>;
tcon0_in: port@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
tcon0_in_be0: endpoint@0 {
reg = <0>;
remote-endpoint = <&be0_out_tcon0>;
};
};
tcon0_out: port@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
tcon0_out_tve0: endpoint@1 {
reg = <1>;
remote-endpoint = <&tve0_in_tcon0>;
};
};
};
};
mmc0: mmc@01c0f000 { mmc0: mmc@01c0f000 {
compatible = "allwinner,sun5i-a13-mmc"; compatible = "allwinner,sun5i-a13-mmc";
reg = <0x01c0f000 0x1000>; reg = <0x01c0f000 0x1000>;
...@@ -273,6 +394,15 @@ pio: pinctrl@01c20800 { ...@@ -273,6 +394,15 @@ pio: pinctrl@01c20800 {
#interrupt-cells = <3>; #interrupt-cells = <3>;
#gpio-cells = <3>; #gpio-cells = <3>;
emac_pins_a: emac0@0 {
pins = "PD6", "PD7", "PD10",
"PD11", "PD12", "PD13", "PD14",
"PD15", "PD18", "PD19", "PD20",
"PD21", "PD22", "PD23", "PD24",
"PD25", "PD26", "PD27";
function = "emac";
};
i2c0_pins_a: i2c0@0 { i2c0_pins_a: i2c0@0 {
pins = "PB0", "PB1"; pins = "PB0", "PB1";
function = "i2c0"; function = "i2c0";
...@@ -288,6 +418,11 @@ i2c2_pins_a: i2c2@0 { ...@@ -288,6 +418,11 @@ i2c2_pins_a: i2c2@0 {
function = "i2c2"; function = "i2c2";
}; };
ir0_rx_pins_a: ir0@0 {
pins = "PB4";
function = "ir0";
};
lcd_rgb565_pins: lcd_rgb565@0 { lcd_rgb565_pins: lcd_rgb565@0 {
pins = "PD3", "PD4", "PD5", "PD6", "PD7", pins = "PD3", "PD4", "PD5", "PD6", "PD7",
"PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
...@@ -296,6 +431,14 @@ lcd_rgb565_pins: lcd_rgb565@0 { ...@@ -296,6 +431,14 @@ lcd_rgb565_pins: lcd_rgb565@0 {
function = "lcd0"; function = "lcd0";
}; };
lcd_rgb666_pins: lcd_rgb666@0 {
pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
"PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
"PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
"PD24", "PD25", "PD26", "PD27";
function = "lcd0";
};
mmc0_pins_a: mmc0@0 { mmc0_pins_a: mmc0@0 {
pins = "PF0", "PF1", "PF2", "PF3", pins = "PF0", "PF1", "PF2", "PF3",
"PF4", "PF5"; "PF4", "PF5";
...@@ -321,6 +464,24 @@ mmc2_4bit_pins_a: mmc2-4bit@0 { ...@@ -321,6 +464,24 @@ mmc2_4bit_pins_a: mmc2-4bit@0 {
bias-pull-up; bias-pull-up;
}; };
nand_pins_a: nand-base0@0 {
pins = "PC0", "PC1", "PC2",
"PC5", "PC8", "PC9", "PC10",
"PC11", "PC12", "PC13", "PC14",
"PC15";
function = "nand0";
};
nand_cs0_pins_a: nand-cs@0 {
pins = "PC4";
function = "nand0";
};
nand_rb0_pins_a: nand-rb@0 {
pins = "PC6";
function = "nand0";
};
spi2_pins_a: spi2@0 { spi2_pins_a: spi2@0 {
pins = "PE1", "PE2", "PE3"; pins = "PE1", "PE2", "PE3";
function = "spi2"; function = "spi2";
...@@ -331,12 +492,32 @@ spi2_cs0_pins_a: spi2-cs0@0 { ...@@ -331,12 +492,32 @@ spi2_cs0_pins_a: spi2-cs0@0 {
function = "spi2"; function = "spi2";
}; };
uart1_pins_a: uart1@0 {
pins = "PE10", "PE11";
function = "uart1";
};
uart1_pins_b: uart1@1 {
pins = "PG3", "PG4";
function = "uart1";
};
uart2_pins_a: uart2@0 {
pins = "PD2", "PD3";
function = "uart2";
};
uart2_cts_rts_pins_a: uart2-cts-rts@0 {
pins = "PD4", "PD5";
function = "uart2";
};
uart3_pins_a: uart3@0 { uart3_pins_a: uart3@0 {
pins = "PG9", "PG10"; pins = "PG9", "PG10";
function = "uart3"; function = "uart3";
}; };
uart3_pins_cts_rts_a: uart3-cts-rts@0 { uart3_cts_rts_pins_a: uart3-cts-rts@0 {
pins = "PG11", "PG12"; pins = "PG11", "PG12";
function = "uart3"; function = "uart3";
}; };
...@@ -359,6 +540,15 @@ wdt: watchdog@01c20c90 { ...@@ -359,6 +540,15 @@ wdt: watchdog@01c20c90 {
reg = <0x01c20c90 0x10>; reg = <0x01c20c90 0x10>;
}; };
ir0: ir@01c21800 {
compatible = "allwinner,sun4i-a10-ir";
clocks = <&ccu CLK_APB0_IR>, <&ccu CLK_IR>;
clock-names = "apb", "ir";
interrupts = <5>;
reg = <0x01c21800 0x40>;
status = "disabled";
};
lradc: lradc@01c22800 { lradc: lradc@01c22800 {
compatible = "allwinner,sun4i-a10-lradc-keys"; compatible = "allwinner,sun4i-a10-lradc-keys";
reg = <0x01c22800 0x100>; reg = <0x01c22800 0x100>;
...@@ -391,6 +581,16 @@ rtp: rtp@01c25000 { ...@@ -391,6 +581,16 @@ rtp: rtp@01c25000 {
#thermal-sensor-cells = <0>; #thermal-sensor-cells = <0>;
}; };
uart0: serial@01c28000 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>;
interrupts = <1>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&ccu CLK_APB1_UART0>;
status = "disabled";
};
uart1: serial@01c28400 { uart1: serial@01c28400 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28400 0x400>; reg = <0x01c28400 0x400>;
...@@ -401,6 +601,16 @@ uart1: serial@01c28400 { ...@@ -401,6 +601,16 @@ uart1: serial@01c28400 {
status = "disabled"; status = "disabled";
}; };
uart2: serial@01c28800 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28800 0x400>;
interrupts = <3>;
reg-shift = <2>;
reg-io-width = <4>;
clocks = <&ccu CLK_APB1_UART2>;
status = "disabled";
};
uart3: serial@01c28c00 { uart3: serial@01c28c00 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28c00 0x400>; reg = <0x01c28c00 0x400>;
...@@ -447,5 +657,75 @@ timer@01c60000 { ...@@ -447,5 +657,75 @@ timer@01c60000 {
interrupts = <82>, <83>; interrupts = <82>, <83>;
clocks = <&ccu CLK_AHB_HSTIMER>; clocks = <&ccu CLK_AHB_HSTIMER>;
}; };
fe0: display-frontend@01e00000 {
compatible = "allwinner,sun5i-a13-display-frontend";
reg = <0x01e00000 0x20000>;
interrupts = <47>;
clocks = <&ccu CLK_DE_FE>, <&ccu CLK_DE_FE>,
<&ccu CLK_DRAM_DE_FE>;
clock-names = "ahb", "mod",
"ram";
resets = <&ccu RST_DE_FE>;
status = "disabled";
ports {
#address-cells = <1>;
#size-cells = <0>;
fe0_out: port@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
fe0_out_be0: endpoint@0 {
reg = <0>;
remote-endpoint = <&be0_in_fe0>;
};
};
};
};
be0: display-backend@01e60000 {
compatible = "allwinner,sun5i-a13-display-backend";
reg = <0x01e60000 0x10000>;
interrupts = <47>;
clocks = <&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>,
<&ccu CLK_DRAM_DE_BE>;
clock-names = "ahb", "mod",
"ram";
resets = <&ccu RST_DE_BE>;
status = "disabled";
assigned-clocks = <&ccu CLK_DE_BE>;
assigned-clock-rates = <300000000>;
ports {
#address-cells = <1>;
#size-cells = <0>;
be0_in: port@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
be0_in_fe0: endpoint@0 {
reg = <0>;
remote-endpoint = <&fe0_out_be0>;
};
};
be0_out: port@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
be0_out_tcon0: endpoint@0 {
reg = <0>;
remote-endpoint = <&tcon0_in_be0>;
};
};
};
};
}; };
}; };
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Allwinner A31 APP4 EVB1 Evaluation Board"; model = "Allwinner A31 APP4 EVB1 Evaluation Board";
......
arch/arm/boot/dts/sun6i-a31-colombus.dts
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "WITS A31 Colombus Evaluation Board"; model = "WITS A31 Colombus Evaluation Board";
......
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Merrii A31 Hummingbird"; model = "Merrii A31 Hummingbird";
......
arch/arm/boot/dts/sun6i-a31-i7.dts
View file @ ec4c22e7
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Mele I7 Quad top set box"; model = "Mele I7 Quad top set box";
......
arch/arm/boot/dts/sun6i-a31-m9.dts
View file @ ec4c22e7
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Mele M9 top set box"; model = "Mele M9 top set box";
......
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
View file @ ec4c22e7
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Mele A1000G Quad top set box"; model = "Mele A1000G Quad top set box";
......
arch/arm/boot/dts/sun6i-a31.dtsi
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/thermal/thermal.h> #include <dt-bindings/thermal/thermal.h>
#include <dt-bindings/clock/sun6i-a31-ccu.h> #include <dt-bindings/clock/sun6i-a31-ccu.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
#include <dt-bindings/reset/sun6i-a31-ccu.h> #include <dt-bindings/reset/sun6i-a31-ccu.h>
/ { / {
......
arch/arm/boot/dts/sun6i-a31s-cs908.dts
View file @ ec4c22e7
...@@ -43,8 +43,6 @@ ...@@ -43,8 +43,6 @@
/dts-v1/; /dts-v1/;
#include "sun6i-a31s.dtsi" #include "sun6i-a31s.dtsi"
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "CSQ CS908 top set box"; model = "CSQ CS908 top set box";
compatible = "csq,cs908", "allwinner,sun6i-a31s"; compatible = "csq,cs908", "allwinner,sun6i-a31s";
......
arch/arm/boot/dts/sun6i-a31s-primo81.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "MSI Primo81 tablet"; model = "MSI Primo81 tablet";
......
arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
View file @ ec4c22e7
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Sinlinx SinA31s Core Board"; model = "Sinlinx SinA31s Core Board";
......
arch/arm/boot/dts/sun6i-a31s-sina31s.dts
View file @ ec4c22e7
...@@ -63,6 +63,23 @@ status { ...@@ -63,6 +63,23 @@ status {
gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>; /* PH13 */ gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>; /* PH13 */
}; };
}; };
sound {
compatible = "simple-audio-card";
simple-audio-card,name = "On-board SPDIF";
simple-audio-card,cpu {
sound-dai = <&spdif>;
};
simple-audio-card,codec {
sound-dai = <&spdif_out>;
};
};
spdif_out: spdif-out {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
};
}; };
&codec { &codec {
...@@ -153,6 +170,12 @@ &reg_dldo1 { ...@@ -153,6 +170,12 @@ &reg_dldo1 {
regulator-name = "vcc-gmac-phy"; regulator-name = "vcc-gmac-phy";
}; };
&spdif {
pinctrl-names = "default";
pinctrl-0 = <&spdif_pins_a>;
status = "okay";
};
&usb_otg { &usb_otg {
dr_mode = "peripheral"; dr_mode = "peripheral";
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
View file @ ec4c22e7
...@@ -86,6 +86,10 @@ mmc2_pwrseq: mmc2_pwrseq { ...@@ -86,6 +86,10 @@ mmc2_pwrseq: mmc2_pwrseq {
}; };
}; };
&cpu0 {
cpu-supply = <&reg_dcdc3>;
};
&ehci0 { &ehci0 {
status = "okay"; status = "okay";
}; };
...@@ -151,6 +155,17 @@ &ohci0 { ...@@ -151,6 +155,17 @@ &ohci0 {
status = "okay"; status = "okay";
}; };
&p2wi {
status = "okay";
axp22x: pmic@68 {
compatible = "x-powers,axp221";
reg = <0x68>;
interrupt-parent = <&nmi_intc>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
};
};
&pio { &pio {
gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin@0 { gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin@0 {
pins = "PA21"; pins = "PA21";
...@@ -176,6 +191,48 @@ mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin@0 { ...@@ -176,6 +191,48 @@ mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin@0 {
}; };
}; };
#include "axp22x.dtsi"
&reg_dc5ldo {
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1320000>;
regulator-name = "vdd-cpus";
};
&reg_dcdc1 {
regulator-always-on;
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-name = "vdd-3v0";
};
&reg_dcdc2 {
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1320000>;
regulator-name = "vdd-gpu";
};
&reg_dcdc3 {
regulator-always-on;
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1320000>;
regulator-name = "vdd-cpu";
};
&reg_dcdc4 {
regulator-always-on;
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1320000>;
regulator-name = "vdd-sys-dll";
};
&reg_dcdc5 {
regulator-always-on;
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
regulator-name = "vcc-dram";
};
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pins_a>;
......
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
View file @ ec4c22e7
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Yones TopTech BS1078 v2 Tablet"; model = "Yones TopTech BS1078 v2 Tablet";
......
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
View file @ ec4c22e7
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
aliases { aliases {
......
arch/arm/boot/dts/sun7i-a20-bananapi.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "LeMaker Banana Pi"; model = "LeMaker Banana Pi";
......
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Cubietech Cubieboard2"; model = "Cubietech Cubieboard2";
......
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Cubietech Cubietruck"; model = "Cubietech Cubietruck";
...@@ -268,6 +267,10 @@ &reg_ahci_5v { ...@@ -268,6 +267,10 @@ &reg_ahci_5v {
#include "axp209.dtsi" #include "axp209.dtsi"
&ac_power_supply {
status = "okay";
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
...@@ -324,6 +327,10 @@ &usb_otg { ...@@ -324,6 +327,10 @@ &usb_otg {
status = "okay"; status = "okay";
}; };
&usb_power_supply {
status = "okay";
};
&usbphy { &usbphy {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
......
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Merrii A20 Hummingbird"; model = "Merrii A20 Hummingbird";
......
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "I12 / Q5 / QT840A A20 tvbox"; model = "I12 / Q5 / QT840A A20 tvbox";
......
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "ICnova-A20 SWAC"; model = "ICnova-A20 SWAC";
......
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Lamobo R1"; model = "Lamobo R1";
......
arch/arm/boot/dts/sun7i-a20-m3.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Mele M3"; model = "Mele M3";
......
arch/arm/boot/dts/sun7i-a20-mk808c.dts
View file @ ec4c22e7
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "mk808c"; model = "mk808c";
......
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Olimex A20-Olimex-SOM-EVB"; model = "Olimex A20-Olimex-SOM-EVB";
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
View file @ ec4c22e7
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Olimex A20-OLinuXino-LIME"; model = "Olimex A20-OLinuXino-LIME";
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Olimex A20-OLinuXino-LIME2"; model = "Olimex A20-OLinuXino-LIME2";
......
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
View file @ ec4c22e7
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Olimex A20-Olinuxino Micro"; model = "Olimex A20-Olinuxino Micro";
...@@ -85,6 +84,14 @@ &ahci { ...@@ -85,6 +84,14 @@ &ahci {
status = "okay"; status = "okay";
}; };
&codec {
status = "okay";
};
&cpu0 {
cpu-supply = <&reg_dcdc2>;
};
&ehci0 { &ehci0 {
status = "okay"; status = "okay";
}; };
...@@ -111,13 +118,9 @@ &i2c0 { ...@@ -111,13 +118,9 @@ &i2c0 {
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
compatible = "x-powers,axp209";
reg = <0x34>; reg = <0x34>;
interrupt-parent = <&nmi_intc>; interrupt-parent = <&nmi_intc>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <1>;
}; };
}; };
...@@ -251,6 +254,29 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { ...@@ -251,6 +254,29 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
}; };
}; };
#include "axp209.dtsi"
&reg_dcdc2 {
regulator-always-on;
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1400000>;
regulator-name = "vdd-cpu";
};
&reg_dcdc3 {
regulator-always-on;
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1400000>;
regulator-name = "vdd-int-dll";
};
&reg_ldo2 {
regulator-always-on;
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
regulator-name = "avcc";
};
&reg_ahci_5v { &reg_ahci_5v {
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Orange Pi Mini"; model = "Orange Pi Mini";
......
arch/arm/boot/dts/sun7i-a20-orangepi.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Orange Pi"; model = "Orange Pi";
......
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "LinkSprite pcDuino3"; model = "LinkSprite pcDuino3";
......
arch/arm/boot/dts/sun7i-a20.dtsi
View file @ ec4c22e7
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
#include <dt-bindings/clock/sun4i-a10-pll2.h> #include <dt-bindings/clock/sun4i-a10-pll2.h>
#include <dt-bindings/dma/sun4i-a10.h> #include <dt-bindings/dma/sun4i-a10.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
...@@ -1096,6 +1095,11 @@ pio: pinctrl@01c20800 { ...@@ -1096,6 +1095,11 @@ pio: pinctrl@01c20800 {
#interrupt-cells = <3>; #interrupt-cells = <3>;
#gpio-cells = <3>; #gpio-cells = <3>;
can0_pins_a: can0@0 {
pins = "PH20", "PH21";
function = "can";
};
clk_out_a_pins_a: clk_out_a@0 { clk_out_a_pins_a: clk_out_a@0 {
pins = "PI12"; pins = "PI12";
function = "clk_out_a"; function = "clk_out_a";
...@@ -1538,6 +1542,22 @@ uart7: serial@01c29c00 { ...@@ -1538,6 +1542,22 @@ uart7: serial@01c29c00 {
status = "disabled"; status = "disabled";
}; };
ps20: ps2@01c2a000 {
compatible = "allwinner,sun4i-a10-ps2";
reg = <0x01c2a000 0x400>;
interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&apb1_gates 6>;
status = "disabled";
};
ps21: ps2@01c2a400 {
compatible = "allwinner,sun4i-a10-ps2";
reg = <0x01c2a400 0x400>;
interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&apb1_gates 7>;
status = "disabled";
};
i2c0: i2c@01c2ac00 { i2c0: i2c@01c2ac00 {
compatible = "allwinner,sun7i-a20-i2c", compatible = "allwinner,sun7i-a20-i2c",
"allwinner,sun4i-a10-i2c"; "allwinner,sun4i-a10-i2c";
...@@ -1582,6 +1602,15 @@ i2c3: i2c@01c2b800 { ...@@ -1582,6 +1602,15 @@ i2c3: i2c@01c2b800 {
#size-cells = <0>; #size-cells = <0>;
}; };
can0: can@01c2bc00 {
compatible = "allwinner,sun7i-a20-can",
"allwinner,sun4i-a10-can";
reg = <0x01c2bc00 0x400>;
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&apb1_gates 4>;
status = "disabled";
};
i2c4: i2c@01c2c000 { i2c4: i2c@01c2c000 {
compatible = "allwinner,sun7i-a20-i2c", compatible = "allwinner,sun7i-a20-i2c",
"allwinner,sun4i-a10-i2c"; "allwinner,sun4i-a10-i2c";
...@@ -1629,20 +1658,5 @@ gic: interrupt-controller@01c81000 { ...@@ -1629,20 +1658,5 @@ gic: interrupt-controller@01c81000 {
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
}; };
ps20: ps2@01c2a000 {
compatible = "allwinner,sun4i-a10-ps2";
reg = <0x01c2a000 0x400>;
interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&apb1_gates 6>;
status = "disabled";
};
ps21: ps2@01c2a400 {
compatible = "allwinner,sun4i-a10-ps2";
reg = <0x01c2a400 0x400>;
interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&apb1_gates 7>;
status = "disabled";
};
}; };
}; };
arch/arm/boot/dts/sun8i-a23-a33.dtsi
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/sun8i-a23-a33-ccu.h> #include <dt-bindings/clock/sun8i-a23-a33-ccu.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
#include <dt-bindings/reset/sun8i-a23-a33-ccu.h> #include <dt-bindings/reset/sun8i-a23-a33-ccu.h>
/ { / {
...@@ -493,6 +492,7 @@ mali: gpu@1c40000 { ...@@ -493,6 +492,7 @@ mali: gpu@1c40000 {
clocks = <&ccu CLK_BUS_GPU>, <&ccu CLK_GPU>; clocks = <&ccu CLK_BUS_GPU>, <&ccu CLK_GPU>;
clock-names = "bus", "core"; clock-names = "bus", "core";
resets = <&ccu RST_BUS_GPU>; resets = <&ccu RST_BUS_GPU>;
#cooling-cells = <2>;
assigned-clocks = <&ccu CLK_GPU>; assigned-clocks = <&ccu CLK_GPU>;
assigned-clock-rates = <408000000>; assigned-clock-rates = <408000000>;
......
arch/arm/boot/dts/sun8i-a23-evb.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Allwinner A23 Evaluation Board"; model = "Allwinner A23 Evaluation Board";
......
arch/arm/boot/dts/sun8i-a23-q8-tablet.dts
View file @ ec4c22e7
...@@ -50,7 +50,6 @@ / { ...@@ -50,7 +50,6 @@ / {
}; };
&codec { &codec {
pinctrl-0 = <&codec_pa_pin>;
allwinner,pa-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ allwinner,pa-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
allwinner,audio-routing = allwinner,audio-routing =
"Headphone", "HP", "Headphone", "HP",
...@@ -62,12 +61,3 @@ &codec { ...@@ -62,12 +61,3 @@ &codec {
"Headset Mic", "HBIAS"; "Headset Mic", "HBIAS";
status = "okay"; status = "okay";
}; };
&pio {
codec_pa_pin: codec_pa_pin@0 {
allwinner,pins = "PH9";
allwinner,function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
};
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
View file @ ec4c22e7
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Sinlinx SinA33"; model = "Sinlinx SinA33";
...@@ -84,6 +83,24 @@ &codec { ...@@ -84,6 +83,24 @@ &codec {
status = "okay"; status = "okay";
}; };
&cpu0 {
cpu-supply = <&reg_dcdc3>;
};
&cpu0_opp_table {
opp@1104000000 {
opp-hz = /bits/ 64 <1104000000>;
opp-microvolt = <1320000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
opp@1200000000 {
opp-hz = /bits/ 64 <1200000000>;
opp-microvolt = <1320000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
};
&de { &de {
status = "okay"; status = "okay";
}; };
...@@ -175,6 +192,10 @@ axp22x: pmic@3a3 { ...@@ -175,6 +192,10 @@ axp22x: pmic@3a3 {
#include "axp223.dtsi" #include "axp223.dtsi"
&ac_power_supply {
status = "okay";
};
&reg_aldo1 { &reg_aldo1 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <3000000>; regulator-min-microvolt = <3000000>;
......
arch/arm/boot/dts/sun8i-a33.dtsi
View file @ ec4c22e7
...@@ -43,24 +43,79 @@ ...@@ -43,24 +43,79 @@
*/ */
#include "sun8i-a23-a33.dtsi" #include "sun8i-a23-a33.dtsi"
#include <dt-bindings/thermal/thermal.h>
/ { / {
cpu0_opp_table: opp_table0 { cpu0_opp_table: opp_table0 {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
opp-shared; opp-shared;
opp@120000000 {
opp-hz = /bits/ 64 <120000000>;
opp-microvolt = <1040000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
opp@240000000 {
opp-hz = /bits/ 64 <240000000>;
opp-microvolt = <1040000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
opp@312000000 {
opp-hz = /bits/ 64 <312000000>;
opp-microvolt = <1040000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
opp@408000000 {
opp-hz = /bits/ 64 <408000000>;
opp-microvolt = <1040000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
opp@480000000 {
opp-hz = /bits/ 64 <480000000>;
opp-microvolt = <1040000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
opp@504000000 {
opp-hz = /bits/ 64 <504000000>;
opp-microvolt = <1040000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
opp@600000000 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1040000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
opp@648000000 { opp@648000000 {
opp-hz = /bits/ 64 <648000000>; opp-hz = /bits/ 64 <648000000>;
opp-microvolt = <1040000>; opp-microvolt = <1040000>;
clock-latency-ns = <244144>; /* 8 32k periods */ clock-latency-ns = <244144>; /* 8 32k periods */
}; };
opp@720000000 {
opp-hz = /bits/ 64 <720000000>;
opp-microvolt = <1100000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
opp@816000000 { opp@816000000 {
opp-hz = /bits/ 64 <816000000>; opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <1100000>; opp-microvolt = <1100000>;
clock-latency-ns = <244144>; /* 8 32k periods */ clock-latency-ns = <244144>; /* 8 32k periods */
}; };
opp@912000000 {
opp-hz = /bits/ 64 <912000000>;
opp-microvolt = <1200000>;
clock-latency-ns = <244144>; /* 8 32k periods */
};
opp@1008000000 { opp@1008000000 {
opp-hz = /bits/ 64 <1008000000>; opp-hz = /bits/ 64 <1008000000>;
opp-microvolt = <1200000>; opp-microvolt = <1200000>;
...@@ -79,6 +134,7 @@ cpu@0 { ...@@ -79,6 +134,7 @@ cpu@0 {
clocks = <&ccu CLK_CPUX>; clocks = <&ccu CLK_CPUX>;
clock-names = "cpu"; clock-names = "cpu";
operating-points-v2 = <&cpu0_opp_table>; operating-points-v2 = <&cpu0_opp_table>;
#cooling-cells = <2>;
}; };
cpu@2 { cpu@2 {
...@@ -100,6 +156,27 @@ de: display-engine { ...@@ -100,6 +156,27 @@ de: display-engine {
status = "disabled"; status = "disabled";
}; };
iio-hwmon {
compatible = "iio-hwmon";
io-channels = <&ths>;
};
mali_opp_table: gpu-opp-table {
compatible = "operating-points-v2";
opp@144000000 {
opp-hz = /bits/ 64 <144000000>;
};
opp@240000000 {
opp-hz = /bits/ 64 <240000000>;
};
opp@384000000 {
opp-hz = /bits/ 64 <384000000>;
};
};
memory { memory {
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
...@@ -196,6 +273,13 @@ codec: codec@01c22e00 { ...@@ -196,6 +273,13 @@ codec: codec@01c22e00 {
status = "disabled"; status = "disabled";
}; };
ths: ths@01c25000 {
compatible = "allwinner,sun8i-a33-ths";
reg = <0x01c25000 0x100>;
#thermal-sensor-cells = <0>;
#io-channel-cells = <0>;
};
fe0: display-frontend@01e00000 { fe0: display-frontend@01e00000 {
compatible = "allwinner,sun8i-a33-display-frontend"; compatible = "allwinner,sun8i-a33-display-frontend";
reg = <0x01e00000 0x20000>; reg = <0x01e00000 0x20000>;
...@@ -306,12 +390,83 @@ drc0_out_tcon0: endpoint@0 { ...@@ -306,12 +390,83 @@ drc0_out_tcon0: endpoint@0 {
}; };
}; };
}; };
thermal-zones {
cpu_thermal {
/* milliseconds */
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&ths>;
cooling-maps {
map0 {
trip = <&cpu_alert0>;
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
map1 {
trip = <&cpu_alert1>;
cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
map2 {
trip = <&gpu_alert0>;
cooling-device = <&mali 1 THERMAL_NO_LIMIT>;
};
map3 {
trip = <&gpu_alert1>;
cooling-device = <&mali 2 THERMAL_NO_LIMIT>;
};
};
trips {
cpu_alert0: cpu_alert0 {
/* milliCelsius */
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
gpu_alert0: gpu_alert0 {
/* milliCelsius */
temperature = <85000>;
hysteresis = <2000>;
type = "passive";
};
cpu_alert1: cpu_alert1 {
/* milliCelsius */
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
gpu_alert1: gpu_alert1 {
/* milliCelsius */
temperature = <95000>;
hysteresis = <2000>;
type = "hot";
};
cpu_crit: cpu_crit {
/* milliCelsius */
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
};
};
};
};
}; };
&ccu { &ccu {
compatible = "allwinner,sun8i-a33-ccu"; compatible = "allwinner,sun8i-a33-ccu";
}; };
&mali {
operating-points-v2 = <&mali_opp_table>;
};
&pio { &pio {
compatible = "allwinner,sun8i-a33-pinctrl"; compatible = "allwinner,sun8i-a33-pinctrl";
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm/boot/dts/sun8i-a83t.dtsi
View file @ ec4c22e7
...@@ -47,8 +47,6 @@ ...@@ -47,8 +47,6 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
......
arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
View file @ ec4c22e7
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Xunlong Orange Pi Zero"; model = "Xunlong Orange Pi Zero";
......
arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Banana Pi BPI-M2-Plus"; model = "Banana Pi BPI-M2-Plus";
......
arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Beelink X2"; model = "Beelink X2";
...@@ -138,6 +137,16 @@ sdiowifi: sdio_wifi@1 { ...@@ -138,6 +137,16 @@ sdiowifi: sdio_wifi@1 {
}; };
}; };
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_8bit_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <8>;
non-removable;
cap-mmc-hw-reset;
status = "okay";
};
&ohci1 { &ohci1 {
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts 0 → 100644
View file @ ec4c22e7
/*
* Copyright (C) 2017 Jelle van der Waa <jelle@vdwaa.nl>
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Or, alternatively,
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
#include "sun8i-h3.dtsi"
#include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "FriendlyARM NanoPi NEO Air";
compatible = "friendlyarm,nanopi-neo-air", "allwinner,sun8i-h3";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
leds {
compatible = "gpio-leds";
pwr {
label = "nanopi:green:pwr";
gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
default-state = "on";
};
status {
label = "nanopi:blue:status";
gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
};
};
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
cd-inverted;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
status = "okay";
};
&usbphy {
/* USB VBUS is always on */
status = "okay";
};
arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
aliases { aliases {
......
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Xunlong Orange Pi 2"; model = "Xunlong Orange Pi 2";
......
arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Xunlong Orange Pi Lite"; model = "Xunlong Orange Pi Lite";
......
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Xunlong Orange Pi One"; model = "Xunlong Orange Pi One";
......
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Xunlong Orange Pi PC"; model = "Xunlong Orange Pi PC";
......
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
View file @ ec4c22e7
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "sun9i-a80.dtsi" #include "sun9i-a80.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Cubietech Cubieboard4"; model = "Cubietech Cubieboard4";
......
arch/arm/boot/dts/sun9i-a80-optimus.dts
View file @ ec4c22e7
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include "sun9i-a80.dtsi" #include "sun9i-a80.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ { / {
model = "Merrii A80 Optimus Board"; model = "Merrii A80 Optimus Board";
......
arch/arm/boot/dts/sun9i-a80.dtsi
View file @ ec4c22e7
...@@ -46,8 +46,6 @@ ...@@ -46,8 +46,6 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
#include <dt-bindings/clock/sun9i-a80-ccu.h> #include <dt-bindings/clock/sun9i-a80-ccu.h>
#include <dt-bindings/clock/sun9i-a80-de.h> #include <dt-bindings/clock/sun9i-a80-de.h>
#include <dt-bindings/clock/sun9i-a80-usb.h> #include <dt-bindings/clock/sun9i-a80-usb.h>
......
arch/arm/boot/dts/sunxi-common-regulators.dtsi
View file @ ec4c22e7
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
*/ */
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
&pio { &pio {
ahci_pwr_pin_a: ahci_pwr_pin@0 { ahci_pwr_pin_a: ahci_pwr_pin@0 {
......
arch/arm/boot/dts/sunxi-reference-design-tablet.dtsi
View file @ ec4c22e7
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
#include "sunxi-common-regulators.dtsi" #include "sunxi-common-regulators.dtsi"
&i2c0 { &i2c0 {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7