Re: [PATCH 2/4] ARM: STi: Supply I2C configuration to STiH416 SoC

From: Lee Jones
Date: Wed Sep 18 2013 - 08:03:59 EST


> This patch supplies I2C configuration to STiH416 SoC.
>
> Cc: Srinivas Kandagatla <srinivas.kandagatla@xxxxxx>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@xxxxxx>
> ---
> arch/arm/boot/dts/stih416-pinctrl.dtsi | 35 ++++++++++++++++++++
> arch/arm/boot/dts/stih416.dtsi | 57 ++++++++++++++++++++++++++++++++
> 2 files changed, 92 insertions(+)
>
> diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi

I genuinely don't know the answer to this question, but are these
nodes identical to the ones you've just put in the stih415 DTSI file?
If so, I think it will be worth creating a stih41x DTSI rather than
duplicating lots of stuff unnecessarily.

> index 0f246c9..b29ff4b 100644
> --- a/arch/arm/boot/dts/stih416-pinctrl.dtsi
> +++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi
> @@ -97,6 +97,24 @@
> };
> };
> };
> +
> + sbc_i2c0 {
> + pinctrl_sbc_i2c0_default: sbc_i2c0-default {
> + st,pins {
> + sda = <&PIO4 6 ALT1 BIDIR>;
> + scl = <&PIO4 5 ALT1 BIDIR>;
> + };
> + };
> + };
> +
> + sbc_i2c1 {
> + pinctrl_sbc_i2c1_default: sbc_i2c1-default {
> + st,pins {
> + sda = <&PIO3 2 ALT2 BIDIR>;
> + scl = <&PIO3 1 ALT2 BIDIR>;
> + };
> + };
> + };
> };
>
> pin-controller-front {
> @@ -175,6 +193,23 @@
> };
> };
>
> + i2c0 {
> + pinctrl_i2c0_default: i2c0-default {
> + st,pins {
> + sda = <&PIO9 3 ALT1 BIDIR>;
> + scl = <&PIO9 2 ALT1 BIDIR>;
> + };
> + };
> + };
> +
> + i2c1 {
> + pinctrl_i2c1_default: i2c1-default {
> + st,pins {
> + sda = <&PIO12 1 ALT1 BIDIR>;
> + scl = <&PIO12 0 ALT1 BIDIR>;
> + };
> + };
> + };
> };
>
> pin-controller-rear {
> diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
> index 1a0326e..8856470 100644
> --- a/arch/arm/boot/dts/stih416.dtsi
> +++ b/arch/arm/boot/dts/stih416.dtsi
> @@ -9,6 +9,7 @@
> #include "stih41x.dtsi"
> #include "stih416-clock.dtsi"
> #include "stih416-pinctrl.dtsi"
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
> / {
> L2: cache-controller {
> compatible = "arm,pl310-cache";
> @@ -92,5 +93,61 @@
> pinctrl-0 = <&pinctrl_sbc_serial1>;
> clocks = <&CLK_SYSIN>;
> };
> +
> + i2c0: i2c@fed40000{

Same issues here. I assume most of this is copy paste.

> + compatible = "st,comms-i2c";
> + status = "disabled";
> + reg = <0xfed40000 0x110>;
> + interrupts = <GIC_SPI 187 IRQ_TYPE_EDGE_RISING>;
> + clocks = <&CLK_S_ICN_REG_0>;
> + clock-frequency = <400000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c0_default>;
> + st,glitches;
> + st,glitch-clk = <500>;
> + st,glitch-dat = <500>;
> + };
> +
> + i2c1: i2c@fed41000{
> + compatible = "st,comms-i2c";
> + status = "disabled";
> + reg = <0xfed41000 0x110>;
> + interrupts = <GIC_SPI 188 IRQ_TYPE_EDGE_RISING>;
> + clocks = <&CLK_S_ICN_REG_0>;
> + clock-frequency = <400000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c1_default>;
> + st,glitches;
> + st,glitch-clk = <500>;
> + st,glitch-dat = <500>;
> + };
> +
> + sbc_i2c0: i2c@fe540000{
> + compatible = "st,comms-i2c";
> + status = "disabled";
> + reg = <0xfe540000 0x110>;
> + interrupts = <GIC_SPI 206 IRQ_TYPE_EDGE_RISING>;
> + clocks = <&CLK_SYSIN>;
> + clock-frequency = <400000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_sbc_i2c0_default>;
> + st,glitches;
> + st,glitch-clk = <500>;
> + st,glitch-dat = <500>;
> + };
> +
> + sbc_i2c1: i2c@fe541000{
> + compatible = "st,comms-i2c";
> + status = "disabled";
> + reg = <0xfe541000 0x110>;
> + interrupts = <GIC_SPI 207 IRQ_TYPE_EDGE_RISING>;
> + clocks = <&CLK_SYSIN>;
> + clock-frequency = <400000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_sbc_i2c1_default>;
> + st,glitches;
> + st,glitch-clk = <500>;
> + st,glitch-dat = <500>;
> + };
> };
> };

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/