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

Commit f9d9126f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ic6d24f05,Ia9c67a11,I5fb2e3e3,Ib2bcf15d into msm-next 

* changes:
  soc: qcom: Add snapshot of gladiator erp driver
  drivers: soc: qcom: Add snapshot of EUD driver
  power_supply: Add REAL_TYPE power_supply_property
  serial: Add UART port for EUD
parents 8d3283fe b9aea534

Documentation/devicetree/bindings/arm/msm/msm_gladiator_erp.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
* MSM Gladiator error reporting driver



Required properties:

- compatible: Should be "qcom,msm-gladiator" or "qcom,msm-gladiator-v2" or

"qcom,msm-gladiator-v3"

- reg: I/O address Gladiator H/W block

- reg-names: Should be "gladiator_base"

- interrupts: Should contain the gladiator error interrupt number

- clock-names: Should be "atb_clk"

- clocks: Handles to clocks specified in "clock-names" property.



Example:



qcom,msm-gladiator-v2@b1c0000 {

	compatible = "qcom,msm-gladiator";

	reg = <0xb1c0000 0xe000>;

	reg-names = "gladiator_base";

	interrupts = <0 34 0>;

	clock-names = "atb_clk";

	clocks = <&clock_gcc clk_qdss_clk>;

}

Documentation/devicetree/bindings/soc/qcom/qcom,msm-eud.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
* Qualcomm Technologies Inc Embedded USB Debugger (EUD)



The EUD (Embedded USB Debugger) is a mini-USB hub implemented

on chip to support the USB-based debug and trace capabilities.



Required properties:



 - compatible:  Should be "qcom,msm-eud"

 - interrupt-names:  Should be "eud_irq"

 - interrupts:  Interrupt number

 - reg: Should be address and size of EUD register space

 - reg-names: Should be "eud_base"



Driver notifies clients via extcon for VBUS spoof attach/detach

and charger enable/disable events. Clients registered for these

notifications should have extcon property set to eud.



An example for EUD device node:



	eud: qcom,msm-eud@88e0000 {

		compatible = "qcom,msm-eud";

		interrupt-names = "eud_irq";

		interrupts = <GIC_SPI 492 IRQ_TYPE_LEVEL_HIGH>;

		reg = <0x88e0000 0x4000>;

		reg-names = "eud_base";

	};



An example for EUD extcon client:



	usb3 {

		extcon = <&eud>;

	};

drivers/power/supply/power_supply_sysfs.c

+3 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ static ssize_t power_supply_show_property(struct device *dev, 
	else if (off == POWER_SUPPLY_PROP_CAPACITY_LEVEL)

		return sprintf(buf, "%s\n",

			       power_supply_capacity_level_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_TYPE)

	else if (off == POWER_SUPPLY_PROP_TYPE ||

			off == POWER_SUPPLY_PROP_REAL_TYPE)

		return sprintf(buf, "%s\n",

			       power_supply_type_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_SCOPE)
@@ -253,6 +254,7 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(usb_otg),

	POWER_SUPPLY_ATTR(charge_enabled),

	POWER_SUPPLY_ATTR(set_ship_mode),

	POWER_SUPPLY_ATTR(real_type),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

	/* Properties of type `const char *' */

drivers/soc/qcom/Kconfig

+36 −6
Original line number Diff line number Diff line
@@ -218,6 +218,25 @@ config MSM_GLADIATOR_HANG_DETECT 
          gladiator hang detection and collects the context for the

          gladiator hang.



config MSM_GLADIATOR_ERP

	tristate "GLADIATOR coherency interconnect error reporting driver"

	help

	  Support dumping debug information for the GLADIATOR

	  cache interconnect in the error interrupt handler.

	  Meant to be used for debug scenarios only.



	  If unsure, say N.



config PANIC_ON_GLADIATOR_ERROR

	depends on MSM_GLADIATOR_ERP

	bool "Panic on GLADIATOR error report"

	help

	  Panic upon detection of an Gladiator coherency interconnect error

	  in order to support dumping debug information.

	  Meant to be used for debug scenarios only.



	  If unsure, say N.



config QCOM_SECURE_BUFFER

	bool "Helper functions for securing buffers through TZ"

	help
@@ -243,3 +262,14 @@ config ICNSS_DEBUG 
	  primarily consists of logs consisting of information related to

	  hardware register access and enabling BUG_ON for certain cases to aid

	  the debugging.



config QCOM_EUD

	tristate "QTI Embedded USB Debugger (EUD)"

	depends on ARCH_QCOM

	select SERIAL_CORE

	help

	  The EUD (Embedded USB Debugger) is a mini-USB hub implemented

	  on chip to support the USB-based debug and trace capabilities.

	  This module enables support for Qualcomm Technologies, Inc.

	  Embedded USB Debugger (EUD).

	  If unsure, say N.

drivers/soc/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ obj-$(CONFIG_SOC_BUS) += socinfo.o 
obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o

obj-$(CONFIG_MSM_CORE_HANG_DETECT) += core_hang_detect.o

obj-$(CONFIG_MSM_GLADIATOR_HANG_DETECT) += gladiator_hang_detect.o

obj-$(CONFIG_MSM_GLADIATOR_ERP) += gladiator_erp.o

obj-$(CONFIG_QCOM_SECURE_BUFFER) += secure_buffer.o

obj-$(CONFIG_QCOM_MEMORY_DUMP_V2) += memory_dump_v2.o

obj-$(CONFIG_QCOM_WATCHDOG_V2) += watchdog_v2.o
@@ -31,3 +32,4 @@ ifdef CONFIG_MSM_SUBSYSTEM_RESTART 
       obj-y += subsystem_restart.o

       obj-y += ramdump.o

endif

obj-$(CONFIG_QCOM_EUD) += eud.o