Merge tag 'qcom-soc-for-4.7' into soc-for-4.7-p2

Qualcomm ARM Based SoC Updates for v4.7 * Add stubs for smem_state to fix build issues * Fix module usage in SPM driver * Add i2c and spi entries into QCOM MAINTAINERS entry * Add SMD multi channel support * Add clks to QCOM MAINTAINERS
mariux64 · Apr 20, 2016 · b55b592 · b55b592
2 parents f55532a + 028021d
commit b55b592
Show file tree

Hide file tree

Showing 5 changed files with 220 additions and 63 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -1470,7 +1470,10 @@ F:	arch/arm/boot/dts/qcom-*.dts
 F:	arch/arm/boot/dts/qcom-*.dtsi
 F:	arch/arm/mach-qcom/
 F:	arch/arm64/boot/dts/qcom/*
+F:	drivers/i2c/busses/i2c-qup.c
+F:	drivers/clk/qcom/
 F:	drivers/soc/qcom/
+F:	drivers/spi/spi-qup.c
 F:	drivers/tty/serial/msm_serial.h
 F:	drivers/tty/serial/msm_serial.c
 F:	drivers/*/pm8???-*