GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: dts: sun8i: Update A23/A33/r16 dts(i) files from Linux-v4.18-rc3

Browse source 
Update all A23/A33/r16 devicetree dtsi and dtsi files from
Linux-v4.18-rc3 with below commits.

A23:
commit bc3bd041fe766219a44688b182c260064007f0cc
Author: Miquel Raynal <miquel.raynal@bootlin.com>
Date:   Tue Apr 24 17:55:02 2018 +0200

    ARM: dts: sun8i: a23/a33: declare NAND pins

A33:
commit 88fe315d2c0a397ef42d7639addab0e021ae911d
Author: Maxime Ripard <maxime.ripard@bootlin.com>
Date:   Wed Apr 4 11:57:15 2018 +0200

    ARM: dts: sun8i: a33: Add the DSI-related nodes

r16:
commit 9621d0bd1b0d61167e1853ac68cf4869c31bcc96
Author: Miquel Raynal <miquel.raynal@bootlin.com>
Date:   Tue Apr 24 17:55:03 2018 +0200

    ARM: dts: nes: add Nintendo NES/SuperNES Classic Edition support

Note:
- Drop pinctrl from sun8i-r16-nintendo-nes-classic-edition.dts since
  sun8i-a23-a33.dtsi is added with Linux sync.
- Don't sync non U-Boot supported dts files
   sun8i-a23-ippo-q8h-v1.2.dts
   sun8i-a23-ippo-q8h-v5.dts
   sun8i-a33-et-q8-v1.6.dts
   sun8i-a33-ippo-q8h-v1.2.dts
   sun8i-r16-nintendo-nes-classic.dts
   sun8i-r16-nintendo-super-nes-classic.dts

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Jagan Teki 2018-08-05 00:40:11 +05:30
parent b9d59d08a6
commit 9ad93c0c96
18 changed files with 338 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
arch/arm/dts/sun8i-a23-a33.dtsi
View file

