Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97d6e326 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM64: dts: sa8155: Changes to Fix Kernel Warnings"

parents f31e69da 7d99ca60

arch/arm64/boot/dts/qcom/pm8150.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
#include <dt-bindings/iio/qcom,spmi-vadc.h>



&spmi_bus {

	#address-cells = <2>;

	#size-cells = <0>;



	qcom,pm8150@0 {

		compatible = "qcom,spmi-pmic";

		reg = <0x0 SPMI_USID>;

arch/arm64/boot/dts/qcom/pm8150b.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
#include <dt-bindings/iio/qcom,spmi-vadc.h>



&spmi_bus {

	#address-cells = <2>;

	#size-cells = <0>;



	qcom,pm8150b@2 {

		compatible = "qcom,spmi-pmic";

		reg = <0x2 SPMI_USID>;

arch/arm64/boot/dts/qcom/pm8150l.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
#include <dt-bindings/iio/qcom,spmi-vadc.h>



&spmi_bus {

	#address-cells = <2>;

	#size-cells = <0>;



	qcom,pm8150l@4 {

		compatible = "qcom,spmi-pmic";

		reg = <0x4 SPMI_USID>;

arch/arm64/boot/dts/qcom/sa8155-adp-common.dtsi

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018, 2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -17,6 +17,10 @@ 


&qupv3_se0_spi {

	status = "ok";



	#address-cells = <1>;

	#size-cells = <0>;



	can-controller@0 {

		compatible = "qcom,nxp,mpc5746c";

		reg = <0>;

arch/arm64/boot/dts/qcom/sa8155-pmic-overlay.dtsi

+4 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -38,6 +38,9 @@ pm8150_1_gpios: &pm8150_gpios { 


/* PM8150_2: */

&spmi_bus {

	#address-cells = <2>;

	#size-cells = <0>;



	qcom,pm8150@4 {

		compatible = "qcom,spmi-pmic";

		reg = <0x4 SPMI_USID>;