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

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

Merge "ARM: dts: msm: enable widebus on SA6155"

parents 7c4c4844 294f5ef5

arch/arm64/boot/dts/qcom/sa6155-adp-air.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/qcom,gcc-sm6150.h>

#include "sa6155-cnss.dtsi"

#include "sa6155-display.dtsi"



&qupv3_2 {

	status = "ok";

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/qcom,gcc-sm6150.h>

#include "sa6155-cnss.dtsi"

#include "sa6155-display.dtsi"



&qupv3_2 {

	status = "ok";

arch/arm64/boot/dts/qcom/sa6155-display.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -48,10 +48,11 @@ 


	vdda-1p2-supply = <&pm6155_1_l11>;

	vdda-0p9-supply = <&pm6155_1_l5>;

	/delete-property/ qcom,dp-aux-switch;

	/delete-property/ pinctrl-names;

	qcom,dp-aux-switch = <0>;

	pinctrl-names = <0>;

	qcom,mst-enable;

	qcom,dp-aux-bridge-sim = <&sde_dp_mst_sim>;

	qcom,widebus-enable;



	qcom,core-supply-entries {

		#address-cells = <1>;

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

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


#include "sm6150.dtsi"

#include "sa6155-pmic.dtsi"

#include "sa6155-display.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155";

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

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


#include "sm6150.dtsi"

#include "sa6155-pmic.dtsi"

#include "sa6155-display.dtsi"

#include "sa6155p-camera.dtsi"

#include "sa6155p-camera-sensor.dtsi"