From 2bce84c1a0c3ff04d29e6ef02823074588e90aa1 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Fri, 20 Nov 2015 15:31:19 -0800 Subject: arm64: dts: qcom: Alias pm8916 on msm8916 devices Add an alias for pm8916 on msm8916 based SoCs so that the newly updated dtbTool can find the pmic compatible string and add the pmic-id element to the QCDT header. Signed-off-by: Stephen Boyd Signed-off-by: Andy Gross --- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi') diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index 6b8abbe68746..46bfcb9b2e84 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -20,6 +20,7 @@ aliases { serial0 = &blsp1_uart2; serial1 = &blsp1_uart1; + usid0 = &pm8916_0; }; chosen { -- cgit v1.2.3 From b98e6c76586e92c407cd543f5a9b4efe802117d7 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Fri, 11 Dec 2015 18:12:50 +0000 Subject: arm64: dts: fix the i2c aliasing to match to schematics. This patch fixes the i2c bus number aliasing so that it matches with the schematics bus naming. Without this patch the user might would get bus numbers depending on the order the devices are probed. Signed-off-by: Srinivas Kandagatla Signed-off-by: Andy Gross --- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi') diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index 46bfcb9b2e84..0f775d7bba6d 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -21,6 +21,9 @@ serial0 = &blsp1_uart2; serial1 = &blsp1_uart1; usid0 = &pm8916_0; + i2c0 = &blsp_i2c2; + i2c1 = &blsp_i2c6; + i2c3 = &blsp_i2c4; }; chosen { -- cgit v1.2.3 From 700dfee1901872625d0190e32dd8b1d0e29d0850 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 10 Dec 2015 15:21:11 -0600 Subject: arm64: dts: apq8016-sbc: enable UART0 on LS connector The LS UART0 is not used by anything else and should be enabled for expansion boards. Signed-off-by: Rob Herring Cc: Srinivas Kandagatla Cc: Andy Gross Signed-off-by: Olof Johansson --- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi') diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index 6b8abbe68746..7505fa385ceb 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -27,6 +27,13 @@ }; soc { + serial@78af000 { + status = "okay"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&blsp1_uart1_default>; + pinctrl-1 = <&blsp1_uart1_sleep>; + }; + serial@78b0000 { status = "okay"; pinctrl-names = "default", "sleep"; -- cgit v1.2.3 From 262c45d43f425c7907a4c9857e7f37c82234a3be Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 10 Dec 2015 15:21:12 -0600 Subject: arm64: dts: apq8016-sbc: add label properties for UART, I2C, and SPI Add label properties to provide a way to identify UART, I2C and SPI ports based on their connector names. This follows naming convention in 96boards CE spec. Ports without external connections are not labelled. Signed-off-by: Rob Herring Cc: Srinivas Kandagatla Cc: Andy Gross Acked-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Olof Johansson --- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi') diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index 7505fa385ceb..14fafa1e9c7c 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -28,6 +28,7 @@ soc { serial@78af000 { + label = "LS-UART0"; status = "okay"; pinctrl-names = "default", "sleep"; pinctrl-0 = <&blsp1_uart1_default>; @@ -35,6 +36,7 @@ }; serial@78b0000 { + label = "LS-UART1"; status = "okay"; pinctrl-names = "default", "sleep"; pinctrl-0 = <&blsp1_uart2_default>; @@ -43,26 +45,31 @@ i2c@78b6000 { /* On Low speed expansion */ + label = "LS-I2C0"; status = "okay"; }; i2c@78b8000 { /* On High speed expansion */ + label = "HS-I2C2"; status = "okay"; }; i2c@78ba000 { /* On Low speed expansion */ + label = "LS-I2C1"; status = "okay"; }; spi@78b7000 { /* On High speed expansion */ + label = "HS-SPI1"; status = "okay"; }; spi@78b9000 { /* On Low speed expansion */ + label = "LS-SPI0"; status = "okay"; }; -- cgit v1.2.3