[PATCH 0/2] Add support for OpenBlocks A7

[PATCH 0/2] Add support for OpenBlocks A7

[Thomas Petazzoni]

Dear Marvell EBU maintainers,

The small set of patches that follow add the support for the new
OpenBlocks A7 platform designed and sold by Plathome.

Best regards,

Thomas

Thomas Petazzoni (2):
  ARM: kirkwood: add support for OpenBlocks A7 platform
  ARM: kirkwood: enable HIGHMEM in defconfig

 arch/arm/boot/dts/Makefile                   |   3 +-
 arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 223 +++++++++++++++++++++++++++
 arch/arm/configs/kirkwood_defconfig          |   1 +
 3 files changed, 226 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-openblocks_a7.dts

-- 
1.8.1.2

[PATCH 1/2] ARM: kirkwood: add support for OpenBlocks A7 platform

[Thomas Petazzoni]

The OpenBlocks A7 board is designed and sold by PlatHome, and based on
a Kirkwood 6283 Marvell SoC. It is quite similar to the OpenBlocks A6
already supported in the kernel, with the following main differences:

 - The A6 uses a RTC on I2C, while the A7 uses the internal SoC RTC.

 - The A6 has one Ethernet port, while the A7 has two Ethernet ports

 - The A6 has only one USB port, while the A7 integrates a USB hub,
   which provides two front-side USB port, and an internal USB port as
   well.

 - The A6 has 512 MB of RAM, while the A7 has 1 GB of RAM.

 - Slightly different GPIOs for some functions.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/Makefile                   |   3 +-
 arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 223 +++++++++++++++++++++++++++
 2 files changed, 225 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-openblocks_a7.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 802720e..64783bb 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -101,7 +101,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 	kirkwood-topkick.dtb \
 	kirkwood-ts219-6281.dtb \
 	kirkwood-ts219-6282.dtb \
