diff options
author | Jagan Teki <jagan@amarulasolutions.com> | 2018-08-05 00:40:11 +0530 |
---|---|---|
committer | Jagan Teki <jagan@amarulasolutions.com> | 2018-09-28 22:09:24 +0530 |
commit | 9ad93c0c968c8e6cd1273b73c44ec7262c616408 (patch) | |
tree | fbf5ba73c82d359e5bb83ad25f12a0960a840f7c /arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts | |
parent | b9d59d08a6c7362a9558dd5f67cdf85cc3a1b7c8 (diff) |
ARM: dts: sun8i: Update A23/A33/r16 dts(i) files from Linux-v4.18-rc3
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>
Diffstat (limited to 'arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts')
-rw-r--r-- | arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts b/arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts index 8e8f3e0846..6b3bcae089 100644 --- a/arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts +++ b/arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts @@ -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 { pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins_a>; @@ -87,14 +79,21 @@ }; &mmc1_pins_a { - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + bias-pull-up; }; &r_pio { wifi_pwrseq_pin_mid2809: wifi_pwrseq_pin@0 { - allwinner,pins = "PL6"; - allwinner,function = "gpio_out"; - allwinner,drive = <SUN4I_PINCTRL_10_MA>; - allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + pins = "PL6"; + function = "gpio_out"; }; }; + +&touchscreen { + reg = <0x40>; + compatible = "silead,gsl3670"; + firmware-name = "gsl3670-polaroid-mid2809pxe04.fw"; + touchscreen-size-x = <1660>; + touchscreen-size-y = <890>; + status = "okay"; +}; |