aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/dts/sun8i-a23.dtsi
diff options
context:
space:
mode:
authorJagan Teki2018-08-05 00:40:11 +0530
committerJagan Teki2018-09-28 22:09:24 +0530
commit9ad93c0c968c8e6cd1273b73c44ec7262c616408 (patch)
treefbf5ba73c82d359e5bb83ad25f12a0960a840f7c /arch/arm/dts/sun8i-a23.dtsi
parentb9d59d08a6c7362a9558dd5f67cdf85cc3a1b7c8 (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.dtsi')
-rw-r--r--arch/arm/dts/sun8i-a23.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/sun8i-a23.dtsi b/arch/arm/dts/sun8i-a23.dtsi
index 4d1f929780a..58e6585b504 100644
--- a/arch/arm/dts/sun8i-a23.dtsi
+++ b/arch/arm/dts/sun8i-a23.dtsi
@@ -49,8 +49,8 @@
reg = <0x40000000 0x40000000>;
};
- soc@01c00000 {
- codec: codec@01c22c00 {
+ soc@1c00000 {
+ codec: codec@1c22c00 {
#sound-dai-cells = <0>;
compatible = "allwinner,sun8i-a23-codec";
reg = <0x01c22c00 0x400>;