-	kirkwood-openblocks_a6.dtb
+	kirkwood-openblocks_a6.dtb \
+	kirkwood-openblocks_a7.dtb
 dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 	msm8960-cdp.dtb
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
new file mode 100644
index 0000000..1864972
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -0,0 +1,223 @@
+/*
+ * Device Tree file for OpenBlocks A7 board
+ *
+ * Copyright (C) 2013 Free Electrons
+ *
+ * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"
+
+/ {
+	model = "Plat'Home OpenBlocksA7";
+	compatible = "plathome,openblocks-a7", "marvell,kirkwood-88f6283", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x40000000>; /* 1 GB */
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
+	};
+
+	ocp at f1000000 {
+		serial at 12000 {
+			status = "ok";
+			pinctrl-0 = <&pmx_uart0>;
+			pinctrl-names = "default";
+		};
+
+		serial at 12100 {
+			status = "ok";
+			pinctrl-0 = <&pmx_uart1>;
+			pinctrl-names = "default";
+		};
+
+		nand at 3000000 {
+			chip-delay = <25>;
+			status = "okay";
+			pinctrl-0 = <&pmx_nand>;
+			pinctrl-names = "default";
+
+			partition at 0 {
+				label = "uboot";
+				reg = <0x0 0x1c0000>;
+			};
+
+			partition at 90000 {
+				label = "env";
+				reg = <0x1c0000 0x2c0000>;
+			};
+
+			partition at d4000 {
+				label = "test";
+				reg = <0x480000 0x160000>;
+			};
+
+			partition at f4000 {
+				label = "conf";
+				reg = <0x5e0000 0x540000>;
+			};
+
+			partition at 4f4000 {
+				label = "linux";
+				reg = <0xb20000 0x3d40000>;
+			};
+
+			partition at 2214000 {
+				label = "user";
+				reg = <0x4860000 0xb7a0000>;
+			};
+		};
+
+		sata at 80000 {
+			nr-ports = <1>;
+			status = "okay";
+		};
+
+		i2c at 11100 {
+			status = "okay";
+			pinctrl-0 = <&pmx_twsi1>;
+			pinctrl-names = "default";
+
+			s24c02: s24c02 at 50 {
+				compatible = "24c02";
+				reg = <0x50>;
+			};
+		};
+
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
+			pinctrl-names = "default";
+
+			pmx_uart0: pmx-uart0 {
+				marvell,pins = "mpp10", "mpp11", "mpp15",
+					"mpp16";
+				marvell,function = "uart0";
+			};
+
+			pmx_uart1: pmx-uart1 {
+				marvell,pins = "mpp13", "mpp14", "mpp8",
+					"mpp9";
+				marvell,function = "uart1";
+			};
+
+			pmx_sysrst: pmx-sysrst {
+				marvell,pins = "mpp6";
+				marvell,function = "sysrst";
+			};
+
+			pmx_dip_switches: pmx-dip-switches {
+				marvell,pins = "mpp44", "mpp45", "mpp46", "mpp47";
+				marvell,function = "gpio";
+			};
+
+			/*
+			 * Accessible on connector J202. The MPP
+			 * listed below are pin 1-7, pin 8 is unused,
+			 * pin 9 is external reset input and pin 10 is
+			 * ground.
+			 */
+			pmx_gpio_header: pmx-gpio-header {
+				marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",
+					       "mpp35", "mpp34", "mpp40";
+				marvell,function = "gpio";
+			};
+
+			pmx_gpio_init: pmx-init {
+				marvell,pins = "mpp38";
+				marvell,function = "gpio";
+			};
+
+			pmx_usb_oc: pmx-usb-oc {
+				marvell,pins = "mpp39";
+				marvell,function = "gpio";
+			};
+
+			pmx_leds: pmx-leds {
+				marvell,pins = "mpp41", "mpp42", "mpp43";
+				marvell,function = "gpio";
+			};
+
+			pmx_ge1: pmx-ge1 {
+				marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
+					       "mpp24", "mpp25", "mpp26", "mpp27",
+					       "mpp30", "mpp31", "mpp32", "mpp33";
+				marvell,function = "ge1";
+			};
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+		pinctrl-0 = <&pmx_leds>;
+		pinctrl-names = "default";
+
+		led-red {
+			label = "obsa7:red:stat";
+			gpios = <&gpio1 9 1>;
+		};
+
+		led-green {
+			label = "obsa7:green:stat";
+			gpios = <&gpio1 10 1>;
+		};
+
+		led-yellow {
+			label = "obsa7:yellow:stat";
+			gpios = <&gpio1 11 1>;
+		};
+        };
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		pinctrl-0 = <&pmx_gpio_init>;
+		pinctrl-names = "default";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		button at 1 {
+			label = "Init Button";
+			linux,code = <116>;
+			gpios = <&gpio1 6 0>;
+		};
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		device_type = "ethernet-phy";
+		reg = <0>;
+	};
+
+	ethphy1: ethernet-phy at 1 {
+		device_type = "ethernet-phy";
+		reg = <1>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
+
+&eth1 {
+	status = "okay";
+	pinctrl-0 = <&pmx_ge1>;
+	pinctrl-names = "default";
+	ethernet1-port at 0 {
+		phy-handle = <&ethphy1>;
+	};
+};
-- 
1.8.1.2

[PATCH 1/2] ARM: kirkwood: add support for OpenBlocks A7 platform

[Andrew Lunn]

On Wed, Oct 30, 2013 at 05:55:09PM +0100, Thomas Petazzoni wrote:
> The OpenBlocks A7 board is designed and sold by PlatHome, and based on
> a Kirkwood 6283 Marvell SoC. It is quite similar to the OpenBlocks A6
> already supported in the kernel, with the following main differences:
> 
>  - The A6 uses a RTC on I2C, while the A7 uses the internal SoC RTC.
> 
>  - The A6 has one Ethernet port, while the A7 has two Ethernet ports
> 
>  - The A6 has only one USB port, while the A7 integrates a USB hub,
>    which provides two front-side USB port, and an internal USB port as
>    well.
> 
>  - The A6 has 512 MB of RAM, while the A7 has 1 GB of RAM.
> 
>  - Slightly different GPIOs for some functions.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/boot/dts/Makefile                   |   3 +-
>  arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 223 +++++++++++++++++++++++++++
>  2 files changed, 225 insertions(+), 1 deletion(-)
>  create mode 100644 arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 802720e..64783bb 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -101,7 +101,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
>  	kirkwood-topkick.dtb \
>  	kirkwood-ts219-6281.dtb \
>  	kirkwood-ts219-6282.dtb \
> -	kirkwood-openblocks_a6.dtb
> +	kirkwood-openblocks_a6.dtb \
> +	kirkwood-openblocks_a7.dtb

Hi Thomas

Could you fix the ordering here? It is wrong to start with that the a6
is at the end. Could you move it, and add your new one, after nsa31a.

Apart from that, it looks good.

Thanks
	Andrew


>  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
>  dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
>  	msm8960-cdp.dtb
> diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> new file mode 100644
> index 0000000..1864972
> --- /dev/null
> +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> @@ -0,0 +1,223 @@
> +/*
> + * Device Tree file for OpenBlocks A7 board
> + *
> + * Copyright (C) 2013 Free Electrons
> + *
> + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */
> +
> +/dts-v1/;
> +
> +#include "kirkwood.dtsi"
> +#include "kirkwood-6282.dtsi"
> +
> +/ {
> +	model = "Plat'Home OpenBlocksA7";
> +	compatible = "plathome,openblocks-a7", "marvell,kirkwood-88f6283", "marvell,kirkwood";
> +
> +	memory {
> +		device_type = "memory";
> +		reg = <0x00000000 0x40000000>; /* 1 GB */
> +	};
> +
> +	chosen {
> +		bootargs = "console=ttyS0,115200n8 earlyprintk";
> +	};
> +
> +	ocp at f1000000 {
> +		serial at 12000 {
> +			status = "ok";
> +			pinctrl-0 = <&pmx_uart0>;
> +			pinctrl-names = "default";
> +		};
> +
> +		serial at 12100 {
> +			status = "ok";
> +			pinctrl-0 = <&pmx_uart1>;
> +			pinctrl-names = "default";
> +		};
> +
> +		nand at 3000000 {
> +			chip-delay = <25>;
> +			status = "okay";
> +			pinctrl-0 = <&pmx_nand>;
> +			pinctrl-names = "default";
> +
> +			partition at 0 {
> +				label = "uboot";
> +				reg = <0x0 0x1c0000>;
> +			};
> +
> +			partition at 90000 {
> +				label = "env";
> +				reg = <0x1c0000 0x2c0000>;
> +			};
> +
> +			partition at d4000 {
> +				label = "test";
> +				reg = <0x480000 0x160000>;
> +			};
> +
> +			partition at f4000 {
> +				label = "conf";
> +				reg = <0x5e0000 0x540000>;
> +			};
> +
> +			partition at 4f4000 {
> +				label = "linux";
> +				reg = <0xb20000 0x3d40000>;
> +			};
> +
> +			partition at 2214000 {
> +				label = "user";
> +				reg = <0x4860000 0xb7a0000>;
> +			};
> +		};
> +
> +		sata at 80000 {
> +			nr-ports = <1>;
> +			status = "okay";
> +		};
> +
> +		i2c at 11100 {
> +			status = "okay";
> +			pinctrl-0 = <&pmx_twsi1>;
> +			pinctrl-names = "default";
> +
> +			s24c02: s24c02 at 50 {
> +				compatible = "24c02";
> +				reg = <0x50>;
> +			};
> +		};
> +
> +		pinctrl: pinctrl at 10000 {
> +			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
> +			pinctrl-names = "default";
> +
> +			pmx_uart0: pmx-uart0 {
> +				marvell,pins = "mpp10", "mpp11", "mpp15",
> +					"mpp16";
> +				marvell,function = "uart0";
> +			};
> +
> +			pmx_uart1: pmx-uart1 {
> +				marvell,pins = "mpp13", "mpp14", "mpp8",
> +					"mpp9";
> +				marvell,function = "uart1";
> +			};
> +
> +			pmx_sysrst: pmx-sysrst {
> +				marvell,pins = "mpp6";
> +				marvell,function = "sysrst";
> +			};
> +
> +			pmx_dip_switches: pmx-dip-switches {
> +				marvell,pins = "mpp44", "mpp45", "mpp46", "mpp47";
> +				marvell,function = "gpio";
> +			};
> +
> +			/*
> +			 * Accessible on connector J202. The MPP
> +			 * listed below are pin 1-7, pin 8 is unused,
> +			 * pin 9 is external reset input and pin 10 is
> +			 * ground.
> +			 */
> +			pmx_gpio_header: pmx-gpio-header {
> +				marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",
> +					       "mpp35", "mpp34", "mpp40";
> +				marvell,function = "gpio";
> +			};
> +
> +			pmx_gpio_init: pmx-init {
> +				marvell,pins = "mpp38";
> +				marvell,function = "gpio";
> +			};
> +
> +			pmx_usb_oc: pmx-usb-oc {
> +				marvell,pins = "mpp39";
> +				marvell,function = "gpio";
> +			};
> +
> +			pmx_leds: pmx-leds {
> +				marvell,pins = "mpp41", "mpp42", "mpp43";
> +				marvell,function = "gpio";
> +			};
> +
> +			pmx_ge1: pmx-ge1 {
> +				marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
> +					       "mpp24", "mpp25", "mpp26", "mpp27",
> +					       "mpp30", "mpp31", "mpp32", "mpp33";
> +				marvell,function = "ge1";
> +			};
> +		};
> +	};
> +
> +	gpio-leds {
> +		compatible = "gpio-leds";
> +		pinctrl-0 = <&pmx_leds>;
> +		pinctrl-names = "default";
> +
> +		led-red {
> +			label = "obsa7:red:stat";
> +			gpios = <&gpio1 9 1>;
> +		};
> +
> +		led-green {
> +			label = "obsa7:green:stat";
> +			gpios = <&gpio1 10 1>;
> +		};
> +
> +		led-yellow {
> +			label = "obsa7:yellow:stat";
> +			gpios = <&gpio1 11 1>;
> +		};
> +        };
> +
> +	gpio_keys {
> +		compatible = "gpio-keys";
> +		pinctrl-0 = <&pmx_gpio_init>;
> +		pinctrl-names = "default";
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		button at 1 {
> +			label = "Init Button";
> +			linux,code = <116>;
> +			gpios = <&gpio1 6 0>;
> +		};
> +	};
> +};
> +
> +&mdio {
> +	status = "okay";
> +
> +	ethphy0: ethernet-phy at 0 {
> +		device_type = "ethernet-phy";
> +		reg = <0>;
> +	};
> +
> +	ethphy1: ethernet-phy at 1 {
> +		device_type = "ethernet-phy";
> +		reg = <1>;
> +	};
> +};
> +
> +&eth0 {
> +	status = "okay";
> +	ethernet0-port at 0 {
> +		phy-handle = <&ethphy0>;
> +	};
> +};
> +
> +&eth1 {
> +	status = "okay";
> +	pinctrl-0 = <&pmx_ge1>;
> +	pinctrl-names = "default";
> +	ethernet1-port at 0 {
> +		phy-handle = <&ethphy1>;
> +	};
> +};
> -- 
> 1.8.1.2
> 

[PATCH 1/2] ARM: kirkwood: add support for OpenBlocks A7 platform

[Gregory CLEMENT]

On 30/10/2013 17:55, Thomas Petazzoni wrote:
> The OpenBlocks A7 board is designed and sold by PlatHome, and based on
> a Kirkwood 6283 Marvell SoC. It is quite similar to the OpenBlocks A6
> already supported in the kernel, with the following main differences:
> 
>  - The A6 uses a RTC on I2C, while the A7 uses the internal SoC RTC.
> 
>  - The A6 has one Ethernet port, while the A7 has two Ethernet ports
> 
>  - The A6 has only one USB port, while the A7 integrates a USB hub,
>    which provides two front-side USB port, and an internal USB port as
>    well.
> 
>  - The A6 has 512 MB of RAM, while the A7 has 1 GB of RAM.
> 
>  - Slightly different GPIOs for some functions.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

> ---
>  arch/arm/boot/dts/Makefile                   |   3 +-
>  arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 223 +++++++++++++++++++++++++++
>  2 files changed, 225 insertions(+), 1 deletion(-)
>  create mode 100644 arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 802720e..64783bb 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -101,7 +101,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
>  	kirkwood-topkick.dtb \
>  	kirkwood-ts219-6281.dtb \
>  	kirkwood-ts219-6282.dtb \
> -	kirkwood-openblocks_a6.dtb
> +	kirkwood-openblocks_a6.dtb \
> +	kirkwood-openblocks_a7.dtb
>  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
>  dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
>  	msm8960-cdp.dtb
> diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> new file mode 100644
> index 0000000..1864972
> --- /dev/null
> +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> @@ -0,0 +1,223 @@
> +/*
> + * Device Tree file for OpenBlocks A7 board
> + *
> + * Copyright (C) 2013 Free Electrons
> + *
> + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */
> +
> +/dts-v1/;
> +
> +#include "kirkwood.dtsi"
> +#include "kirkwood-6282.dtsi"
> +
> +/ {
> +	model = "Plat'Home OpenBlocksA7";
> +	compatible = "plathome,openblocks-a7", "marvell,kirkwood-88f6283", "marvell,kirkwood";
> +
> +	memory {
> +		device_type = "memory";
> +		reg = <0x00000000 0x40000000>; /* 1 GB */
> +	};
> +
> +	chosen {
> +		bootargs = "console=ttyS0,115200n8 earlyprintk";
> +	};
> +
> +	ocp at f1000000 {
> +		serial at 12000 {
> +			status = "ok";
> +			pinctrl-0 = <&pmx_uart0>;
> +			pinctrl-names = "default";
> +		};
> +
> +		serial at 12100 {
> +			status = "ok";
> +			pinctrl-0 = <&pmx_uart1>;
> +			pinctrl-names = "default";
> +		};
> +
> +		nand at 3000000 {
> +			chip-delay = <25>;
> +			status = "okay";
> +			pinctrl-0 = <&pmx_nand>;
> +			pinctrl-names = "default";
> +
> +			partition at 0 {
> +				label = "uboot";
> +				reg = <0x0 0x1c0000>;
> +			};
> +
> +			partition at 90000 {
> +				label = "env";
> +				reg = <0x1c0000 0x2c0000>;
> +			};
> +
> +			partition at d4000 {
> +				label = "test";
> +				reg = <0x480000 0x160000>;
> +			};
> +
> +			partition at f4000 {
> +				label = "conf";
> +				reg = <0x5e0000 0x540000>;
> +			};
> +
> +			partition at 4f4000 {
> +				label = "linux";
> +				reg = <0xb20000 0x3d40000>;
> +			};
> +
> +			partition at 2214000 {
> +				label = "user";
> +				reg = <0x4860000 0xb7a0000>;
> +			};
> +		};
> +
> +		sata at 80000 {
> +			nr-ports = <1>;
> +			status = "okay";
> +		};
> +
> +		i2c at 11100 {
> +			status = "okay";
> +			pinctrl-0 = <&pmx_twsi1>;
> +			pinctrl-names = "default";
> +
> +			s24c02: s24c02 at 50 {
> +				compatible = "24c02";
> +				reg = <0x50>;
> +			};
> +		};
> +
> +		pinctrl: pinctrl at 10000 {
> +			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
> +			pinctrl-names = "default";
> +
> +			pmx_uart0: pmx-uart0 {
> +				marvell,pins = "mpp10", "mpp11", "mpp15",
> +					"mpp16";
> +				marvell,function = "uart0";
> +			};
> +
> +			pmx_uart1: pmx-uart1 {
> +				marvell,pins = "mpp13", "mpp14", "mpp8",
> +					"mpp9";
> +				marvell,function = "uart1";
> +			};
> +
> +			pmx_sysrst: pmx-sysrst {
> +				marvell,pins = "mpp6";
> +				marvell,function = "sysrst";
> +			};
> +
> +			pmx_dip_switches: pmx-dip-switches {
> +				marvell,pins = "mpp44", "mpp45", "mpp46", "mpp47";
> +				marvell,function = "gpio";
> +			};
> +
> +			/*
> +			 * Accessible on connector J202. The MPP
> +			 * listed below are pin 1-7, pin 8 is unused,
> +			 * pin 9 is external reset input and pin 10 is
> +			 * ground.
> +			 */
> +			pmx_gpio_header: pmx-gpio-header {
> +				marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",
> +					       "mpp35", "mpp34", "mpp40";
> +				marvell,function = "gpio";
> +			};
> +
> +			pmx_gpio_init: pmx-init {
> +				marvell,pins = "mpp38";
> +				marvell,function = "gpio";
> +			};
> +
> +			pmx_usb_oc: pmx-usb-oc {
> +				marvell,pins = "mpp39";
> +				marvell,function = "gpio";
> +			};
> +
> +			pmx_leds: pmx-leds {
> +				marvell,pins = "mpp41", "mpp42", "mpp43";
> +				marvell,function = "gpio";
> +			};
> +
> +			pmx_ge1: pmx-ge1 {
> +				marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
> +					       "mpp24", "mpp25", "mpp26", "mpp27",
> +					       "mpp30", "mpp31", "mpp32", "mpp33";
> +				marvell,function = "ge1";
> +			};
> +		};
> +	};
> +
> +	gpio-leds {
> +		compatible = "gpio-leds";
> +		pinctrl-0 = <&pmx_leds>;
> +		pinctrl-names = "default";
> +
> +		led-red {
> +			label = "obsa7:red:stat";
> +			gpios = <&gpio1 9 1>;
> +		};
> +
> +		led-green {
> +			label = "obsa7:green:stat";
> +			gpios = <&gpio1 10 1>;
> +		};
> +
> +		led-yellow {
> +			label = "obsa7:yellow:stat";
> +			gpios = <&gpio1 11 1>;
> +		};
> +        };
> +
> +	gpio_keys {
> +		compatible = "gpio-keys";
> +		pinctrl-0 = <&pmx_gpio_init>;
> +		pinctrl-names = "default";
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		button at 1 {
> +			label = "Init Button";
> +			linux,code = <116>;
> +			gpios = <&gpio1 6 0>;
> +		};
> +	};
> +};
> +
> +&mdio {
> +	status = "okay";
> +
> +	ethphy0: ethernet-phy at 0 {
> +		device_type = "ethernet-phy";
> +		reg = <0>;
> +	};
> +
> +	ethphy1: ethernet-phy at 1 {
> +		device_type = "ethernet-phy";
> +		reg = <1>;
> +	};
> +};
> +
> +&eth0 {
> +	status = "okay";
> +	ethernet0-port at 0 {
> +		phy-handle = <&ethphy0>;
> +	};
> +};
> +
> +&eth1 {
> +	status = "okay";
> +	pinctrl-0 = <&pmx_ge1>;
> +	pinctrl-names = "default";
> +	ethernet1-port at 0 {
> +		phy-handle = <&ethphy1>;
> +	};
> +};
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

acked

[Jason Cooper]

Gregory,

I like the idea, and if you perhaps do '[PATCH X/Y] Acked' it should
make it through the filters.  (they currently whitelist 'GIT PULL' and
'PATCH' subjects).

Sure would make things easier when going through the threads...

thx,

Jason.

On Wed, Oct 30, 2013 at 06:00:00PM +0100, Gregory CLEMENT wrote:
> On 30/10/2013 17:55, Thomas Petazzoni wrote:
> > The OpenBlocks A7 board is designed and sold by PlatHome, and based on
> > a Kirkwood 6283 Marvell SoC. It is quite similar to the OpenBlocks A6
> > already supported in the kernel, with the following main differences:
> > 
> >  - The A6 uses a RTC on I2C, while the A7 uses the internal SoC RTC.
> > 
> >  - The A6 has one Ethernet port, while the A7 has two Ethernet ports
> > 
> >  - The A6 has only one USB port, while the A7 integrates a USB hub,
> >    which provides two front-side USB port, and an internal USB port as
> >    well.
> > 
> >  - The A6 has 512 MB of RAM, while the A7 has 1 GB of RAM.
> > 
> >  - Slightly different GPIOs for some functions.
> > 
> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> 
> 
> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> 
> 
> > ---
> >  arch/arm/boot/dts/Makefile                   |   3 +-
> >  arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 223 +++++++++++++++++++++++++++
> >  2 files changed, 225 insertions(+), 1 deletion(-)
> >  create mode 100644 arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> > 
> > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > index 802720e..64783bb 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -101,7 +101,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
> >  	kirkwood-topkick.dtb \
> >  	kirkwood-ts219-6281.dtb \
> >  	kirkwood-ts219-6282.dtb \
> > -	kirkwood-openblocks_a6.dtb
> > +	kirkwood-openblocks_a6.dtb \
> > +	kirkwood-openblocks_a7.dtb
> >  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
> >  dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
> >  	msm8960-cdp.dtb
> > diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> > new file mode 100644
> > index 0000000..1864972
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> > @@ -0,0 +1,223 @@
> > +/*
> > + * Device Tree file for OpenBlocks A7 board
> > + *
> > + * Copyright (C) 2013 Free Electrons
> > + *
> > + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > + *
> > + * This file is licensed under the terms of the GNU General Public
> > + * License version 2.  This program is licensed "as is" without any
> > + * warranty of any kind, whether express or implied.
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include "kirkwood.dtsi"
> > +#include "kirkwood-6282.dtsi"
> > +
> > +/ {
> > +	model = "Plat'Home OpenBlocksA7";
> > +	compatible = "plathome,openblocks-a7", "marvell,kirkwood-88f6283", "marvell,kirkwood";
> > +
> > +	memory {
> > +		device_type = "memory";
> > +		reg = <0x00000000 0x40000000>; /* 1 GB */
> > +	};
> > +
> > +	chosen {
> > +		bootargs = "console=ttyS0,115200n8 earlyprintk";
> > +	};
> > +
> > +	ocp at f1000000 {
> > +		serial at 12000 {
> > +			status = "ok";
> > +			pinctrl-0 = <&pmx_uart0>;
> > +			pinctrl-names = "default";
> > +		};
> > +
> > +		serial at 12100 {
> > +			status = "ok";
> > +			pinctrl-0 = <&pmx_uart1>;
> > +			pinctrl-names = "default";
> > +		};
> > +
> > +		nand at 3000000 {
> > +			chip-delay = <25>;
> > +			status = "okay";
> > +			pinctrl-0 = <&pmx_nand>;
> > +			pinctrl-names = "default";
> > +
> > +			partition at 0 {
> > +				label = "uboot";
> > +				reg = <0x0 0x1c0000>;
> > +			};
> > +
> > +			partition at 90000 {
> > +				label = "env";
> > +				reg = <0x1c0000 0x2c0000>;
> > +			};
> > +
> > +			partition at d4000 {
> > +				label = "test";
> > +				reg = <0x480000 0x160000>;
> > +			};
> > +
> > +			partition at f4000 {
> > +				label = "conf";
> > +				reg = <0x5e0000 0x540000>;
> > +			};
> > +
> > +			partition at 4f4000 {
> > +				label = "linux";
> > +				reg = <0xb20000 0x3d40000>;
> > +			};
> > +
> > +			partition at 2214000 {
> > +				label = "user";
> > +				reg = <0x4860000 0xb7a0000>;
> > +			};
> > +		};
> > +
> > +		sata at 80000 {
> > +			nr-ports = <1>;
> > +			status = "okay";
> > +		};
> > +
> > +		i2c at 11100 {
> > +			status = "okay";
> > +			pinctrl-0 = <&pmx_twsi1>;
> > +			pinctrl-names = "default";
> > +
> > +			s24c02: s24c02 at 50 {
> > +				compatible = "24c02";
> > +				reg = <0x50>;
> > +			};
> > +		};
> > +
> > +		pinctrl: pinctrl at 10000 {
> > +			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
> > +			pinctrl-names = "default";
> > +
> > +			pmx_uart0: pmx-uart0 {
> > +				marvell,pins = "mpp10", "mpp11", "mpp15",
> > +					"mpp16";
> > +				marvell,function = "uart0";
> > +			};
> > +
> > +			pmx_uart1: pmx-uart1 {
> > +				marvell,pins = "mpp13", "mpp14", "mpp8",
> > +					"mpp9";
> > +				marvell,function = "uart1";
> > +			};
> > +
> > +			pmx_sysrst: pmx-sysrst {
> > +				marvell,pins = "mpp6";
> > +				marvell,function = "sysrst";
> > +			};
> > +
> > +			pmx_dip_switches: pmx-dip-switches {
> > +				marvell,pins = "mpp44", "mpp45", "mpp46", "mpp47";
> > +				marvell,function = "gpio";
> > +			};
> > +
> > +			/*
> > +			 * Accessible on connector J202. The MPP
> > +			 * listed below are pin 1-7, pin 8 is unused,
> > +			 * pin 9 is external reset input and pin 10 is
> > +			 * ground.
> > +			 */
> > +			pmx_gpio_header: pmx-gpio-header {
> > +				marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",
> > +					       "mpp35", "mpp34", "mpp40";
> > +				marvell,function = "gpio";
> > +			};
> > +
> > +			pmx_gpio_init: pmx-init {
> > +				marvell,pins = "mpp38";
> > +				marvell,function = "gpio";
> > +			};
> > +
> > +			pmx_usb_oc: pmx-usb-oc {
> > +				marvell,pins = "mpp39";
> > +				marvell,function = "gpio";
> > +			};
> > +
> > +			pmx_leds: pmx-leds {
> > +				marvell,pins = "mpp41", "mpp42", "mpp43";
> > +				marvell,function = "gpio";
> > +			};
> > +
> > +			pmx_ge1: pmx-ge1 {
> > +				marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
> > +					       "mpp24", "mpp25", "mpp26", "mpp27",
> > +					       "mpp30", "mpp31", "mpp32", "mpp33";
> > +				marvell,function = "ge1";
> > +			};
> > +		};
> > +	};
> > +
> > +	gpio-leds {
> > +		compatible = "gpio-leds";
> > +		pinctrl-0 = <&pmx_leds>;
> > +		pinctrl-names = "default";
> > +
> > +		led-red {
> > +			label = "obsa7:red:stat";
> > +			gpios = <&gpio1 9 1>;
> > +		};
> > +
> > +		led-green {
> > +			label = "obsa7:green:stat";
> > +			gpios = <&gpio1 10 1>;
> > +		};
> > +
> > +		led-yellow {
> > +			label = "obsa7:yellow:stat";
> > +			gpios = <&gpio1 11 1>;
> > +		};
> > +        };
> > +
> > +	gpio_keys {
> > +		compatible = "gpio-keys";
> > +		pinctrl-0 = <&pmx_gpio_init>;
> > +		pinctrl-names = "default";
> > +		#address-cells = <1>;
> > +		#size-cells = <0>;
> > +
> > +		button at 1 {
> > +			label = "Init Button";
> > +			linux,code = <116>;
> > +			gpios = <&gpio1 6 0>;
> > +		};
> > +	};
> > +};
> > +
> > +&mdio {
> > +	status = "okay";
> > +
> > +	ethphy0: ethernet-phy at 0 {
> > +		device_type = "ethernet-phy";
> > +		reg = <0>;
> > +	};
> > +
> > +	ethphy1: ethernet-phy at 1 {
> > +		device_type = "ethernet-phy";
> > +		reg = <1>;
> > +	};
> > +};
> > +
> > +&eth0 {
> > +	status = "okay";
> > +	ethernet0-port at 0 {
> > +		phy-handle = <&ethphy0>;
> > +	};
> > +};
> > +
> > +&eth1 {
> > +	status = "okay";
> > +	pinctrl-0 = <&pmx_ge1>;
> > +	pinctrl-names = "default";
> > +	ethernet1-port at 0 {
> > +		phy-handle = <&ethphy1>;
> > +	};
> > +};
> > 
> 
> 
> -- 
> Gregory Clement, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com