@ -118,13 +118,13 @@
}; };
}; };
soc@01c00000 { soc@1c00000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
dma: dma-controller@01c02000 { dma: dma-controller@1c02000 {
compatible = "allwinner,sun8i-a23-dma"; compatible = "allwinner,sun8i-a23-dma";
reg = <0x01c02000 0x1000>; reg = <0x01c02000 0x1000>;
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
@ -133,7 +133,7 @@
#dma-cells = <1>; #dma-cells = <1>;
}; };
mmc0: mmc@01c0f000 { mmc0: mmc@1c0f000 {
compatible = "allwinner,sun7i-a20-mmc"; compatible = "allwinner,sun7i-a20-mmc";
reg = <0x01c0f000 0x1000>; reg = <0x01c0f000 0x1000>;
clocks = <&ccu CLK_BUS_MMC0>, clocks = <&ccu CLK_BUS_MMC0>,
@ -152,7 +152,7 @@
#size-cells = <0>; #size-cells = <0>;
}; };
mmc1: mmc@01c10000 { mmc1: mmc@1c10000 {
compatible = "allwinner,sun7i-a20-mmc"; compatible = "allwinner,sun7i-a20-mmc";
reg = <0x01c10000 0x1000>; reg = <0x01c10000 0x1000>;
clocks = <&ccu CLK_BUS_MMC1>, clocks = <&ccu CLK_BUS_MMC1>,
@ -171,7 +171,7 @@
#size-cells = <0>; #size-cells = <0>;
}; };
mmc2: mmc@01c11000 { mmc2: mmc@1c11000 {
compatible = "allwinner,sun7i-a20-mmc"; compatible = "allwinner,sun7i-a20-mmc";
reg = <0x01c11000 0x1000>; reg = <0x01c11000 0x1000>;
clocks = <&ccu CLK_BUS_MMC2>, clocks = <&ccu CLK_BUS_MMC2>,
@ -190,7 +190,7 @@
#size-cells = <0>; #size-cells = <0>;
}; };
nfc: nand@01c03000 { nfc: nand@1c03000 {
compatible = "allwinner,sun4i-a10-nand"; compatible = "allwinner,sun4i-a10-nand";
reg = <0x01c03000 0x1000>; reg = <0x01c03000 0x1000>;
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
@ -198,12 +198,14 @@
clock-names = "ahb", "mod"; clock-names = "ahb", "mod";
resets = <&ccu RST_BUS_NAND>; resets = <&ccu RST_BUS_NAND>;
reset-names = "ahb"; reset-names = "ahb";
pinctrl-names = "default";
pinctrl-0 = <&nand_pins &nand_pins_cs0 &nand_pins_rb0>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
}; };
usb_otg: usb@01c19000 { usb_otg: usb@1c19000 {
/* compatible gets set in SoC specific dtsi file */ /* compatible gets set in SoC specific dtsi file */
reg = <0x01c19000 0x0400>; reg = <0x01c19000 0x0400>;
clocks = <&ccu CLK_BUS_OTG>; clocks = <&ccu CLK_BUS_OTG>;
@ -216,7 +218,7 @@
status = "disabled"; status = "disabled";
}; };
usbphy: phy@01c19400 { usbphy: phy@1c19400 {
/* /*
* compatible and address regions get set in * compatible and address regions get set in
* SoC specific dtsi file * SoC specific dtsi file
@ -233,7 +235,7 @@
#phy-cells = <1>; #phy-cells = <1>;
}; };
ehci0: usb@01c1a000 { ehci0: usb@1c1a000 {
compatible = "allwinner,sun8i-a23-ehci", "generic-ehci"; compatible = "allwinner,sun8i-a23-ehci", "generic-ehci";
reg = <0x01c1a000 0x100>; reg = <0x01c1a000 0x100>;
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
@ -244,7 +246,7 @@
status = "disabled"; status = "disabled";
}; };
ohci0: usb@01c1a400 { ohci0: usb@1c1a400 {
compatible = "allwinner,sun8i-a23-ohci", "generic-ohci"; compatible = "allwinner,sun8i-a23-ohci", "generic-ohci";
reg = <0x01c1a400 0x100>; reg = <0x01c1a400 0x100>;
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
@ -255,7 +257,7 @@
status = "disabled"; status = "disabled";
}; };
ccu: clock@01c20000 { ccu: clock@1c20000 {
reg = <0x01c20000 0x400>; reg = <0x01c20000 0x400>;
clocks = <&osc24M>, <&rtc 0>; clocks = <&osc24M>, <&rtc 0>;
clock-names = "hosc", "losc"; clock-names = "hosc", "losc";
@ -263,7 +265,7 @@
#reset-cells = <1>; #reset-cells = <1>;
}; };
pio: pinctrl@01c20800 { pio: pinctrl@1c20800 {
/* compatible gets set in SoC specific dtsi file */ /* compatible gets set in SoC specific dtsi file */
reg = <0x01c20800 0x400>; reg = <0x01c20800 0x400>;
/* interrupts get set in SoC specific dtsi file */ /* interrupts get set in SoC specific dtsi file */
@ -289,23 +291,6 @@
function = "uart1"; function = "uart1";
}; };
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";
};
mmc0_pins_a: mmc0@0 { mmc0_pins_a: mmc0@0 {
pins = "PF0", "PF1", "PF2", pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5"; "PF3", "PF4", "PF5";
@ -332,6 +317,37 @@
bias-pull-up; bias-pull-up;
}; };
nand_pins: nand-pins {
pins = "PC0", "PC1", "PC2", "PC5",
"PC8", "PC9", "PC10", "PC11",
"PC12", "PC13", "PC14", "PC15";
function = "nand0";
};
nand_pins_cs0: nand-pins-cs0 {
pins = "PC4";
function = "nand0";
bias-pull-up;
};
nand_pins_cs1: nand-pins-cs1 {
pins = "PC3";
function = "nand0";
bias-pull-up;
};
nand_pins_rb0: nand-pins-rb0 {
pins = "PC6";
function = "nand0";
bias-pull-up;
};
nand_pins_rb1: nand-pins-rb1 {
pins = "PC7";
function = "nand0";
bias-pull-up;
};
pwm0_pins: pwm0 { pwm0_pins: pwm0 {
pins = "PH0"; pins = "PH0";
function = "pwm0"; function = "pwm0";
@ -361,7 +377,7 @@
}; };
}; };
timer@01c20c00 { timer@1c20c00 {
compatible = "allwinner,sun4i-a10-timer"; compatible = "allwinner,sun4i-a10-timer";
reg = <0x01c20c00 0xa0>; reg = <0x01c20c00 0xa0>;
interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
@ -369,13 +385,13 @@
clocks = <&osc24M>; clocks = <&osc24M>;
}; };
wdt0: watchdog@01c20ca0 { wdt0: watchdog@1c20ca0 {
compatible = "allwinner,sun6i-a31-wdt"; compatible = "allwinner,sun6i-a31-wdt";
reg = <0x01c20ca0 0x20>; reg = <0x01c20ca0 0x20>;
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
}; };
pwm: pwm@01c21400 { pwm: pwm@1c21400 {
compatible = "allwinner,sun7i-a20-pwm"; compatible = "allwinner,sun7i-a20-pwm";
reg = <0x01c21400 0xc>; reg = <0x01c21400 0xc>;
clocks = <&osc24M>; clocks = <&osc24M>;
@ -383,14 +399,14 @@
status = "disabled"; status = "disabled";
}; };
lradc: lradc@01c22800 { lradc: lradc@1c22800 {
compatible = "allwinner,sun4i-a10-lradc-keys"; compatible = "allwinner,sun4i-a10-lradc-keys";
reg = <0x01c22800 0x100>; reg = <0x01c22800 0x100>;
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
uart0: serial@01c28000 { uart0: serial@1c28000 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>; reg = <0x01c28000 0x400>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
@ -403,7 +419,7 @@
status = "disabled"; status = "disabled";
}; };
uart1: serial@01c28400 { uart1: serial@1c28400 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28400 0x400>; reg = <0x01c28400 0x400>;
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
@ -416,7 +432,7 @@
status = "disabled"; status = "disabled";
}; };
uart2: serial@01c28800 { uart2: serial@1c28800 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28800 0x400>; reg = <0x01c28800 0x400>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
@ -429,7 +445,7 @@
status = "disabled"; status = "disabled";
}; };
uart3: serial@01c28c00 { uart3: serial@1c28c00 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c28c00 0x400>; reg = <0x01c28c00 0x400>;
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
@ -442,7 +458,7 @@
status = "disabled"; status = "disabled";
}; };
uart4: serial@01c29000 { uart4: serial@1c29000 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01c29000 0x400>; reg = <0x01c29000 0x400>;
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
@ -455,7 +471,7 @@
status = "disabled"; status = "disabled";
}; };
i2c0: i2c@01c2ac00 { i2c0: i2c@1c2ac00 {
compatible = "allwinner,sun6i-a31-i2c"; compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2ac00 0x400>; reg = <0x01c2ac00 0x400>;
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
@ -466,7 +482,7 @@
#size-cells = <0>; #size-cells = <0>;
}; };
i2c1: i2c@01c2b000 { i2c1: i2c@1c2b000 {
compatible = "allwinner,sun6i-a31-i2c"; compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2b000 0x400>; reg = <0x01c2b000 0x400>;
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
@ -477,7 +493,7 @@
#size-cells = <0>; #size-cells = <0>;
}; };
i2c2: i2c@01c2b400 { i2c2: i2c@1c2b400 {
compatible = "allwinner,sun6i-a31-i2c"; compatible = "allwinner,sun6i-a31-i2c";
reg = <0x01c2b400 0x400>; reg = <0x01c2b400 0x400>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
@ -515,7 +531,7 @@
assigned-clock-rates = <384000000>; assigned-clock-rates = <384000000>;
}; };
gic: interrupt-controller@01c81000 { gic: interrupt-controller@1c81000 {
compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
reg = <0x01c81000 0x1000>, reg = <0x01c81000 0x1000>,
<0x01c82000 0x2000>, <0x01c82000 0x2000>,
@ -526,7 +542,7 @@
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)>;
}; };
rtc: rtc@01f00000 { rtc: rtc@1f00000 {
compatible = "allwinner,sun6i-a31-rtc"; compatible = "allwinner,sun6i-a31-rtc";
reg = <0x01f00000 0x54>; reg = <0x01f00000 0x54>;
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
@ -544,7 +560,7 @@
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
}; };
prcm@01f01400 { prcm@1f01400 {
compatible = "allwinner,sun8i-a23-prcm"; compatible = "allwinner,sun8i-a23-prcm";
reg = <0x01f01400 0x200>; reg = <0x01f01400 0x200>;
@ -592,12 +608,12 @@
}; };
}; };
cpucfg@01f01c00 { cpucfg@1f01c00 {
compatible = "allwinner,sun8i-a23-cpuconfig"; compatible = "allwinner,sun8i-a23-cpuconfig";
reg = <0x01f01c00 0x300>; reg = <0x01f01c00 0x300>;
}; };
r_uart: serial@01f02800 { r_uart: serial@1f02800 {
compatible = "snps,dw-apb-uart"; compatible = "snps,dw-apb-uart";
reg = <0x01f02800 0x400>; reg = <0x01f02800 0x400>;
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
@ -608,7 +624,7 @@
status = "disabled"; status = "disabled";
}; };
r_pio: pinctrl@01f02c00 { r_pio: pinctrl@1f02c00 {
compatible = "allwinner,sun8i-a23-r-pinctrl"; compatible = "allwinner,sun8i-a23-r-pinctrl";
reg = <0x01f02c00 0x400>; reg = <0x01f02c00 0x400>;
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
@ -635,7 +651,7 @@
}; };
}; };
r_rsb: rsb@01f03400 { r_rsb: rsb@1f03400 {
compatible = "allwinner,sun8i-a23-rsb"; compatible = "allwinner,sun8i-a23-rsb";
reg = <0x01f03400 0x400>; reg = <0x01f03400 0x400>;
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

11
arch/arm/dts/sun8i-a23-evb.dts
View file

@ -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";
@ -108,17 +107,15 @@
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_evb>; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_evb>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
cd-inverted;
status = "okay"; status = "okay";
}; };
&pio { &pio {
mmc0_cd_pin_evb: mmc0_cd_pin@0 { mmc0_cd_pin_evb: mmc0_cd_pin@0 {
allwinner,pins = "PB4"; pins = "PB4";
allwinner,function = "gpio_in"; function = "gpio_in";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; bias-pull-up;
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
}; };
}; };

