[PATCH 3/3] rockchip: px30: Change sfc node to match upstream linux proposed

[Jon Lin]

On 2021/8/19 1:13, Chris Morgan wrote:
> On Tue, Aug 17, 2021 at 09:41:01AM +0800, Jon Lin wrote:
>> TX single line is more compatible for corresponding board
>>
>> Signed-off-by: Jon Lin <jon.lin at rock-chips.com>
>> ---
>>
> There are still some bugs with this. Note that if you want for now
> you can just abandon this patch (or fix it, either way is fine).
> If you abandon it I'll make sure once the Linux driver is upstream
> the nodes match between it and U-Boot. Otherwise, you'll need to make
> the changes below to fix this.
I had abandon it because I think it would be more accurate for you to 
deal with it
>>   arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 2 +-
>>   arch/arm/dts/rk3326-odroid-go2.dts         | 2 +-
>>   2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
>> index 741e8dd935..0990005a15 100644
>> --- a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
>> +++ b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
>> @@ -70,7 +70,7 @@
>>   	u-boot,dm-pre-reloc;
>>   };
>>   
>> -&spi_flash {
>> +&{/sfc at ff3a0000/flash at 0} {
>>   	u-boot,dm-pre-reloc;
>>   };
>>   
> This causes the devicetree to fail to compile, since the node is not
> getting changed from spi_flash in the main dts file.
>
>> diff --git a/arch/arm/dts/rk3326-odroid-go2.dts b/arch/arm/dts/rk3326-odroid-go2.dts
>> index 6f91f5040b..57e7f409d8 100644
>> --- a/arch/arm/dts/rk3326-odroid-go2.dts
>> +++ b/arch/arm/dts/rk3326-odroid-go2.dts
>> @@ -629,7 +629,7 @@
> The node should change here to just "flash at 0" instead of
> "spi_flash: xt25f128b at 0" to match upstream (proposed).
>
> Also note that on the upstream (proposed) the pinctrl values are in a
> different order, and the sfc_cs pinctrl is called the sfc_cs0.
>
>>   		reg = <0>;
>>   		spi-max-frequency = <108000000>;
>>   		spi-rx-bus-width = <2>;
>> -		spi-tx-bus-width = <2>;
>> +		spi-tx-bus-width = <1>;
>>   	};
>>   };
>>   
>> -- 
>> 2.17.1
>>
>>
>>
>
>