acked

[Russell King - ARM Linux]

On Wed, Oct 30, 2013 at 01:15:44PM -0400, Jason Cooper wrote:
> Gregory,
> 
> I like the idea, and if you perhaps do '[PATCH X/Y] Acked' it should
> make it through the filters.  (they currently whitelist 'GIT PULL' and
> 'PATCH' subjects).
> 
> Sure would make things easier when going through the threads...

NAK. :)

The reason being that some mailing list archivers will break threads
with a subject line change, which will detach the "acked" from the
original messages.

If a patch made it though with "[PATCH" in the subject line, then a
reply (though *correctly* trimmed down as per Internet Etiquette
which is something people - including yourself as evidenced by the
message to which I'm replying - regularly don't do) will get through
without any issues.

acked

[Jason Cooper]

On Wed, Oct 30, 2013 at 05:20:07PM +0000, Russell King - ARM Linux wrote:
> On Wed, Oct 30, 2013 at 01:15:44PM -0400, Jason Cooper wrote:
> > Gregory,
> > 
> > I like the idea, and if you perhaps do '[PATCH X/Y] Acked' it should
> > make it through the filters.  (they currently whitelist 'GIT PULL' and
> > 'PATCH' subjects).
> > 
> > Sure would make things easier when going through the threads...
> 
> NAK. :)
> 
> The reason being that some mailing list archivers will break threads
> with a subject line change, which will detach the "acked" from the
> original messages.

Ahhh, you're right.  I completely forgot about the archives.  Shame on
me.

Oh well, back to writing better scripts...

thx,

Jason.

acked

[Gregory CLEMENT]

Hi Jason,

On 30/10/2013 18:15, Jason Cooper wrote:
> Gregory,
> 
> I like the idea, and if you perhaps do '[PATCH X/Y] Acked' it should
> make it through the filters.  (they currently whitelist 'GIT PULL' and
> 'PATCH' subjects).
> 

Well actually it was a mistake! I ended to use a plugin to automatically
writing some pattern instead of writing it myself each time, but I
mis-configured it!

I am not sure that everybody like the idea to hijack the subject of a thread,
but if there a agreement on it, now I know hot to do it! ;)

Gregory