5
arch/arm/dts/sun8i-a23-gt90h-v4.dts
View file

@ -53,9 +53,10 @@
status = "okay"; status = "okay";
}; };
&gsl1680 { &touchscreen {
reg = <0x40>;
compatible = "silead,gsl3675"; compatible = "silead,gsl3675";
touchscreen-fw-name = "silead/gsl3675-gt90h.fw"; firmware-name = "gsl3675-gt90h.fw";
touchscreen-size-x = <1792>; touchscreen-size-x = <1792>;
touchscreen-size-y = <1024>; touchscreen-size-y = <1024>;
status = "okay"; status = "okay";

6
arch/arm/dts/sun8i-a23-inet86dz.dts
View file

@ -53,10 +53,12 @@
status = "okay"; status = "okay";
}; };
&gsl1680 { &touchscreen {
reg = <0x40>;
compatible = "silead,gsl1680";
firmware-name = "gsl1680-inet86dz.fw";
touchscreen-size-x = <960>; touchscreen-size-x = <960>;
touchscreen-size-y = <640>; touchscreen-size-y = <640>;
touchscreen-fw-name = "silead/gsl1680-inet86dz.fw";
status = "okay"; status = "okay";
}; };

34
arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts
View file

@ -62,14 +62,11 @@
}; };
}; };
&gsl1680 { &i2c1 {
vddio-supply = <&reg_ldo_io1>; mma7660: accelerometer@4c {
touchscreen-size-x = <960>; reg = <0x4c>;
touchscreen-size-y = <640>; compatible = "fsl,mma7660";
touchscreen-inverted-x; };
touchscreen-inverted-y;
touchscreen-fw-name = "silead/gsl1680-polaroid-mid2407pxe03.fw";
status = "okay";
}; };
&mmc1 { &mmc1 {
@ -89,21 +86,24 @@
}; };
&mmc1_pins_a { &mmc1_pins_a {
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; bias-pull-up;
}; };
&r_pio { &r_pio {
wifi_pwrseq_pin_mid2407: wifi_pwrseq_pin@0 { wifi_pwrseq_pin_mid2407: wifi_pwrseq_pin@0 {
allwinner,pins = "PL6"; pins = "PL6";
allwinner,function = "gpio_out"; function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
}; };
&reg_ldo_io1 { &touchscreen {
regulator-min-microvolt = <3300000>; reg = <0x40>;
regulator-max-microvolt = <3300000>; compatible = "silead,gsl1680";
regulator-name = "vcc-touchscreen"; firmware-name = "gsl1680-polaroid-mid2407pxe03.fw";
touchscreen-size-x = <960>;
touchscreen-size-y = <640>;
touchscreen-inverted-x;
touchscreen-inverted-y;
vddio-supply = <&reg_ldo_io1>;
status = "okay"; status = "okay";
}; };

25
arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts
View file

@ -62,14 +62,6 @@
}; };
}; };
&gsl1680 {
compatible = "silead,gsl3670";
touchscreen-fw-name = "silead/gsl3670-polaroid-mid2809pxe04.fw";
touchscreen-size-x = <1660>;
touchscreen-size-y = <890>;
status = "okay";
};
&mmc1 { &mmc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>; pinctrl-0 = <&mmc1_pins_a>;
@ -87,14 +79,21 @@
}; };
&mmc1_pins_a { &mmc1_pins_a {
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; bias-pull-up;
}; };
&r_pio { &r_pio {
wifi_pwrseq_pin_mid2809: wifi_pwrseq_pin@0 { wifi_pwrseq_pin_mid2809: wifi_pwrseq_pin@0 {
allwinner,pins = "PL6"; pins = "PL6";
allwinner,function = "gpio_out"; function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
}; };
&touchscreen {
reg = <0x40>;
compatible = "silead,gsl3670";
firmware-name = "gsl3670-polaroid-mid2809pxe04.fw";
touchscreen-size-x = <1660>;
touchscreen-size-y = <890>;
status = "okay";
};

13
arch/arm/dts/sun8i-a23-q8-tablet.dts
View file

@ -48,3 +48,16 @@
model = "Q8 A23 Tablet"; model = "Q8 A23 Tablet";
compatible = "allwinner,q8-a23", "allwinner,sun8i-a23"; compatible = "allwinner,q8-a23", "allwinner,sun8i-a23";
}; };
&codec {
allwinner,pa-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
allwinner,audio-routing =
"Headphone", "HP",
"Headphone", "HPCOM",
"Speaker", "HP",
"MIC1", "Mic",
"MIC2", "Headset Mic",
"Mic", "MBIAS",
"Headset Mic", "HBIAS";
status = "okay";
};

