db820: Add missing initialization for uart
Subsystems (2)
cover db820: Add missing initialization for uart
Uart was lacking initialization of pinctrl & PLL's and relied on previous initialization from LK. Fix that.
Ramon Fried (5):
arm: mach-snapdragon: db820c: Actually init PLL for serial
arm: mach-snapdragon: add pinctrl driver for db820c
configs: dragonboard820c: Enable pinctrl/mux config
arm: mach-snapdragon: pinctrl: clarify gpio disable bit
dts: 820c: Add pinctrl node and uart mux
arch/arm/dts/dragonboard820c-uboot.dtsi | 10 +++- arch/arm/dts/dragonboard820c.dts | 29 +++++++--- arch/arm/mach-snapdragon/Makefile | 5 +- arch/arm/mach-snapdragon/clock-apq8096.c | 34 +++++++++++ .../include/mach/sysmap-apq8096.h | 9 +++ arch/arm/mach-snapdragon/pinctrl-apq8096.c | 56 +++++++++++++++++++ arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 6 +- arch/arm/mach-snapdragon/pinctrl-snapdragon.h | 1 + configs/dragonboard820c_defconfig | 2 + 9 files changed, 139 insertions(+), 13 deletions(-) create mode 100644 arch/arm/mach-snapdragon/pinctrl-apq8096.c
Signature · 1 line
2.20.1
PATCH 1/5 arm: mach-snapdragon: db820c: Actually init PLL for serial
The PLL for the UART was not set, and relied on previous initializtion made by LK. add the appropriate initialization.
---
arch/arm/mach-snapdragon/clock-apq8096.c | 34 +++++++++++++++++++ .../include/mach/sysmap-apq8096.h | 9 +++++ 2 files changed, 43 insertions(+)
arch/arm/mach-snapdragon/clock-apq8096.c +34 -0
@@ -34,6 +34,12 @@ static const struct pll_vote_clk gpll0_vote_clk = { .vote_bit = APCS_GPLL_ENA_VOTE_GPLL0, }; +static struct vote_clk gcc_blsp2_ahb_clk = { + .cbcr_reg =BLSP2_AHB_CBCR , + .ena_vote =APCS_CLOCK_BRANCH_ENA_VOTE , + .vote_bit =BIT (15 ), +}; +static int clk_init_sdc (struct msm_clk_priv *priv,uint rate) {int div =3 ;
@@ -47,6 +53,32 @@ static int clk_init_sdc(struct msm_clk_priv *priv, uint rate)return rate; } +static const struct bcr_regs uart2_regs = { + .cfg_rcgr =BLSP2_UART2_APPS_CFG_RCGR , + .cmd_rcgr =BLSP2_UART2_APPS_CMD_RCGR , + .M =BLSP2_UART2_APPS_M , + .N =BLSP2_UART2_APPS_N , + .D =BLSP2_UART2_APPS_D , +}; + +static int clk_init_uart (struct msm_clk_priv *priv) +{ +/* Enable AHB clock */ +clk_enable_vote_clk (priv->base, &gcc_blsp2_ahb_clk); + +/* 7372800 uart block clock @ GPLL0 */ +clk_rcg_set_rate_mnd (priv->base, &uart2_regs,1 ,192 ,15625 , +CFG_CLK_SRC_GPLL0 ); + +/* Vote for gpll0 clock */ +clk_enable_gpll0 (priv->base, &gpll0_vote_clk); + +/* Enable core clk */ +clk_enable_cbc (priv->base +BLSP2_UART2_APPS_CBCR ); + +return 0 ; +} +ulong msm_set_rate (struct clk *clk,ulong rate) {struct msm_clk_priv *priv =dev_get_priv (clk->dev);
@@ -55,6 +87,8 @@ ulong msm_set_rate(struct clk *clk, ulong rate)case 0 :/* SDC1 */ return clk_init_sdc (priv, rate);break ; +case 4 :/*UART2*/ +return clk_init_uart (priv);default :return 0 ; }
arch/arm/mach-snapdragon/include/mach/sysmap-apq8096.h +9 -0
@@ -15,6 +15,7 @@/* Clocks: (from CLK_CTL_BASE) */ #define GPLL0_STATUS (0x0000)#define APCS_GPLL_ENA_VOTE (0x52000) +#define APCS_CLOCK_BRANCH_ENA_VOTE (0x52004)#define SDCC2_BCR (0x14000)/* block reset */ #define SDCC2_APPS_CBCR (0x14004)/* branch control */
@@ -25,4 +26,12 @@#define SDCC2_N (0x1401C)#define SDCC2_D (0x14020) +#define BLSP2_AHB_CBCR (0x25004) +#define BLSP2_UART2_APPS_CBCR (0x29004) +#define BLSP2_UART2_APPS_CMD_RCGR (0x2900C) +#define BLSP2_UART2_APPS_CFG_RCGR (0x29010) +#define BLSP2_UART2_APPS_M (0x29014) +#define BLSP2_UART2_APPS_N (0x29018) +#define BLSP2_UART2_APPS_D (0x2901C) +#endif
Signature · 1 line
2.20.1
PATCH 1/5 arm: mach-snapdragon: db820c: Actually init PLL for serial
Quoted 4 lines · Ramon Fried
The PLL for the UART was not set, and relied on previous initializtion made by LK. add the appropriate initialization.
Signed-off-by Ramon Fried <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190126/94252846/attachment.sig>
PATCH 2/5 arm: mach-snapdragon: add pinctrl driver for db820c
In reply to Ramon FriedAdd pinctrl driver for Dragonboard820c, currently with only one mux func to initialize pins for serial console.
---
arch/arm/mach-snapdragon/Makefile | 5 +- arch/arm/mach-snapdragon/pinctrl-apq8096.c | 56 +++++++++++++++++++ arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 2 +- arch/arm/mach-snapdragon/pinctrl-snapdragon.h | 1 + 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 arch/arm/mach-snapdragon/pinctrl-apq8096.c
arch/arm/mach-snapdragon/Makefile +3 -2
@@ -6,8 +6,9 @@ obj-$(CONFIG_TARGET_DRAGONBOARD820C) += clock-apq8096.o obj-$(CONFIG_TARGET_DRAGONBOARD820C) += sysmap-apq8096.o obj-$(CONFIG_TARGET_DRAGONBOARD410C) += clock-apq8016.o obj-$(CONFIG_TARGET_DRAGONBOARD410C) += sysmap-apq8016.o -obj-$(CONFIG_TARGET_DRAGONBOARD410C) += pinctrl-apq8016.o -obj-$(CONFIG_TARGET_DRAGONBOARD410C) += pinctrl-snapdragon.o obj-y += misc.o obj-y += clock-snapdragon.o obj-y += dram.o +obj-y += pinctrl-snapdragon.o +obj-y += pinctrl-apq8016.o +obj-y += pinctrl-apq8096.o
arch/arm/mach-snapdragon/pinctrl-apq8096.c new file +56 -0
56 lines not on this page · raw message
arch/arm/mach-snapdragon/pinctrl-snapdragon.c +1 -1
@@ -113,8 +113,8 @@ static struct pinctrl_ops msm_pinctrl_ops = { };static const struct udevice_id msm_pinctrl_ids[] = { - { .compatible ="qcom,tlmm-msm8916" , .data = (ulong)&apq8016_data }, { .compatible ="qcom,tlmm-apq8016" , .data = (ulong)&apq8016_data }, + { .compatible ="qcom,tlmm-apq8096" , .data = (ulong)&apq8096_data }, { } };
arch/arm/mach-snapdragon/pinctrl-snapdragon.h +1 -0
@@ -26,5 +26,6 @@ struct pinctrl_function { };extern struct msm_pinctrl_data apq8016_data; +extern struct msm_pinctrl_data apq8096_data;#endif
Signature · 1 line
2.20.1
PATCH 2/5 arm: mach-snapdragon: add pinctrl driver for db820c
Quoted 4 lines · Ramon Fried
Add pinctrl driver for Dragonboard820c, currently with only one mux func to initialize pins for serial console.
Signed-off-by Ramon Fried <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190126/53a976fc/attachment.sig>
PATCH 3/5 configs: dragonboard820c: Enable pinctrl/mux config
In reply to Ramon Fried---
configs/dragonboard820c_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/dragonboard820c_defconfig +2 -0
@@ -31,6 +31,8 @@ CONFIG_PM8916_GPIO=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_MSM=y +CONFIG_PINCTRL=y +CONFIG_PINCONF=y CONFIG_DM_PMIC=y CONFIG_PMIC_PM8916=y CONFIG_MSM_SERIAL=y
Signature · 1 line
2.20.1
PATCH 3/5 configs: dragonboard820c: Enable pinctrl/mux config
Quoted 1 line · Ramon Fried
Signed-off-by Ramon Fried <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190126/0c734dce/attachment.sig>
PATCH 4/5 arm: mach-snapdragon: pinctrl: clarify gpio disable bit
In reply to Ramon FriedThe TLMM_GPIO_ENABLE bit is actually use to disable the GPIO. change it to TLMM_GPIO_DISABLE so it's clearer.
---
arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-snapdragon/pinctrl-snapdragon.c +2 -2
@@ -22,7 +22,7 @@ struct msm_pinctrl_priv {#define TLMM_GPIO_PULL_MASK GENMASK(1, 0)#define TLMM_FUNC_SEL_MASK GENMASK(5, 2)#define TLMM_DRV_STRENGTH_MASK GENMASK(8, 6) -#define TLMM_GPIO_ENABLE BIT(9) +#define TLMM_GPIO_DISABLE BIT(9)static const struct pinconf_param msm_conf_params[] = { {"drive-strength" ,PIN_CONFIG_DRIVE_STRENGTH ,3 },
@@ -74,7 +74,7 @@ static int msm_pinmux_set(struct udevice *dev, unsigned int pin_selector,struct msm_pinctrl_priv *priv =dev_get_priv (dev);clrsetbits_le32 (priv->base +GPIO_CONFIG_OFFSET (pin_selector), -TLMM_FUNC_SEL_MASK |TLMM_GPIO_ENABLE , +TLMM_FUNC_SEL_MASK |TLMM_GPIO_DISABLE , priv->data->get_function_mux (func_selector) <<2 );return 0 ; }
Signature · 1 line
2.20.1
PATCH 4/5 arm: mach-snapdragon: pinctrl: clarify gpio disable bit
Quoted 4 lines · Ramon Fried
The
TLMM_GPIO_ENABLEbit is actually use to disable the GPIO. change it toTLMM_GPIO_DISABLEso it's clearer.Signed-off-by Ramon Fried <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190126/678795a6/attachment.sig>
PATCH 5/5 dts: 820c: Add pinctrl node and uart mux
In reply to Ramon Fried* Add pinctrl node for TLMM and add mux request for uart node.
* Rename uart to the actual board uart port.
* Fix indentendation of sdhc2 node.
---
arch/arm/dts/dragonboard820c-uboot.dtsi | 10 ++++++++- arch/arm/dts/dragonboard820c.dts | 29 +++++++++++++++++++------ 2 files changed, 31 insertions(+), 8 deletions(-)
arch/arm/dts/dragonboard820c-uboot.dtsi +9 -1
@@ -13,14 +13,22 @@ soc { u-boot,dm-pre-reloc; + qcom,tlmm at 1010000 { + u-boot,dm-pre-reloc; + + uart { + u-boot,dm-pre-reloc; + }; + }; + clock-controller at 300000 { u-boot,dm-pre-reloc; }; serial at 75b0000 { u-boot,dm-pre-reloc; - }; }; + }; }; &pm8994_pon {
arch/arm/dts/dragonboard820c.dts +22 -7
@@ -8,6 +8,7 @@ /dts-v1/; #include "skeleton64.dtsi" +#include <dt-bindings/pinctrl/pinctrl-snapdragon.h> / { model = "Qualcomm Technologies, Inc. DB820c";
@@ -16,7 +17,7 @@ #size-cells = <2>; aliases { - serial0 = &blsp2_uart1; + serial0 = &blsp2_uart2; }; chosen {
@@ -63,18 +64,32 @@ reg = <0x300000 0x90000>; }; - blsp2_uart1: serial at 75b0000 { + pinctrl: qcom,tlmm at 1010000 { + compatible = "qcom,tlmm-apq8096"; + reg = <0x1010000 0x400000>; + + blsp8_uart: uart { + function = "blsp_uart8"; + pins = "GPIO_4", "GPIO_5"; + drive-strength = <DRIVE_STRENGTH_8MA>; + bias-disable; + }; + }; + + blsp2_uart2: serial at 75b0000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x75b0000 0x1000>; clock = <&gcc 4>; + pinctrl-names = "uart"; + pinctrl-0 = <&blsp8_uart>; }; sdhc2: sdhci at 74a4900 { - compatible = "qcom,sdhci-msm-v4"; - reg = <0x74a4900 0x314>, <0x74a4000 0x800>; - index = <0x0>; - bus-width = <4>; - clock = <&gcc 0>; + compatible = "qcom,sdhci-msm-v4"; + reg = <0x74a4900 0x314>, <0x74a4000 0x800>; + index = <0x0>; + bus-width = <4>; + clock = <&gcc 0>; clock-frequency = <200000000>; };
Signature · 1 line
2.20.1
PATCH 5/5 dts: 820c: Add pinctrl node and uart mux
Quoted 5 lines · Ramon Fried
* Add pinctrl node for TLMM and add mux request for uart node.
* Rename uart to the actual board uart port.
* Fix indentendation of sdhc2 node.Signed-off-by Ramon Fried <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190126/4a74e0d9/attachment.sig>