> Sure would make things easier when going through the threads...
> 
> thx,
> 
> Jason.
> 
> On Wed, Oct 30, 2013 at 06:00:00PM +0100, Gregory CLEMENT wrote:
>> On 30/10/2013 17:55, Thomas Petazzoni wrote:
>>> The OpenBlocks A7 board is designed and sold by PlatHome, and based on
>>> a Kirkwood 6283 Marvell SoC. It is quite similar to the OpenBlocks A6
>>> already supported in the kernel, with the following main differences:
>>>
>>>  - The A6 uses a RTC on I2C, while the A7 uses the internal SoC RTC.
>>>
>>>  - The A6 has one Ethernet port, while the A7 has two Ethernet ports
>>>
>>>  - The A6 has only one USB port, while the A7 integrates a USB hub,
>>>    which provides two front-side USB port, and an internal USB port as
>>>    well.
>>>
>>>  - The A6 has 512 MB of RAM, while the A7 has 1 GB of RAM.
>>>
>>>  - Slightly different GPIOs for some functions.
>>>
>>> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>>
>>
>> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>>
>>
>>> ---
>>>  arch/arm/boot/dts/Makefile                   |   3 +-
>>>  arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 223 +++++++++++++++++++++++++++
>>>  2 files changed, 225 insertions(+), 1 deletion(-)
>>>  create mode 100644 arch/arm/boot/dts/kirkwood-openblocks_a7.dts
>>>
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index 802720e..64783bb 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -101,7 +101,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
>>>  	kirkwood-topkick.dtb \
>>>  	kirkwood-ts219-6281.dtb \
>>>  	kirkwood-ts219-6282.dtb \
>>> -	kirkwood-openblocks_a6.dtb
>>> +	kirkwood-openblocks_a6.dtb \
>>> +	kirkwood-openblocks_a7.dtb
>>>  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
>>>  dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
>>>  	msm8960-cdp.dtb
>>> diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
>>> new file mode 100644
>>> index 0000000..1864972
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
>>> @@ -0,0 +1,223 @@
>>> +/*
>>> + * Device Tree file for OpenBlocks A7 board
>>> + *
>>> + * Copyright (C) 2013 Free Electrons
>>> + *
>>> + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>>> + *
>>> + * This file is licensed under the terms of the GNU General Public
>>> + * License version 2.  This program is licensed "as is" without any
>>> + * warranty of any kind, whether express or implied.
>>> + */
>>> +
>>> +/dts-v1/;
>>> +
>>> +#include "kirkwood.dtsi"
>>> +#include "kirkwood-6282.dtsi"
>>> +
>>> +/ {
>>> +	model = "Plat'Home OpenBlocksA7";
>>> +	compatible = "plathome,openblocks-a7", "marvell,kirkwood-88f6283", "marvell,kirkwood";
>>> +
>>> +	memory {
>>> +		device_type = "memory";
>>> +		reg = <0x00000000 0x40000000>; /* 1 GB */
>>> +	};
>>> +
>>> +	chosen {
>>> +		bootargs = "console=ttyS0,115200n8 earlyprintk";
>>> +	};
>>> +
>>> +	ocp at f1000000 {
>>> +		serial at 12000 {
>>> +			status = "ok";
>>> +			pinctrl-0 = <&pmx_uart0>;
>>> +			pinctrl-names = "default";
>>> +		};
>>> +
>>> +		serial at 12100 {
>>> +			status = "ok";
>>> +			pinctrl-0 = <&pmx_uart1>;
>>> +			pinctrl-names = "default";
>>> +		};
>>> +
>>> +		nand at 3000000 {
>>> +			chip-delay = <25>;
>>> +			status = "okay";
>>> +			pinctrl-0 = <&pmx_nand>;
>>> +			pinctrl-names = "default";
>>> +
>>> +			partition at 0 {
>>> +				label = "uboot";
>>> +				reg = <0x0 0x1c0000>;
>>> +			};
>>> +
>>> +			partition at 90000 {
>>> +				label = "env";
>>> +				reg = <0x1c0000 0x2c0000>;
>>> +			};
>>> +
>>> +			partition at d4000 {
>>> +				label = "test";
>>> +				reg = <0x480000 0x160000>;
>>> +			};
>>> +
>>> +			partition at f4000 {
>>> +				label = "conf";
>>> +				reg = <0x5e0000 0x540000>;
>>> +			};
>>> +
>>> +			partition at 4f4000 {
>>> +				label = "linux";
>>> +				reg = <0xb20000 0x3d40000>;
>>> +			};
>>> +
>>> +			partition at 2214000 {
>>> +				label = "user";
>>> +				reg = <0x4860000 0xb7a0000>;
>>> +			};
>>> +		};
>>> +
>>> +		sata at 80000 {
>>> +			nr-ports = <1>;
>>> +			status = "okay";
>>> +		};
>>> +
>>> +		i2c at 11100 {
>>> +			status = "okay";
>>> +			pinctrl-0 = <&pmx_twsi1>;
>>> +			pinctrl-names = "default";
>>> +
>>> +			s24c02: s24c02 at 50 {
>>> +				compatible = "24c02";
>>> +				reg = <0x50>;
>>> +			};
>>> +		};
>>> +
>>> +		pinctrl: pinctrl at 10000 {
>>> +			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
>>> +			pinctrl-names = "default";
>>> +
>>> +			pmx_uart0: pmx-uart0 {
>>> +				marvell,pins = "mpp10", "mpp11", "mpp15",
>>> +					"mpp16";
>>> +				marvell,function = "uart0";
>>> +			};
>>> +
>>> +			pmx_uart1: pmx-uart1 {
>>> +				marvell,pins = "mpp13", "mpp14", "mpp8",
>>> +					"mpp9";
>>> +				marvell,function = "uart1";
>>> +			};
>>> +
>>> +			pmx_sysrst: pmx-sysrst {
>>> +				marvell,pins = "mpp6";
>>> +				marvell,function = "sysrst";
>>> +			};
>>> +
>>> +			pmx_dip_switches: pmx-dip-switches {
>>> +				marvell,pins = "mpp44", "mpp45", "mpp46", "mpp47";
>>> +				marvell,function = "gpio";
>>> +			};
>>> +
>>> +			/*
>>> +			 * Accessible on connector J202. The MPP
>>> +			 * listed below are pin 1-7, pin 8 is unused,
>>> +			 * pin 9 is external reset input and pin 10 is
>>> +			 * ground.
>>> +			 */
>>> +			pmx_gpio_header: pmx-gpio-header {
>>> +				marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",
>>> +					       "mpp35", "mpp34", "mpp40";
>>> +				marvell,function = "gpio";
>>> +			};
>>> +
>>> +			pmx_gpio_init: pmx-init {
>>> +				marvell,pins = "mpp38";
>>> +				marvell,function = "gpio";
>>> +			};
>>> +
>>> +			pmx_usb_oc: pmx-usb-oc {
>>> +				marvell,pins = "mpp39";
>>> +				marvell,function = "gpio";
>>> +			};
>>> +
>>> +			pmx_leds: pmx-leds {
>>> +				marvell,pins = "mpp41", "mpp42", "mpp43";
>>> +				marvell,function = "gpio";
>>> +			};
>>> +
>>> +			pmx_ge1: pmx-ge1 {
>>> +				marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
>>> +					       "mpp24", "mpp25", "mpp26", "mpp27",
>>> +					       "mpp30", "mpp31", "mpp32", "mpp33";
>>> +				marvell,function = "ge1";
>>> +			};
>>> +		};
>>> +	};
>>> +
>>> +	gpio-leds {
>>> +		compatible = "gpio-leds";
>>> +		pinctrl-0 = <&pmx_leds>;
>>> +		pinctrl-names = "default";
>>> +
>>> +		led-red {
>>> +			label = "obsa7:red:stat";
>>> +			gpios = <&gpio1 9 1>;
>>> +		};
>>> +
>>> +		led-green {
>>> +			label = "obsa7:green:stat";
>>> +			gpios = <&gpio1 10 1>;
>>> +		};
>>> +
>>> +		led-yellow {
>>> +			label = "obsa7:yellow:stat";
>>> +			gpios = <&gpio1 11 1>;
>>> +		};
>>> +        };
>>> +
>>> +	gpio_keys {
>>> +		compatible = "gpio-keys";
>>> +		pinctrl-0 = <&pmx_gpio_init>;
>>> +		pinctrl-names = "default";
>>> +		#address-cells = <1>;
>>> +		#size-cells = <0>;
>>> +
>>> +		button at 1 {
>>> +			label = "Init Button";
>>> +			linux,code = <116>;
>>> +			gpios = <&gpio1 6 0>;
>>> +		};
>>> +	};
>>> +};
>>> +
>>> +&mdio {
>>> +	status = "okay";
>>> +
>>> +	ethphy0: ethernet-phy at 0 {
>>> +		device_type = "ethernet-phy";
>>> +		reg = <0>;
>>> +	};
>>> +
>>> +	ethphy1: ethernet-phy at 1 {
>>> +		device_type = "ethernet-phy";
>>> +		reg = <1>;
>>> +	};
>>> +};
>>> +
>>> +&eth0 {
>>> +	status = "okay";
>>> +	ethernet0-port at 0 {
>>> +		phy-handle = <&ethphy0>;
>>> +	};
>>> +};
>>> +
>>> +&eth1 {
>>> +	status = "okay";
>>> +	pinctrl-0 = <&pmx_ge1>;
>>> +	pinctrl-names = "default";
>>> +	ethernet1-port at 0 {
>>> +		phy-handle = <&ethphy1>;
>>> +	};
>>> +};
>>>
>>
>>
>> -- 
>> Gregory Clement, Free Electrons
>> Kernel, drivers, real-time and embedded Linux
>> development, consulting, training and support.
>> http://free-electrons.com


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

acked

[Jason Cooper]

On Wed, Oct 30, 2013 at 06:22:08PM +0100, Gregory CLEMENT wrote:
> Hi Jason,
> 
> On 30/10/2013 18:15, Jason Cooper wrote:
> > Gregory,
> > 
> > I like the idea, and if you perhaps do '[PATCH X/Y] Acked' it should
> > make it through the filters.  (they currently whitelist 'GIT PULL' and
> > 'PATCH' subjects).
> > 
> 
> Well actually it was a mistake! I ended to use a plugin to automatically
> writing some pattern instead of writing it myself each time, but I
> mis-configured it!

yeah, saw that on irc after I hit send.

> I am not sure that everybody like the idea to hijack the subject of a thread,
> but if there a agreement on it, now I know hot to do it! ;)

No, rmk has a very valid point.  It would break most ml archiving.  We
don't want to do that.

thx,

Jason.

[PATCH 1/2] ARM: kirkwood: add support for OpenBlocks A7 platform

[Jason Cooper]