4
arch/arm/dts/sun8i-a23.dtsi
View file

@ -49,8 +49,8 @@
reg = <0x40000000 0x40000000>; reg = <0x40000000 0x40000000>;
}; };
soc@01c00000 { soc@1c00000 {
codec: codec@01c22c00 { codec: codec@1c22c00 {
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
compatible = "allwinner,sun8i-a23-codec"; compatible = "allwinner,sun8i-a23-codec";
reg = <0x01c22c00 0x400>; reg = <0x01c22c00 0x400>;

5
arch/arm/dts/sun8i-a33-ga10h-v1.1.dts
View file

@ -58,9 +58,10 @@
status = "okay"; status = "okay";
}; };
&gsl1680 { &touchscreen {
reg = <0x40>;
compatible = "silead,gsl3675"; compatible = "silead,gsl3675";
touchscreen-fw-name = "silead/gsl3675-ga10h.fw"; firmware-name = "gsl3675-ga10h.fw";
touchscreen-size-x = <1630>; touchscreen-size-x = <1630>;
touchscreen-size-y = <990>; touchscreen-size-y = <990>;
touchscreen-inverted-y; touchscreen-inverted-y;

29
arch/arm/dts/sun8i-a33-inet-d978-rev2.dts
View file

@ -49,6 +49,15 @@
model = "INet-D978 Rev 02"; model = "INet-D978 Rev 02";
compatible = "primux,inet-d978-rev2", "allwinner,sun8i-a33"; compatible = "primux,inet-d978-rev2", "allwinner,sun8i-a33";
aliases {
serial0 = &uart1;
};
chosen {
/* Delete debug UART as serial0 is the UART for bluetooth */
/delete-property/stdout-path;
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
@ -62,7 +71,7 @@
}; };
&mmc1_pins_a { &mmc1_pins_a {
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; bias-pull-up;
}; };
&mmc1 { &mmc1 {
@ -80,9 +89,19 @@
&r_pio { &r_pio {
led_pin_d978: led_pin_d978@0 { led_pin_d978: led_pin_d978@0 {
allwinner,pins = "PL5"; pins = "PL5";
allwinner,function = "gpio_out"; function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_20_MA>; drive-strength = <20>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
}; };
&r_uart {
status = "disabled";
};
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_a>,
<&uart1_pins_cts_rts_a>;
status = "okay";
};

66
arch/arm/dts/sun8i-a33-olinuxino.dts
View file

@ -43,7 +43,6 @@
/dts-v1/; /dts-v1/;
#include "sun8i-a33.dtsi" #include "sun8i-a33.dtsi"
#include "sunxi-common-regulators.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -62,8 +61,6 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pin_olinuxino>;
green { green {
label = "a33-olinuxino:green:usr"; label = "a33-olinuxino:green:usr";
@ -72,17 +69,24 @@
}; };
}; };
&codec {
status = "okay";
};
&dai {
status = "okay";
};
&ehci0 { &ehci0 {
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
cd-inverted;
status = "okay"; status = "okay";
}; };
@ -90,29 +94,6 @@
status = "okay"; status = "okay";
}; };
&pio {
led_pin_olinuxino: led_pins@0 {
allwinner,pins = "PB7";
allwinner,function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
allwinner,pins = "PB4";
allwinner,function = "gpio_in";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PB3";
allwinner,function = "gpio_in";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
};
&r_rsb { &r_rsb {
status = "okay"; status = "okay";
@ -126,7 +107,15 @@
}; };
}; };
#include "axp22x.dtsi" #include "axp223.dtsi"
&ac_power_supply {
status = "okay";
};
&battery_power_supply {
status = "okay";
};
&reg_aldo1 { &reg_aldo1 {
regulator-always-on; regulator-always-on;
@ -201,6 +190,21 @@
vcc-lcd-supply = <&reg_dc1sw>; vcc-lcd-supply = <&reg_dc1sw>;
}; };
&sound {
/* Board level jack widgets */
simple-audio-card,widgets = "Microphone", "Microphone Jack",
"Headphone", "Headphone Jack";
/* Board level routing. First 2 routes copied from SoC level */
simple-audio-card,routing =
"Left DAC", "AIF1 Slot 0 Left",
"Right DAC", "AIF1 Slot 0 Right",
"HP", "HPCOM",
"Headphone Jack", "HP",
"MIC1", "Microphone Jack",
"Microphone Jack", "MBIAS";
status = "okay";
};
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_b>; pinctrl-0 = <&uart0_pins_b>;
@ -217,8 +221,6 @@
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */ usb0_id_det-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb0_vbus-supply = <&reg_drivevbus>; usb0_vbus-supply = <&reg_drivevbus>;

53
arch/arm/dts/sun8i-a33-sinlinx-sina33.dts
View file

@ -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";
@ -80,7 +79,7 @@
}; };
}; };
&de { &codec {
status = "okay"; status = "okay";
}; };
@ -88,6 +87,28 @@
cpu-supply = <&reg_dcdc3>; 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 {
status = "okay";
};
&dai {
status = "okay";
};
&ehci0 { &ehci0 {
status = "okay"; status = "okay";
}; };
@ -123,8 +144,7 @@
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
cd-inverted;
status = "okay"; status = "okay";
}; };
@ -140,9 +160,9 @@
&mmc2_8bit_pins { &mmc2_8bit_pins {
/* Increase drive strength for DDR modes */ /* Increase drive strength for DDR modes */
allwinner,drive = <SUN4I_PINCTRL_40_MA>; drive-strength = <40>;
/* eMMC is missing pull-ups */ /* eMMC is missing pull-ups */
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; bias-pull-up;
}; };
&ohci0 { &ohci0 {
@ -151,10 +171,9 @@
&pio { &pio {
mmc0_cd_pin_sina33: mmc0_cd_pin@0 { mmc0_cd_pin_sina33: mmc0_cd_pin@0 {
allwinner,pins = "PB4"; pins = "PB4";
allwinner,function = "gpio_in"; function = "gpio_in";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; bias-pull-up;
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
}; };
}; };
@ -170,7 +189,15 @@
}; };
}; };
#include "axp22x.dtsi" #include "axp223.dtsi"
&ac_power_supply {
status = "okay";
};
&battery_power_supply {
status = "okay";
};
&reg_aldo1 { &reg_aldo1 {
regulator-always-on; regulator-always-on;
@ -232,6 +259,10 @@
regulator-name = "vcc-rtc"; regulator-name = "vcc-rtc";
}; };
&sound {
status = "okay";
};
&tcon0 { &tcon0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&lcd_rgb666_pins>; pinctrl-0 = <&lcd_rgb666_pins>;

63
arch/arm/dts/sun8i-a33.dtsi
View file

@ -203,8 +203,8 @@
}; };
}; };
soc@01c00000 { soc@1c00000 {
tcon0: lcd-controller@01c0c000 { tcon0: lcd-controller@1c0c000 {
compatible = "allwinner,sun8i-a33-tcon"; compatible = "allwinner,sun8i-a33-tcon";
reg = <0x01c0c000 0x1000>; reg = <0x01c0c000 0x1000>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
@ -236,11 +236,16 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <1>; reg = <1>;
tcon0_out_dsi: endpoint@1 {
reg = <1>;
remote-endpoint = <&dsi_in_tcon0>;
};
}; };
}; };
}; };
crypto: crypto-engine@01c15000 { crypto: crypto-engine@1c15000 {
compatible = "allwinner,sun4i-a10-crypto"; compatible = "allwinner,sun4i-a10-crypto";
reg = <0x01c15000 0x1000>; reg = <0x01c15000 0x1000>;
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
@ -250,7 +255,7 @@
reset-names = "ahb"; reset-names = "ahb";
}; };
dai: dai@01c22c00 { dai: dai@1c22c00 {
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
compatible = "allwinner,sun6i-a31-i2s"; compatible = "allwinner,sun6i-a31-i2s";
reg = <0x01c22c00 0x200>; reg = <0x01c22c00 0x200>;
@ -263,7 +268,7 @@
status = "disabled"; status = "disabled";
}; };
codec: codec@01c22e00 { codec: codec@1c22e00 {
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
compatible = "allwinner,sun8i-a33-codec"; compatible = "allwinner,sun8i-a33-codec";
reg = <0x01c22e00 0x400>; reg = <0x01c22e00 0x400>;
@ -273,14 +278,53 @@
status = "disabled"; status = "disabled";
}; };
ths: ths@01c25000 { ths: ths@1c25000 {
compatible = "allwinner,sun8i-a33-ths"; compatible = "allwinner,sun8i-a33-ths";
reg = <0x01c25000 0x100>; reg = <0x01c25000 0x100>;
#thermal-sensor-cells = <0>; #thermal-sensor-cells = <0>;
#io-channel-cells = <0>; #io-channel-cells = <0>;
}; };
fe0: display-frontend@01e00000 { dsi: dsi@1ca0000 {
compatible = "allwinner,sun6i-a31-mipi-dsi";
reg = <0x01ca0000 0x1000>;
interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_MIPI_DSI>,
<&ccu CLK_DSI_SCLK>;
clock-names = "bus", "mod";
resets = <&ccu RST_BUS_MIPI_DSI>;
phys = <&dphy>;
phy-names = "dphy";
status = "disabled";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
dsi_in_tcon0: endpoint {
remote-endpoint = <&tcon0_out_dsi>;
};
};
};
};
dphy: d-phy@1ca1000 {
compatible = "allwinner,sun6i-a31-mipi-dphy";
reg = <0x01ca1000 0x1000>;
clocks = <&ccu CLK_BUS_MIPI_DSI>,
<&ccu CLK_DSI_DPHY>;
clock-names = "bus", "mod";
resets = <&ccu RST_BUS_MIPI_DSI>;
status = "disabled";
#phy-cells = <0>;
};
fe0: display-frontend@1e00000 {
compatible = "allwinner,sun8i-a33-display-frontend"; compatible = "allwinner,sun8i-a33-display-frontend";
reg = <0x01e00000 0x20000>; reg = <0x01e00000 0x20000>;
interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
@ -289,7 +333,6 @@
clock-names = "ahb", "mod", clock-names = "ahb", "mod",
"ram"; "ram";
resets = <&ccu RST_BUS_DE_FE>; resets = <&ccu RST_BUS_DE_FE>;
status = "disabled";
ports { ports {
#address-cells = <1>; #address-cells = <1>;
@ -308,7 +351,7 @@
}; };
}; };
be0: display-backend@01e60000 { be0: display-backend@1e60000 {
compatible = "allwinner,sun8i-a33-display-backend"; compatible = "allwinner,sun8i-a33-display-backend";
reg = <0x01e60000 0x10000>, <0x01e80000 0x1000>; reg = <0x01e60000 0x10000>, <0x01e80000 0x1000>;
reg-names = "be", "sat"; reg-names = "be", "sat";
@ -350,7 +393,7 @@
}; };
}; };
drc0: drc@01e70000 { drc0: drc@1e70000 {
compatible = "allwinner,sun8i-a33-drc"; compatible = "allwinner,sun8i-a33-drc";
reg = <0x01e70000 0x10000>; reg = <0x01e70000 0x10000>;
interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;

30
arch/arm/dts/sun8i-q8-common.dtsi
View file

@ -49,13 +49,6 @@
ethernet0 = &sdio_wifi; ethernet0 = &sdio_wifi;
}; };
q8_hardwaremgr {
compatible = "allwinner,sunxi-q8-hardwaremgr";
touchscreen-i2c-bus = <&i2c0>;
touchscreen-supply = <&reg_ldo_io1>;
touchscreen-power-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
};
wifi_pwrseq: wifi_pwrseq { wifi_pwrseq: wifi_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
/* /*
@ -90,32 +83,17 @@
}; };
&mmc1_pins_a { &mmc1_pins_a {
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; bias-pull-up;
}; };
&r_pio { &r_pio {
wifi_pwrseq_pin_q8: wifi_pwrseq_pin@0 { wifi_pwrseq_pin_q8: wifi_pwrseq_pin@0 {
allwinner,pins = "PL6", "PL7", "PL11"; pins = "PL6", "PL7", "PL11";
allwinner,function = "gpio_in"; function = "gpio_in";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; bias-pull-up;
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
}; };
}; };
&usbphy { &usbphy {
usb1_vbus-supply = <&reg_dldo1>; usb1_vbus-supply = <&reg_dldo1>;
}; };
&gsl1680 {
touchscreen-size-x = <1024>;
touchscreen-size-y = <600>;
touchscreen-fw-name = "silead/gsl1680-q8-700.fw";
status = "okay";
};
&reg_ldo_io1 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-name = "vcc-touchscreen";
status = "okay";
};

3
arch/arm/dts/sun8i-r16-bananapi-m2m.dts
View file

@ -150,8 +150,7 @@
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
cd-inverted;
status = "okay"; status = "okay";
}; };

2
arch/arm/dts/sun8i-r16-nintendo-nes-classic-edition.dts
View file

@ -63,8 +63,6 @@
}; };
&nfc { &nfc {
pinctrl-names = "default";
pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
status = "okay"; status = "okay";
nand@0 { nand@0 {

50
arch/arm/dts/sun8i-r16-parrot.dts
View file

@ -84,6 +84,14 @@
}; };
&codec {
status = "okay";
};
&dai {
status = "okay";
};
&ehci0 { &ehci0 {
status = "okay"; status = "okay";
}; };
@ -149,8 +157,8 @@
}; };
&mmc2_8bit_pins { &mmc2_8bit_pins {
allwinner,drive = <SUN4I_PINCTRL_40_MA>; drive-strength = <40>;
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; bias-pull-up;
}; };
&ohci0 { &ohci0 {
@ -159,40 +167,32 @@
&pio { &pio {
mmc0_cd_pin_parrot: mmc0_cd_pin@0 { mmc0_cd_pin_parrot: mmc0_cd_pin@0 {
allwinner,pins = "PD14"; pins = "PD14";
allwinner,function = "gpio_in"; function = "gpio_in";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; bias-pull-up;
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
}; };
led_pins_parrot: led_pins@0 { led_pins_parrot: led_pins@0 {
allwinner,pins = "PE16", "PE17"; pins = "PE16", "PE17";
allwinner,function = "gpio_out"; function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
usb0_id_det: usb0_id_detect_pin@0 { usb0_id_det: usb0_id_detect_pin@0 {
allwinner,pins = "PD10"; pins = "PD10";
allwinner,function = "gpio_in"; function = "gpio_in";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; bias-pull-up;
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
}; };
usb1_vbus_pin_parrot: usb1_vbus_pin@0 { usb1_vbus_pin_parrot: usb1_vbus_pin@0 {
allwinner,pins = "PD12"; pins = "PD12";
allwinner,function = "gpio_out"; function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
}; };
&r_pio { &r_pio {
wifi_reset_pin_parrot: wifi_reset_pin@0 { wifi_reset_pin_parrot: wifi_reset_pin@0 {
allwinner,pins = "PL6"; pins = "PL6";
allwinner,function = "gpio_out"; function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
}; };
@ -209,7 +209,7 @@
}; };
}; };
#include "axp22x.dtsi" #include "axp223.dtsi"
&reg_aldo1 { &reg_aldo1 {
regulator-always-on; regulator-always-on;
@ -325,6 +325,10 @@
status = "okay"; status = "okay";
}; };
&sound {
status = "okay";
};
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_b>; pinctrl-0 = <&uart0_pins_b>;

59
arch/arm/dts/sun8i-reference-design-tablet.dtsi
View file

@ -50,8 +50,6 @@
backlight: backlight { backlight: backlight {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pinctrl-names = "default";
pinctrl-0 = <&bl_en_pin>;
pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
default-brightness-level = <8>; default-brightness-level = <8>;
@ -71,15 +69,13 @@
*/ */
clock-frequency = <400000>; clock-frequency = <400000>;
gsl1680: touchscreen@40 { touchscreen: touchscreen@0 {
compatible = "silead,gsl1680";
reg = <0x40>;
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
interrupts = <1 5 IRQ_TYPE_EDGE_FALLING>; /* PB5 */ interrupts = <1 5 IRQ_TYPE_EDGE_FALLING>; /* PB5 */
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ts_power_pin>; pinctrl-0 = <&ts_power_pin>;
power-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ power-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
/* Most tablets use this touchscreen, but not all */ /* Tablet dts must provide reg and compatible */
status = "disabled"; status = "disabled";
}; };
}; };
@ -89,38 +85,26 @@
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
cd-inverted;
status = "okay"; status = "okay";
}; };
&pio { &pio {
bl_en_pin: bl_en_pin@0 {
allwinner,pins = "PH6";
allwinner,function = "gpio_in";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
mmc0_cd_pin: mmc0_cd_pin@0 { mmc0_cd_pin: mmc0_cd_pin@0 {
allwinner,pins = "PB4"; pins = "PB4";
allwinner,function = "gpio_in"; function = "gpio_in";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; bias-pull-up;
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
}; };
ts_power_pin: ts_power_pin@0 { ts_power_pin: ts_power_pin@0 {
allwinner,pins = "PH1"; pins = "PH1";
allwinner,function = "gpio_out"; function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH8"; pins = "PH8";
allwinner,function = "gpio_in"; function = "gpio_in";
allwinner,drive = <SUN4I_PINCTRL_10_MA>; bias-pull-up;
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
}; };
}; };
@ -138,7 +122,15 @@
}; };
}; };
#include "axp22x.dtsi" #include "axp223.dtsi"
&ac_power_supply {
status = "okay";
};
&battery_power_supply {
status = "okay";
};
&reg_aldo1 { &reg_aldo1 {
regulator-always-on; regulator-always-on;
@ -211,10 +203,21 @@
status = "okay"; status = "okay";
}; };
&reg_ldo_io1 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-name = "vcc-touchscreen";
status = "okay";
};
&reg_rtc_ldo { &reg_rtc_ldo {
regulator-name = "vcc-rtc"; regulator-name = "vcc-rtc";
}; };
&cpu0 {
cpu-supply = <&reg_dcdc2>;
};
&r_uart { &r_uart {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&r_uart_pins_a>; pinctrl-0 = <&r_uart_pins_a>;