Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44598f98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC board updates from Olof Johansson:
 "Board updates for 3.12.  Again, a bit of domain overlap with SoC and
  DT branches, but most of this is around legacy code and board support.
  We've found that platform maintainers have a hard time separating all
  of these out and might move towards fewer branches for next release.

   - Removal of a number of Marvell Kirkwood board files, since contents
     is now common and mostly configured via DT.
   - Device-tree updates for Marvell Dove, including irqchip and
     clocksource setup.
   - Defconfig updates.  Gotta go somewhere.  One new one for Renesas
     Lager.
   - New backlight drivers for backlights used on Renesas shmobile
     platforms.
   - Removal of Renesas leds driver.
   - Shuffling of some of the new Broadcom platforms to give room for
     others in the same mach directory.  More in 3.13"

* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
  mmc: sdhci-bcm-kona: Staticize sdhci_bcm_kona_card_event
  mmc: sdhci-bcm-kona: Remove unneeded version.h inclusion
  ARM: bcm: Make secure API call optional
  ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)
  ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
  ARM: bcm: Rename board_bcm
  mmc: sdhci-bcm-kona: make linker-section warning go away
  ARM: tegra: defconfig updates
  ARM: dove: add initial DT file for Globalscale D2Plug
  ARM: dove: add GPIO IR receiver node to SolidRun CuBox
  ARM: dove: add common pinmux functions to DT
  ARM: dove: add cpu device tree node
  ARM: dove: update dove_defconfig with SI5351, PCI, and xHCI
  arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument
  ARM: kirkwood: fix DT building and update defconfig
  ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code
  ARM: configs: disable DEBUG_LL in bcm_defconfig
  ARM: bcm281xx: Board specific reboot code
  ARM bcm281xx: Turn on socket & network support.
  ARM: bcm281xx: Turn on L2 cache.
  ...
parents b4b50fd7 4e5f67fa

arch/arm/boot/dts/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ 
	da850-evm.dtb

	da850-evm.dtb

dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \

dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \

	dove-cubox.dtb \

	dove-cubox.dtb \

	dove-d2plug.dtb \

	dove-dove-db.dtb

	dove-dove-db.dtb

dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \

dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \

	exynos4210-smdkv310.dtb \

	exynos4210-smdkv310.dtb \
@@ -85,6 +86,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ 
	kirkwood-lschlv2.dtb \

	kirkwood-lschlv2.dtb \

	kirkwood-lsxhl.dtb \

	kirkwood-lsxhl.dtb \

	kirkwood-mplcec4.dtb \

	kirkwood-mplcec4.dtb \

	kirkwood-mv88f6281gtw-ge.dtb \

	kirkwood-netgear_readynas_duo_v2.dtb \

	kirkwood-netgear_readynas_duo_v2.dtb \

	kirkwood-ns2.dtb \

	kirkwood-ns2.dtb \

	kirkwood-ns2lite.dtb \

	kirkwood-ns2lite.dtb \

arch/arm/boot/dts/dove-cubox.dts

+17 −20
Original line number Original line Diff line number Diff line
@@ -42,6 +42,8 @@ 
			regulator-always-on;

			regulator-always-on;

			regulator-boot-on;

			regulator-boot-on;

			gpio = <&gpio0 1 0>;

			gpio = <&gpio0 1 0>;

			pinctrl-0 = <&pmx_gpio_1>;

			pinctrl-names = "default";

		};

		};

	};

	};
@@ -53,10 +55,24 @@ 
			clock-frequency = <25000000>;

			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"; };

&uart0 { status = "okay"; };

&sata0 { status = "okay"; };

&sata0 { status = "okay"; };

&mdio { status = "okay"; };

&eth { status = "okay"; };



&ethphy {

	compatible = "marvell,88e1310";

	reg = <1>;

};





&i2c0 {

&i2c0 {

	status = "okay";

	status = "okay";
@@ -103,6 +119,7 @@ 
	status = "okay";

	status = "okay";

	/* sdio0 card detect is connected to wrong pin on CuBox */

	/* sdio0 card detect is connected to wrong pin on CuBox */

	cd-gpios = <&gpio0 12 1>;

	cd-gpios = <&gpio0 12 1>;

	pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;

};

};





&spi0 {

&spi0 {
@@ -115,23 +132,3 @@ 
		reg = <0>;

		reg = <0>;

	};

	};

};
 
};
 