On Wed, Oct 30, 2013 at 05:55:09PM +0100, Thomas Petazzoni wrote:
> The OpenBlocks A7 board is designed and sold by PlatHome, and based on
> a Kirkwood 6283 Marvell SoC. It is quite similar to the OpenBlocks A6
> already supported in the kernel, with the following main differences:
> 
>  - The A6 uses a RTC on I2C, while the A7 uses the internal SoC RTC.
> 
>  - The A6 has one Ethernet port, while the A7 has two Ethernet ports
> 
>  - The A6 has only one USB port, while the A7 integrates a USB hub,
>    which provides two front-side USB port, and an internal USB port as
>    well.
> 
>  - The A6 has 512 MB of RAM, while the A7 has 1 GB of RAM.
> 
>  - Slightly different GPIOs for some functions.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/boot/dts/Makefile                   |   3 +-
>  arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 223 +++++++++++++++++++++++++++
>  2 files changed, 225 insertions(+), 1 deletion(-)
>  create mode 100644 arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 802720e..64783bb 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -101,7 +101,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
>  	kirkwood-topkick.dtb \
>  	kirkwood-ts219-6281.dtb \
>  	kirkwood-ts219-6282.dtb \
> -	kirkwood-openblocks_a6.dtb
> +	kirkwood-openblocks_a6.dtb \
> +	kirkwood-openblocks_a7.dtb
>  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
>  dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
>  	msm8960-cdp.dtb
> diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> new file mode 100644
> index 0000000..1864972
> --- /dev/null
> +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
> @@ -0,0 +1,223 @@
> +/*
> + * Device Tree file for OpenBlocks A7 board
> + *
> + * Copyright (C) 2013 Free Electrons
> + *
> + * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + */
> +
> +/dts-v1/;
> +
> +#include "kirkwood.dtsi"
> +#include "kirkwood-6282.dtsi"
> +
> +/ {
> +	model = "Plat'Home OpenBlocksA7";
> +	compatible = "plathome,openblocks-a7", "marvell,kirkwood-88f6283", "marvell,kirkwood";
> +
> +	memory {
> +		device_type = "memory";
> +		reg = <0x00000000 0x40000000>; /* 1 GB */
> +	};
> +
> +	chosen {
> +		bootargs = "console=ttyS0,115200n8 earlyprintk";
> +	};
> +
> +	ocp at f1000000 {
> +		serial at 12000 {
> +			status = "ok";
> +			pinctrl-0 = <&pmx_uart0>;
> +			pinctrl-names = "default";
> +		};
> +
> +		serial at 12100 {
> +			status = "ok";
> +			pinctrl-0 = <&pmx_uart1>;
> +			pinctrl-names = "default";
> +		};
> +
> +		nand at 3000000 {
> +			chip-delay = <25>;
> +			status = "okay";
> +			pinctrl-0 = <&pmx_nand>;
> +			pinctrl-names = "default";
> +
> +			partition at 0 {
> +				label = "uboot";
> +				reg = <0x0 0x1c0000>;
> +			};
> +
> +			partition at 90000 {
> +				label = "env";
> +				reg = <0x1c0000 0x2c0000>;
> +			};

Hmm, something doesn't look right here.  Cut-n-paste problem?  Did you
run 'make dtbs' against this?  I get address size errors when I do.

At any rate, I've fixed it up (new version, incorporating my fix and
Andrew's requested change, below) and added it to mvebu/dt, and
for-next.

let me know if it's ok with you and I'll push it tomorrow.

thx,

Jason.

----->8------------------------------------
commit 8b96b90abbf6645e0a5e4ac68515f68d405a069b
Author: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date:   Wed Oct 30 17:55:09 2013 +0100

    ARM: kirkwood: add support for OpenBlocks A7 platform
    
    The OpenBlocks A7 board is designed and sold by PlatHome, and based on
    a Kirkwood 6283 Marvell SoC. It is quite similar to the OpenBlocks A6
    already supported in the kernel, with the following main differences:
    
     - The A6 uses a RTC on I2C, while the A7 uses the internal SoC RTC.
    
     - The A6 has one Ethernet port, while the A7 has two Ethernet ports
    
     - The A6 has only one USB port, while the A7 integrates a USB hub,
       which provides two front-side USB port, and an internal USB port as
       well.
    
     - The A6 has 512 MB of RAM, while the A7 has 1 GB of RAM.
    
     - Slightly different GPIOs for some functions.
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
    Acked-by: Andrew Lunn <andrew@lunn.ch>
    Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
    Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5b832744a0bb..f2b1c33efbfc 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -95,12 +95,13 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 	kirkwood-ns2mini.dtb \
 	kirkwood-nsa310.dtb \
 	kirkwood-nsa310a.dtb \
+	kirkwood-openblocks_a6.dtb \
+	kirkwood-openblocks_a7.dtb \
 	kirkwood-sheevaplug.dtb \
 	kirkwood-sheevaplug-esata.dtb \
 	kirkwood-topkick.dtb \
 	kirkwood-ts219-6281.dtb \
-	kirkwood-ts219-6282.dtb \
-	kirkwood-openblocks_a6.dtb
+	kirkwood-ts219-6282.dtb
 dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 	msm8960-cdp.dtb
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
new file mode 100644
index 000000000000..851fb2a60f20
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -0,0 +1,223 @@
+/*
+ * Device Tree file for OpenBlocks A7 board
+ *
+ * Copyright (C) 2013 Free Electrons
+ *
+ * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"
+
+/ {
+	model = "Plat'Home OpenBlocksA7";
+	compatible = "plathome,openblocks-a7", "marvell,kirkwood-88f6283", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x40000000>; /* 1 GB */
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
+	};
+
+	ocp at f1000000 {
+		serial at 12000 {
+			status = "ok";
+			pinctrl-0 = <&pmx_uart0>;
+			pinctrl-names = "default";
+		};
+
+		serial at 12100 {
+			status = "ok";
+			pinctrl-0 = <&pmx_uart1>;
+			pinctrl-names = "default";
+		};
+
+		sata at 80000 {
+			nr-ports = <1>;
+			status = "okay";
+		};
+
+		i2c at 11100 {
+			status = "okay";
+			pinctrl-0 = <&pmx_twsi1>;
+			pinctrl-names = "default";
+
+			s24c02: s24c02 at 50 {
+				compatible = "24c02";
+				reg = <0x50>;
+			};
+		};
+
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
+			pinctrl-names = "default";
+
+			pmx_uart0: pmx-uart0 {
+				marvell,pins = "mpp10", "mpp11", "mpp15",
+					"mpp16";
+				marvell,function = "uart0";
+			};
+
+			pmx_uart1: pmx-uart1 {
+				marvell,pins = "mpp13", "mpp14", "mpp8",
+					"mpp9";
+				marvell,function = "uart1";
+			};
+
+			pmx_sysrst: pmx-sysrst {
+				marvell,pins = "mpp6";
+				marvell,function = "sysrst";
+			};
+
+			pmx_dip_switches: pmx-dip-switches {
+				marvell,pins = "mpp44", "mpp45", "mpp46", "mpp47";
+				marvell,function = "gpio";
+			};
+
+			/*
+			 * Accessible on connector J202. The MPP
+			 * listed below are pin 1-7, pin 8 is unused,
+			 * pin 9 is external reset input and pin 10 is
+			 * ground.
+			 */
+			pmx_gpio_header: pmx-gpio-header {
+				marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",
+					       "mpp35", "mpp34", "mpp40";
+				marvell,function = "gpio";
+			};
+
+			pmx_gpio_init: pmx-init {
+				marvell,pins = "mpp38";
+				marvell,function = "gpio";
+			};
+
+			pmx_usb_oc: pmx-usb-oc {
+				marvell,pins = "mpp39";
+				marvell,function = "gpio";
+			};
+
+			pmx_leds: pmx-leds {
+				marvell,pins = "mpp41", "mpp42", "mpp43";
+				marvell,function = "gpio";
+			};
+
+			pmx_ge1: pmx-ge1 {
+				marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
+					       "mpp24", "mpp25", "mpp26", "mpp27",
+					       "mpp30", "mpp31", "mpp32", "mpp33";
+				marvell,function = "ge1";
+			};
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+		pinctrl-0 = <&pmx_leds>;
+		pinctrl-names = "default";
+
+		led-red {
+			label = "obsa7:red:stat";
+			gpios = <&gpio1 9 1>;
+		};
+
+		led-green {
+			label = "obsa7:green:stat";
+			gpios = <&gpio1 10 1>;
+		};
+
+		led-yellow {
+			label = "obsa7:yellow:stat";
+			gpios = <&gpio1 11 1>;
+		};
+        };
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		pinctrl-0 = <&pmx_gpio_init>;
+		pinctrl-names = "default";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		button at 1 {
+			label = "Init Button";
+			linux,code = <116>;
+			gpios = <&gpio1 6 0>;
+		};
+	};
+};
+
+&nand {
+	chip-delay = <25>;
+	status = "okay";
+	pinctrl-0 = <&pmx_nand>;
+	pinctrl-names = "default";
+
+	partition at 0 {
+		label = "uboot";
+		reg = <0x0 0x1c0000>;
+	};
+
+	partition at 1c0000 {
+		label = "env";
+		reg = <0x1c0000 0x2c0000>;
+	};
+
+	partition at 480000 {
+		label = "test";
+		reg = <0x480000 0x160000>;
+	};
+
+	partition at 5e0000 {
+		label = "conf";
+		reg = <0x5e0000 0x540000>;
+	};
+
+	partition at b20000 {
+		label = "linux";
+		reg = <0xb20000 0x3d40000>;
+	};
+
+	partition at 4860000 {
+		label = "user";
+		reg = <0x4860000 0xb7a0000>;
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		device_type = "ethernet-phy";
+		reg = <0>;
+	};
+
+	ethphy1: ethernet-phy at 1 {
+		device_type = "ethernet-phy";
+		reg = <1>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
+
+&eth1 {
+	status = "okay";
+	pinctrl-0 = <&pmx_ge1>;
+	pinctrl-names = "default";
+	ethernet1-port at 0 {
+		phy-handle = <&ethphy1>;
+	};
+};

[PATCH 1/2] ARM: kirkwood: add support for OpenBlocks A7 platform

[Thomas Petazzoni]

Dear Jason Cooper,

On Wed, 30 Oct 2013 15:57:25 -0400, Jason Cooper wrote:

> > +			partition at 0 {
> > +				label = "uboot";
> > +				reg = <0x0 0x1c0000>;
> > +			};
> > +
> > +			partition at 90000 {
> > +				label = "env";
> > +				reg = <0x1c0000 0x2c0000>;
> > +			};
> 
> Hmm, something doesn't look right here.  Cut-n-paste problem?  Did you
> run 'make dtbs' against this?  I get address size errors when I do.

Strange. 'make dtbs' was working here. What was wrong exactly? Just
that the unit address (@90000) didn't match the starting address
0x1c0000 ?

> let me know if it's ok with you and I'll push it tomorrow.

This all looks good to me!

Thanks a lot,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[PATCH 1/2] ARM: kirkwood: add support for OpenBlocks A7 platform

[Gregory CLEMENT]

On 31/10/2013 09:37, Thomas Petazzoni wrote:
> Dear Jason Cooper,
> 
> On Wed, 30 Oct 2013 15:57:25 -0400, Jason Cooper wrote:
> 
>>> +			partition at 0 {
>>> +				label = "uboot";
>>> +				reg = <0x0 0x1c0000>;
>>> +			};
>>> +
>>> +			partition at 90000 {
>>> +				label = "env";
>>> +				reg = <0x1c0000 0x2c0000>;
>>> +			};
>>
>> Hmm, something doesn't look right here.  Cut-n-paste problem?  Did you
>> run 'make dtbs' against this?  I get address size errors when I do.
> 
> Strange. 'make dtbs' was working here. What was wrong exactly? Just
> that the unit address (@90000) didn't match the starting address
> 0x1c0000 ?

The unit address has no special meaning for the device tree it's just a
way to give a unique name to a node right?

So in this case it is not really a problem, but it's just nicer for the
coherency of the information in the dt to have the unit address which match
the starting address.

I also do a make dtbs ans I didn't get any errors:
$ make dtbs
 [...]
  DTC     arch/arm/boot/dts/kirkwood-openblocks_a6.dtb
  DTC     arch/arm/boot/dts/kirkwood-openblocks_a7.dtb

Regards,
> 
>> let me know if it's ok with you and I'll push it tomorrow.
> 
> This all looks good to me!
> 
> Thanks a lot,
> 
> Thomas
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 1/2] ARM: kirkwood: add support for OpenBlocks A7 platform

[Thomas Petazzoni]

Dear Gregory CLEMENT,

On Thu, 31 Oct 2013 10:17:43 +0100, Gregory CLEMENT wrote:

> > Strange. 'make dtbs' was working here. What was wrong exactly? Just
> > that the unit address (@90000) didn't match the starting address
> > 0x1c0000 ?
> 
> The unit address has no special meaning for the device tree it's just a
> way to give a unique name to a node right?

Yes, that's also my understanding.

> So in this case it is not really a problem, but it's just nicer for the
> coherency of the information in the dt to have the unit address which match
> the starting address.

Indeed, it's much better if they match (shame on me for the silly
copy/paste), but having then *not* matching should not cause any DTC
error, I believe.

> I also do a make dtbs ans I didn't get any errors:
> $ make dtbs
>  [...]
>   DTC     arch/arm/boot/dts/kirkwood-openblocks_a6.dtb
>   DTC     arch/arm/boot/dts/kirkwood-openblocks_a7.dtb

Same here.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[PATCH 1/2] ARM: kirkwood: add support for OpenBlocks A7 platform

[Jason Cooper]

On Thu, Oct 31, 2013 at 10:21:23AM +0100, Thomas Petazzoni wrote:
> Dear Gregory CLEMENT,
> 
> On Thu, 31 Oct 2013 10:17:43 +0100, Gregory CLEMENT wrote:
> 
> > > Strange. 'make dtbs' was working here. What was wrong exactly? Just
> > > that the unit address (@90000) didn't match the starting address
> > > 0x1c0000 ?
> > 
> > The unit address has no special meaning for the device tree it's just a
> > way to give a unique name to a node right?
> 
> Yes, that's also my understanding.

Correct, that's not what caused the error.

> > So in this case it is not really a problem, but it's just nicer for the
> > coherency of the information in the dt to have the unit address which match
> > the starting address.
> 
> Indeed, it's much better if they match (shame on me for the silly
> copy/paste), but having then *not* matching should not cause any DTC
> error, I believe.
> 
> > I also do a make dtbs ans I didn't get any errors:
> > $ make dtbs
> >  [...]
> >   DTC     arch/arm/boot/dts/kirkwood-openblocks_a6.dtb
> >   DTC     arch/arm/boot/dts/kirkwood-openblocks_a7.dtb
> 
> Same here.

With Thomas' original patch (on top of mvebu/dt, based on v3.12-rc1):

$ make kirkwood_defconfig
$ make dtbs
...
  DTC     arch/arm/boot/dts/kirkwood-openblocks_a6.dtb
  DTC     arch/arm/boot/dts/kirkwood-openblocks_a7.dtb
Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 0 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 90000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at d4000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at f4000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 4f4000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 2214000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 0
Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 0
Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 90000
Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 90000
Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at d4000
Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at d4000
Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at f4000
Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at f4000
Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 4f4000
Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 4f4000
Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 2214000
Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 2214000

thx,

Jason.

[PATCH 1/2] ARM: kirkwood: add support for OpenBlocks A7 platform

[Gregory CLEMENT]

On 31/10/2013 13:50, Jason Cooper wrote:
> On Thu, Oct 31, 2013 at 10:21:23AM +0100, Thomas Petazzoni wrote:
>> Dear Gregory CLEMENT,
>>
>> On Thu, 31 Oct 2013 10:17:43 +0100, Gregory CLEMENT wrote:
>>
>>>> Strange. 'make dtbs' was working here. What was wrong exactly? Just
>>>> that the unit address (@90000) didn't match the starting address
>>>> 0x1c0000 ?
>>>
>>> The unit address has no special meaning for the device tree it's just a
>>> way to give a unique name to a node right?
>>
>> Yes, that's also my understanding.
> 
> Correct, that's not what caused the error.
> 
>>> So in this case it is not really a problem, but it's just nicer for the
>>> coherency of the information in the dt to have the unit address which match
>>> the starting address.
>>
>> Indeed, it's much better if they match (shame on me for the silly
>> copy/paste), but having then *not* matching should not cause any DTC
>> error, I believe.
>>
>>> I also do a make dtbs ans I didn't get any errors:
>>> $ make dtbs
>>>  [...]
>>>   DTC     arch/arm/boot/dts/kirkwood-openblocks_a6.dtb
>>>   DTC     arch/arm/boot/dts/kirkwood-openblocks_a7.dtb
>>
>> Same here.
> 
> With Thomas' original patch (on top of mvebu/dt, based on v3.12-rc1):

