Skip to content

Commit

Permalink
Merge tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux i…
Browse files Browse the repository at this point in the history
…nto next/soc

From Maxime Ripard:
Allwinner sunXi SoCs machine additions for 3.13

Nothing outstanding here, mostly some documentation cleanup, and the split of
the previous generic machine declaration into three different machines to
handle the sun4i/sun5i, sun6i and sun7i separately.

* tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux:
  Documentation: dt: Remove clock gates IDs list for Allwinner SoCs
  Documentation: dt: Remove interrupt sources list for Allwinner SoCs
  Documentation: sunxi: Update Allwinner SoC documentation
  Documentation: sunxi: Update A13 user manual dead link
  ARM: sunxi: Order Kconfig options alphabetically
  ARM: sunxi: Simplify restart setup code
  ARM: sunxi: Split out the DT machines for sun6i and sun7i

Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
Olof Johansson committed Oct 28, 2013
2 parents 0fc869e + fc42ef5 commit e086df9
Show file tree
Hide file tree
Showing 12 changed files with 57 additions and 570 deletions.
26 changes: 25 additions & 1 deletion Documentation/arm/sunxi/README
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ SunXi family
Linux kernel mach directory: arch/arm/mach-sunxi

Flavors:
* ARM926 based SoCs
- Allwinner F20 (sun3i)
+ Not Supported

* ARM Cortex-A8 based SoCs
- Allwinner A10 (sun4i)
+ Datasheet
Expand All @@ -25,4 +29,24 @@ SunXi family
+ Datasheet
http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf
+ User Manual
http://dl.linux-sunxi.org/A13/A13%20User%20Manual%20-%20v1.2%20%282013-08-08%29.pdf
http://dl.linux-sunxi.org/A13/A13%20User%20Manual%20-%20v1.2%20%282013-01-08%29.pdf

* Dual ARM Cortex-A7 based SoCs
- Allwinner A20 (sun7i)
+ User Manual
http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf

- Allwinner A23
+ Not Supported

* Quad ARM Cortex-A7 based SoCs
- Allwinner A31 (sun6i)
+ Datasheet
http://dl.linux-sunxi.org/A31/A31%20Datasheet%20-%20v1.00%20(2012-12-24).pdf

- Allwinner A31s (sun6i)
+ Not Supported

* Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs
- Allwinner A80
+ Not Supported
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/clock/sunxi.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ Additionally, "allwinner,*-gates-clk" clocks require:

Clock consumers should specify the desired clocks they use with a
"clocks" phandle cell. Consumers that are using a gated clock should
provide an additional ID in their clock property. The values of this
ID are documented in sunxi/<soc>-gates.txt.
provide an additional ID in their clock property. This ID is the
offset of the bit controlling this particular gate in the register.

For example:

Expand Down
93 changes: 0 additions & 93 deletions Documentation/devicetree/bindings/clock/sunxi/sun4i-a10-gates.txt

This file was deleted.

75 changes: 0 additions & 75 deletions Documentation/devicetree/bindings/clock/sunxi/sun5i-a10s-gates.txt

This file was deleted.

58 changes: 0 additions & 58 deletions Documentation/devicetree/bindings/clock/sunxi/sun5i-a13-gates.txt

This file was deleted.

83 changes: 0 additions & 83 deletions Documentation/devicetree/bindings/clock/sunxi/sun6i-a31-gates.txt

This file was deleted.

Loading

0 comments on commit e086df9

Please sign in to comment.