Hi,
On Mon, Mar 23, 2015 at 03:00:31PM +0100, Michal Suchanek wrote:
> Signed-off-by: Michal Suchanek <[email protected]>
Commit log, please.
> ---
> arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 12 ++++++++++
> arch/arm/boot/dts/sun5i-a10s.dtsi | 28 ++++++++++++++++++++++++
> 2 files changed, 40 insertions(+)
>
> diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
> index aa88ee8..e546b3f 100644
> --- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
> +++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
> @@ -59,6 +59,12 @@
> model = "Olimex A10s-Olinuxino Micro";
> compatible = "olimex,a10s-olinuxino-micro", "allwinner,sun5i-a10s";
>
> + chosen {
> + framebuffer@0 {
> + status = "okay";
> + };
> + };
> +
This is wrong.
If the bootloader has set a simplefb node, it will enable the right
one, if not it means that it's not meant to be used.
> aliases {
> serial0 = &uart0;
> serial1 = &uart2;
> @@ -182,6 +188,12 @@
> status = "okay";
> };
>
> +&spi2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&spi2_pins_a>;
> + status = "okay";
> +};
> +
This should be in a separate patch, and the node are to be ordered
alphabetically.
> &ohci0 {
> status = "okay";
> };
> diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
> index a78c95d..438eba1 100644
> --- a/arch/arm/boot/dts/sun5i-a10s.dtsi
> +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
> @@ -154,6 +154,20 @@
> clocks = <&apb1_gates 18>;
> status = "disabled";
> };
> +
> + spi2: spi@01c17000 {
> + compatible = "allwinner,sun4i-a10-spi";
> + reg = <0x01c17000 0x1000>;
> + interrupts = <12>;
> + clocks = <&ahb_gates 22>, <&spi2_clk>;
> + clock-names = "ahb", "mod";
> + dmas = <&dma SUN4I_DMA_DEDICATED 29>,
> + <&dma SUN4I_DMA_DEDICATED 28>;
> + dma-names = "rx", "tx";
> + status = "disabled";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + };
> };
> };
This should be in sun5i.dtsi (and in a separate patch).
> @@ -198,4 +212,18 @@
> allwinner,drive = <SUN4I_PINCTRL_30_MA>;
> allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> };
> +
> + spi2_pins_a: spi2@0 {
> + allwinner,pins = "PB11", "PB12", "PB13", "PB14";
> + allwinner,function = "spi2";
> + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + };
> +
> + spi2_pins_b: spi2@1 {
> + allwinner,pins = "PE00", "PE01", "PE02", "PE03";
> + allwinner,function = "spi2";
> + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> + };
> };
Ditto.
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Hello,
On 26 April 2015 at 10:39, Maxime Ripard
<[email protected]> wrote:
> Hi,
>
> On Mon, Mar 23, 2015 at 03:00:31PM +0100, Michal Suchanek wrote:
>> Signed-off-by: Michal Suchanek <[email protected]>
>> &ohci0 {
>> status = "okay";
>> };
>> diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
>> index a78c95d..438eba1 100644
>> --- a/arch/arm/boot/dts/sun5i-a10s.dtsi
>> +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
>> @@ -154,6 +154,20 @@
>> clocks = <&apb1_gates 18>;
>> status = "disabled";
>> };
>> +
>> + spi2: spi@01c17000 {
>> + compatible = "allwinner,sun4i-a10-spi";
>> + reg = <0x01c17000 0x1000>;
>> + interrupts = <12>;
>> + clocks = <&ahb_gates 22>, <&spi2_clk>;
>> + clock-names = "ahb", "mod";
>> + dmas = <&dma SUN4I_DMA_DEDICATED 29>,
>> + <&dma SUN4I_DMA_DEDICATED 28>;
>> + dma-names = "rx", "tx";
>> + status = "disabled";
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + };
>> };
>> };
>
> This should be in sun5i.dtsi (and in a separate patch).
>
>> @@ -198,4 +212,18 @@
>> allwinner,drive = <SUN4I_PINCTRL_30_MA>;
>> allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> };
>> +
>> + spi2_pins_a: spi2@0 {
>> + allwinner,pins = "PB11", "PB12", "PB13", "PB14";
>> + allwinner,function = "spi2";
>> + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> + };
>> +
>> + spi2_pins_b: spi2@1 {
>> + allwinner,pins = "PE00", "PE01", "PE02", "PE03";
>> + allwinner,function = "spi2";
>> + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>> + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
>> + };
>> };
>
> Ditto.
>
A13 does not have these pins so maybe not?
Thanks
Michal
On Sun, Apr 26, 2015 at 11:21:34AM +0200, Michal Suchanek wrote:
> Hello,
>
> On 26 April 2015 at 10:39, Maxime Ripard
> <[email protected]> wrote:
> > Hi,
> >
> > On Mon, Mar 23, 2015 at 03:00:31PM +0100, Michal Suchanek wrote:
> >> Signed-off-by: Michal Suchanek <[email protected]>
>
> >> &ohci0 {
> >> status = "okay";
> >> };
> >> diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
> >> index a78c95d..438eba1 100644
> >> --- a/arch/arm/boot/dts/sun5i-a10s.dtsi
> >> +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
> >> @@ -154,6 +154,20 @@
> >> clocks = <&apb1_gates 18>;
> >> status = "disabled";
> >> };
> >> +
> >> + spi2: spi@01c17000 {
> >> + compatible = "allwinner,sun4i-a10-spi";
> >> + reg = <0x01c17000 0x1000>;
> >> + interrupts = <12>;
> >> + clocks = <&ahb_gates 22>, <&spi2_clk>;
> >> + clock-names = "ahb", "mod";
> >> + dmas = <&dma SUN4I_DMA_DEDICATED 29>,
> >> + <&dma SUN4I_DMA_DEDICATED 28>;
> >> + dma-names = "rx", "tx";
> >> + status = "disabled";
> >> + #address-cells = <1>;
> >> + #size-cells = <0>;
> >> + };
> >> };
> >> };
> >
> > This should be in sun5i.dtsi (and in a separate patch).
> >
> >> @@ -198,4 +212,18 @@
> >> allwinner,drive = <SUN4I_PINCTRL_30_MA>;
> >> allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> >> };
> >> +
> >> + spi2_pins_a: spi2@0 {
> >> + allwinner,pins = "PB11", "PB12", "PB13", "PB14";
> >> + allwinner,function = "spi2";
> >> + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> >> + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> >> + };
> >> +
> >> + spi2_pins_b: spi2@1 {
> >> + allwinner,pins = "PE00", "PE01", "PE02", "PE03";
> >> + allwinner,function = "spi2";
> >> + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> >> + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> >> + };
> >> };
> >
> > Ditto.
> >
>
> A13 does not have these pins so maybe not?
A13 has the PE* pins, but yeah, that's true for the first group.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com