On my side I tested the patch on top on v3.12-rc7. So the difference should
be there.

> 
> $ make kirkwood_defconfig
> $ make dtbs
> ...
>   DTC     arch/arm/boot/dts/kirkwood-openblocks_a6.dtb
>   DTC     arch/arm/boot/dts/kirkwood-openblocks_a7.dtb
> Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 0 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 90000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at d4000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at f4000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 4f4000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 2214000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 0
> Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 0
> Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 90000
> Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 90000
> Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at d4000
> Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at d4000
> Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at f4000
> Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at f4000
> Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 4f4000
> Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 4f4000
> Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 2214000
> Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 2214000
> 
> thx,
> 
> Jason.
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 1/2] ARM: kirkwood: add support for OpenBlocks A7 platform

[Jason Cooper]

On Thu, Oct 31, 2013 at 01:54:42PM +0100, Gregory CLEMENT wrote:
> On 31/10/2013 13:50, Jason Cooper wrote:
> > On Thu, Oct 31, 2013 at 10:21:23AM +0100, Thomas Petazzoni wrote:
> >> Dear Gregory CLEMENT,
> >>
> >> On Thu, 31 Oct 2013 10:17:43 +0100, Gregory CLEMENT wrote:
> >>
> >>>> Strange. 'make dtbs' was working here. What was wrong exactly? Just
> >>>> that the unit address (@90000) didn't match the starting address
> >>>> 0x1c0000 ?
> >>>
> >>> The unit address has no special meaning for the device tree it's just a
> >>> way to give a unique name to a node right?
> >>
> >> Yes, that's also my understanding.
> > 
> > Correct, that's not what caused the error.
> > 
> >>> So in this case it is not really a problem, but it's just nicer for the
> >>> coherency of the information in the dt to have the unit address which match
> >>> the starting address.
> >>
> >> Indeed, it's much better if they match (shame on me for the silly
> >> copy/paste), but having then *not* matching should not cause any DTC
> >> error, I believe.
> >>
> >>> I also do a make dtbs ans I didn't get any errors:
> >>> $ make dtbs
> >>>  [...]
> >>>   DTC     arch/arm/boot/dts/kirkwood-openblocks_a6.dtb
> >>>   DTC     arch/arm/boot/dts/kirkwood-openblocks_a7.dtb
> >>
> >> Same here.
> > 
> > With Thomas' original patch (on top of mvebu/dt, based on v3.12-rc1):
> 
> On my side I tested the patch on top on v3.12-rc7. So the difference should
> be there.

Ok, I get no warnings when I rebase the original patch onto v3.12-rc7.

Since Thomas is ok with my version, I'm going to send it up since it
doesn't generate warnings.  There's no point merging in v3.12-rc7 just
to silence a few warnings.

thx,

Jason.

> > $ make kirkwood_defconfig
> > $ make dtbs
> > ...
> >   DTC     arch/arm/boot/dts/kirkwood-openblocks_a6.dtb
> >   DTC     arch/arm/boot/dts/kirkwood-openblocks_a7.dtb
> > Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 0 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> > Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 90000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> > Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at d4000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> > Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at f4000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> > Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 4f4000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> > Warning (reg_format): "reg" property in /ocp at f1000000/nand at 3000000/partition at 2214000 has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
> > Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 0
> > Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 0
> > Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 90000
> > Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 90000
> > Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at d4000
> > Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at d4000
> > Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at f4000
> > Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at f4000
> > Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 4f4000
> > Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 4f4000
> > Warning (avoid_default_addr_size): Relying on default #address-cells value for /ocp at f1000000/nand at 3000000/partition at 2214000
> > Warning (avoid_default_addr_size): Relying on default #size-cells value for /ocp at f1000000/nand at 3000000/partition at 2214000

[PATCH 2/2] ARM: kirkwood: enable HIGHMEM in defconfig

[Thomas Petazzoni]

The Kirkwood-based OpenBlocks A7 platform has 1 GB of memory. To make
use of this memory completely, enabling HIGHMEM is needed, so we
enable it by default in the kirkwood_defconfig.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/configs/kirkwood_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 0ae0eaeb..2e762d9 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -27,6 +27,7 @@ CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
+CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CPU_FREQ=y
-- 
1.8.1.2

[PATCH 2/2] ARM: kirkwood: enable HIGHMEM in defconfig

[Andrew Lunn]

On Wed, Oct 30, 2013 at 05:55:10PM +0100, Thomas Petazzoni wrote:
> The Kirkwood-based OpenBlocks A7 platform has 1 GB of memory. To make
> use of this memory completely, enabling HIGHMEM is needed, so we
> enable it by default in the kirkwood_defconfig.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Acked-by: Andrew Lunn <andrew@lunn.ch>

	  Andrew

> ---
>  arch/arm/configs/kirkwood_defconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
> index 0ae0eaeb..2e762d9 100644
> --- a/arch/arm/configs/kirkwood_defconfig
> +++ b/arch/arm/configs/kirkwood_defconfig
> @@ -27,6 +27,7 @@ CONFIG_PCI_MVEBU=y
>  CONFIG_PREEMPT=y
>  CONFIG_AEABI=y
>  # CONFIG_OABI_COMPAT is not set
> +CONFIG_HIGHMEM=y
>  CONFIG_ZBOOT_ROM_TEXT=0x0
>  CONFIG_ZBOOT_ROM_BSS=0x0
>  CONFIG_CPU_FREQ=y
> -- 
> 1.8.1.2
> 

[PATCH 2/2] ARM: kirkwood: enable HIGHMEM in defconfig

[Gregory CLEMENT]

On 30/10/2013 17:55, Thomas Petazzoni wrote:
> The Kirkwood-based OpenBlocks A7 platform has 1 GB of memory. To make
> use of this memory completely, enabling HIGHMEM is needed, so we
> enable it by default in the kirkwood_defconfig.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

> ---
>  arch/arm/configs/kirkwood_defconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
> index 0ae0eaeb..2e762d9 100644
> --- a/arch/arm/configs/kirkwood_defconfig
> +++ b/arch/arm/configs/kirkwood_defconfig
> @@ -27,6 +27,7 @@ CONFIG_PCI_MVEBU=y
>  CONFIG_PREEMPT=y
>  CONFIG_AEABI=y
>  # CONFIG_OABI_COMPAT is not set
> +CONFIG_HIGHMEM=y
>  CONFIG_ZBOOT_ROM_TEXT=0x0
>  CONFIG_ZBOOT_ROM_BSS=0x0
>  CONFIG_CPU_FREQ=y
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH 2/2] ARM: kirkwood: enable HIGHMEM in defconfig

[Jason Cooper]

On Wed, Oct 30, 2013 at 05:55:10PM +0100, Thomas Petazzoni wrote:
> The Kirkwood-based OpenBlocks A7 platform has 1 GB of memory. To make
> use of this memory completely, enabling HIGHMEM is needed, so we
> enable it by default in the kirkwood_defconfig.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/configs/kirkwood_defconfig | 1 +
>  1 file changed, 1 insertion(+)

Applied to mvebu-next/defconfig

thx,

Jason.

[PATCH 0/7] watchdog_reset cleanup

[Rasmus Villemoes]

watchdog_reset is no more. That is, it is no longer called from
anywhere, so any leftover definitions are just dead weight, and
references in comments need to be updated.

I don't have access to any m68k, sh or powerpc boards. Only lightly
compile-tested.

Apart from the two sh4 patches, these are independent of each other
and can be applied individually.

Cc: Angelo Dureghello <angelo@kernel-space.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Huan Wang <alison.wang@nxp.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

Rasmus Villemoes (7):
  m68k: remove dead code
  wdt-uclass: watchdog_reset cleanup
  serial: ns16550: fix comment to mention schedule instead of
    watchdog_reset
  sh4: move reset_cpu() from watchdog.c to cpu.c
  sh4: remove watchdog.c file
  powerpc: mpc83xx: remove unused watchdog_reset() function
  powerpc: mpc85xx: remove dead watchdog-related code

 arch/m68k/cpu/mcf52x2/cpu.c    | 108 ---------------------------------
 arch/powerpc/cpu/mpc83xx/cpu.c |  15 -----
 arch/powerpc/cpu/mpc85xx/cpu.c |  31 ----------
 arch/sh/cpu/sh4/Makefile       |   2 +-
 arch/sh/cpu/sh4/cpu.c          |  10 +++
 arch/sh/cpu/sh4/watchdog.c     |  61 -------------------
 drivers/serial/ns16550.c       |   8 +--
 drivers/watchdog/wdt-uclass.c  |  19 +-----
 include/watchdog.h             |   3 -
 9 files changed, 17 insertions(+), 240 deletions(-)
 delete mode 100644 arch/sh/cpu/sh4/watchdog.c

-- 
2.40.1.1.g1c60b9335d

Acked

[Angelo Dureghello]

Hi Rasmus,


On 28/05/24 1:13 PM, Rasmus Villemoes wrote:
> watchdog_reset is no more. That is, it is no longer called from
> anywhere, so any leftover definitions are just dead weight, and
> references in comments need to be updated.
>
> I don't have access to any m68k, sh or powerpc boards. Only lightly
> compile-tested.
>
> Apart from the two sh4 patches, these are independent of each other
> and can be applied individually.

Thanks for the cleanup,

Acked-by: Angelo Dureghello <angelo@kernel-space.org>


> Cc: Angelo Dureghello <angelo@kernel-space.org>
> Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
> Cc: Huan Wang <alison.wang@nxp.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>
> Rasmus Villemoes (7):
>    m68k: remove dead code
>    wdt-uclass: watchdog_reset cleanup
>    serial: ns16550: fix comment to mention schedule instead of
>      watchdog_reset
>    sh4: move reset_cpu() from watchdog.c to cpu.c
>    sh4: remove watchdog.c file
>    powerpc: mpc83xx: remove unused watchdog_reset() function
>    powerpc: mpc85xx: remove dead watchdog-related code
>
>   arch/m68k/cpu/mcf52x2/cpu.c    | 108 ---------------------------------
>   arch/powerpc/cpu/mpc83xx/cpu.c |  15 -----
>   arch/powerpc/cpu/mpc85xx/cpu.c |  31 ----------
>   arch/sh/cpu/sh4/Makefile       |   2 +-
>   arch/sh/cpu/sh4/cpu.c          |  10 +++
>   arch/sh/cpu/sh4/watchdog.c     |  61 -------------------
>   drivers/serial/ns16550.c       |   8 +--
>   drivers/watchdog/wdt-uclass.c  |  19 +-----
>   include/watchdog.h             |   3 -
>   9 files changed, 17 insertions(+), 240 deletions(-)
>   delete mode 100644 arch/sh/cpu/sh4/watchdog.c
>

[PATCH 1/7] m68k: Implement a default flush_dcache_all

[Tom Rini]

Implement a weak default version of flush_dcache_all which is based on
the ARM default, which is to flush the entire range via
flush_dcache_range(...).

Signed-off-by: Tom Rini <trini@konsulko.com>
---
Cc: Huan Wang <alison.wang@nxp.com>
Cc: Angelo Dureghello <angelo@kernel-space.org>
---
 arch/m68k/lib/cache.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c
index de04124404cf..dab834c1cbd8 100644
--- a/arch/m68k/lib/cache.c
+++ b/arch/m68k/lib/cache.c
@@ -134,6 +134,15 @@ void dcache_invalid(void)
 #endif
 }
 