&pinctrl {

	pinctrl-0 = <&pmx_gpio_1 &pmx_gpio_12>;

	pinctrl-names = "default";



	pmx_gpio_1: pmx-gpio-1 {

		marvell,pins = "mpp1";

		marvell,function = "gpio";

	};



	pmx_gpio_12: pmx-gpio-12 {

		marvell,pins = "mpp12";

		marvell,function = "gpio";

	};



	pmx_gpio_18: pmx-gpio-18 {

		marvell,pins = "mpp18";

		marvell,function = "gpio";

	};

};

arch/arm/boot/dts/dove-d2plug.dts

0 → 100644
+69 −0
Original line number Original line Diff line number Diff line 
/dts-v1/;



/include/ "dove.dtsi"



/ {

	model = "Globalscale D2Plug";

	compatible = "globalscale,d2plug", "marvell,dove";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x40000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk";

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-0 = <&pmx_gpio_0 &pmx_gpio_1 &pmx_gpio_2>;

		pinctrl-names = "default";



		wlan-ap {

			label = "wlan-ap";

			gpios = <&gpio0 0 1>;

		};



		wlan-act {

			label = "wlan-act";

			gpios = <&gpio0 1 1>;

		};



		bluetooth-act {

			label = "bt-act";

			gpios = <&gpio0 2 1>;

		};

	};

};



&uart0 { status = "okay"; };

&sata0 { status = "okay"; };

&i2c0 { status = "okay"; };

&mdio { status = "okay"; };

&eth { status = "okay"; };



/* Samsung M8G2F eMMC */

&sdio0 {

	status = "okay";

	non-removable;

	bus-width = <4>;

};



/* Marvell SD8787 WLAN/BT */

&sdio1 {

	status = "okay";

	non-removable;

	bus-width = <4>;

};



&spi0 {

	status = "okay";



	/* spi0.0: 4M Flash Macronix MX25L3205D */

	spi-flash@0 {

		compatible = "st,m25l3205d";

		spi-max-frequency = <20000000>;

		reg = <0>;

	};

};

arch/arm/boot/dts/dove.dtsi

+266 −19
Original line number Original line Diff line number Diff line
@@ -10,6 +10,23 @@ 
		gpio2 = &gpio2;

		gpio2 = &gpio2;

	};

	};





	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: cpu@0 {

			compatible = "marvell,pj4a", "marvell,sheeva-v7";

			device_type = "cpu";

			next-level-cache = <&l2>;

			reg = <0>;

		};

	};



	l2: l2-cache {

		compatible = "marvell,tauros2-cache";

		marvell,tauros2-cache-features = <0>;

	};



	soc@f1000000 {

	soc@f1000000 {

		compatible = "simple-bus";

		compatible = "simple-bus";

		#address-cells = <1>;

		#address-cells = <1>;
@@ -25,16 +42,28 @@ 
		          0xf2100000 0xf2100000 0x0100000   /* PCIe0 I/O   1M */

		          0xf2100000 0xf2100000 0x0100000   /* PCIe0 I/O   1M */

		          0xf8000000 0xf8000000 0x8000000>; /* BootROM   128M */

		          0xf8000000 0xf8000000 0x8000000>; /* BootROM   128M */





		l2: l2-cache {

		timer: timer@20300 {

			compatible = "marvell,tauros2-cache";

			compatible = "marvell,orion-timer";

			marvell,tauros2-cache-features = <0>;

			reg = <0x20300 0x20>;

			interrupt-parent = <&bridge_intc>;

			interrupts = <1>, <2>;

			clocks = <&core_clk 0>;

		};

		};





		intc: interrupt-controller {

		intc: main-interrupt-ctrl@20200 {

			compatible = "marvell,orion-intc";

			compatible = "marvell,orion-intc";

			interrupt-controller;

			interrupt-controller;

			#interrupt-cells = <1>;

			#interrupt-cells = <1>;

			reg = <0x20204 0x04>, <0x20214 0x04>;

			reg = <0x20200 0x10>, <0x20210 0x10>;

		};



		bridge_intc: bridge-interrupt-ctrl@20110 {

			compatible = "marvell,orion-bridge-intc";

			interrupt-controller;

			#interrupt-cells = <1>;

			reg = <0x20110 0x8>;

			interrupts = <0>;

			marvell,#interrupts = <5>;

		};

		};





		core_clk: core-clocks@d0214 {

		core_clk: core-clocks@d0214 {
@@ -43,14 +72,14 @@ 
			#clock-cells = <1>;

			#clock-cells = <1>;

		};

		};





		gate_clk: clock-gating-control@d0038 {

		gate_clk: clock-gating-ctrl@d0038 {

			compatible = "marvell,dove-gating-clock";

			compatible = "marvell,dove-gating-clock";

			reg = <0xd0038 0x4>;

			reg = <0xd0038 0x4>;

			clocks = <&core_clk 0>;

			clocks = <&core_clk 0>;

			#clock-cells = <1>;

			#clock-cells = <1>;

		};

		};





		thermal: thermal@d001c {

		thermal: thermal-diode@d001c {

			compatible = "marvell,dove-thermal";

			compatible = "marvell,dove-thermal";

			reg = <0xd001c 0x0c>, <0xd005c 0x08>;

			reg = <0xd001c 0x0c>, <0xd005c 0x08>;

		};

		};
@@ -70,6 +99,8 @@ 
			reg-shift = <2>;

			reg-shift = <2>;

			interrupts = <8>;

			interrupts = <8>;

			clocks = <&core_clk 0>;

			clocks = <&core_clk 0>;

			pinctrl-0 = <&pmx_uart1>;

			pinctrl-names = "default";

			status = "disabled";

			status = "disabled";

		};

		};
