Skip to content

Commit

Permalink
Merge commit 'bdd6da44c0b94684e6573d840097489c74919904' into HEAD
Browse files Browse the repository at this point in the history
Change-Id: I45438f445f31373c24fe64ae5ce9cd3753b72f36
Signed-off-by: Pradosh Das <[email protected]>
  • Loading branch information
Pradosh Das committed Sep 10, 2020
2 parents 197130f + bdd6da4 commit 29a3c5b
Show file tree
Hide file tree
Showing 278 changed files with 8,954 additions and 2,162 deletions.
19 changes: 9 additions & 10 deletions Documentation/devicetree/bindings/arm/msm/msm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,6 @@ SoCs:
- SDA429W
compatible = "qcom,sda429w"

- QCM6125
compatible = "qcom,qcm6125"

- QCS6125
compatible = "qcom,qcs6125"

- SA2145P
compatible = "qcom,sa2145p"

Expand Down Expand Up @@ -168,6 +162,11 @@ Generic board variants:
- TTP device:
compatible = "qcom,ttp"

- TRINKET-IOT
compatible = "qcom,trinket-iot"

- TRINKETP-IOT
compatible = "qcom,trinketp-iot"

Boards (SoC type + board variant):

Expand Down Expand Up @@ -311,7 +310,7 @@ compatible = "qcom,sda429w-wdp"
compatible = "qcom,sda429-wdp"
compatible = "qcom,sdm429w-wdp"
compatible = "qcom,sdm429-wdp"
compatible = "qcom,qcm6125"
compatible = "qcom,qcs6125"
compatible = "qcom,qcm6125-idp"
compatible = "qcom,qcs6125-idp"
compatible = "qcom,trinket-iot"
compatible = "qcom,trinketp-iot"
compatible = "qcom,trinket-iot-idp"
compatible = "qcom,trinketp-iot-idp"
64 changes: 64 additions & 0 deletions Documentation/devicetree/bindings/net/qcom,sja1105p-eth-switch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
* NXP SJA1105P 10/100/1000 Ethernet Switch Driver

Required properties:
### Properties of top level
- compatible: Should be "qcom,nxp,sja1105p-switch".
- reg: Should contain SPI chip select.
- spi-max-frequency: Should contain maximum spi clock frequency
for slave device.
- spi-cpha: SPI configuration to enable shift clock phase (CPHA) mode.
- switch-speed: Should contain switch ports speed 10/100/1000 Mbps.
- pinctrl-names : Names corresponding to the numbered pinctrl states
- pinctrl-<n> : Pinctrl states as described in bindings/pinctrl/pinctrl-bindings.txt
- qcom,reset-gpio: Reference to the GPIO connected to the reset input.

### Properties of the port-X child node
- `null-phy`: Determines if the port has a PHY connected to it or not
- `phy-ref`: _phandle_ to the connected ethernet PHY
**NOTE**: Must be `0x00` in case there is no PHY connected to port-X
(for example if port-X is a host port or a cascaded port)
- `logical-port-num`: logical port number, used for the port mapping
**NOTE**: Must be `0xff` in case port-X is a cascaded port.

Example:

sja1105: ethernet-switch@0{
compatible = "qcom,nxp,sja1105p-switch";
reg = <0>;
spi-max-frequency = <12000000>;
spi-cpha;
switch-speed = <1000>;
pinctrl-names = "default";
pinctrl-0 = <&sja1105_default>;
qcom,reset-gpio = <&tlmm 91 0x1>;

port-0 {
null-phy = <0x1>;
phy-ref = < 0 >;
logical-port-num = < 0 >;
};

port-1 {
null-phy = <0x1>;
phy-ref = < 0 >;
logical-port-num = < 1 >;
};

port-2 {
null-phy = <0x1>;
phy-ref = < 0 >;
logical-port-num = < 2 >;
};

port-3 {
null-phy = <0x1>;
phy-ref = < 0 >;
logical-port-num = < 3 >;
};

port-4 {
null-phy = <0x1>;
phy-ref = < 0 >;
logical-port-num = < 4 >;
};
};
19 changes: 19 additions & 0 deletions Documentation/devicetree/bindings/soc/qcom/bg_rsb.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Qualcomm technologies, Inc. bg-rsb

BG-RSB : bg-rsb is used to communicate with Blackghost over
Glink to configure the RSB events. bg-rsb enable/disable
LDO11 and LDO15 before making any communication to BG
regarding RSB. It also provides an input device, which is
used to send the RSB/Button events to input framework.

Required properties:
- compatible : should be "qcom,bg-rsb"
- vdd-ldo1-supply : for powering main supply
- vdd-ldo2-supply : for powering sensor

Example:
qcom,bg-rsb {
compatible = "qcom,bg-rsb";
vdd-ldo1-supply = <&pm660_l11>;
vdd-ldo2-supply = <&pm660_l15>;
};
20 changes: 20 additions & 0 deletions Documentation/devicetree/bindings/soc/qcom/bgrsb_rpmsg.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Qualcomm technologies, Inc. bgrsb-rpmsg

BGRSB-RPMSG : bgrsb-rpmsg is used as an interface between
BG-RSB and Blackghost for Glink communication. bg-rsb is
used to communicate with Blackghost over Glink to
configure the RSB events.

Required properties:
- compatible : should be "qcom,bgrsb-rpmsg"
- glink-channels : RSB_CTRL
- glinkpkt-edge : bg
- intents : <0x200 20>

Example:
qcom,bg-rsb {
compatible = "qcom,bgrsb-rpmsg";
qcom,glink-channels = "RSB_CTRL";
qcom,glinkpkt-edge = "bg";
intents = <0x200 20>;
};
2 changes: 2 additions & 0 deletions arch/arm/configs/vendor/sa515m-perf_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,14 @@ CONFIG_BRIDGE=y
CONFIG_VLAN_8021Q=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_PRIO=y
CONFIG_NET_SWITCHDEV=y
CONFIG_QRTR=y
CONFIG_QRTR_NODE_ID=2
CONFIG_QRTR_SMD=y
CONFIG_QRTR_MHI=y
CONFIG_QRTR_MHI_DEV=y
CONFIG_QRTR_USB_DEV=y
CONFIG_QRTR_ETHERNET=y
CONFIG_CAN=y
CONFIG_QTI_CAN=y
CONFIG_CFG80211=y
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/configs/vendor/sa515m_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,14 @@ CONFIG_BRIDGE=y
CONFIG_VLAN_8021Q=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_PRIO=y
CONFIG_NET_SWITCHDEV=y
CONFIG_QRTR=y
CONFIG_QRTR_NODE_ID=2
CONFIG_QRTR_SMD=y
CONFIG_QRTR_MHI=y
CONFIG_QRTR_MHI_DEV=y
CONFIG_QRTR_USB_DEV=y
CONFIG_QRTR_ETHERNET=y
CONFIG_CAN=y
CONFIG_QTI_CAN=y
CONFIG_CFG80211=y
Expand Down
Loading

0 comments on commit 29a3c5b

Please sign in to comment.