+/*
+ * Default implementation:
+ * do a range flush for the entire range
+ */
+__weak void flush_dcache_all(void)
+{
+	flush_dcache_range(0, ~0);
+}
+
 __weak void invalidate_dcache_range(unsigned long start, unsigned long stop)
 {
 	/* An empty stub, real implementation should be in platform code */
-- 
2.34.1

Acked

[Angelo Dureghello]

Hi Tom,

Acked-by: Angelo Dureghello <angelo@kernel-space.org>


thanks,
angelo

On 19/06/24 11:27 PM, Tom Rini wrote:
> Implement a weak default version of flush_dcache_all which is based on
> the ARM default, which is to flush the entire range via
> flush_dcache_range(...).
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Cc: Huan Wang <alison.wang@nxp.com>
> Cc: Angelo Dureghello <angelo@kernel-space.org>
> ---
>   arch/m68k/lib/cache.c | 9 +++++++++
>   1 file changed, 9 insertions(+)
>
> diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c
> index de04124404cf..dab834c1cbd8 100644
> --- a/arch/m68k/lib/cache.c
> +++ b/arch/m68k/lib/cache.c
> @@ -134,6 +134,15 @@ void dcache_invalid(void)
>   #endif
>   }
>   
> +/*
> + * Default implementation:
> + * do a range flush for the entire range
> + */
> +__weak void flush_dcache_all(void)
> +{
> +	flush_dcache_range(0, ~0);
> +}
> +
>   __weak void invalidate_dcache_range(unsigned long start, unsigned long stop)
>   {
>   	/* An empty stub, real implementation should be in platform code */

[PATCH 00/35] global_data: Reduce size of struct global_data

[Simon Glass]

The global data structure has grown quite a lot over the years, being
the best place to put an important pointer or something that must be
accessed before and after relocation.

This series attempts to reduce the size a little, by moving some things
out and shrinking and aligning some fields.

Some fields are needed during init but not afterwards. To deal with this
a new 'boardf' structure is created, which sits on the stack and is only
present during board_init_f(). It is possible that more fields could
move to this struct, but for now only 4 are moved.

An assumption is made that an int is 32-bits wide on all architectures,
which seems to be true, but maintainers should be able to confirm.

Mostly the code-size impact is neutral, but the patch
'Use less space for environment fields' does increase U-Boot's size by
about 30 bytes on aarch64.

For firefly-rk3399 (64-bit) the size of global reduces from 456 to 368
bytes. For SPL it reduces from 416 to 272 bytes.

There are other things which could be attempted, for example:
- Using hlist instead of list for some lists
- Checking that only necessary fields are present in SPL


Simon Glass (35):
  global_data: Move pci_clk to m68k and powerpc
  x86: Drop use of global_data fb_base
  video: Add a function to obtain the framebuffer address
  video: mxc: Avoid setting global_data fb_base
  video: mxs: Avoid setting global_data fb_base
  arm: friendlyarm: Avoid accessing global_data fb_base
  arm: ronetix: Avoid accessing global_data fb_base
  zynqmp: Avoid setting the framebuffer address
  video: Avoid setting global_data fb_base from SPL handoff
  video: Avoid setting global_data fb_base in video setup
  global_data: Drop fb_base
  global_data: Convert have_console into a flag
  global_data: Remove pci_ram_top
  global_data: Drop global_data hose
  global_data: Drop pci_bootdelay
  global_data: Use less space for environment fields
  board_f: Add a new struct to hold pre-relocation info
  board_f: Move fdt_size to board
  board_f: Move new_bootstage to boardf
  board_f: Move new_bloblist to boardf
  global_data: Drop spl_handoff
  global_data: Collect common fields at the top
  global_data: Reduce the size of bus_clk and mem_clk
  global_data: Reduce the size of mon_len
  global_data: log: Reorder and shrink fields
  global_data: Reduce size of early-malloc vars
  global_data: Move baud_rate field lower
  global_data: Move env_addr field higher
  global_data: Put phys_addr fields near the top
  global_data: Move ulong fields together
  global_data: Move pointer members together
  global_data: Remove jump table in SPL
  global_data: Remove environment members if not used
  doc: Move generic-board documentation into rst
  doc: Add some guidelines about global data

 arch/arm/cpu/arm926ejs/mxs/spl_boot.c         |   2 +-
 arch/arm/lib/bdinfo.c                         |   2 +-
 arch/arm/mach-exynos/spl_boot.c               |   2 +-
 arch/arm/mach-k3/common.c                     |   2 +-
 arch/arm/mach-k3/r5/sysfw-loader.c            |   2 +-
 arch/arm/mach-tegra/board2.c                  |   4 -
 arch/arm/mach-tegra/cboot.c                   |   4 -
 arch/m68k/cpu/mcf5445x/cpu.c                  |   2 +-
 arch/m68k/include/asm/global_data.h           |   2 +
 arch/m68k/lib/bdinfo.c                        |   2 +-
 arch/mips/mach-ath79/ar934x/clk.c             |   4 +-
 arch/mips/mach-octeon/cpu.c                   |   2 +-
 arch/powerpc/cpu/mpc83xx/pci.c                |   4 +-
 arch/powerpc/cpu/mpc83xx/speed.c              |   2 +-
 arch/powerpc/include/asm/global_data.h        |   2 +
 arch/x86/cpu/i386/cpu.c                       |   8 -
 arch/x86/cpu/intel_common/cpu_from_spl.c      |   4 +-
 arch/x86/cpu/ivybridge/cpu.c                  |   5 -
 arch/x86/lib/fsp/fsp_graphics.c               |   1 -
 arch/x86/lib/fsp2/fsp_dram.c                  |   4 +-
 board/freescale/ls2080ardb/eth_ls2080rdb.c    |   2 +-
 board/friendlyarm/nanopi2/board.c             |   9 +-
 board/ronetix/pm9263/pm9263.c                 |   6 +-
 board/siemens/common/board_am335x.c           |   2 +-
 cmd/bdinfo.c                                  |   2 -
 cmd/sb.c                                      |   6 +-
 common/board_f.c                              |  59 ++-
 common/board_r.c                              |   2 +-
 common/console.c                              |  17 +-
 common/hwconfig.c                             |   8 +-
 common/init/handoff.c                         |  12 +
 common/malloc_simple.c                        |   7 +-
 common/spl/spl.c                              |   6 +-
 doc/develop/global_data.rst                   |  25 ++
 .../historical/generic_board.rst}             |  16 +-
 doc/develop/historical/index.rst              |  12 +
 doc/develop/index.rst                         |   8 +
 drivers/clk/mpc83xx_clk.c                     |   2 +-
 drivers/clk/rockchip/clk_rk3399.c             |   3 +-
 drivers/video/imx/mxc_ipuv3_fb.c              |   2 -
 drivers/video/mxsfb.c                         |   1 -
 drivers/video/video-uclass.c                  |  16 +-
 drivers/video/zynqmp/zynqmp_dpsub.c           |   3 +-
 include/asm-generic/global_data.h             | 349 ++++++++----------
 include/board_f.h                             |  35 ++
 include/env_default.h                         |   3 -
 include/env_internal.h                        |   1 +
 include/handoff.h                             |   7 +
 include/video.h                               |  11 +
 lib/asm-offsets.c                             |   2 +
 test/cmd/bdinfo.c                             |   3 -
 test/log/log_test.c                           |   6 +-
 52 files changed, 373 insertions(+), 330 deletions(-)
 rename doc/{README.generic-board => develop/historical/generic_board.rst} (96%)
 create mode 100644 doc/develop/historical/index.rst
 create mode 100644 include/board_f.h

-- 
2.34.1

[PATCH 01/35] global_data: Move pci_clk to m68k and powerpc

[Simon Glass]

Only m68k and powerpc use this field, so move it to the arch-specific
info, to reduce the size for other archs.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/m68k/cpu/mcf5445x/cpu.c           | 2 +-
 arch/m68k/include/asm/global_data.h    | 2 ++
 arch/m68k/lib/bdinfo.c                 | 2 +-
 arch/powerpc/cpu/mpc83xx/pci.c         | 4 ++--
 arch/powerpc/cpu/mpc83xx/speed.c       | 2 +-
 arch/powerpc/include/asm/global_data.h | 2 ++
 drivers/clk/mpc83xx_clk.c              | 2 +-
 include/asm-generic/global_data.h      | 5 -----
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index b811ac355e4..3fbd6a58c7d 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -92,7 +92,7 @@ int print_cpuinfo(void)
 		       strmhz(buf3, gd->arch.flb_clk));
 #ifdef CONFIG_PCI
 		printf("       PCI CLK %s MHz INP CLK %s MHz VCO CLK %s MHz\n",
-		       strmhz(buf1, gd->pci_clk),
+		       strmhz(buf1, gd->arch.pci_clk),
 		       strmhz(buf2, gd->arch.inp_clk),
 		       strmhz(buf3, gd->arch.vco_clk));
 #else
diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h
index 93efc722ba8..4ac886933c6 100644
--- a/arch/m68k/include/asm/global_data.h
+++ b/arch/m68k/include/asm/global_data.h
@@ -26,6 +26,8 @@ struct arch_global_data {
 #if defined(CONFIG_FSL_ESDHC)
 	unsigned long sdhc_per_clk;
 #endif
+	/** @pci_clk: PCI clock rate in Hz */
+	unsigned long pci_clk;
 };
 
 #include <asm-generic/global_data.h>
diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index cf6ae5adddf..891e94bbd3f 100644
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -22,7 +22,7 @@ int arch_setup_bdinfo(void)
 	bd->bi_busfreq = gd->bus_clk;	/* Bus Freq,      in Hz */
 
 	if (IS_ENABLED(CONFIG_PCI))
-		bd->bi_pcifreq = gd->pci_clk;
+		bd->bi_pcifreq = gd->arch.pci_clk;
 
 #if defined(CONFIG_EXTRA_CLOCK)
 	bd->bi_inpfreq = gd->arch.inp_clk;	/* input Freq in Hz */
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index 6f378c4e221..aef1123a2b7 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -45,7 +45,7 @@ void ft_pci_setup(void *blob, struct bd_info *bd)
 			do_fixup_by_path(blob, path, "bus-range",
 				&tmp, sizeof(tmp), 1);
 
-			tmp[0] = cpu_to_be32(gd->pci_clk);
+			tmp[0] = cpu_to_be32(gd->arch.pci_clk);
 			do_fixup_by_path(blob, path, "clock-frequency",
 				&tmp, sizeof(tmp[0]), 1);
 		}
@@ -60,7 +60,7 @@ void ft_pci_setup(void *blob, struct bd_info *bd)
 			do_fixup_by_path(blob, path, "bus-range",
 				&tmp, sizeof(tmp), 1);
 
-			tmp[0] = cpu_to_be32(gd->pci_clk);
+			tmp[0] = cpu_to_be32(gd->arch.pci_clk);
 			do_fixup_by_path(blob, path, "clock-frequency",
 				&tmp, sizeof(tmp[0]), 1);
 		}
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index 72464962613..0185ab50ad9 100644
--- a/arch/powerpc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
@@ -456,7 +456,7 @@ int get_clocks(void)
 #if defined(CONFIG_ARCH_MPC837X)
 	gd->arch.sata_clk = sata_clk;
 #endif
-	gd->pci_clk = pci_sync_in;
+	gd->arch.pci_clk = pci_sync_in;
 	gd->cpu_clk = gd->arch.core_clk;
 	gd->bus_clk = gd->arch.csb_clk;
 	return 0;
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index a9efbbdd3d4..cc2ce617350 100644
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -87,6 +87,8 @@ struct arch_global_data {
 #if defined(CONFIG_LWMON5)
 	unsigned long kbd_status;
 #endif
+	/** @pci_clk: PCI clock rate in Hz */
+	unsigned long pci_clk;
 };
 
 #include <asm-generic/global_data.h>
diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
index a29ad0d7a68..a43fff2e7ed 100644
--- a/drivers/clk/mpc83xx_clk.c
+++ b/drivers/clk/mpc83xx_clk.c
@@ -358,7 +358,7 @@ static int mpc83xx_clk_probe(struct udevice *dev)
 	gd->mem_clk = priv->speed[MPC83XX_CLK_MEM];
 
 	if (mpc83xx_has_pci(type))
