diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
| commit | 9157f620436a8383b13c30c0a26ad06b976b1a0b (patch) | |
| tree | 768c585c31df15ffc89cd03480ce4558ea291ca0 /target/linux/ipq806x/patches-3.18/102-soc-qcom-gsbi-Add-support-for-ADM-CRCI-muxing.patch | |
| parent | 19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd (diff) | |
| download | upstream-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.gz upstream-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.bz2 upstream-9157f620436a8383b13c30c0a26ad06b976b1a0b.zip | |
kernel: update 3.18 to 3.18.14
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14
Build tested on brcm63xx and ipq806x, runtested on brcm63xx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45711 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ipq806x/patches-3.18/102-soc-qcom-gsbi-Add-support-for-ADM-CRCI-muxing.patch')
| -rw-r--r-- | target/linux/ipq806x/patches-3.18/102-soc-qcom-gsbi-Add-support-for-ADM-CRCI-muxing.patch | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/target/linux/ipq806x/patches-3.18/102-soc-qcom-gsbi-Add-support-for-ADM-CRCI-muxing.patch b/target/linux/ipq806x/patches-3.18/102-soc-qcom-gsbi-Add-support-for-ADM-CRCI-muxing.patch index f37ebeb486..752f3f74d5 100644 --- a/target/linux/ipq806x/patches-3.18/102-soc-qcom-gsbi-Add-support-for-ADM-CRCI-muxing.patch +++ b/target/linux/ipq806x/patches-3.18/102-soc-qcom-gsbi-Add-support-for-ADM-CRCI-muxing.patch @@ -1,8 +1,6 @@ -diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt -index 4ce24d4..186e5f4 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt -@@ -6,7 +6,8 @@ configuration settings. The mode setting will govern the input/output mode of +@@ -6,7 +6,8 @@ configuration settings. The mode settin the 4 GSBI IOs. Required properties: @@ -48,8 +46,6 @@ index 4ce24d4..186e5f4 100644 + }; + + -diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig -index 7bd2c94..460b2db 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -4,6 +4,7 @@ @@ -60,8 +56,6 @@ index 7bd2c94..460b2db 100644 help Say y here to enable GSBI support. The GSBI provides control functions for connecting the underlying serial UART, SPI, and I2C -diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c -index 729425d..09c669e 100644 --- a/drivers/soc/qcom/qcom_gsbi.c +++ b/drivers/soc/qcom/qcom_gsbi.c @@ -18,22 +18,129 @@ @@ -194,7 +188,7 @@ index 729425d..09c669e 100644 gsbi = devm_kzalloc(&pdev->dev, sizeof(*gsbi), GFP_KERNEL); -@@ -45,6 +152,32 @@ static int gsbi_probe(struct platform_device *pdev) +@@ -45,6 +152,32 @@ static int gsbi_probe(struct platform_de if (IS_ERR(base)) return PTR_ERR(base); @@ -227,7 +221,7 @@ index 729425d..09c669e 100644 if (of_property_read_u32(node, "qcom,mode", &gsbi->mode)) { dev_err(&pdev->dev, "missing mode configuration\n"); return -EINVAL; -@@ -64,6 +197,25 @@ static int gsbi_probe(struct platform_device *pdev) +@@ -64,6 +197,25 @@ static int gsbi_probe(struct platform_de writel_relaxed((gsbi->mode << GSBI_PROTOCOL_SHIFT) | gsbi->crci, base + GSBI_CTRL_REG); @@ -253,6 +247,3 @@ index 729425d..09c669e 100644 /* make sure the gsbi control write is not reordered */ wmb(); --- -1.9.1 - |