diff options
| author | Jagan Teki <jagan@amarulasolutions.com> | 2019-04-09 15:08:51 +0530 |
|---|---|---|
| committer | Jagan Teki <jagan@amarulasolutions.com> | 2019-04-17 14:34:45 +0530 |
| commit | 3705d4965faf32ff64386dd02d49b3d1e315e924 (patch) | |
| tree | 77faf12017941c9bb0d5d0887cc0cc1e4e8b8041 /arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts | |
| parent | 99a8a3114f1ddb9b1e245879ff7186b2a499064d (diff) | |
arm: allwinner: r40: Sync R40 dts(i) files from Linux 5.1-rc2
Sync sun8i-r40 dts(i) files from Linux 5.1-rc2
Linux commit details about the sun8i-r40* sync:
"ARM: dts: sun8i: r40: bananapi-m2-ultra: Add Bluetooth device node"
(sha1: 1e5f1db4ccd8348a21da55bff82f4263000879ef)
Linux commit details about the sun8i-v40* sync:
"ARM: dts: sunxi: Fix I2C bus warnings"
(sha1: 0729b4af5753b65aa031f58c435da53dbbf56d19)
Cc: Pablo Sebastián Greco <pgreco@centosproject.org>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Diffstat (limited to 'arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts')
| -rw-r--r-- | arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts index 35859d8f32..bf97f6244c 100644 --- a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts @@ -95,7 +95,7 @@ &i2c0 { status = "okay"; - axp22x: pmic@68 { + axp22x: pmic@34 { compatible = "x-powers,axp221"; reg = <0x34>; interrupt-parent = <&nmi_intc>; |