-		gd->pci_clk = priv->speed[MPC83XX_CLK_PCI];
+		gd->arch.pci_clk = priv->speed[MPC83XX_CLK_PCI];
 
 	gd->cpu_clk = priv->speed[MPC83XX_CLK_CORE];
 	gd->bus_clk = priv->speed[MPC83XX_CLK_CSB];
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index aa336d63e3a..970053892e1 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -59,11 +59,6 @@ struct global_data {
 	 * @bus_clk: platform clock rate in Hz
 	 */
 	unsigned long bus_clk;
-	/**
-	 * @pci_clk: PCI clock rate in Hz
-	 */
-	/* We cannot bracket this with CONFIG_PCI due to mpc5xxx */
-	unsigned long pci_clk;
 	/**
 	 * @mem_clk: memory clock rate in Hz
 	 */
-- 
2.34.1

Acked

[Angelo Dureghello]

Acked-by: Angelo Dureghello <angelo@kernel-space.org>

On 24/07/24 5:08 PM, Simon Glass wrote:
> Only m68k and powerpc use this field, so move it to the arch-specific
> info, to reduce the size for other archs.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>   arch/m68k/cpu/mcf5445x/cpu.c           | 2 +-
>   arch/m68k/include/asm/global_data.h    | 2 ++
>   arch/m68k/lib/bdinfo.c                 | 2 +-
>   arch/powerpc/cpu/mpc83xx/pci.c         | 4 ++--
>   arch/powerpc/cpu/mpc83xx/speed.c       | 2 +-
>   arch/powerpc/include/asm/global_data.h | 2 ++
>   drivers/clk/mpc83xx_clk.c              | 2 +-
>   include/asm-generic/global_data.h      | 5 -----
>   8 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
> index b811ac355e4..3fbd6a58c7d 100644
> --- a/arch/m68k/cpu/mcf5445x/cpu.c
> +++ b/arch/m68k/cpu/mcf5445x/cpu.c
> @@ -92,7 +92,7 @@ int print_cpuinfo(void)
>   		       strmhz(buf3, gd->arch.flb_clk));
>   #ifdef CONFIG_PCI
>   		printf("       PCI CLK %s MHz INP CLK %s MHz VCO CLK %s MHz\n",
> -		       strmhz(buf1, gd->pci_clk),
> +		       strmhz(buf1, gd->arch.pci_clk),
>   		       strmhz(buf2, gd->arch.inp_clk),
>   		       strmhz(buf3, gd->arch.vco_clk));
>   #else
> diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h
> index 93efc722ba8..4ac886933c6 100644
> --- a/arch/m68k/include/asm/global_data.h
> +++ b/arch/m68k/include/asm/global_data.h
> @@ -26,6 +26,8 @@ struct arch_global_data {
>   #if defined(CONFIG_FSL_ESDHC)
>   	unsigned long sdhc_per_clk;
>   #endif
> +	/** @pci_clk: PCI clock rate in Hz */
> +	unsigned long pci_clk;
>   };
>   
>   #include <asm-generic/global_data.h>
> diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
> index cf6ae5adddf..891e94bbd3f 100644
> --- a/arch/m68k/lib/bdinfo.c
> +++ b/arch/m68k/lib/bdinfo.c
> @@ -22,7 +22,7 @@ int arch_setup_bdinfo(void)
>   	bd->bi_busfreq = gd->bus_clk;	/* Bus Freq,      in Hz */
>   
>   	if (IS_ENABLED(CONFIG_PCI))
> -		bd->bi_pcifreq = gd->pci_clk;
> +		bd->bi_pcifreq = gd->arch.pci_clk;
>   
>   #if defined(CONFIG_EXTRA_CLOCK)
>   	bd->bi_inpfreq = gd->arch.inp_clk;	/* input Freq in Hz */
> diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
> index 6f378c4e221..aef1123a2b7 100644
> --- a/arch/powerpc/cpu/mpc83xx/pci.c
> +++ b/arch/powerpc/cpu/mpc83xx/pci.c
> @@ -45,7 +45,7 @@ void ft_pci_setup(void *blob, struct bd_info *bd)
>   			do_fixup_by_path(blob, path, "bus-range",
>   				&tmp, sizeof(tmp), 1);
>   
> -			tmp[0] = cpu_to_be32(gd->pci_clk);
> +			tmp[0] = cpu_to_be32(gd->arch.pci_clk);
>   			do_fixup_by_path(blob, path, "clock-frequency",
>   				&tmp, sizeof(tmp[0]), 1);
>   		}
> @@ -60,7 +60,7 @@ void ft_pci_setup(void *blob, struct bd_info *bd)
>   			do_fixup_by_path(blob, path, "bus-range",
>   				&tmp, sizeof(tmp), 1);
>   
> -			tmp[0] = cpu_to_be32(gd->pci_clk);
> +			tmp[0] = cpu_to_be32(gd->arch.pci_clk);
>   			do_fixup_by_path(blob, path, "clock-frequency",
>   				&tmp, sizeof(tmp[0]), 1);
>   		}
> diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
> index 72464962613..0185ab50ad9 100644
> --- a/arch/powerpc/cpu/mpc83xx/speed.c
> +++ b/arch/powerpc/cpu/mpc83xx/speed.c
> @@ -456,7 +456,7 @@ int get_clocks(void)
>   #if defined(CONFIG_ARCH_MPC837X)
>   	gd->arch.sata_clk = sata_clk;
>   #endif
> -	gd->pci_clk = pci_sync_in;
> +	gd->arch.pci_clk = pci_sync_in;
>   	gd->cpu_clk = gd->arch.core_clk;
>   	gd->bus_clk = gd->arch.csb_clk;
>   	return 0;
> diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
> index a9efbbdd3d4..cc2ce617350 100644
> --- a/arch/powerpc/include/asm/global_data.h
> +++ b/arch/powerpc/include/asm/global_data.h
> @@ -87,6 +87,8 @@ struct arch_global_data {
>   #if defined(CONFIG_LWMON5)
>   	unsigned long kbd_status;
>   #endif
> +	/** @pci_clk: PCI clock rate in Hz */
> +	unsigned long pci_clk;
>   };
>   
>   #include <asm-generic/global_data.h>
> diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c
> index a29ad0d7a68..a43fff2e7ed 100644
> --- a/drivers/clk/mpc83xx_clk.c
> +++ b/drivers/clk/mpc83xx_clk.c
> @@ -358,7 +358,7 @@ static int mpc83xx_clk_probe(struct udevice *dev)
>   	gd->mem_clk = priv->speed[MPC83XX_CLK_MEM];
>   
>   	if (mpc83xx_has_pci(type))
> -		gd->pci_clk = priv->speed[MPC83XX_CLK_PCI];
> +		gd->arch.pci_clk = priv->speed[MPC83XX_CLK_PCI];
>   
>   	gd->cpu_clk = priv->speed[MPC83XX_CLK_CORE];
>   	gd->bus_clk = priv->speed[MPC83XX_CLK_CSB];
> diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
> index aa336d63e3a..970053892e1 100644
> --- a/include/asm-generic/global_data.h
> +++ b/include/asm-generic/global_data.h
> @@ -59,11 +59,6 @@ struct global_data {
>   	 * @bus_clk: platform clock rate in Hz
>   	 */
>   	unsigned long bus_clk;
> -	/**
> -	 * @pci_clk: PCI clock rate in Hz
> -	 */
> -	/* We cannot bracket this with CONFIG_PCI due to mpc5xxx */
> -	unsigned long pci_clk;
>   	/**
>   	 * @mem_clk: memory clock rate in Hz
>   	 */

[PATCH 00/27] led: Remove old status-LED code

[Simon Glass]

There has been an LED framework in U-Boot which uses driver model for
about 9 years now. Recent work is underway to improve it and provide
more features. It is probably a good time to drop the old code, which
is only used by 5 boards:

   ./tools/qconfig.py -f LED_STATUS
   5 matches
   eb_cpu5282 eb_cpu5282_internal mx23_olinuxino pinephone
   socfpga_vining_fpga

This series attempts that.


Simon Glass (27):
  led: Drop LED_STATUS_BOARD_SPECIFIC
  arm: Drop old LED support
  common: doc: Drop old LED support
  st: stm32f429: Drop old LED code
  led: Make the LED config common
  eb_cpu5282: Drop STATUS_LED
  mx23_olinuxino: Drop STATUS_LED
  pinephone: Drop STATUS_LED
  socfpga_vining_fpga: Drop STATUS_LED
  led: Drop LED_STATUS from Kconfig
  led: Drop the legacy LED command
  misc: Drop gpio_led driver
  pca9551_led: Delete driver
  misc: status_led: Delete driver
  m68k: Drop unused status_led.h header file
  powerpc: Drop status-LED code
  eb_cpu5282: Drop status-LED code
  igep00x0: Drop unused status_led.h header file
  mx23_olinuxino: Drop status-LED code
  vining_fpga: Drop status-LED code
  sunxi: Drop status-LED code
  common: Drop status-LED code in board_r
  image: Drop unused status_led.h header file
  ide: Drop unused status_led.h header file
  mpc83xx: Drop status-LED code
  net: Drop status-LED code
  led: Drop status_led header file

 arch/arm/lib/crt0.S                          |   4 -
 arch/m68k/lib/bootm.c                        |   3 -
 arch/powerpc/lib/interrupts.c                |   6 -
 board/BuS/eb_cpu5282/eb_cpu5282.c            |  20 --
 board/isee/igep00x0/igep00x0.c               |   1 -
 board/olimex/mx23_olinuxino/mx23_olinuxino.c |   7 -
 board/softing/vining_fpga/socfpga.c          |   4 -
 board/st/stm32f429-discovery/Makefile        |   1 -
 board/st/stm32f429-discovery/led.c           |  39 ---
 board/sunxi/board.c                          |   6 -
 boot/image.c                                 |   4 -
 cmd/Makefile                                 |   1 -
 cmd/ide.c                                    |   4 -
 cmd/legacy_led.c                             | 185 ----------
 common/board_f.c                             |  22 --
 common/board_r.c                             |  16 -
 configs/eb_cpu5282_defconfig                 |   6 -
 configs/eb_cpu5282_internal_defconfig        |   6 -
 configs/mx23_olinuxino_defconfig             |   8 -
 configs/pinephone_defconfig                  |   5 -
 configs/socfpga_vining_fpga_defconfig        |  11 -
 doc/README.LED                               |  77 -----
 drivers/led/Kconfig                          | 342 +------------------
 drivers/misc/Kconfig                         |  13 -
 drivers/misc/Makefile                        |   3 -
 drivers/misc/gpio_led.c                      | 106 ------
 drivers/misc/pca9551_led.c                   | 170 ---------
 drivers/misc/status_led.c                    | 124 -------
 drivers/timer/mpc83xx_timer.c                |   5 -
 include/configs/eb_cpu5282.h                 |   6 -
 include/status_led.h                         | 102 ------
 net/bootp.c                                  |   7 -
 net/net.c                                    |  33 --
 33 files changed, 11 insertions(+), 1336 deletions(-)
 delete mode 100644 board/st/stm32f429-discovery/led.c
 delete mode 100644 cmd/legacy_led.c
 delete mode 100644 doc/README.LED
 delete mode 100644 drivers/misc/gpio_led.c
 delete mode 100644 drivers/misc/pca9551_led.c
 delete mode 100644 drivers/misc/status_led.c
 delete mode 100644 include/status_led.h

-- 
2.43.0

[PATCH 15/27] m68k: Drop unused status_led.h header file

[Simon Glass]

This header file is not used, so drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/m68k/lib/bootm.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 3dcff8076e3..1fa112f8dbf 100644
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -15,9 +15,6 @@
 #include <bzlib.h>
 #include <watchdog.h>
 #include <asm/byteorder.h>
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
-- 
2.43.0

Acked

[Angelo Dureghello]

Acked-by: Angelo Dureghello <angelo@kernel-space.org>

Thanks !

On 26/09/24 10:44 PM, Simon Glass wrote:
> This header file is not used, so drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>   arch/m68k/lib/bootm.c | 3 ---
>   1 file changed, 3 deletions(-)
>
> diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
> index 3dcff8076e3..1fa112f8dbf 100644
> --- a/arch/m68k/lib/bootm.c
> +++ b/arch/m68k/lib/bootm.c
> @@ -15,9 +15,6 @@
>   #include <bzlib.h>
>   #include <watchdog.h>
>   #include <asm/byteorder.h>
> -#ifdef CONFIG_SHOW_BOOT_PROGRESS
> -# include <status_led.h>
> -#endif
>   
>   DECLARE_GLOBAL_DATA_PTR;
>