From patchwork Wed May 22 07:02:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3110 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 6568D3F9F8 for ; Wed, 22 May 2024 09:02:48 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-574ec615e9fsf378623a12.2 for ; Wed, 22 May 2024 00:02:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361368; cv=pass; d=google.com; s=arc-20160816; b=eLYIEm4U6z6iiyT7nam2WAfNjbUR2RDWVlSVxBaEch88Ag2wfggtd7EX1/xzKHCzox cf+meHNqLaBxGNNlsadXjzeaFCxwzE4F8az4ocORQKGZ4vNNrsQ6h/A9ROiGmvRf7DcI AsyFkicPjvjLA+zBkXgDusz0LWmEYLcprLstqXCZfg1Oy51jC84aQmbSEF96WQ7v43Ua ybUAXY8QnyDp5s0XffbMRpKLljrTqf2/YxeDUvzslNNus1a5X0p1ATK7V2N0drdkvi8+ 5Q1/3QR5nM3FCI23D6TqvZrlXA10UyXpRzWH7vQHwpxuJCjvJosedsQvhrOnm++ZSjgt 2M8g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Hcn8yyZ//0sOlgCu1goW8zNLH37L76tUPhxVbZhN6UY=; fh=MbfwS1E1qBja2p2JHdjptWPNVXygYx60yNWIcaw/l5s=; b=Ys8BHjJqeWQe+5rEc7UiOFzwFfq334HCGa9bR3Qpo9E+KpNFo1/dkbSc0Mhd9ygBTs 0kLtZYKONnx6oSgOtF0VdlZaAZk5+UXwgomc/Wd46uSOtzmKqCNsVi093XvaEjQN6pP1 EoSRIhXBl30AE5AONPjMcbzbBCc77GTYv3lKz08QqAmadGCeONxio0oS/gDdohjW//KH eNrzQV13hYVQ2eBWw7p2NWnxo6LZneSSefHMYEAHr/0yHm3eClrtsFmrgLRiJ4qLG86B joVUFPVuEVZi4NQJ3G/mpAQarKZ52cNy8GPHKEsp2WmJqwqmje4xbdWXv1pkaCp66WmK Vn4Q==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BK4+qpKl; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361368; x=1716966168; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Hcn8yyZ//0sOlgCu1goW8zNLH37L76tUPhxVbZhN6UY=; b=XnJAtb8s2C3YKhDP0O4QxuwLK4f+N3u5fuROLS4uokSAg1ooRqxPYesgWGfoXroEZo 0S369rXy5Zcy4btLIHDZ9QpYKsPykxMLmPgvwqWBIdbwC4+g4+4ZC74JLy3QYra7Nbvu TouRhaAcVc45Y538qrtQPOz1ukAW/oIEKz+6k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361368; x=1716966168; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Hcn8yyZ//0sOlgCu1goW8zNLH37L76tUPhxVbZhN6UY=; b=mh537peh9eEKSn4xokiwI5uvFAo0obCnT2+JzKs/ljONJeWfhIDu2CqW0yjF95oYr9 WjgjHMnyZo1rWWJfIJiuF3ZEgt1K4AM/tC19TpfgSrZllM9RV/r06yqlC0k6eR6VgAC7 uS+vKfKlOA1xyryv5uUqhf16xc6QCcY97UwOEtO0q82AY73YBDviJkHTBiwaSroCWOEQ +3NPtbQDYcjg75uWsitFrIro28pp5D+DEE4KYkMAqed95B2ViPzUM0ZgdsLqcNrCLQO7 PZTKZuvHrD2KMgmzI5pxkz2RBCY+sNf1G2wNJ8bynV6kuonjwl9DjPYi4XdooV1+SOkM M3NA== X-Forwarded-Encrypted: i=2; AJvYcCUirX/ZTH+JVHPxlGYJg2P7uHwVEY22VOEfPeMEhoQbOh4hE9RZ2rLBqcNq3SxOHzTbbzfQVfoSH+UhNjVLCCeKEUnoAdiL87EkflgtIyrQeOGJ29SNZAenA7o8cA== X-Gm-Message-State: AOJu0Yyt+kz8lhvIJxpby8lSrzLP7FjSzV4gE4zQOcKfIbvGqOmw3fT7 kTH3qn7Zd8mGkZqF9r0K1G4wXLcV9YVD5oL00q90N//jVC47buloNvWnlhgLjYrv0w== X-Google-Smtp-Source: AGHT+IG3xw8dnlrrNgJF0HszobxrxMIzsvGjZFtFfOhge2n7HVyUWzAEpPBICxztVmPKAVnlEhDjfw== X-Received: by 2002:a50:a44e:0:b0:56f:e585:2388 with SMTP id 4fb4d7f45d1cf-57832c54dfcmr647087a12.36.1716361368015; Wed, 22 May 2024 00:02:48 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:4009:b0:578:27b6:cf9 with SMTP id 4fb4d7f45d1cf-57827b625abls484641a12.2.-pod-prod-07-eu; Wed, 22 May 2024 00:02:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXu5ZeHipqvGmm2dPZxgd7vumL14vG7s9y+rfZKTRSfeLmqi4OLjwvoGjk4o4J3IEht423epOELNyPqPgcvT8t8t77PgV+2GTos7fr/OJg53C/a X-Received: by 2002:a50:f699:0:b0:568:1882:651f with SMTP id 4fb4d7f45d1cf-57832abc743mr595790a12.25.1716361366046; Wed, 22 May 2024 00:02:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361366; cv=none; d=google.com; s=arc-20160816; b=Uz57Ym+QCmfXhPEAOXU4iozBhhwEpsFbrgQBvGNfGK62aIgazoQyIPF5ao5pfwsvZm ByRlVqZcCtNRgIZSpOokZy0vf6N4lpAQuJsyI+BLSMaFrhmzDwmgXA1g97l1NxWrr3iB gVbTTGxjX1W7PyEbsblLvkJR4047jPNqvzop2alvwypuIq+7ri4JGzk6krVx3rQrSYcm ZahwARNgyHO7LWc6JYuyQ84dFZpJ2fJiRyfX433UauD6pOexJJJZQBuxo8u686JO8luv tO3Io+gF/ikYF9gJajxldUF/5NZur/zZeBq8uzEh0McAuYOyJcxWxSM1mBxePDGiwGEA X3Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=UvkAYVneU80i5ut71j/6Of/HRF/qbYJDIQXPcUAdskM=; fh=2TiIHzJI1SXNhYDDRGpZU+N7/6/b6c2OGRCAXeNOU8o=; b=MAo/ME3FonHAKsidpq9edBW49lAlNx0STtE9ih2HP2b5WGQ53pkXTLR1XESM4WC1qI WGumcg2/smGAXbzzSWrrxAOsH2sYD9Taa2p5aAVww4sWNrWqAn6Ow/Dp7bjFB+/WGzQm q0xGBKmRL9Ox+kI3zxblfJ70TDN9ElKTwBFz5Np8ENt9/RKy1m2ND7CnpygtTYwQrTT1 pGWv8zTriY2Nn6V+Q4uTj5MjNIVfsoezw1kRNiaENATLD46QR1B/0IObt0Bze9RN48Mg Xfa5RVVj7zpAO+Juxd5B+JXJHj845iJxj8/xNHauwPBTgCJ51DDm1l7WS0goYseTH1fC 6dCg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BK4+qpKl; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-574f9bec535sor3592172a12.6.2024.05.22.00.02.45 for (Google Transport Security); Wed, 22 May 2024 00:02:46 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCXAuY1qC7vESZgBMu2vCb+/Jsh+GvXZZBBwP9VJgAWfpI4pbdRynCXITiQLL0fvB3+0KOIccdACuzz3ptmmioLeNvnCx4YHVl2QPbDozjErCjk9 X-Received: by 2002:a50:9fc9:0:b0:56e:24a5:587a with SMTP id 4fb4d7f45d1cf-57832a44748mr719726a12.11.1716361365177; Wed, 22 May 2024 00:02:45 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:44 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 01/18] board/orangepi/orangepi-zero: make the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:20 +0200 Message-ID: <20240522070238.3282121-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BK4+qpKl; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the Linux kernel patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...RM-dts-orange-pi-zero-enable-spi-nor.patch | 41 ++++++++++--------- ...ARM-dts-orange-pi-zero-enable-spidev.patch | 23 +++++++---- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch index ff0a1db223ea..ff350d68b4cc 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch @@ -1,4 +1,4 @@ -From 068c3baff3048a3db4ef2518ff917ce749cd8169 Mon Sep 17 00:00:00 2001 +From ddc295a04269437e5c726f63239689786354d44b Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 20 May 2017 11:24:26 +0300 Subject: [PATCH] ARM: dts: orange-pi-zero: enable SPI NOR @@ -9,34 +9,37 @@ For more information see: - http://linux-sunxi.org/Orange_Pi_Zero#SPI_NOR_flash Signed-off-by: Sergey Matyukevich +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + .../boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -index 4e1a9050c6b4..cdf19821b1f3 100644 +index 6b74cc923e16..4012f8712cd7 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -@@ -161,3 +161,19 @@ - /* USB VBUS is always on */ - status = "okay"; - }; -+ -+&spi0 { +@@ -167,14 +167,18 @@ &ohci1 { + + &spi0 { + /* Disable SPI NOR by default: it optional on Orange Pi Zero boards */ +- status = "disabled"; + status = "okay"; -+ -+ flash@0 { -+ #address-cells = <1>; -+ #size-cells = <1>; + + flash@0 { + #address-cells = <1>; + #size-cells = <1>; +- compatible = "mxicy,mx25l1606e", "jedec,spi-nor"; + compatible = "mxicy,mx25l1606e", "winbond,w25q128"; -+ reg = <0>; -+ spi-max-frequency = <40000000>; + reg = <0>; + spi-max-frequency = <40000000>; + + partition@00000000 { + reg = <0x00000000 0x200000>; /* 2Mb */ + }; -+ }; -+}; + }; + }; + -- -2.11.0 +2.43.0 diff --git a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch index 04d43c344f29..61dc97fd8b4f 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch @@ -1,4 +1,4 @@ -From 8dd1b2a696bb7e9914abd11cc6f5c0f54c33d626 Mon Sep 17 00:00:00 2001 +From 208b13119fc0f709935fc2fc13c0295b19edbbf5 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 20 May 2017 15:36:51 +0300 Subject: [PATCH] ARM: dts: orange-pi-zero: enable spidev @@ -7,27 +7,28 @@ On orange-pi-zero board SPI1 pins are accessible via GPIO expansion port. This patch enables spidev driver for SPI1. Signed-off-by: Sergey Matyukevich +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ + .../dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -index cdf19821b1f3..7242aaecb14f 100644 +index 4012f8712cd7..3552eb312747 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -@@ -59,6 +59,7 @@ - serial0 = &uart0; +@@ -59,6 +59,7 @@ aliases { /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet0 = &emac; ethernet1 = &xr819; + spi1 = &spi1; }; chosen { -@@ -177,3 +178,13 @@ - }; +@@ -182,6 +183,16 @@ partition@00000000 { }; }; -+ + +&spi1 { + status = "okay"; + @@ -37,6 +38,10 @@ index cdf19821b1f3..7242aaecb14f 100644 + spi-max-frequency = <10000000>; + }; +}; ++ + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pa_pins>; -- -2.11.0 +2.43.0