On Mon, Apr 28, 2014 at 07:36:13PM +0200, Sebastian Hesselbarth wrote:
> Sascha,
>
> thanks _a lot_ for doing this. It saves me from importing the same
> for the other SoCs. Anyway, I'd even go further and fixup the Dove
> patch with this one here.
>
> Feel free to squash this into
>
> 09015ae52c18 ("ARM: dove: Use upstream dtsi file")
>
> and add my
>
> Tested-by: Sebastian Hesselbarth <sebastian.hesselba...@gmail.com>
I'll do that. Thanks for testing.
Sascha
>
> ---
> Cc: Sascha Hauer <s.ha...@pengutronix.de>
> Cc: barebox@lists.infradead.org
> ---
> arch/arm/dts/dove-cubox-bb.dts | 2 +-
> arch/arm/dts/dove-cubox.dts | 136
> -----------------------------------------
> arch/arm/dts/dove.dtsi | 1 -
> 3 files changed, 1 insertion(+), 138 deletions(-)
> delete mode 100644 arch/arm/dts/dove-cubox.dts
> delete mode 100644 arch/arm/dts/dove.dtsi
>
> diff --git a/arch/arm/dts/dove-cubox-bb.dts b/arch/arm/dts/dove-cubox-bb.dts
> index 3d1e5b4fa622..f7ad55c4e794 100644
> --- a/arch/arm/dts/dove-cubox-bb.dts
> +++ b/arch/arm/dts/dove-cubox-bb.dts
> @@ -3,7 +3,7 @@
> * Sebastian Hesselbarth <sebastian.hesselba...@gmail.com>
> */
>
> -#include "dove-cubox.dts"
> +#include "arm/dove-cubox.dts"
>
> / {
> chosen {
> diff --git a/arch/arm/dts/dove-cubox.dts b/arch/arm/dts/dove-cubox.dts
> deleted file mode 100644
> index 7a70f4ca502a..000000000000
> --- a/arch/arm/dts/dove-cubox.dts
> +++ /dev/null
> @@ -1,136 +0,0 @@
> -/dts-v1/;
> -
> -#include "dove.dtsi"
> -
> -/ {
> - model = "SolidRun CuBox";
> - compatible = "solidrun,cubox", "marvell,dove";
> -
> - memory {
> - device_type = "memory";
> - reg = <0x00000000 0x40000000>;
> - };
> -
> - chosen {
> - bootargs = "console=ttyS0,115200n8 earlyprintk";
> - };
> -
> - leds {
> - compatible = "gpio-leds";
> - pinctrl-0 = <&pmx_gpio_18>;
> - pinctrl-names = "default";
> -
> - power {
> - label = "Power";
> - gpios = <&gpio0 18 1>;
> - default-state = "keep";
> - };
> - };
> -
> - regulators {
> - compatible = "simple-bus";
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - usb_power: regulator@1 {
> - compatible = "regulator-fixed";
> - reg = <1>;
> - regulator-name = "USB Power";
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - enable-active-high;
> - regulator-always-on;
> - regulator-boot-on;
> - gpio = <&gpio0 1 0>;
> - pinctrl-0 = <&pmx_gpio_1>;
> - pinctrl-names = "default";
> - };
> - };
> -
> - clocks {
> - /* 25MHz reference crystal */
> - ref25: oscillator {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <25000000>;
> - };
> - };
> -
> - ir_recv: ir-receiver {
> - compatible = "gpio-ir-receiver";
> - gpios = <&gpio0 19 1>;
> - pinctrl-0 = <&pmx_gpio_19>;
> - pinctrl-names = "default";
> - };
> -};
> -
> -&uart0 { status = "okay"; };
> -&sata0 { status = "okay"; };
> -&mdio { status = "okay"; };
> -ð { status = "okay"; };
> -
> -ðphy {
> - compatible = "marvell,88e1310";
> - reg = <1>;
> -};
> -
> -&i2c0 {
> - status = "okay";
> - clock-frequency = <100000>;
> -
> - si5351: clock-generator {
> - compatible = "silabs,si5351a-msop";
> - reg = <0x60>;
> - #address-cells = <1>;
> - #size-cells = <0>;
> - #clock-cells = <1>;
> -
> - /* connect xtal input to 25MHz reference */
> - clocks = <&ref25>;
> -
> - /* connect xtal input as source of pll0 and pll1 */
> - silabs,pll-source = <0 0>, <1 0>;
> -
> - clkout0 {
> - reg = <0>;
> - silabs,drive-strength = <8>;
> - silabs,multisynth-source = <0>;
> - silabs,clock-source = <0>;
> - silabs,pll-master;
> - };
> -
> - clkout2 {
> - reg = <2>;
> - silabs,drive-strength = <8>;
> - silabs,multisynth-source = <1>;
> - silabs,clock-source = <0>;
> - silabs,pll-master;
> - };
> - };
> -};
> -
> -&sdio0 {
> - status = "okay";
> - /* sdio0 card detect is connected to wrong pin on CuBox */
> - cd-gpios = <&gpio0 12 1>;
> - pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;
> -};
> -
> -&spi0 {
> - status = "okay";
> -
> - /* spi0.0: 4M Flash Winbond W25Q32BV */
> - spi-flash@0 {
> - compatible = "st,w25q32";
> - spi-max-frequency = <20000000>;
> - reg = <0>;
> - };
> -};
> -
> -&audio1 {
> - status = "okay";
> - clocks = <&gate_clk 13>, <&si5351 2>;
> - clock-names = "internal", "extclk";
> - pinctrl-0 = <&pmx_audio1_i2s1_spdifo &pmx_audio1_extclk>;
> - pinctrl-names = "default";
> -};
> diff --git a/arch/arm/dts/dove.dtsi b/arch/arm/dts/dove.dtsi
> deleted file mode 100644
> index 2074fc56a3fe..000000000000
> --- a/arch/arm/dts/dove.dtsi
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <arm/dove.dtsi>
> --
> 1.9.1
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