@@ -91,7 +122,7 @@ 
			status = "disabled";

			status = "disabled";

		};

		};





		gpio0: gpio@d0400 {

		gpio0: gpio-ctrl@d0400 {

			compatible = "marvell,orion-gpio";

			compatible = "marvell,orion-gpio";

			#gpio-cells = <2>;

			#gpio-cells = <2>;

			gpio-controller;

			gpio-controller;
@@ -102,7 +133,7 @@ 
			interrupts = <12>, <13>, <14>, <60>;

			interrupts = <12>, <13>, <14>, <60>;

		};

		};





		gpio1: gpio@d0420 {

		gpio1: gpio-ctrl@d0420 {

			compatible = "marvell,orion-gpio";

			compatible = "marvell,orion-gpio";

			#gpio-cells = <2>;

			#gpio-cells = <2>;

			gpio-controller;

			gpio-controller;
@@ -113,7 +144,7 @@ 
			interrupts = <61>;

			interrupts = <61>;

		};

		};





		gpio2: gpio@e8400 {

		gpio2: gpio-ctrl@e8400 {

			compatible = "marvell,orion-gpio";

			compatible = "marvell,orion-gpio";

			#gpio-cells = <2>;

			#gpio-cells = <2>;

			gpio-controller;

			gpio-controller;
@@ -121,13 +152,188 @@ 
			ngpios = <8>;

			ngpios = <8>;

		};

		};





		pinctrl: pinctrl@d0200 {

		pinctrl: pin-ctrl@d0200 {

			compatible = "marvell,dove-pinctrl";

			compatible = "marvell,dove-pinctrl";

			reg = <0xd0200 0x10>;

			reg = <0xd0200 0x10>;

			clocks = <&gate_clk 22>;

			clocks = <&gate_clk 22>;



			pmx_gpio_0: pmx-gpio-0 {

				marvell,pins = "mpp0";

				marvell,function = "gpio";

			};



			pmx_gpio_1: pmx-gpio-1 {

				marvell,pins = "mpp1";

				marvell,function = "gpio";

			};



			pmx_gpio_2: pmx-gpio-2 {

				marvell,pins = "mpp2";

				marvell,function = "gpio";

			};



			pmx_gpio_3: pmx-gpio-3 {

				marvell,pins = "mpp3";

				marvell,function = "gpio";

			};



			pmx_gpio_4: pmx-gpio-4 {

				marvell,pins = "mpp4";

				marvell,function = "gpio";

			};



			pmx_gpio_5: pmx-gpio-5 {

				marvell,pins = "mpp5";

				marvell,function = "gpio";

			};



			pmx_gpio_6: pmx-gpio-6 {

				marvell,pins = "mpp6";

				marvell,function = "gpio";

			};



			pmx_gpio_7: pmx-gpio-7 {

				marvell,pins = "mpp7";

				marvell,function = "gpio";

			};



			pmx_gpio_8: pmx-gpio-8 {

				marvell,pins = "mpp8";

				marvell,function = "gpio";

			};



			pmx_gpio_9: pmx-gpio-9 {

				marvell,pins = "mpp9";

				marvell,function = "gpio";

			};



			pmx_gpio_10: pmx-gpio-10 {

				marvell,pins = "mpp10";

				marvell,function = "gpio";

			};



			pmx_gpio_11: pmx-gpio-11 {

				marvell,pins = "mpp11";

				marvell,function = "gpio";

			};



			pmx_gpio_12: pmx-gpio-12 {

				marvell,pins = "mpp12";

				marvell,function = "gpio";

			};



			pmx_gpio_13: pmx-gpio-13 {

				marvell,pins = "mpp13";

				marvell,function = "gpio";

			};



			pmx_gpio_14: pmx-gpio-14 {

				marvell,pins = "mpp14";

				marvell,function = "gpio";

			};



			pmx_gpio_15: pmx-gpio-15 {

				marvell,pins = "mpp15";

				marvell,function = "gpio";

			};



			pmx_gpio_16: pmx-gpio-16 {

				marvell,pins = "mpp16";

				marvell,function = "gpio";

			};

			};





		spi0: spi@10600 {

			pmx_gpio_17: pmx-gpio-17 {

				marvell,pins = "mpp17";

				marvell,function = "gpio";

			};



			pmx_gpio_18: pmx-gpio-18 {

				marvell,pins = "mpp18";

				marvell,function = "gpio";

			};



			pmx_gpio_19: pmx-gpio-19 {

				marvell,pins = "mpp19";

				marvell,function = "gpio";

			};



			pmx_gpio_20: pmx-gpio-20 {

				marvell,pins = "mpp20";

				marvell,function = "gpio";

			};



			pmx_gpio_21: pmx-gpio-21 {

				marvell,pins = "mpp21";

				marvell,function = "gpio";

			};



			pmx_camera: pmx-camera {

				marvell,pins = "mpp_camera";

				marvell,function = "camera";

			};



			pmx_camera_gpio: pmx-camera-gpio {

				marvell,pins = "mpp_camera";

				marvell,function = "gpio";

			};



			pmx_sdio0: pmx-sdio0 {

				marvell,pins = "mpp_sdio0";

				marvell,function = "sdio0";

			};



			pmx_sdio0_gpio: pmx-sdio0-gpio {

				marvell,pins = "mpp_sdio0";

				marvell,function = "gpio";

			};



			pmx_sdio1: pmx-sdio1 {

				marvell,pins = "mpp_sdio1";

				marvell,function = "sdio1";

			};



			pmx_sdio1_gpio: pmx-sdio1-gpio {

				marvell,pins = "mpp_sdio1";

				marvell,function = "gpio";

			};



			pmx_audio1_gpio: pmx-audio1-gpio {

				marvell,pins = "mpp_audio1";

				marvell,function = "gpio";

			};



			pmx_spi0: pmx-spi0 {

				marvell,pins = "mpp_spi0";

				marvell,function = "spi0";

			};



			pmx_spi0_gpio: pmx-spi0-gpio {

				marvell,pins = "mpp_spi0";

				marvell,function = "gpio";

			};



			pmx_uart1: pmx-uart1 {

				marvell,pins = "mpp_uart1";

				marvell,function = "uart1";

			};



			pmx_uart1_gpio: pmx-uart1-gpio {

				marvell,pins = "mpp_uart1";

				marvell,function = "gpio";

			};



			pmx_nand: pmx-nand {

				marvell,pins = "mpp_nand";

				marvell,function = "nand";

			};



			pmx_nand_gpo: pmx-nand-gpo {

				marvell,pins = "mpp_nand";

				marvell,function = "gpo";

			};

		};



		spi0: spi-ctrl@10600 {

			compatible = "marvell,orion-spi";

			compatible = "marvell,orion-spi";

			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;
@@ -135,10 +341,12 @@ 
			interrupts = <6>;

			interrupts = <6>;

			reg = <0x10600 0x28>;

			reg = <0x10600 0x28>;

			clocks = <&core_clk 0>;

			clocks = <&core_clk 0>;

			pinctrl-0 = <&pmx_spi0>;

			pinctrl-names = "default";

			status = "disabled";

			status = "disabled";

		};

		};





		spi1: spi@14600 {

		spi1: spi-ctrl@14600 {

			compatible = "marvell,orion-spi";

			compatible = "marvell,orion-spi";

			#address-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			#size-cells = <0>;
@@ -149,7 +357,7 @@ 
			status = "disabled";

			status = "disabled";

		};

		};





		i2c0: i2c@11000 {

		i2c0: i2c-ctrl@11000 {

			compatible = "marvell,mv64xxx-i2c";

			compatible = "marvell,mv64xxx-i2c";

			reg = <0x11000 0x20>;

			reg = <0x11000 0x20>;

			#address-cells = <1>;

			#address-cells = <1>;
@@ -177,23 +385,27 @@ 
			status = "okay";

			status = "okay";

		};

		};





		sdio0: sdio@92000 {

		sdio0: sdio-host@92000 {

			compatible = "marvell,dove-sdhci";

			compatible = "marvell,dove-sdhci";

			reg = <0x92000 0x100>;

			reg = <0x92000 0x100>;

			interrupts = <35>, <37>;

			interrupts = <35>, <37>;

			clocks = <&gate_clk 8>;

			clocks = <&gate_clk 8>;

			pinctrl-0 = <&pmx_sdio0>;

			pinctrl-names = "default";

			status = "disabled";

			status = "disabled";

		};

		};





		sdio1: sdio@90000 {

		sdio1: sdio-host@90000 {

			compatible = "marvell,dove-sdhci";

			compatible = "marvell,dove-sdhci";

			reg = <0x90000 0x100>;

			reg = <0x90000 0x100>;

			interrupts = <36>, <38>;

			interrupts = <36>, <38>;

			clocks = <&gate_clk 9>;

			clocks = <&gate_clk 9>;

			pinctrl-0 = <&pmx_sdio1>;

			pinctrl-names = "default";

			status = "disabled";

			status = "disabled";

		};

		};





		sata0: sata@a0000 {

		sata0: sata-host@a0000 {

			compatible = "marvell,orion-sata";

			compatible = "marvell,orion-sata";

			reg = <0xa0000 0x2400>;

			reg = <0xa0000 0x2400>;

			interrupts = <62>;

			interrupts = <62>;
@@ -202,12 +414,12 @@ 
			status = "disabled";

			status = "disabled";

		};

		};





		rtc@d8500 {

		rtc: real-time-clock@d8500 {

			compatible = "marvell,orion-rtc";

			compatible = "marvell,orion-rtc";

			reg = <0xd8500 0x20>;

			reg = <0xd8500 0x20>;

		};

		};





		crypto: crypto@30000 {

		crypto: crypto-engine@30000 {

			compatible = "marvell,orion-crypto";

			compatible = "marvell,orion-crypto";

			reg = <0x30000 0x10000>,

			reg = <0x30000 0x10000>,

			      <0xc8000000 0x800>;

			      <0xc8000000 0x800>;
@@ -258,5 +470,40 @@ 
				dmacap,xor;

				dmacap,xor;

			};

			};

		};

		};



		mdio: mdio-bus@72004 {

			compatible = "marvell,orion-mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x72004 0x84>;

			interrupts = <30>;

			clocks = <&gate_clk 2>;

			status = "disabled";



			ethphy: ethernet-phy {

				device-type = "ethernet-phy";

				/* set phy address in board file */

			};

		};



		eth: ethernet-controller@72000 {

			compatible = "marvell,orion-eth";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x72000 0x4000>;

			clocks = <&gate_clk 2>;

			marvell,tx-checksum-limit = <1600>;

			status = "disabled";



			ethernet-port@0 {

				device_type = "network";

				compatible = "marvell,orion-eth-port";

				reg = <0>;

				interrupts = <29>;

				/* overwrite MAC address in bootloader */

				local-mac-address = [00 00 00 00 00 00];

				phy-handle = <&ethphy>;

			};

		};

	};

	};

};
 
};

arch/arm/boot/dts/kirkwood-cloudbox.dts

+16 −0
Original line number Original line Diff line number Diff line
@@ -89,3 +89,19 @@ 
		gpios = <&gpio0 17 0>;

		gpios = <&gpio0 17 0>;

	};

	};

};

};



&mdio {

	status = "okay";



	ethphy0: ethernet-phy@0 {

		device_type = "ethernet-phy";

		reg = <0>;

	};

};



&eth0 {

	status = "okay";

	ethernet0-port@0 {

		phy-handle = <&ethphy0>;

	};

};